Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clarify that only Aegis vaults can be imported during the intro #1182

Merged
merged 1 commit into from
Sep 9, 2023
+25 −9
Merged

Clarify that only Aegis vaults can be imported during the intro #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions app/src/main/res/layout/fragment_welcome_slide.xml
View file
Open in desktop
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
View file
Open in desktop
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