cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make it a style to reduce code duplication

Browse Source
This commit is contained in:
Dominik Schürmann
2016-03-08 16:10:06 +01:00
parent 456535729c
commit 7882f16331
6 changed files with 25 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
OpenKeychain/src/main/res/layout-w360dp/passphrase_dialog_backup_code.xml
View File

@@ -1,73 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="14dp"
android:paddingTop="14dp">
<LinearLayout
android:id="@+id/input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/passphrase_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:text="@string/passphrase_for_backup"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp">
<com.github.pinball83.maskededittext.MaskedEditText
android:id="@+id/backup_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:textSize="16dp"
android:textStyle="bold"
android:typeface="monospace"
app:mask="****-****-****-****-****-****"
app:maskIconColor="@color/colorPrimary"
app:notMaskedSymbol="*"
tools:ignore="SpUsage" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:orientation="horizontal"
android:visibility="invisible">
<ProgressBar
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
<TextView
style="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="4dp"
android:text="@string/label_unlock" />
</LinearLayout>
</RelativeLayout>

73
OpenKeychain/src/main/res/layout-w400dp/passphrase_dialog_backup_code.xml
View File

@@ -1,73 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="14dp"
android:paddingTop="14dp">
<LinearLayout
android:id="@+id/input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/passphrase_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:text="@string/passphrase_for_backup"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp">
<com.github.pinball83.maskededittext.MaskedEditText
android:id="@+id/backup_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:textSize="18dp"
android:textStyle="bold"
android:typeface="monospace"
app:mask="****-****-****-****-****-****"
app:maskIconColor="@color/colorPrimary"
app:notMaskedSymbol="*"
tools:ignore="SpUsage" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:orientation="horizontal"
android:visibility="invisible">
<ProgressBar
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
<TextView
style="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="4dp"
android:text="@string/label_unlock" />
</LinearLayout>
</RelativeLayout>

2
OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml
View File

@@ -30,12 +30,12 @@
<com.github.pinball83.maskededittext.MaskedEditText <com.github.pinball83.maskededittext.MaskedEditText
android:id="@+id/backup_code" android:id="@+id/backup_code"
style="@style/BackupCodeTextStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:textSize="14dp"
android:textStyle="bold" android:textStyle="bold"
android:typeface="monospace" android:typeface="monospace"
app:mask="****-****-****-****-****-****" app:mask="****-****-****-****-****-****"

9
OpenKeychain/src/main/res/values-sw360dp/styles.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- constrain size of backup code input for smaller devices -->
<style name="BackupCodeTextStyle">
<item name="android:textSize" tools:ignore="SpUsage">16dp</item>
</style>
</resources>

9
OpenKeychain/src/main/res/values-sw400dp/styles.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- constrain size of backup code input for smaller devices -->
<style name="BackupCodeTextStyle">
<item name="android:textSize" tools:ignore="SpUsage">18dp</item>
</style>
</resources>

7
OpenKeychain/src/main/res/values/styles.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources xmlns:tools="http://schemas.android.com/tools">
<style name="CardViewHeader"> <style name="CardViewHeader">
<item name="android:drawableBottom">?attr/cardViewHeaderDrawable</item> <item name="android:drawableBottom">?attr/cardViewHeaderDrawable</item>
@@ -38,4 +38,9 @@
<item name="android:textColor">?attr/colorAccent</item> <item name="android:textColor">?attr/colorAccent</item>
</style> </style>
<!-- constrain size of backup code input for smaller devices -->
<style name="BackupCodeTextStyle">
<item name="android:textSize" tools:ignore="SpUsage">14dp</item>
</style>
</resources> </resources>