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

Fix paddings, cards less information were unnecessarily large.

Browse Source
This commit is contained in:
darken
2022-02-13 21:46:12 +01:00
parent 9f49b470fe
commit 4e258e65c1
4 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/DualPodsCardVH.kt
+1
View File
@@ -153,6 +153,7 @@ class DualPodsCardVH(parent: ViewGroup) :
sb.append("\n").append(rawDataHex)
}
status.text = sb
status.isGone = sb.isEmpty()
}
}
app/src/main/java/eu/darken/capod/main/ui/overview/cards/pods/SinglePodsCardVH.kt
+12 -14
View File
@@ -41,26 +41,24 @@ class SinglePodsCardVH(parent: ViewGroup) :
// Charge state
device.apply {
if (this !is HasChargeDetection) {
chargingIcon.isInvisible = true
chargingLabel.isInvisible = true
return@apply
if (this is HasChargeDetection) {
chargingIcon.isInvisible = isHeadsetBeingCharged
chargingLabel.isInvisible = isHeadsetBeingCharged
} else {
chargingIcon.isGone = true
chargingLabel.isGone = true
}
chargingIcon.isInvisible = isHeadsetBeingCharged
chargingLabel.isInvisible = isHeadsetBeingCharged
}
// Has ear detection
device.apply {
if (this !is HasEarDetection) {
wearIcon.isInvisible = true
wearLabel.isInvisible = true
return@apply
if (this is HasEarDetection) {
wearIcon.isInvisible = isBeingWorn
wearLabel.isInvisible = isBeingWorn
} else {
wearIcon.isGone = true
wearLabel.isGone = true
}
wearIcon.isInvisible = isBeingWorn
wearLabel.isInvisible = isBeingWorn
}
status.apply {
app/src/main/res/layout/overview_pods_dual_item.xml
+3 -4
View File
@@ -12,7 +12,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/card_content"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:paddingBottom="16dp">
<ImageView
android:id="@+id/device_icon"
@@ -107,7 +108,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="4dp"
android:minHeight="108dp"
app:layout_constraintBottom_toTopOf="@id/barrier_bottom"
app:layout_constraintEnd_toStartOf="@id/pod_case_container"
app:layout_constraintStart_toStartOf="parent"
@@ -117,8 +117,8 @@
<ImageView
android:id="@+id/pod_left_icon"
style="@style/PodInfoItemIcon"
android:src="@drawable/ic_airpod_left_24"
android:contentDescription="@string/pods_dual_left_label"
android:src="@drawable/ic_airpod_left_24"
app:layout_constraintBottom_toBottomOf="@id/pod_left_label"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/pod_left_label" />
@@ -436,7 +436,6 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app/src/main/res/layout/overview_pods_single_item.xml
+3 -5
View File
@@ -12,7 +12,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/card_content"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:paddingBottom="16dp">
<ImageView
android:id="@+id/device_icon"
@@ -96,13 +97,11 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="8dp"
android:minHeight="64dp"
app:layout_constraintBottom_toTopOf="@id/barrier_bottom"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/barrier_top"
app:layout_constraintVertical_bias="0.0"
app:layout_goneMarginBottom="16dp">
app:layout_constraintVertical_bias="0.0">
<ImageView
android:id="@+id/battery_icon"
@@ -180,7 +179,6 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"