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

Use non-breaking spaces for backup code MaskedEditText

Browse Source
This commit is contained in:
Dominik Schürmann
2016-02-10 18:14:36 +01:00
parent a2ea509f06
commit 0feb4d074c
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
View File

@@ -170,7 +170,11 @@ public class BackupCodeFragment extends CryptoOperationFragment<BackupKeyringPar
mTitleAnimator.setDisplayedChild(1, animate); mTitleAnimator.setDisplayedChild(1, animate);
mStatusAnimator.setDisplayedChild(1, animate); mStatusAnimator.setDisplayedChild(1, animate);
mCodeFieldsAnimator.setDisplayedChild(1, animate); mCodeFieldsAnimator.setDisplayedChild(1, animate);
mCodeEditText.setText(" - - - - - "); // use non-breaking spaces to enlarge the empty EditText appropriately
String empty = "\u00a0\u00a0\u00a0\u00a0-\u00a0\u00a0\u00a0\u00a0" +
"-\u00a0\u00a0\u00a0\u00a0-\u00a0\u00a0\u00a0\u00a0" +
"-\u00a0\u00a0\u00a0\u00a0-\u00a0\u00a0\u00a0\u00a0";
mCodeEditText.setText(empty);
pushBackStackEntry(); pushBackStackEntry();
@@ -349,7 +353,8 @@ public class BackupCodeFragment extends CryptoOperationFragment<BackupKeyringPar
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
boolean inInputState = mCurrentState == BackupCodeState.STATE_INPUT boolean inInputState = mCurrentState == BackupCodeState.STATE_INPUT
|| mCurrentState == BackupCodeState.STATE_INPUT_ERROR; || mCurrentState == BackupCodeState.STATE_INPUT_ERROR;
boolean partIsComplete = (backupCode.getText().toString().indexOf(' ') == -1); boolean partIsComplete = (backupCode.getText().toString().indexOf(' ') == -1)
&& (backupCode.getText().toString().indexOf('\u00a0') == -1);
if (!inInputState || !partIsComplete) { if (!inInputState || !partIsComplete) {
return; return;
} }

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

@@ -84,9 +84,11 @@
android:textSize="18dp" android:textSize="18dp"
android:textStyle="bold" android:textStyle="bold"
android:typeface="monospace" android:typeface="monospace"
app:deleteChar="\u00a0"
app:mask="****-****-****-****-****-****" app:mask="****-****-****-****-****-****"
app:maskIconColor="@color/colorPrimary" app:maskIconColor="@color/colorPrimary"
app:notMaskedSymbol="*" app:notMaskedSymbol="*"
app:replacementChar="\u00a0"
tools:ignore="SpUsage" /> tools:ignore="SpUsage" />
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>

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

@@ -38,9 +38,11 @@
android:textSize="18dp" android:textSize="18dp"
android:textStyle="bold" android:textStyle="bold"
android:typeface="monospace" android:typeface="monospace"
app:deleteChar="\u00a0"
app:mask="****-****-****-****-****-****" app:mask="****-****-****-****-****-****"
app:maskIconColor="@color/colorPrimary" app:maskIconColor="@color/colorPrimary"
app:notMaskedSymbol="*" app:notMaskedSymbol="*"
app:replacementChar="\u00a0"
tools:ignore="SpUsage" /> tools:ignore="SpUsage" />
</LinearLayout> </LinearLayout>