Skip to content

Track icon reapply per device, not per card #1943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robcodedev wants to merge 1 commit into
base: v4.5-dev
Choose a base branch
from
Open

Track icon reapply per device, not per card #1943

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions static/build/.tmp_update/runtime.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,22 @@ main() {
# Start the battery monitor
batmon &

# Reapply theme
# Reapply theme when this SD is first used on a device.
system_theme="$(/customer/app/jsonval theme)"
active_theme="$(cat $sysdir/config/active_theme)"

if [ "$system_theme" == "./" ] || [ "$system_theme" != "$active_theme" ] || [ ! -d "$system_theme" ]; then
active_theme="$(cat "$sysdir/config/active_theme" 2>/dev/null)"
theme_device_state="$sysdir/config/theme-applied-$SERIAL_NUMBER"
applied_theme="$(cat "$theme_device_state" 2>/dev/null)"

if [ "$system_theme" == "./" ] ||
[ "$system_theme" != "$active_theme" ] ||
[ ! -d "$system_theme" ] ||
[ "$applied_theme" != "$system_theme" ]; then
themeSwitcher --reapply_icons

# Re-read: themeSwitcher writes the resolved theme back to settings,
# including when it falls back to a different one.
system_theme="$(/customer/app/jsonval theme)"
echo -n "$system_theme" > "$theme_device_state"
fi

# Check is charging
Expand Down