Merge branch 'Wanztwurst-darkTheme' fixes #529

1 files changed, 12 insertions, 12 deletions

diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 6fb1d013..886c45c6 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/grey200">
+                android:background="?attr/color_background_secondary">
 
 	<ScrollView
 		android:layout_width="fill_parent"
@@ -15,7 +15,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">
 
@@ -24,7 +24,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/current_password"
-				android:textColor="@color/black87"
+				android:textColor="?attr/color_text_primary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<EditText
@@ -34,15 +34,15 @@
 				android:layout_marginBottom="8dp"
 				android:hint="@string/password"
 				android:inputType="textPassword"
-				android:textColor="@color/black87"
-				android:textColorHint="@color/black54"
+				android:textColor="?attr/color_text_primary"
+				android:textColorHint="?attr/color_text_secondary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/new_password"
-				android:textColor="@color/black87"
+				android:textColor="?attr/color_text_primary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<EditText
@@ -52,15 +52,15 @@
 				android:layout_marginBottom="8dp"
 				android:hint="@string/password"
 				android:inputType="textPassword"
-				android:textColor="@color/black87"
-				android:textColorHint="@color/black54"
+				android:textColor="?attr/color_text_primary"
+				android:textColorHint="?attr/color_text_secondary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/account_settings_confirm_password"
-				android:textColor="@color/black87"
+				android:textColor="?attr/color_text_primary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<EditText
@@ -69,8 +69,8 @@
 				android:layout_height="wrap_content"
 				android:hint="@string/password"
 				android:inputType="textPassword"
-				android:textColor="@color/black87"
-				android:textColorHint="@color/black54"
+				android:textColor="?attr/color_text_primary"
+				android:textColorHint="?attr/color_text_secondary"
 				android:textSize="?attr/TextSizeBody"/>
 		</LinearLayout>
 	</ScrollView>
@@ -96,7 +96,7 @@
 			android:layout_height="fill_parent"
 			android:layout_marginBottom="7dp"
 			android:layout_marginTop="7dp"
-			android:background="@color/black12"/>
+			android:background="?attr/divider"/>
 
 		<Button
 			android:id="@+id/right_button"