diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 52 | ||||
| -rw-r--r-- | src/main/res/layout/activity_enter_name.xml | 63 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/styles.xml | 4 |
4 files changed, 122 insertions, 1 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 56d108b68..163fe270a 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -42,11 +42,57 @@ android:layout_height="wrap_content" android:padding="@dimen/card_padding_regular"> + <RelativeLayout + android:id="@+id/your_name_box" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentTop="true" + android:layout_marginBottom="@dimen/activity_vertical_margin"> + + <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" /> + + <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" /> + </LinearLayout> + + <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" /> + </RelativeLayout> + <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/avater" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentTop="true" + android:layout_below="@id/your_name_box" android:layout_centerHorizontal="true" android:layout_marginBottom="@dimen/avatar_item_distance" android:adjustViewBounds="true" @@ -513,6 +559,10 @@ </TableRow> </TableLayout> + <View + android:layout_width="match_parent" + android:layout_height="8dp" /> + <RelativeLayout android:id="@+id/pgp_fingerprint_box" android:layout_width="wrap_content" diff --git a/src/main/res/layout/activity_enter_name.xml b/src/main/res/layout/activity_enter_name.xml new file mode 100644 index 000000000..cb446479d --- /dev/null +++ b/src/main/res/layout/activity_enter_name.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/instructions" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:padding="16dp" + android:text="@string/enter_your_name_instructions" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + <LinearLayout + android:id="@+id/name_box" + android:layout_width="256dp" + android:layout_height="wrap_content" + android:layout_above="@+id/next" + android:layout_below="@+id/instructions" + android:layout_centerHorizontal="true" + android:orientation="vertical"> + + <EditText + android:id="@+id/name" + style="@style/Widget.Conversations.EditText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/your_name" + android:imeOptions="flagNoExtractUi" + android:longClickable="false" /> + + </LinearLayout> + + <Button + android:id="@+id/next" + style="@style/Widget.Conversations.Button.Borderless" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="true" + android:text="@string/next" + android:textColor="?colorAccent" /> + </RelativeLayout> + </ScrollView> + </LinearLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 611334782..96b095277 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -850,4 +850,8 @@ <string name="no_market_app_installed">No market app installed.</string> <string name="group_chat_will_make_your_jabber_id_public">This group chat will make your Jabber ID public</string> <string name="ebook">e-book</string> + <string name="your_name">Your name</string> + <string name="enter_your_name">Enter your name</string> + <string name="enter_your_name_instructions">Please enter your nickname which will be visible to your contacts.</string> + <string name="no_name_set_instructions">No nickname set.</string> </resources> diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 3f693fccc..4418706e1 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -67,6 +67,10 @@ <item name="android:textColor">?android:textColorSecondary</item> </style> + <style name="TextAppearance.Conversations.Body1.Tertiary" parent="TextAppearance.Conversations.Body1"> + <item name="android:textColor">?android:textColorTertiary</item> + </style> + <style name="TextAppearance.Conversations.Fingerprint" parent="TextAppearance.Conversations.Body1"> <item name="android:fontFamily" tools:targetApi="jelly_bean">monospace</item> <item name="android:typeface">monospace</item> |