keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Clean up password unlock layout

Browse Source 
Remove unnecessary and redundant nested layouts, fix the alignment of
the unlock button to the right edge of the screen, use cleaner margins
and replace the deprecated fill_parent sizes with match_parent.
pull/1/head
Veeti Paananen 12 years ago
parent afa20058b8
commit 89ae5ed4ed
1 changed files with 36 additions and 50 deletions
Show Stats Download Patch File Download Diff File

86
res/layout/prompt_passphrase_activity.xml
Unescape Escape View File

@ -1,57 +1,43 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:fillViewport="true" android:fillViewport="true"
android:background="@drawable/background_pattern_repeat"> android:background="@drawable/background_pattern_repeat">
<FrameLayout <LinearLayout android:id="@+id/prompt_layout"
android:layout_width="fill_parent" android:padding="16dp"
android:layout_height="fill_parent" android:layout_width="match_parent"
android:gravity="center" > android:layout_height="wrap_content"
android:gravity="center_horizontal|center_vertical"
<LinearLayout android:id="@+id/prompt_layout" android:orientation="vertical">
android:paddingRight="16dip"
android:paddingLeft="16dip" <ImageView android:layout_width="wrap_content"
android:paddingTop="10dip" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_gravity="center"
android:layout_height="wrap_content" android:layout_marginBottom="24dp"
android:layout_gravity="center" android:src="@drawable/padlock_prompt"/>
android:orientation="vertical">
<TextView style="@style/Registration.Label"
<ImageView android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:textAllCaps="true"
android:layout_gravity="center" android:text="@string/prompt_passphrase_activity__textsecure_passphrase" />
android:layout_marginBottom="30dip"
android:src="@drawable/padlock_prompt"/> <EditText android:id="@+id/passphrase_edit"
android:layout_width="match_parent"
<TextView style="@style/Registration.Label" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:inputType="textPassword"
android:textAllCaps="true" android:layout_marginBottom="8dp"
android:text="@string/prompt_passphrase_activity__textsecure_passphrase" /> android:singleLine="true"/>
<EditText android:id="@+id/passphrase_edit" <Button android:id="@+id/ok_button"
android:layout_width="fill_parent" android:text="@string/prompt_passphrase_activity__unlock"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:inputType="textPassword" android:layout_height="wrap_content"
android:layout_marginBottom="10dip" android:layout_gravity="right"
android:singleLine="true"/> android:textAppearance="?android:attr/textAppearanceMedium"/>
<LinearLayout android:orientation="horizontal" </LinearLayout>
android:gravity="right"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dip"
android:layout_marginRight="20dip">
<Button android:id="@+id/ok_button"
android:text="@string/prompt_passphrase_activity__unlock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout>
</LinearLayout>
</FrameLayout>
</ScrollView> </ScrollView>
Write Preview
Loading…
Cancel
Save