diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-03-17 22:53:46 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-03-17 22:53:46 +0100 |
commit | 89552e226a883d2ea3c63b6aed994ea0c3021a93 (patch) | |
tree | 5507b65b86a4c1300e4ab8d428ee7a5add7da384 /src/main/res/layout | |
parent | 168f36a319861f446daaccb274e868c6d5d61a69 (diff) |
ported presence activity to cardview
Diffstat (limited to '')
-rw-r--r-- | src/main/res/layout/activity_change_password.xml | 78 | ||||
-rw-r--r-- | src/main/res/layout/activity_set_presence.xml | 131 |
2 files changed, 110 insertions, 99 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" diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml index 5910431df..b3fc6f26e 100644 --- a/src/main/res/layout/activity_set_presence.xml +++ b/src/main/res/layout/activity_set_presence.xml @@ -1,76 +1,85 @@ <?xml version="1.0" encoding="utf-8"?> -<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:id="@+id/scroll_view"> - - <LinearLayout +<layout xmlns:android="http://schemas.android.com/apk/res/android"> + <ScrollView + android:id="@+id/scroll_view" android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> + android:layout_height="fill_parent" + android:background="?attr/color_background_secondary"> <LinearLayout - android:layout_width="match_parent" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - 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:padding="@dimen/infocard_padding" android:orientation="vertical"> - <android.support.text.emoji.widget.EmojiAppCompatEditText + <android.support.v7.widget.CardView android:layout_width="match_parent" android:layout_height="wrap_content" - android:inputType="textMultiLine" - android:hint="@string/status_message" - android:id="@+id/presence_status_message" - android:textColor="@color/black87" - android:layout_marginBottom="8dp" - android:textSize="?attr/TextSizeBody" /> + 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"> - <Spinner - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/presence_show" - android:layout_gravity="center_horizontal" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="@dimen/infocard_padding"> - <CheckBox - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/all_accounts_on_this_device" - android:id="@+id/all_accounts" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:visibility="gone" /> + <android.support.text.emoji.widget.EmojiAppCompatEditText + android:id="@+id/presence_status_message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:hint="@string/status_message" + android:inputType="textMultiLine" + android:textColor="?attr/color_text_primary" + android:textSize="?attr/TextSizeBody"/> + + <Spinner + android:id="@+id/presence_show" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal"/> + + <CheckBox + android:id="@+id/all_accounts" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="16dp" + android:layout_marginTop="16dp" + android:text="@string/all_accounts_on_this_device" + android:textColor="?attr/color_text_primary" + android:textSize="?attr/TextSizeBody"/> - <Button - android:id="@+id/change_presence" - style="?android:attr/borderlessButtonStyle" - android:layout_width="wrap_content" + <Button + android:id="@+id/change_presence" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:layout_marginBottom="-8dp" + android:layout_marginRight="-8dp" + android:text="@string/change_presence" + android:textColor="@color/accent"/> + </LinearLayout> + </android.support.v7.widget.CardView> + + <android.support.v7.widget.CardView + android:id="@+id/templates_card" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="right" - android:text="@string/change_presence" - android:textColor="@color/accent" /> - </LinearLayout> + 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"> - <LinearLayout - android:id="@+id/templates" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - 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:padding="@dimen/infocard_padding" - android:orientation="vertical" - android:divider="?android:dividerHorizontal" - android:showDividers="middle"> + <LinearLayout + android:id="@+id/templates" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="@dimen/infocard_padding"/> + </android.support.v7.widget.CardView> </LinearLayout> - </LinearLayout> -</ScrollView>
\ No newline at end of file + </ScrollView> +</layout>
\ No newline at end of file |