Fix status bar crash and add more signal labels (#34)

* add more signal type labels

* cleanup redundant function

Author: vandamd

app/src/main/java/com/vandam/luma/helper/ActionService.kt

@@ -2226,7 +2226,6 @@ class ActionService : AccessibilityService() {
         batteryIcon.visibility = if (prefs.batteryIcon) View.VISIBLE else View.GONE
         batteryIcon.setImageResource(iconRes)
         batteryIcon.setColorFilter(textColor)
-        LumaStatusBarUi.updateSectionBaseline(batteryLayout)
     }
 
     private fun updateSecureLockMaskConnectivityStatus(
@@ -2298,7 +2297,6 @@ class ActionService : AccessibilityService() {
                 wifiIcon.visibility == View.VISIBLE ||
                 bluetoothIcon.visibility == View.VISIBLE
         connectivityLayout.visibility = if (anyVisible) View.VISIBLE else View.INVISIBLE
-        LumaStatusBarUi.updateSectionBaseline(connectivityLayout)
     }
 
     private fun shouldShowUnlockGateStatusBar(): Boolean =

app/src/main/java/com/vandam/luma/helper/LumaStatusBarUi.kt

@@ -5,7 +5,6 @@ import android.os.BatteryManager
 import android.telephony.TelephonyManager
 import android.view.View
 import android.widget.ImageView
-import android.widget.LinearLayout
 import android.widget.TextView
 import com.vandam.luma.R
 import com.vandam.luma.data.Prefs
@@ -21,15 +20,6 @@ object LumaStatusBarUi {
         imageView.setColorFilter(tintColor)
     }
 
-    fun updateSectionBaseline(layout: LinearLayout) {
-        for (index in 0 until layout.childCount) {
-            if (layout.getChildAt(index).visibility != View.GONE) {
-                layout.baselineAlignedChildIndex = index
-                return
-            }
-        }
-    }
-
     fun clockPlaceholder(prefs: Prefs): String {
         val is24Hour = prefs.timeFormat == Prefs.TimeFormat.TwentyFourHour
         val hour = if (is24Hour || prefs.leadingZero) "00" else "12"
@@ -58,15 +48,33 @@ object LumaStatusBarUi {
     fun networkLabelForType(type: Int?): String =
         when (type) {
             TelephonyManager.NETWORK_TYPE_NR -> "5G"
+
             TelephonyManager.NETWORK_TYPE_LTE -> "LTE"
+
             TelephonyManager.NETWORK_TYPE_HSPAP,
             TelephonyManager.NETWORK_TYPE_HSPA,
             TelephonyManager.NETWORK_TYPE_HSDPA,
             TelephonyManager.NETWORK_TYPE_HSUPA,
             TelephonyManager.NETWORK_TYPE_UMTS,
+            TelephonyManager.NETWORK_TYPE_EVDO_0,
+            TelephonyManager.NETWORK_TYPE_EVDO_A,
+            TelephonyManager.NETWORK_TYPE_EVDO_B,
+            TelephonyManager.NETWORK_TYPE_EHRPD,
+            TelephonyManager.NETWORK_TYPE_TD_SCDMA,
             -> "3G"
+
+            TelephonyManager.NETWORK_TYPE_GSM -> "2G"
+
+            TelephonyManager.NETWORK_TYPE_CDMA -> "CDMA"
+
+            TelephonyManager.NETWORK_TYPE_1xRTT -> "1x"
+
             TelephonyManager.NETWORK_TYPE_EDGE -> "E"
+
             TelephonyManager.NETWORK_TYPE_GPRS -> "G"
+
+            TelephonyManager.NETWORK_TYPE_IWLAN -> "IWLAN"
+
             else -> ""
         }
 

app/src/main/java/com/vandam/luma/ui/HomeFragment.kt

@@ -756,7 +756,6 @@ class HomeFragment :
         if (!prefs.showsLumaStatusBarAnywhere() || (!prefs.batteryPercentage && !prefs.batteryIcon)) {
             binding.statusBatteryText.visibility = View.GONE
             binding.statusBattery.visibility = View.GONE
-            updateSectionBaseline(binding.statusBatteryLayout)
             binding.statusBatteryLayout.visibility = View.INVISIBLE
             return
         }
@@ -771,7 +770,6 @@ class HomeFragment :
         if (!prefs.showsLumaStatusBarAnywhere() || (!prefs.batteryPercentage && !prefs.batteryIcon)) {
             binding.statusBatteryText.visibility = View.GONE
             binding.statusBattery.visibility = View.GONE
-            updateSectionBaseline(binding.statusBatteryLayout)
             binding.statusBatteryLayout.visibility = View.INVISIBLE
             return
         }
@@ -808,7 +806,6 @@ class HomeFragment :
         binding.statusBatteryText.visibility = if (prefs.batteryPercentage) View.VISIBLE else View.GONE
         binding.statusBatteryText.text = "$pct%"
         binding.statusBattery.visibility = if (prefs.batteryIcon) View.VISIBLE else View.GONE
-        updateSectionBaseline(binding.statusBatteryLayout)
         binding.statusBattery.setImageResource(icon)
         binding.statusBattery.setColorFilter(binding.statusBatteryText.currentTextColor)
     }
@@ -821,7 +818,6 @@ class HomeFragment :
         if (prefs.cellularEnabled) startCellularMonitor() else hideCellular()
         if (prefs.wifiEnabled) startWifiMonitor() else hideWifi()
         if (prefs.bluetoothEnabled) startBluetoothMonitor() else hideBluetooth()
-        updateSectionBaseline(binding.statusConnectivityLayout)
     }
 
     private fun stopConnectivityMonitors() {
@@ -855,7 +851,6 @@ class HomeFragment :
         } else {
             hideBluetooth()
         }
-        updateSectionBaseline(binding.statusConnectivityLayout)
     }
 
     private fun primeCellularState() {
@@ -956,10 +951,6 @@ class HomeFragment :
         binding.statusNetworkType.text = label
     }
 
-    private fun updateSectionBaseline(layout: LinearLayout) {
-        LumaStatusBarUi.updateSectionBaseline(layout)
-    }
-
     private fun hideCellular() {
         binding.statusSignal.visibility = View.GONE
         binding.statusNetworkType.visibility = View.GONE

app/src/main/res/layout/luma_status_bar_content.xml

@@ -9,6 +9,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
+        android:baselineAligned="false"
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:clipToPadding="false"
@@ -58,6 +59,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
+        android:baselineAligned="false"
         android:gravity="center_vertical|end"
         android:orientation="horizontal"
         android:clipToPadding="false"