ported presence activity to cardview

1 files changed, 40 insertions, 38 deletions

diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index de1ad216d..ab2535281 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -3,65 +3,67 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     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"
         android:layout_height="fill_parent"
         android:layout_above="@+id/button_bar">
 
-        <LinearLayout
+        <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
             android:layout_marginLeft="@dimen/activity_horizontal_margin"
             android:layout_marginRight="@dimen/activity_horizontal_margin"
-            android:layout_marginTop="@dimen/activity_vertical_margin"
-            android:background="@drawable/infocard_border"
-            android:orientation="vertical"
-            android:padding="@dimen/infocard_padding">
+            android:layout_marginTop="@dimen/activity_vertical_margin">
 
-            <android.support.design.widget.TextInputLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
-                app:passwordToggleEnabled="true"
-                app:passwordToggleTint="?attr/color_text_secondary">
+                android:orientation="vertical"
+                android:padding="@dimen/infocard_padding">
 
 
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/current_password"
+                <android.support.design.widget.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_marginBottom="8dp"
-                    android:hint="@string/current_password"
-                    android:inputType="textPassword"
-                    android:textColor="?attr/color_text_primary"
-                    android:textColorHint="?attr/color_text_secondary"
-                    android:textSize="?attr/TextSizeBody" />
-            </android.support.design.widget.TextInputLayout>
+                    app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
+                    app:passwordToggleEnabled="true"
+                    app:passwordToggleTint="?attr/color_text_secondary">
 
-            <android.support.design.widget.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
-                app:passwordToggleEnabled="true"
-                app:passwordToggleTint="?attr/color_text_secondary">
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/current_password"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentTop="true"
+                        android:hint="@string/current_password"
+                        android:inputType="textPassword"
+                        android:textColor="?attr/color_text_primary"
+                        android:textColorHint="?attr/color_text_secondary"
+                        android:textSize="?attr/TextSizeBody" />
+                </android.support.design.widget.TextInputLayout>
 
-                <android.support.design.widget.TextInputEditText
-                    android:id="@+id/new_password"
+                <android.support.design.widget.TextInputLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_marginBottom="8dp"
-                    android:hint="@string/new_password"
-                    android:inputType="textPassword"
-                    android:textColor="?attr/color_text_primary"
-                    android:textColorHint="?attr/color_text_secondary"
-                    android:textSize="?attr/TextSizeBody" />
-            </android.support.design.widget.TextInputLayout>
-        </LinearLayout>
+                    app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
+                    app:passwordToggleEnabled="true"
+                    app:passwordToggleTint="?attr/color_text_secondary">
+
+                    <android.support.design.widget.TextInputEditText
+                        android:id="@+id/new_password"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentTop="true"
+                        android:hint="@string/new_password"
+                        android:inputType="textPassword"
+                        android:textColor="?attr/color_text_primary"
+                        android:textColorHint="?attr/color_text_secondary"
+                        android:textSize="?attr/TextSizeBody" />
+                </android.support.design.widget.TextInputLayout>
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
     </ScrollView>
 
     <LinearLayout
@@ -85,7 +87,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"