diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-06-08 20:10:21 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-06-08 20:10:21 +0200 |
commit | 112a4d389eae89a29d7abfe71d26066a66cae3c2 (patch) | |
tree | d268d139d9de4dd24a29c19eabf3b7b9b6aea553 /src/main/res/layout/activity_set_presence.xml | |
parent | b88128241eb7deb6599e946dc009fdc5dfd32974 (diff) | |
parent | 7932244c51e7c5e6e5775d282e91ec223fe2a9bf (diff) |
Merge branch 'Wanztwurst-darkTheme' fixes #529
Diffstat (limited to 'src/main/res/layout/activity_set_presence.xml')
-rw-r--r-- | src/main/res/layout/activity_set_presence.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml index 8195092f..dcdaaaf0 100644 --- a/src/main/res/layout/activity_set_presence.xml +++ b/src/main/res/layout/activity_set_presence.xml @@ -2,7 +2,7 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@color/grey200" + android:background="?attr/color_background_secondary" android:id="@+id/scroll_view"> <LinearLayout @@ -17,7 +17,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:padding="@dimen/infocard_padding" android:orientation="vertical"> <EditText @@ -26,7 +26,7 @@ android:inputType="textMultiLine" android:hint="@string/status_message" android:id="@+id/presence_status_message" - android:textColor="@color/black87" + android:textColor="?attr/color_text_primary" android:layout_marginBottom="8dp" android:textSize="?attr/TextSizeBody"/> <Spinner @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:text="@string/all_accounts_on_this_device" android:id="@+id/all_accounts" - android:textColor="@color/black87" + android:textColor="?attr/color_text_primary" android:textSize="?attr/TextSizeBody"/> <Button android:id="@+id/change_presence" @@ -62,7 +62,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:padding="@dimen/infocard_padding" android:orientation="vertical" android:divider="?android:dividerHorizontal" |