1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-07-26 08:33:27 +02:00

Fix alignment of action icons and enable proper (vector) scaling.

This commit is contained in:
Daniele Gobbetti 2017-04-03 18:30:29 +02:00
parent d8894d315a
commit 96a49f0b7a

View File

@ -111,18 +111,16 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/device_image" android:layout_below="@id/device_image"
android:layout_marginBottom="4dp" android:layout_alignParentStart="true"
android:layout_marginStart="4dp" android:layout_margin="4dp"
android:layout_marginEnd="0dp"
android:layout_marginTop="4dp"
android:padding="4dp"
android:minWidth="48dp"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/device_battery_status" android:id="@+id/device_battery_status"
android:layout_width="48dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:padding="4dp"
android:scaleType="fitXY"
android:tint="@color/secondarytext" android:tint="@color/secondarytext"
card_view:srcCompat="@drawable/level_list_battery" /> card_view:srcCompat="@drawable/level_list_battery" />
@ -144,7 +142,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/device_image" android:layout_below="@id/device_image"
android:layout_margin="4dp" android:layout_margin="4dp"
android:padding="4dp"
android:layout_toEndOf="@id/device_battery_status_box" android:layout_toEndOf="@id/device_battery_status_box"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minWidth="36dp" android:minWidth="36dp"
@ -154,10 +151,12 @@
android:id="@+id/device_action_fetch_activity" android:id="@+id/device_action_fetch_activity"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:padding="4dp"
android:background="?android:attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/controlcenter_fetch_activity_data" android:contentDescription="@string/controlcenter_fetch_activity_data"
android:scaleType="fitXY"
android:tint="@color/secondarytext" android:tint="@color/secondarytext"
android:background="?android:attr/selectableItemBackground"
card_view:srcCompat="@drawable/ic_action_fetch_activity_data" /> card_view:srcCompat="@drawable/ic_action_fetch_activity_data" />
<ProgressBar <ProgressBar
@ -177,12 +176,13 @@
android:layout_height="40dp" android:layout_height="40dp"
android:layout_below="@id/device_image" android:layout_below="@id/device_image"
android:layout_margin="4dp" android:layout_margin="4dp"
android:padding="4dp"
android:layout_toEndOf="@id/device_action_fetch_activity_box" android:layout_toEndOf="@id/device_action_fetch_activity_box"
android:background="?android:attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/controlcenter_take_screenshot" android:contentDescription="@string/controlcenter_take_screenshot"
android:padding="4dp"
android:scaleType="fitXY"
android:tint="@color/secondarytext" android:tint="@color/secondarytext"
android:background="?android:attr/selectableItemBackground"
card_view:srcCompat="@drawable/ic_screenshot" /> card_view:srcCompat="@drawable/ic_screenshot" />
<ImageView <ImageView
@ -191,12 +191,13 @@
android:layout_height="40dp" android:layout_height="40dp"
android:layout_below="@id/device_image" android:layout_below="@id/device_image"
android:layout_margin="4dp" android:layout_margin="4dp"
android:padding="4dp"
android:layout_toEndOf="@id/device_action_take_screenshot" android:layout_toEndOf="@id/device_action_take_screenshot"
android:background="?android:attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/title_activity_appmanager" android:contentDescription="@string/title_activity_appmanager"
android:padding="4dp"
android:scaleType="fitXY"
android:tint="@color/secondarytext" android:tint="@color/secondarytext"
android:background="?android:attr/selectableItemBackground"
card_view:srcCompat="@drawable/ic_action_manage_apps" /> card_view:srcCompat="@drawable/ic_action_manage_apps" />
<ImageView <ImageView
@ -205,12 +206,13 @@
android:layout_height="40dp" android:layout_height="40dp"
android:layout_below="@id/device_image" android:layout_below="@id/device_image"
android:layout_margin="4dp" android:layout_margin="4dp"
android:padding="4dp"
android:layout_toEndOf="@id/device_action_manage_apps" android:layout_toEndOf="@id/device_action_manage_apps"
android:background="?android:attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/controlcenter_start_configure_alarms" android:contentDescription="@string/controlcenter_start_configure_alarms"
android:padding="4dp"
android:scaleType="fitXY"
android:tint="@color/secondarytext" android:tint="@color/secondarytext"
android:background="?android:attr/selectableItemBackground"
card_view:srcCompat="@drawable/ic_device_set_alarms" /> card_view:srcCompat="@drawable/ic_device_set_alarms" />
<ImageView <ImageView
@ -219,13 +221,14 @@
android:layout_height="40dp" android:layout_height="40dp"
android:layout_below="@id/device_image" android:layout_below="@id/device_image"
android:layout_margin="4dp" android:layout_margin="4dp"
android:padding="4dp"
android:layout_toEndOf="@id/device_action_set_alarms" android:layout_toEndOf="@id/device_action_set_alarms"
android:clickable="true"
android:tint="@color/secondarytext"
card_view:srcCompat="@drawable/ic_activity_graphs"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/controlcenter_start_activitymonitor" /> android:clickable="true"
android:contentDescription="@string/controlcenter_start_activitymonitor"
android:padding="4dp"
android:scaleType="fitXY"
android:tint="@color/secondarytext"
card_view:srcCompat="@drawable/ic_activity_graphs" />
<ImageView <ImageView
android:id="@+id/device_action_find" android:id="@+id/device_action_find"
@ -233,10 +236,11 @@
android:layout_height="40dp" android:layout_height="40dp"
android:layout_below="@id/device_image" android:layout_below="@id/device_image"
android:layout_margin="4dp" android:layout_margin="4dp"
android:padding="4dp"
android:layout_toEndOf="@id/device_action_show_activity_graphs" android:layout_toEndOf="@id/device_action_show_activity_graphs"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/controlcenter_find_device" android:contentDescription="@string/controlcenter_find_device"
android:padding="4dp"
android:scaleType="fitXY"
android:tint="@color/secondarytext" android:tint="@color/secondarytext"
card_view:srcCompat="@drawable/ic_action_find_lost_device" /> card_view:srcCompat="@drawable/ic_action_find_lost_device" />