aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/activity_muc_details.xml
diff options
context:
space:
mode:
authorSteffen Keiper <github@crystal-mett.de>2016-05-12 20:00:18 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-06-08 20:07:40 +0200
commit7932244c51e7c5e6e5775d282e91ec223fe2a9bf (patch)
treed268d139d9de4dd24a29c19eabf3b7b9b6aea553 /src/main/res/layout/activity_muc_details.xml
parentb88128241eb7deb6599e946dc009fdc5dfd32974 (diff)
Dark theme, theme switch, icons, style, strings
added some white icons, changed hardcoded icons to theme attributes, changed icon_edit_dark to icon_edit_body to reflect icons position, grey message bubbles in dark theme, misc purged ic_action_chat as it wasn't used preference use_white_background changed to use_green_background, default true grey chat bubbles darker, text white replaced all grey600 with black icons and 0.54 alpha attribute highlightColor in dark grey chat bubble now darker than background
Diffstat (limited to 'src/main/res/layout/activity_muc_details.xml')
-rw-r--r--src/main/res/layout/activity_muc_details.xml28
1 files changed, 15 insertions, 13 deletions
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index e7b11d9f..7ff91e15 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@color/grey200">
+ android:background="?attr/color_background_secondary">
<LinearLayout
android:id="@+id/muc_main_layout"
@@ -18,7 +18,7 @@
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginBottom="@dimen/activity_vertical_margin"
- android:background="@drawable/infocard_border"
+ android:background="?attr/infocard_border"
android:orientation="vertical"
android:padding="@dimen/infocard_padding">
@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/account_settings_example_jabber_id"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold"/>
@@ -58,7 +58,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeHeadline"/>
<TextView
@@ -66,7 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/>
</LinearLayout>
@@ -78,7 +78,8 @@
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
android:padding="@dimen/image_button_padding"
- android:src="?attr/icon_edit_dark"/>
+ android:alpha="?attr/icon_alpha"
+ android:src="?attr/icon_edit_body"/>
</RelativeLayout>
<RelativeLayout
@@ -90,7 +91,7 @@
android:layout_height="wrap_content"
android:text="@string/private_conference"
android:layout_centerVertical="true"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/change_conference_button"
@@ -105,6 +106,7 @@
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
android:padding="@dimen/image_button_padding"
+ android:alpha="?attr/icon_alpha"
android:src="?attr/icon_settings"/>
</RelativeLayout>
@@ -117,7 +119,7 @@
android:layout_height="wrap_content"
android:text="@string/notify_on_all_messages"
android:layout_centerVertical="true"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/notification_status_button"
@@ -132,7 +134,7 @@
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
android:padding="@dimen/image_button_padding"
- android:src="@drawable/ic_notifications_grey600_24dp"/>
+ android:src="?attr/icon_notifications"/>
</RelativeLayout>
<TableLayout
@@ -150,7 +152,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/server_info_mam"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" />
<TextView
@@ -158,7 +160,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody" />
</TableRow>
@@ -171,7 +173,7 @@
android:layout_gravity="right"
android:layout_marginTop="32dp"
android:text="@string/using_account"
- android:textColor="@color/black54"
+ android:textColor="?attr/color_text_secondary"
android:textSize="?attr/TextSizeInfo"/>
</LinearLayout>
@@ -183,7 +185,7 @@
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginBottom="@dimen/activity_vertical_margin"
- android:background="@drawable/infocard_border"
+ android:background="?attr/infocard_border"
android:orientation="vertical"
android:padding="@dimen/infocard_padding">