diff options
author | Christian Schneppe <christian@pix-art.de> | 2019-01-26 15:07:28 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2019-01-26 15:07:28 +0100 |
commit | f2d502518ea3de673c7f0ebf425f53295f620f2f (patch) | |
tree | 2db8f4e334d51b59c35105bc1871b102f4bb34d3 /src/main/res/layout | |
parent | 2773c19c429c4bcb99fd0144cd1b3e2346cab962 (diff) |
rework backup & restore
use the implementation from Conversations
Diffstat (limited to '')
-rw-r--r-- | src/main/res/layout/account_row.xml | 99 | ||||
-rw-r--r-- | src/main/res/layout/activity_import_backup.xml | 32 | ||||
-rw-r--r-- | src/main/res/layout/dialog_enter_password.xml | 47 | ||||
-rw-r--r-- | src/main/res/layout/dialog_quickedit.xml | 6 |
4 files changed, 128 insertions, 56 deletions
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index eaacbde5e..d6831ac26 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -1,60 +1,57 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?android:attr/activatedBackgroundIndicator" - android:paddingStart="8dp" - android:paddingLeft="8dp" - android:paddingTop="8dp" - android:paddingBottom="8dp"> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> - <com.makeramen.roundedimageview.RoundedImageView - android:id="@+id/account_image" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" - android:contentDescription="@string/account_image_description" - android:padding="1dp" - app:riv_corner_radius="@dimen/rounded_image_border" /> - - <LinearLayout - android:layout_width="fill_parent" + <RelativeLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toStartOf="@+id/tgl_account_status" - android:layout_toLeftOf="@+id/tgl_account_status" - android:layout_toEndOf="@+id/account_image" - android:layout_toRightOf="@+id/account_image" - android:orientation="vertical" - android:paddingStart="@dimen/avatar_item_distance" - android:paddingLeft="@dimen/avatar_item_distance"> + android:background="?android:selectableItemBackground" + android:paddingLeft="8dp" + android:paddingTop="8dp" + android:paddingBottom="8dp"> - <TextView - android:id="@+id/account_jid" - android:layout_width="wrap_content" + <com.makeramen.roundedimageview.RoundedImageView + android:id="@+id/account_image" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_alignParentLeft="true" + android:contentDescription="@string/account_image_description" + app:riv_corner_radius="2dp" /> + + <LinearLayout + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:scrollHorizontally="false" - android:singleLine="true" - android:textAppearance="@style/TextAppearance.Conversations.Subhead" /> + android:layout_centerVertical="true" + android:layout_toStartOf="@+id/tgl_account_status" + android:layout_toLeftOf="@+id/tgl_account_status" + android:layout_toRightOf="@+id/account_image" + android:orientation="vertical" + android:paddingLeft="@dimen/avatar_item_distance"> + + <TextView + android:id="@+id/account_jid" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:scrollHorizontally="false" + android:singleLine="true" + android:textAppearance="@style/TextAppearance.Conversations.Subhead" /> - <TextView - android:id="@+id/account_status" + <TextView + android:id="@+id/account_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/account_status_unknown" + android:textAppearance="@style/TextAppearance.Conversations.Body2" /> + </LinearLayout> + + <android.support.v7.widget.SwitchCompat + android:id="@+id/tgl_account_status" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/account_status_unknown" - android:textAppearance="@style/TextAppearance.Conversations.Body2" /> - </LinearLayout> - - <android.support.v7.widget.SwitchCompat - android:id="@+id/tgl_account_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:focusable="false" - android:padding="16dp" /> + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:focusable="false" + android:padding="16dp" /> -</RelativeLayout>
\ No newline at end of file + </RelativeLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_import_backup.xml b/src/main/res/layout/activity_import_backup.xml new file mode 100644 index 000000000..bc5ccecc1 --- /dev/null +++ b/src/main/res/layout/activity_import_backup.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="?attr/color_background_primary" + android:orientation="vertical"> + + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> + + <android.support.design.widget.CoordinatorLayout + android:id="@+id/coordinator" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/color_background_primary"> + + <android.support.v7.widget.RecyclerView + android:id="@+id/list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/color_background_primary" + android:orientation="vertical" + app:layoutManager="android.support.v7.widget.LinearLayoutManager" /> + </android.support.design.widget.CoordinatorLayout> + + </LinearLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/layout/dialog_enter_password.xml b/src/main/res/layout/dialog_enter_password.xml new file mode 100644 index 000000000..935ebad6c --- /dev/null +++ b/src/main/res/layout/dialog_enter_password.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="?dialogPreferredPadding"> + + <TextView + android:id="@+id/explain" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/enter_password_to_restore" + android:textAppearance="@style/TextAppearance.Conversations.Body2" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="?TextSizeBody1" + android:text="@string/restore_warning" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + <android.support.design.widget.TextInputLayout + android:id="@+id/account_password_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" + app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint" + app:passwordToggleDrawable="@drawable/visibility_toggle_drawable" + app:passwordToggleEnabled="true" + app:passwordToggleTint="?android:textColorSecondary"> + + <de.pixart.messenger.ui.widget.TextInputEditText + android:id="@+id/account_password" + style="@style/Widget.Conversations.EditText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/password" + android:inputType="textPassword" + android:textColor="?attr/edit_text_color" /> + + </android.support.design.widget.TextInputLayout> + </LinearLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/layout/dialog_quickedit.xml b/src/main/res/layout/dialog_quickedit.xml index 4ce88b2ba..b309bc173 100644 --- a/src/main/res/layout/dialog_quickedit.xml +++ b/src/main/res/layout/dialog_quickedit.xml @@ -6,11 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingStart="?attr/dialog_horizontal_padding" - android:paddingLeft="?attr/dialog_horizontal_padding" - android:paddingTop="?attr/dialog_vertical_padding" - android:paddingEnd="?attr/dialog_horizontal_padding" - android:paddingRight="?attr/dialog_horizontal_padding"> + android:padding="?dialogPreferredPadding"> <android.support.design.widget.TextInputLayout android:id="@+id/input_layout" |