jab2870/sxmo-utils
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix status bar icon spaces

Browse source 
Signed-off-by: Stacy Harper <contact@stacyharper.net>
Signed-off-by: Maarten van Gompel <proycon@anaproy.nl>
This commit is contained in:
Stacy Harper 2021-03-27 18:20:37 +01:00 • committed by Maarten van Gompel
parent cf876823fb
commit 18009c8378
1 changed files with 63 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

126
scripts/core/sxmo_statusbar.sh
View file

@ -18,14 +18,14 @@ update() {
cut -f1 cut -f1
)")" )")"
CALLSECONDS="$(echo "$NOWS" - "$CALLSTARTS" | bc)" CALLSECONDS="$(echo "$NOWS" - "$CALLSTARTS" | bc)"
CALLINFO=" ${CALLSECONDS}s " CALLINFO="${CALLSECONDS}s"
fi fi
# W symbol if wireless is connect # W symbol if wireless is connect
WIRELESS="" WIRELESS=""
WLANSTATE="$(tr -d "\n" < /sys/class/net/wlan0/operstate)" WLANSTATE="$(tr -d "\n" < /sys/class/net/wlan0/operstate)"
if [ "$WLANSTATE" = "up" ]; then if [ "$WLANSTATE" = "up" ]; then
WIRELESS=" " WIRELESS=""
fi fi
# M symbol if modem monitoring is on & modem present # M symbol if modem monitoring is on & modem present
@ -38,79 +38,79 @@ update() {
cat /sys/class/power_supply/*-battery/status | cat /sys/class/power_supply/*-battery/status |
cut -c1 cut -c1
)" )"
if [ "$BATSTATUS" = "C" ]; then if [ "$BATSTATUS" = "C" ]; then
if [ "$PCT" -lt 20 ]; then if [ "$PCT" -lt 20 ]; then
BATSTATUS="" BATSTATUS=""
elif [ "$PCT" -lt 30 ]; then elif [ "$PCT" -lt 30 ]; then
BATSTATUS="" BATSTATUS=""
elif [ "$PCT" -lt 40 ]; then elif [ "$PCT" -lt 40 ]; then
BATSTATUS="" BATSTATUS=""
elif [ "$PCT" -lt 60 ]; then elif [ "$PCT" -lt 60 ]; then
BATSTATUS="" BATSTATUS=""
elif [ "$PCT" -lt 80 ]; then elif [ "$PCT" -lt 80 ]; then
BATSTATUS="" BATSTATUS=""
elif [ "$PCT" -lt 90 ]; then elif [ "$PCT" -lt 90 ]; then
BATSTATUS="" BATSTATUS=""
else else
BATSTATUS="" BATSTATUS=""
fi fi
else else
if [ "$PCT" -lt 10 ]; then if [ "$PCT" -lt 10 ]; then
BATSTATUS="" BATSTATUS=""
elif [ "$PCT" -lt 20 ]; then elif [ "$PCT" -lt 20 ]; then
BATSTATUS="" BATSTATUS=""
elif [ "$PCT" -lt 30 ]; then elif [ "$PCT" -lt 30 ]; then
BATSTATUS="" BATSTATUS=""
elif [ "$PCT" -lt 40 ]; then elif [ "$PCT" -lt 40 ]; then
BATSTATUS="" BATSTATUS=""
elif [ "$PCT" -lt 50 ]; then elif [ "$PCT" -lt 50 ]; then
BATSTATUS="" BATSTATUS=""
elif [ "$PCT" -lt 60 ]; then elif [ "$PCT" -lt 60 ]; then
BATSTATUS="" BATSTATUS=""
elif [ "$PCT" -lt 70 ]; then elif [ "$PCT" -lt 70 ]; then
BATSTATUS="" BATSTATUS=""
elif [ "$PCT" -lt 80 ]; then elif [ "$PCT" -lt 80 ]; then
BATSTATUS="" BATSTATUS=""
elif [ "$PCT" -lt 90 ]; then elif [ "$PCT" -lt 90 ]; then
BATSTATUS="" BATSTATUS=""
else else
BATSTATUS="" BATSTATUS=""
fi fi
fi fi
# Volume # Volume
AUDIODEV="$(sxmo_audiocurrentdevice.sh)" AUDIODEV="$(sxmo_audiocurrentdevice.sh)"
AUDIOSYMBOL=$(echo "$AUDIODEV" | cut -c1) AUDIOSYMBOL=$(echo "$AUDIODEV" | cut -c1)
if [ "$AUDIOSYMBOL" = "L" ]; then if [ "$AUDIOSYMBOL" = "L" ] || [ "$AUDIOSYMBOL" = "N" ]; then
AUDIOSYMBOL="" #speakers, use no special symbol AUDIOSYMBOL="" #speakers or none, use no special symbol
elif [ "$AUDIOSYMBOL" = "H" ]; then elif [ "$AUDIOSYMBOL" = "H" ]; then
AUDIOSYMBOL=" " AUDIOSYMBOL=" "
elif [ "$AUDIOSYMBOL" = "E" ]; then elif [ "$AUDIOSYMBOL" = "E" ]; then
AUDIOSYMBOL=" " #earpiece AUDIOSYMBOL=" " #earpiece
fi fi
VOL=0 VOL=0
[ "$AUDIODEV" = "None" ] && AUDIOSYMBOL="ﱝ" || VOL="$( [ "$AUDIODEV" = "None" ] || VOL="$(
amixer sget "$AUDIODEV" | amixer sget "$AUDIODEV" |
grep -oE '([0-9]+)%' | grep -oE '([0-9]+)%' |
tr -d ' %' | tr -d ' %' |
awk '{ s += $1; c++ } END { print s/c }' | awk '{ s += $1; c++ } END { print s/c }' |
xargs printf %.0f xargs printf %.0f
)" )"
if [ "$AUDIODEV" != "None" ]; then if [ "$AUDIODEV" != "None" ]; then
if [ "$VOL" -eq 0 ]; then if [ "$VOL" -eq 0 ]; then
AUDIOSYMBOL="$AUDIOSYMBOLﱝ" VOLUMESYMBOL="ﱝ"
elif [ "$VOL" -lt 25 ]; then elif [ "$VOL" -lt 25 ]; then
AUDIOSYMBOL="$AUDIOSYMBOL奄" VOLUMESYMBOL="奄"
elif [ "$VOL" -gt 75 ]; then elif [ "$VOL" -gt 75 ]; then
AUDIOSYMBOL="$AUDIOSYMBOL墳" VOLUMESYMBOL="墳"
else else
AUDIOSYMBOL="$AUDIOSYMBOL奔" VOLUMESYMBOL="奔"
fi fi
fi fi
# Time # Time
TIME="$(date +%R)" TIME="$(date +%R)"
BAR="${CALLINFO}${MODEMMON}${WIRELESS} ${AUDIOSYMBOL} ${BATSTATUS} ${TIME}" BAR="${CALLINFO} ${MODEMMON} ${WIRELESS} ${AUDIOSYMBOL}${VOLUMESYMBOL} ${BATSTATUS} ${TIME}"
xsetroot -name "$BAR" xsetroot -name "$BAR"
} }