TySS-Dev/capod
1
0
Fork 0
mirror of https://github.com/d4rken-org/capod.git synced 2026-09-14 18:26:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(monitor): Clean up collapsed notification layouts

Browse Source 
Normalize root containers to FrameLayout, remove weight-based spacers,

standardize icon sizes to 16dp, and use consistent margins.
This commit is contained in:
darken
2026-03-01 00:15:42 +01:00
committed by Matthias Urhahn
parent eefe740b6f
commit 4db2edd29a
3 changed files with 123 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/monitor_notification_dual_pods_small.xml
+89 -98
View File
@@ -1,129 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Notification.Container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:orientation="horizontal"
android:paddingVertical="8dp">
<FrameLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/pod_left_icon"
style="@style/PodInfoItemIcon.Notification"
android:src="@drawable/device_airpods_gen1_left" />
<TextView
android:id="@+id/pod_left_label"
style="@style/PodInfoItemText.Notification"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingHorizontal="2dp"
tools:text="100%" />
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/pod_left_charging"
style="@style/PodInfoItemIcon.Notification"
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_baseline_power_24" />
<ImageView
android:id="@+id/pod_left_icon"
style="@style/PodInfoItemIcon.Notification"
android:src="@drawable/device_airpods_gen1_left" />
<ImageView
android:id="@+id/pod_left_ear"
style="@style/PodInfoItemIcon.Notification"
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_baseline_hearing_24" />
</LinearLayout>
<TextView
android:id="@+id/pod_left_label"
style="@style/PodInfoItemText.Notification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
tools:text="100%" />
<FrameLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<ImageView
android:id="@+id/pod_left_charging"
style="@style/PodInfoItemIcon.Notification"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginStart="2dp"
android:src="@drawable/ic_baseline_power_24" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:id="@+id/pod_case_container"
android:orientation="horizontal">
<ImageView
android:id="@+id/pod_left_ear"
style="@style/PodInfoItemIcon.Notification"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginStart="2dp"
android:src="@drawable/ic_baseline_hearing_24" />
</LinearLayout>
<ImageView
android:id="@+id/pod_case_icon"
style="@style/PodInfoItemIcon.Notification"
android:src="@drawable/device_airpods_gen1_case" />
<TextView
android:id="@+id/pod_case_label"
style="@style/PodInfoItemText.Notification"
<LinearLayout
android:id="@+id/pod_case_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingHorizontal="4dp"
tools:text="100%" />
android:layout_marginStart="20dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/pod_case_charging"
style="@style/PodInfoItemIcon.Notification"
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_baseline_power_24" />
</LinearLayout>
<ImageView
android:id="@+id/pod_case_icon"
style="@style/PodInfoItemIcon.Notification"
android:src="@drawable/device_airpods_gen1_case" />
<FrameLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<TextView
android:id="@+id/pod_case_label"
style="@style/PodInfoItemText.Notification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
tools:text="100%" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/pod_case_charging"
style="@style/PodInfoItemIcon.Notification"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginStart="2dp"
android:src="@drawable/ic_baseline_power_24" />
</LinearLayout>
<ImageView
android:id="@+id/pod_right_icon"
style="@style/PodInfoItemIcon.Notification"
android:src="@drawable/device_airpods_gen1_right" />
<TextView
android:id="@+id/pod_right_label"
style="@style/PodInfoItemText.Notification"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingHorizontal="2dp"
tools:text="100%" />
android:layout_marginStart="20dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/pod_right_charging"
style="@style/PodInfoItemIcon.Notification"
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_baseline_power_24" />
<ImageView
android:id="@+id/pod_right_icon"
style="@style/PodInfoItemIcon.Notification"
android:src="@drawable/device_airpods_gen1_right" />
<TextView
android:id="@+id/pod_right_label"
style="@style/PodInfoItemText.Notification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
tools:text="100%" />
<ImageView
android:id="@+id/pod_right_charging"
style="@style/PodInfoItemIcon.Notification"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginStart="2dp"
android:src="@drawable/ic_baseline_power_24" />
<ImageView
android:id="@+id/pod_right_ear"
style="@style/PodInfoItemIcon.Notification"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginStart="2dp"
android:src="@drawable/ic_baseline_hearing_24" />
</LinearLayout>
<ImageView
android:id="@+id/pod_right_ear"
style="@style/PodInfoItemIcon.Notification"
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_baseline_hearing_24" />
</LinearLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
</FrameLayout>
app/src/main/res/layout/monitor_notification_single_pods_small.xml
+27 -27
View File
@@ -1,36 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
style="@style/Notification.Container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="8dp"
android:gravity="center_horizontal">
<ImageView
android:id="@+id/headphones_icon"
style="@style/PodInfoItemIcon.Notification"
android:layout_marginEnd="4dp"
android:src="@drawable/twotone_headphones_24" />
<TextView
android:id="@+id/headphones_label"
style="@style/PodInfoItemText.Notification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
tools:text="AirPods Max" />
android:paddingVertical="8dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_vertical"
android:layout_marginHorizontal="8dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/headphones_icon"
style="@style/PodInfoItemIcon.Notification"
android:src="@drawable/twotone_headphones_24" />
<TextView
android:id="@+id/headphones_label"
style="@style/PodInfoItemText.Notification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
tools:text="AirPods Max" />
<ImageView
android:id="@+id/headphones_battery_icon"
style="@style/PodInfoItemIcon.Notification"
android:layout_marginStart="12dp"
android:src="@drawable/ic_baseline_battery_unknown_24" />
<TextView
@@ -38,23 +37,24 @@
style="@style/PodInfoItemText.Notification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="8dp"
android:layout_marginStart="4dp"
tools:text="100%" />
<ImageView
android:id="@+id/headphones_charging"
style="@style/PodInfoItemIcon.Notification"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginStart="2dp"
android:src="@drawable/ic_baseline_power_24" />
<ImageView
android:id="@+id/headphones_worn"
style="@style/PodInfoItemIcon.Notification"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginStart="2dp"
android:src="@drawable/ic_baseline_hearing_24" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</FrameLayout>
app/src/main/res/layout/monitor_notification_unknown_device_small.xml
+7 -7
View File
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Notification.Container"
android:layout_width="match_parent"
android:paddingVertical="8dp"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:paddingVertical="8dp">
<TextView
android:id="@+id/device"
style="@style/PodInfoItemText.Notification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:gravity="center"
tools:text="100%"
android:layout_gravity="center_horizontal"
android:drawablePadding="4dp"
tools:text="Unknown Device"
app:drawableStartCompat="@drawable/ic_baseline_question_mark_24" />
</LinearLayout>
</FrameLayout>