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

Fix layout on small screens

Browse Source
This commit is contained in:
Niels Andriesse
2020-01-14 10:08:39 +11:00
parent 52dc8d6b63
commit 392360d85e
13 changed files with 449 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/layout/activity_display_name_v2.xml
View File

@@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/very_large_font_size"
android:textSize="@dimen/large_font_size"
android:textStyle="bold"
android:textColor="@color/text"
android:text="Pick your display name" />
@@ -25,19 +25,19 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginTop="6dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/medium_font_size"
android:textSize="@dimen/small_font_size"
android:textColor="@color/text"
android:text="This is how others will be able to recognize you." />
<EditText
style="@style/SessionEditText"
style="@style/SmallSessionEditText"
android:id="@+id/displayNameEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="20dp"
android:layout_marginTop="12dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:hint="Enter a display name" />
@@ -53,7 +53,7 @@
android:layout_height="@dimen/medium_button_height"
android:layout_marginLeft="@dimen/massive_spacing"
android:layout_marginRight="@dimen/massive_spacing"
android:layout_marginBottom="@dimen/medium_spacing"
android:layout_marginBottom="@dimen/small_spacing"
android:text="Continue" />
</LinearLayout>

11
res/layout/activity_register.xml
View File

@@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/very_large_font_size"
android:textSize="@dimen/large_font_size"
android:textStyle="bold"
android:textColor="@color/text"
android:text="Say hello to your Session ID" />
@@ -25,9 +25,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginTop="6dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/medium_font_size"
android:textSize="@dimen/small_font_size"
android:textColor="@color/text"
android:text="Your Session ID is the unique address that people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design." />
@@ -36,8 +36,9 @@
android:id="@+id/publicKeyTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18dp"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="20dp"
android:layout_marginTop="12dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
@@ -61,7 +62,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"
android:layout_marginLeft="@dimen/massive_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginTop="@dimen/small_spacing"
android:layout_marginRight="@dimen/massive_spacing"
android:text="Copy" />

13
res/layout/activity_restore.xml
View File

@@ -15,9 +15,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/very_large_font_size"
android:textSize="@dimen/large_font_size"
android:textStyle="bold"
android:textColor="@color/text"
android:text="Restore your account" />
@@ -26,19 +25,19 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginTop="6dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/medium_font_size"
android:textSize="@dimen/small_font_size"
android:textColor="@color/text"
android:text="Enter the recovery phrase that was given to you when you signed up to restore your account." />
<EditText
style="@style/SessionEditText"
style="@style/SmallSessionEditText"
android:id="@+id/mnemonicEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="20dp"
android:layout_marginTop="12dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:hint="Enter your recovery phrase" />
@@ -53,7 +52,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"
android:layout_marginLeft="@dimen/massive_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginTop="@dimen/small_spacing"
android:layout_marginRight="@dimen/massive_spacing"
android:text="Continue" />

2
res/layout/fragment_enter_chat_url.xml
View File

@@ -9,7 +9,7 @@
android:orientation="vertical">
<EditText
style="@style/SessionEditText"
style="@style/SmallSessionEditText"
android:id="@+id/chatURLEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
res/layout/fragment_enter_public_key.xml
View File

@@ -9,7 +9,7 @@
android:orientation="vertical">
<EditText
style="@style/SessionEditText"
style="@style/SmallSessionEditText"
android:id="@+id/publicKeyEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"

12
res/layout/fragment_enter_session_id.xml
View File

@@ -17,7 +17,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/large_spacing"
android:layout_marginRight="@dimen/large_spacing"
android:textSize="@dimen/very_large_font_size"
android:textSize="@dimen/large_font_size"
android:textStyle="bold"
android:textColor="@color/text"
android:text="Link your device" />
@@ -26,19 +26,19 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/large_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginTop="6dp"
android:layout_marginRight="@dimen/large_spacing"
android:textSize="@dimen/medium_font_size"
android:textSize="@dimen/small_font_size"
android:textColor="@color/text"
android:text="Enter your Session ID to start the linking process." />
<EditText
style="@style/SessionEditText"
style="@style/SmallSessionEditText"
android:id="@+id/sessionIDEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/large_spacing"
android:layout_marginTop="20dp"
android:layout_marginTop="12dp"
android:layout_marginRight="@dimen/large_spacing"
android:hint="Enter your session ID" />
@@ -52,7 +52,7 @@
android:id="@+id/requestDeviceLinkButton"
android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height"
android:layout_marginBottom="@dimen/medium_spacing"
android:layout_marginBottom="@dimen/small_spacing"
android:text="Next" />
</LinearLayout>