luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-06-08 07:37:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1182 from alexbakker/clarify-intro-import

Browse source 
Clarify that only Aegis vaults can be imported during the intro
This commit is contained in:
Michael Schättgen 2023-09-09 21:05:53 +02:00 • committed by GitHub
commit 1c1dee560c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

61
app/src/main/res/layout/fragment_welcome_slide.xml
View file

@ -18,28 +18,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<ImageView
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"/>
<Button
android:id="@+id/btnImport"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:text="@string/import_vault"
android:textSize="11sp"
style="?attr/outlineButtonStyle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@+id/descriptionText" />
<TextView <TextView
android:id="@+id/descriptionText" android:id="@+id/descriptionText"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -47,8 +25,45 @@
android:text="@string/app_description" android:text="@string/app_description"
android:textAlignment="center" android:textAlignment="center"
android:textSize="16sp" android:textSize="16sp"
android:layout_marginTop="10dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="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/descriptionText"/>
<Button
android:id="@+id/btnImport"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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/txtImportHelp" />
<TextView
android:id="@+id/txtImportHelp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/import_vault_hint"
android:textSize="11sp"
android:textAlignment="center"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintWidth_percent="0.9" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/values/strings.xml
View file

@ -469,7 +469,8 @@
<string name="pref_panic_trigger_title">Delete vault on panic trigger</string> <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="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"> <plurals name="import_duplicate_toast">
<item quantity="one">Unchecked %d potential duplicate. Please review the list of entries.</item> <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> <item quantity="other">Unchecked %d potential duplicates. Please review the list of entries.</item>