diff options
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/drawable-hdpi/pencil_overlay.png | bin | 0 -> 1199 bytes | |||
-rw-r--r-- | src/main/res/drawable-mdpi/pencil_overlay.png | bin | 0 -> 1873 bytes | |||
-rw-r--r-- | src/main/res/drawable-xhdpi/pencil_overlay.png | bin | 0 -> 3465 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxhdpi/pencil_overlay.png | bin | 0 -> 2119 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxxhdpi/pencil_overlay.png | bin | 0 -> 9724 bytes | |||
-rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 444 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 1 |
7 files changed, 225 insertions, 220 deletions
diff --git a/src/main/res/drawable-hdpi/pencil_overlay.png b/src/main/res/drawable-hdpi/pencil_overlay.png Binary files differnew file mode 100644 index 000000000..78c3b4e16 --- /dev/null +++ b/src/main/res/drawable-hdpi/pencil_overlay.png diff --git a/src/main/res/drawable-mdpi/pencil_overlay.png b/src/main/res/drawable-mdpi/pencil_overlay.png Binary files differnew file mode 100644 index 000000000..daedd4d9f --- /dev/null +++ b/src/main/res/drawable-mdpi/pencil_overlay.png diff --git a/src/main/res/drawable-xhdpi/pencil_overlay.png b/src/main/res/drawable-xhdpi/pencil_overlay.png Binary files differnew file mode 100644 index 000000000..6cdbe555b --- /dev/null +++ b/src/main/res/drawable-xhdpi/pencil_overlay.png diff --git a/src/main/res/drawable-xxhdpi/pencil_overlay.png b/src/main/res/drawable-xxhdpi/pencil_overlay.png Binary files differnew file mode 100644 index 000000000..12c95c2f5 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/pencil_overlay.png diff --git a/src/main/res/drawable-xxxhdpi/pencil_overlay.png b/src/main/res/drawable-xxxhdpi/pencil_overlay.png Binary files differnew file mode 100644 index 000000000..f98e658a1 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/pencil_overlay.png diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index fd2cb6b3a..a4638fee3 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -48,7 +48,7 @@ android:id="@+id/jid_password_box" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_below="@+id/nick_avatar_box" + android:layout_below="@+id/status_avatar_box" android:orientation="vertical"> <LinearLayout @@ -174,70 +174,71 @@ </LinearLayout> <RelativeLayout - android:id="@+id/nick_avatar_box" - android:layout_width="match_parent" + android:id="@+id/your_name_box" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:orientation="horizontal"> + android:layout_marginStart="6dp" + android:layout_marginLeft="6dp" + android:visibility="gone"> - <RelativeLayout + <ImageButton + android:id="@+id/action_edit_your_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toEndOf="@+id/avater" - android:layout_toRightOf="@+id/avater" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:alpha="?attr/icon_alpha" + android:background="?attr/selectableItemBackgroundBorderless" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_edit_body" + android:visibility="visible" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toStartOf="@+id/action_edit_your_name" + android:layout_toLeftOf="@+id/action_edit_your_name" android:orientation="vertical"> - <RelativeLayout - android:id="@+id/your_name_box" + <TextView + android:id="@+id/your_name_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:visibility="gone"> - - <ImageButton - android:id="@+id/action_edit_your_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:alpha="?attr/icon_alpha" - android:background="?attr/selectableItemBackgroundBorderless" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_edit_body" - android:visibility="visible" /> + android:text="@string/your_name" + android:textAppearance="@style/TextAppearance.Conversations.Caption" /> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_toStartOf="@+id/action_edit_your_name" - android:layout_toLeftOf="@+id/action_edit_your_name" - android:orientation="vertical"> + <TextView + android:id="@+id/your_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_name_set_instructions" + android:textAppearance="@style/TextAppearance.Conversations.Body1.Tertiary" /> + </LinearLayout> + </RelativeLayout> - <TextView - android:id="@+id/your_name_desc" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/your_name" - android:textAppearance="@style/TextAppearance.Conversations.Caption" /> + <RelativeLayout + android:id="@+id/status_avatar_box" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/your_name_box" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:orientation="horizontal"> - <TextView - android:id="@+id/your_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/no_name_set_instructions" - android:textAppearance="@style/TextAppearance.Conversations.Body1.Tertiary" /> - </LinearLayout> - </RelativeLayout> + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toEndOf="@+id/avater" + android:layout_toRightOf="@+id/avater" + android:orientation="vertical"> <RelativeLayout android:id="@+id/your_status_box" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_below="@+id/your_name_box" android:visibility="gone"> <ImageButton @@ -374,15 +375,10 @@ android:id="@+id/stats" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:background="@drawable/infocard_border" - android:orientation="vertical" - android:padding="@dimen/card_padding_regular" + android:layout_marginTop="@dimen/activity_vertical_margin" android:visibility="gone"> <LinearLayout @@ -391,161 +387,44 @@ android:orientation="vertical" android:padding="@dimen/card_padding_regular"> - <RelativeLayout - android:id="@+id/pgp_fingerprint_box" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginTop="32dp"> - - <ImageButton - android:id="@+id/action_delete_pgp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:alpha="1.0" - android:background="?attr/selectableItemBackgroundBorderless" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_remove" - android:visibility="visible" /> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_toStartOf="@+id/action_delete_pgp" - android:layout_toLeftOf="@+id/action_delete_pgp" - android:orientation="vertical"> - - <TextView - android:id="@+id/pgp_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="@style/TextAppearance.Conversations.Fingerprint" /> - - <TextView - android:id="@+id/pgp_fingerprint_desc" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/openpgp_key_id" - android:textAppearance="@style/TextAppearance.Conversations.Caption" /> - </LinearLayout> - </RelativeLayout> - - <RelativeLayout - android:id="@+id/otr_fingerprint_box" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginTop="24dp"> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_toStartOf="@+id/key_actions" - android:layout_toLeftOf="@+id/key_actions" - android:orientation="vertical"> - - <TextView - android:id="@+id/otr_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="@style/TextAppearance.Conversations.Fingerprint" /> - - <TextView - android:id="@+id/otr_fingerprint_desc" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/otr_fingerprint" - android:textAppearance="@style/TextAppearance.Conversations.Caption" /> - - </LinearLayout> - - <LinearLayout - android:id="@+id/key_actions" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:orientation="horizontal"> - - <ImageButton - android:id="@+id/action_copy_to_clipboard" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/copy_otr_clipboard_description" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_copy" - android:visibility="visible" /> - </LinearLayout> - </RelativeLayout> - - <RelativeLayout - android:id="@+id/axolotl_fingerprint_box" + <TextView + android:id="@+id/this_device_keys_title" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginTop="24dp"> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/list_padding" + android:layout_marginBottom="@dimen/list_padding" + android:text="@string/this_device" + android:textAppearance="@style/TextAppearance.Conversations.Title" /> - <LinearLayout - android:layout_width="wrap_content" + <TableLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:shrinkColumns="0" + android:stretchColumns="1"> + <TableRow + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_toStartOf="@+id/axolotl_actions" - android:layout_toLeftOf="@+id/axolotl_actions" - android:orientation="vertical"> + tools:ignore="UselessParent"> <TextView - android:id="@+id/axolotl_fingerprint" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="@style/TextAppearance.Conversations.Fingerprint" /> + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_session_established" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> <TextView - android:id="@+id/own_fingerprint_desc" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="@style/TextAppearance.Conversations.Caption" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/axolotl_actions" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:orientation="horizontal"> - - <ImageButton - android:id="@+id/action_copy_axolotl_to_clipboard" + android:id="@+id/session_est" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/copy_omemo_clipboard_description" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_copy" - android:visibility="visible" /> + android:layout_gravity="end" + android:paddingStart="4dp" + android:paddingLeft="4dp" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + </TableRow> - <ImageButton - android:id="@+id/action_regenerate_omemo_key" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/regenerate_omemo_key" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_refresh" - android:visibility="gone" /> - </LinearLayout> - </RelativeLayout> + </TableLayout> <TableLayout android:id="@+id/server_info_more" @@ -779,40 +658,165 @@ </TableRow> </TableLayout> - <TableLayout + <View android:layout_width="match_parent" - android:layout_height="wrap_content" - android:shrinkColumns="0" - android:stretchColumns="1"> + android:layout_height="8dp" /> - <TableRow - android:layout_width="fill_parent" + <RelativeLayout + android:id="@+id/pgp_fingerprint_box" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginTop="32dp"> + + <ImageButton + android:id="@+id/action_delete_pgp" + android:layout_width="wrap_content" android:layout_height="wrap_content" - tools:ignore="UselessParent"> + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:alpha="1.0" + android:background="?attr/selectableItemBackgroundBorderless" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_remove" + android:visibility="visible" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toStartOf="@+id/action_delete_pgp" + android:layout_toLeftOf="@+id/action_delete_pgp" + android:orientation="vertical"> <TextView + android:id="@+id/pgp_fingerprint" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_session_established" - android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + android:textAppearance="@style/TextAppearance.Conversations.Fingerprint" /> <TextView - android:id="@+id/session_est" + android:id="@+id/pgp_fingerprint_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="end" - android:paddingStart="4dp" - android:paddingLeft="4dp" - android:textAppearance="@style/TextAppearance.Conversations.Body1" /> - </TableRow> + android:text="@string/openpgp_key_id" + android:textAppearance="@style/TextAppearance.Conversations.Caption" /> + </LinearLayout> + </RelativeLayout> - </TableLayout> + <RelativeLayout + android:id="@+id/otr_fingerprint_box" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginTop="24dp"> - <View - android:layout_width="match_parent" - android:layout_height="8dp" /> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toStartOf="@+id/key_actions" + android:layout_toLeftOf="@+id/key_actions" + android:orientation="vertical"> + + <TextView + android:id="@+id/otr_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="@style/TextAppearance.Conversations.Fingerprint" /> + + <TextView + android:id="@+id/otr_fingerprint_desc" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/otr_fingerprint" + android:textAppearance="@style/TextAppearance.Conversations.Caption" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/key_actions" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:orientation="horizontal"> + + <ImageButton + android:id="@+id/action_copy_to_clipboard" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/copy_otr_clipboard_description" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_copy" + android:visibility="visible" /> + </LinearLayout> + </RelativeLayout> + + <RelativeLayout + android:id="@+id/axolotl_fingerprint_box" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginTop="24dp"> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toStartOf="@+id/axolotl_actions" + android:layout_toLeftOf="@+id/axolotl_actions" + android:orientation="vertical"> + + <TextView + android:id="@+id/axolotl_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="@style/TextAppearance.Conversations.Fingerprint" /> + + <TextView + android:id="@+id/own_fingerprint_desc" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="@style/TextAppearance.Conversations.Caption" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/axolotl_actions" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:orientation="horizontal"> + + <ImageButton + android:id="@+id/action_copy_axolotl_to_clipboard" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/copy_omemo_clipboard_description" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_copy" + android:visibility="visible" /> + + <ImageButton + android:id="@+id/action_regenerate_omemo_key" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/regenerate_omemo_key" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_refresh" + android:visibility="gone" /> + </LinearLayout> + </RelativeLayout> </LinearLayout> </androidx.cardview.widget.CardView> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 420b13b2f..47dfc1b9b 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -940,4 +940,5 @@ <string name="your_status">Your status</string> <string name="pref_use_invidious">Replace YouTube links with Invidious</string> <string name="pref_use_invidious_summary">Invidious is a privacy friendly alternative to YouTube</string> + <string name="this_device">This device</string> </resources> |