SHA256
Убрать нижнюю кнопку в каналах
This commit is contained in:
+1
-1
@@ -1,2 +1,2 @@
|
|||||||
client.version=1.12.0
|
client.version=1.12.1
|
||||||
server.version=1.10.0
|
server.version=1.10.0
|
||||||
|
|||||||
+18
-1
@@ -123,6 +123,23 @@ find_offline_gradle_zip() {
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
local extracted_dir=""
|
||||||
|
if [[ -d "$HOME/.gradle/wrapper/dists/gradle-8.14-bin" ]]; then
|
||||||
|
extracted_dir="$(find "$HOME/.gradle/wrapper/dists/gradle-8.14-bin" -type d -name 'gradle-8.14' | sort | head -n 1 || true)"
|
||||||
|
fi
|
||||||
|
if [[ -n "$extracted_dir" && -d "$extracted_dir" ]]; then
|
||||||
|
local generated_zip="$TMP/gradle-offline.zip"
|
||||||
|
(
|
||||||
|
cd "$(dirname -- "$extracted_dir")"
|
||||||
|
rm -f -- "$generated_zip"
|
||||||
|
zip -qr "$generated_zip" "gradle-8.14"
|
||||||
|
)
|
||||||
|
if [[ -f "$generated_zip" ]]; then
|
||||||
|
printf '%s\n' "$generated_zip"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -269,7 +286,7 @@ if OFFLINE_ZIP_SRC="$(find_offline_gradle_zip)"; then
|
|||||||
OFFLINE_ZIP_NAME="gradle-offline.zip"
|
OFFLINE_ZIP_NAME="gradle-offline.zip"
|
||||||
else
|
else
|
||||||
echo "ERROR: offline Gradle zip not found." >&2
|
echo "ERROR: offline Gradle zip not found." >&2
|
||||||
echo "Place it at ./offline/gradle-offline.zip or set BUNDLE_OFFLINE_GRADLE_ZIP." >&2
|
echo "Place it at ./offline/gradle-offline.zip, set BUNDLE_OFFLINE_GRADLE_ZIP, or install Gradle 8.14 locally." >&2
|
||||||
echo "The bundle is not created because this variant is meant to be offline-ready." >&2
|
echo "The bundle is not created because this variant is meant to be offline-ready." >&2
|
||||||
exit 4
|
exit 4
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1094,14 +1094,6 @@ function renderListContent({ screen, container, listState, navigate, refreshFeed
|
|||||||
container.append(list);
|
container.append(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateBottomCta({ button }) {
|
|
||||||
if (!button) return;
|
|
||||||
button.hidden = true;
|
|
||||||
button.textContent = '';
|
|
||||||
button.className = 'channels-bottom-action';
|
|
||||||
button.onclick = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadFeedAndRender({ screen, listState, contentEl, navigate }) {
|
async function loadFeedAndRender({ screen, listState, contentEl, navigate }) {
|
||||||
renderSkeletonList(contentEl, 5);
|
renderSkeletonList(contentEl, 5);
|
||||||
|
|
||||||
@@ -1215,9 +1207,6 @@ export function render({ navigate, route, chrome }) {
|
|||||||
});
|
});
|
||||||
const topMenuBtn = topBarEl.querySelector('.channels-top-more-btn');
|
const topMenuBtn = topBarEl.querySelector('.channels-top-more-btn');
|
||||||
|
|
||||||
const bottomCta = document.createElement('button');
|
|
||||||
bottomCta.type = 'button';
|
|
||||||
|
|
||||||
const reloadFeed = async () => loadFeedAndRender({ screen, listState, contentEl, navigate });
|
const reloadFeed = async () => loadFeedAndRender({ screen, listState, contentEl, navigate });
|
||||||
|
|
||||||
const rerenderList = () => {
|
const rerenderList = () => {
|
||||||
@@ -1234,18 +1223,15 @@ export function render({ navigate, route, chrome }) {
|
|||||||
topTitle.textContent = channelsViewTitle(listState.viewMode);
|
topTitle.textContent = channelsViewTitle(listState.viewMode);
|
||||||
topMenuBtn.style.display = '';
|
topMenuBtn.style.display = '';
|
||||||
|
|
||||||
updateBottomCta({ button: bottomCta });
|
|
||||||
};
|
};
|
||||||
|
|
||||||
chrome?.setTopbar(topBarEl);
|
chrome?.setTopbar(topBarEl);
|
||||||
screen.append(contentEl, bottomCta);
|
screen.append(contentEl);
|
||||||
|
|
||||||
if (createSuccessFlash) {
|
if (createSuccessFlash) {
|
||||||
showToast(createSuccessFlash);
|
showToast(createSuccessFlash);
|
||||||
}
|
}
|
||||||
|
|
||||||
updateBottomCta({ button: bottomCta });
|
|
||||||
|
|
||||||
// Применяем корректное состояние хедера сразу на первом рендере,
|
// Применяем корректное состояние хедера сразу на первом рендере,
|
||||||
// чтобы не показывать лишние кнопки до первой перерисовки.
|
// чтобы не показывать лишние кнопки до первой перерисовки.
|
||||||
rerenderList();
|
rerenderList();
|
||||||
|
|||||||
Reference in New Issue
Block a user