nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CCv2: Less contrast by using grey icons. 

Delete and Find Device icons are even lighter
This commit is contained in:
cpfeiffer 2016-10-24 20:56:43 +02:00
parent d302a0a5c3
commit 59212b54c8
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/res/layout/device_itemv2.xml
View File

@ -68,7 +68,7 @@
android:id="@+id/device_battery_status" android:id="@+id/device_battery_status"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="36dp" android:layout_height="36dp"
android:tint="?android:attr/textColor" android:tint="@color/secondarytext"
card_view:srcCompat="@drawable/level_list_battery" /> card_view:srcCompat="@drawable/level_list_battery" />
<TextView <TextView
@ -77,7 +77,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:minWidth="36dp" android:minWidth="36dp"
android:textColor="?android:attr/textColor" android:textColor="@color/secondarytext"
android:textStyle="bold" android:textStyle="bold"
tools:text="100%" /> tools:text="100%" />
@ -100,7 +100,7 @@
android:layout_height="36dp" android:layout_height="36dp"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/controlcenter_fetch_activity_data" android:contentDescription="@string/controlcenter_fetch_activity_data"
android:tint="?android:attr/textColor" android:tint="@color/secondarytext"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
card_view:srcCompat="@drawable/ic_action_fetch_activity_data" /> card_view:srcCompat="@drawable/ic_action_fetch_activity_data" />
@ -124,7 +124,7 @@
android:layout_toRightOf="@id/device_action_fetch_activity_box" android:layout_toRightOf="@id/device_action_fetch_activity_box"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/controlcenter_take_screenshot" android:contentDescription="@string/controlcenter_take_screenshot"
android:tint="?android:attr/textColor" android:tint="@color/secondarytext"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
card_view:srcCompat="@drawable/ic_screenshot" /> card_view:srcCompat="@drawable/ic_screenshot" />
@ -137,7 +137,7 @@
android:layout_toRightOf="@id/device_action_take_screenshot" android:layout_toRightOf="@id/device_action_take_screenshot"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/controlcenter_start_configure_alarms" android:contentDescription="@string/controlcenter_start_configure_alarms"
android:tint="?android:attr/textColor" android:tint="@color/secondarytext"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
card_view:srcCompat="@drawable/ic_device_set_alarms" /> card_view:srcCompat="@drawable/ic_device_set_alarms" />
@ -149,7 +149,7 @@
android:layout_margin="8dp" android:layout_margin="8dp"
android:layout_toRightOf="@id/device_action_set_alarms" android:layout_toRightOf="@id/device_action_set_alarms"
android:clickable="true" android:clickable="true"
android:tint="?android:attr/textColor" android:tint="@color/secondarytext"
card_view:srcCompat="@drawable/ic_activity_graphs" card_view:srcCompat="@drawable/ic_activity_graphs"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/controlcenter_start_activitymonitor" /> android:contentDescription="@string/controlcenter_start_activitymonitor" />
@ -166,7 +166,7 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/candidate_item_device_image" android:contentDescription="@string/candidate_item_device_image"
android:tint="?android:attr/textColor" android:tint="@color/secondarytext"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
card_view:srcCompat="@drawable/ic_more_vert" /> card_view:srcCompat="@drawable/ic_more_vert" />
@ -201,7 +201,7 @@
android:layout_marginRight="0dp" android:layout_marginRight="0dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:clickable="true" android:clickable="true"
android:tint="?android:attr/textColor" android:tint="?android:textColorTertiary"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
card_view:srcCompat="@drawable/ic_action_find_lost_device" card_view:srcCompat="@drawable/ic_action_find_lost_device"
android:contentDescription="@string/controlcenter_find_device" /> android:contentDescription="@string/controlcenter_find_device" />
@ -217,7 +217,7 @@
android:layout_marginRight="0dp" android:layout_marginRight="0dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:clickable="true" android:clickable="true"
android:tint="?android:attr/textColor" android:tint="?android:textColorTertiary"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
card_view:srcCompat="@drawable/ic_remove_device" card_view:srcCompat="@drawable/ic_remove_device"
android:contentDescription="@string/controlcenter_delete_device" /> android:contentDescription="@string/controlcenter_delete_device" />

2
app/src/main/res/values/colors.xml
View File

@ -10,6 +10,8 @@
<color name="primarytext_light" type="color">#000000</color> <color name="primarytext_light" type="color">#000000</color>
<color name="primarytext_dark" type="color">#ffffff</color> <color name="primarytext_dark" type="color">#ffffff</color>
<color name="secondarytext" type="color">#ff808080</color> <color name="secondarytext" type="color">#ff808080</color>
<color name="tertiarytext_light" type="color">#ffd0d0d0</color>
<color name="tertiarytext_dark" type="color">#ff606060</color>
<color name="divider" type="color">#1f000000</color> <color name="divider" type="color">#1f000000</color>
<color name="chart_heartrate" type="color">#ffab40</color> <color name="chart_heartrate" type="color">#ffab40</color>

2
app/src/main/res/values/styles.xml
View File

@ -5,6 +5,7 @@
<item name="android:textColorSecondary">@color/secondarytext</item> <item name="android:textColorSecondary">@color/secondarytext</item>
<item name="colorPrimary">@color/primary_light</item> <item name="colorPrimary">@color/primary_light</item>
<item name="colorPrimaryDark">@color/primarydark_light</item> <item name="colorPrimaryDark">@color/primarydark_light</item>
<item name="android:textColorTertiary">@color/tertiarytext_light</item>
<item name="colorAccent">@color/accent</item> <item name="colorAccent">@color/accent</item>
<!-- unfortunately it doesn't work this way :( --> <!-- unfortunately it doesn't work this way :( -->
@ -26,6 +27,7 @@
<item name="android:textColorSecondary">@color/secondarytext</item> <item name="android:textColorSecondary">@color/secondarytext</item>
<item name="colorPrimary">@color/primary_dark</item> <item name="colorPrimary">@color/primary_dark</item>
<item name="colorPrimaryDark">@color/primarydark_dark</item> <item name="colorPrimaryDark">@color/primarydark_dark</item>
<item name="android:textColorTertiary">@color/tertiarytext_dark</item>
<item name="colorAccent">@color/accent</item> <item name="colorAccent">@color/accent</item>
<!-- unfortunately it doesn't work this way :( --> <!-- unfortunately it doesn't work this way :( -->