TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-12 07:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed profile screen layout on small screens.

Browse Source 
Fixes #8670
This commit is contained in:
Greyson Parrelli 2019-03-07 17:25:02 -08:00
parent f2703f0b7b
commit 8b6ecd1d2e
3 changed files with 164 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/labeled_edit_text_default.xml
View File

@ -5,7 +5,10 @@
android:id="@+id/input" android:id="@+id/input"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="16dp" android:paddingTop="7dp"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:background="@color/transparent" android:background="@color/transparent"
android:singleLine="true" android:singleLine="true"
tools:text="Peter Parker"/> tools:text="Peter Parker"/>

28
res/layout/profile_create_activity.xml
View File

@ -12,11 +12,15 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<android.support.constraint.ConstraintLayout <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"> android:layout_weight="1">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
style="@style/Signal.Text.Headline.Registration" style="@style/Signal.Text.Headline.Registration"
@ -94,6 +98,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:layout_weight="1" android:layout_weight="1"
@ -128,19 +133,22 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginLeft="32dp" android:layout_marginLeft="32dp"
android:layout_marginTop="8dp" android:layout_marginTop="24dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:layout_marginRight="32dp" android:layout_marginRight="32dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:gravity="center" android:gravity="center"
android:text="@string/CreateProfileActivity_signal_profiles_are_end_to_end_encrypted" android:text="@string/CreateProfileActivity_signal_profiles_are_end_to_end_encrypted"
android:textColor="@color/core_grey_60" android:textColor="@color/core_grey_60"
app:layout_constraintBottom_toTopOf="@+id/finish_button"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/name" app:layout_constraintTop_toBottomOf="@+id/name"
app:layout_constraintVertical_bias="1.0" /> app:layout_constraintVertical_bias="1.0" />
</android.support.constraint.ConstraintLayout>
</ScrollView>
<com.dd.CircularProgressButton <com.dd.CircularProgressButton
android:id="@+id/finish_button" android:id="@+id/finish_button"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -157,10 +165,7 @@
app:cpb_colorProgress="@color/textsecure_primary" app:cpb_colorProgress="@color/textsecure_primary"
app:cpb_cornerRadius="4dp" app:cpb_cornerRadius="4dp"
app:cpb_selectorIdle="@drawable/progress_button_state" app:cpb_selectorIdle="@drawable/progress_button_state"
app:cpb_textIdle="@string/profile_create_activity__finish" app:cpb_textIdle="@string/profile_create_activity__finish" />
app:layout_constraintBottom_toTopOf="@+id/skip_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<Button <Button
android:id="@+id/skip_button" android:id="@+id/skip_button"
@ -169,14 +174,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/profile_create_activity__set_later" android:text="@string/profile_create_activity__set_later"
android:textColor="@color/gray50" android:textColor="@color/gray50" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout> <org.thoughtcrime.securesms.components.emoji.EmojiDrawer
<org.thoughtcrime.securesms.components.emoji.EmojiDrawer xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/emoji_drawer" android:id="@+id/emoji_drawer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

5
res/layout/profile_name_text.xml
View File

@ -5,7 +5,10 @@
android:id="@+id/input" android:id="@+id/input"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="16dp" android:paddingTop="7dp"
android:paddingBottom="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:background="@color/transparent" android:background="@color/transparent"
android:singleLine="true" android:singleLine="true"
android:inputType="textCapWords" android:inputType="textCapWords"