Skip to content

Commit

Permalink
Clarify that only Aegis vaults can be imported during the intro
Browse files Browse the repository at this point in the history
Some users understandably get confused when they try to import a backup
file from a different 2FA app during the intro and then get greeted
with an error dialog.

This changes the button text to "Import Aegis vault" and adds a small
hint text in the hope that this makes the limitations of the intro more
clear to the user.

<img width="200" src="https://alexbakker.me/u/jzhh3bk30w.png" />
  • Loading branch information
alexbakker committed Sep 9, 2023
1 parent dd9c307 commit 37964da
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 9 deletions.
31 changes: 23 additions & 8 deletions app/src/main/res/layout/fragment_welcome_slide.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,37 +18,52 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/descriptionText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/app_description"
android:textAlignment="center"
android:textSize="16sp"
android:layout_marginTop="10dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titleText" />

<ImageView
android:id="@+id/imgLogo"
android:layout_width="210dp"
android:layout_height="210dp"
android:layout_marginTop="60dp"
android:adjustViewBounds="true"
android:src="@drawable/app_icon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titleText"/>
app:layout_constraintTop_toBottomOf="@+id/descriptionText"/>

<Button
android:id="@+id/btnImport"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:layout_marginBottom="5dp"
android:text="@string/import_vault"
android:textSize="11sp"
android:layout_marginVertical="10dp"
style="?attr/outlineButtonStyle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@+id/descriptionText" />
app:layout_constraintBottom_toTopOf="@+id/txtImportHelp" />

<TextView
android:id="@+id/descriptionText"
android:layout_width="match_parent"
android:id="@+id/txtImportHelp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/app_description"
android:text="@string/import_vault_hint"
android:textSize="11sp"
android:textAlignment="center"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintWidth_percent="0.9" />

</androidx.constraintlayout.widget.ConstraintLayout>
3 changes: 2 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,8 @@
<string name="pref_panic_trigger_title">Delete vault on panic trigger</string>
<string name="pref_panic_trigger_summary">Delete vault when a panic trigger is received from Ripple</string>

<string name="import_vault">Import vault</string>
<string name="import_vault">Import Aegis vault</string>
<string name="import_vault_hint">Want to import from a different 2FA app? Complete the setup first and then head over to the settings menu.</string>
<plurals name="import_duplicate_toast">
<item quantity="one">Unchecked %d potential duplicate. Please review the list of entries.</item>
<item quantity="other">Unchecked %d potential duplicates. Please review the list of entries.</item>
Expand Down

0 comments on commit 37964da

Please sign in to comment.