Use strings and clean up margins in ssh keygen

This commit is contained in:
Matthew Wong
2015-07-17 22:19:18 -04:00
parent 395309e39e
commit 9817760c4b
2 changed files with 32 additions and 22 deletions

View File

@@ -6,54 +6,60 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/label_length" android:id="@+id/label_length"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginLeft="16dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="Length"/> android:text="@string/ssh_keygen_length"/>
<Spinner <Spinner
android:id="@+id/length" android:id="@+id/length"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:spinnerMode="dropdown"/> android:spinnerMode="dropdown"/>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
app:hintTextAppearance="@style/TextAppearance.AppCompat"
android:layout_marginTop="8dp">
<EditText <EditText
android:id="@+id/passphrase" android:id="@+id/passphrase"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:hint="@string/ssh_keygen_passphrase"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp"
android:hint="Passphrase"
android:inputType="textVisiblePassword"/> android:inputType="textVisiblePassword"/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
app:hintTextAppearance="@style/TextAppearance.AppCompat"
android:layout_marginTop="8dp">
<EditText <EditText
android:id="@+id/comment" android:id="@+id/comment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:hint="@string/ssh_keygen_comment"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp"
android:hint="Comment"
android:inputType="textShortMessage"/> android:inputType="textShortMessage"/>
</android.support.design.widget.TextInputLayout>
<Button <Button
android:id="@+id/generate_ssh_key" android:id="@+id/generate_ssh_key"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:onClick="generate" android:onClick="generate"
android:text="Generate"/> android:text="@string/ssh_keygen_generate"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

View File

@@ -127,6 +127,10 @@
<string name="pwgen_ambiguous">Ambiguous</string> <string name="pwgen_ambiguous">Ambiguous</string>
<!-- ssh keygen fragment --> <!-- ssh keygen fragment -->
<string name="ssh_keygen_length">Length</string>
<string name="ssh_keygen_passphrase">Passphrase</string>
<string name="ssh_keygen_comment">Comment</string>
<string name="ssh_keygen_generate">Generate</string>
<string name="ssh_keygen_copy">Copy</string> <string name="ssh_keygen_copy">Copy</string>
<string name="ssh_keygen_tip">Provide this public key to your Git server.</string> <string name="ssh_keygen_tip">Provide this public key to your Git server.</string>