From 0ffacd2f2b7e922fa512408dd28c44ea3085dd36 Mon Sep 17 00:00:00 2001
From: Jonathan GUILLOT <jonathan@joggee.fr>
Date: Tue, 14 May 2024 23:15:24 +0200
Subject: [PATCH 1/8] Replace hardcoded welcome string

Add "app_welcome" as a new string resource for this purpose.
BTW, add the translation for this new resource in French.
---
 mobile/src/main/res/layout/fragment_welcome.xml | 2 +-
 mobile/src/main/res/values-fr/strings.xml       | 1 +
 mobile/src/main/res/values/strings.xml          | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mobile/src/main/res/layout/fragment_welcome.xml b/mobile/src/main/res/layout/fragment_welcome.xml
index 793eadec..fb6fd6de 100644
--- a/mobile/src/main/res/layout/fragment_welcome.xml
+++ b/mobile/src/main/res/layout/fragment_welcome.xml
@@ -21,7 +21,7 @@
         android:id="@+id/textViewTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Welcome to FreeOTP 2.0"
+        android:text="@string/app_welcome"
         android:textSize="26dp"
         android:layout_marginTop="24dp"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/mobile/src/main/res/values-fr/strings.xml b/mobile/src/main/res/values-fr/strings.xml
index 409c9cb4..f3e51a13 100644
--- a/mobile/src/main/res/values-fr/strings.xml
+++ b/mobile/src/main/res/values-fr/strings.xml
@@ -20,6 +20,7 @@
 
 <resources>
     <string name="app_name">FreeOTP</string>
+    <string name="app_welcome">Bienvenue dans FreeOTP 2.0</string>
 
     <!-- Buttons -->
     <string name="ok">Ok</string>
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index a10441df..18daa982 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -20,6 +20,7 @@
 
 <resources>
     <string name="app_name">FreeOTP</string>
+    <string name="app_welcome">Welcome to FreeOTP 2.0</string>
 
     <!-- Buttons -->
     <string name="ok">Ok</string>

From 7d5b29afa0f5f26ac2e2a7ee4255355748f53138 Mon Sep 17 00:00:00 2001
From: Jonathan GUILLOT <jonathan@joggee.fr>
Date: Wed, 8 May 2024 23:45:46 +0200
Subject: [PATCH 2/8] Use tools:listitem in RecyclerView to preview token items

---
 mobile/src/main/res/layout/activity_main.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/src/main/res/layout/activity_main.xml b/mobile/src/main/res/layout/activity_main.xml
index 30277e0f..84f31336 100644
--- a/mobile/src/main/res/layout/activity_main.xml
+++ b/mobile/src/main/res/layout/activity_main.xml
@@ -62,6 +62,7 @@
         app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         app:spanCount="@integer/columns"
+        tools:listitem="@layout/token"
         />
 
     <LinearLayout
@@ -111,4 +112,4 @@
     </LinearLayout>
 
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

From 6501a9514279f0702ac257d18ad6c8a9d8b3b594 Mon Sep 17 00:00:00 2001
From: Jonathan GUILLOT <jonathan@joggee.fr>
Date: Wed, 8 May 2024 23:46:35 +0200
Subject: [PATCH 3/8] Add margins to manual add activity

And move away app bar from the scroll view. It is already the case in
main activity for example.
Also remove ConstraintLayout nesting Button which seems a bit
superfluous.
---
 .../main/res/layout/activity_manual_add.xml   | 347 +++++++++---------
 1 file changed, 172 insertions(+), 175 deletions(-)

diff --git a/mobile/src/main/res/layout/activity_manual_add.xml b/mobile/src/main/res/layout/activity_manual_add.xml
index 3e374d19..f43d4fd9 100644
--- a/mobile/src/main/res/layout/activity_manual_add.xml
+++ b/mobile/src/main/res/layout/activity_manual_add.xml
@@ -1,212 +1,209 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
-    >
-    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    tools:context=".ManualAdd">
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        tools:context=".ManualAdd">
-
-        <com.google.android.material.appbar.AppBarLayout
+        android:layout_height="wrap_content"
+        android:theme="@style/Base.FreeOTP">
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_height="?android:attr/actionBarSize"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:theme="@style/Base.FreeOTP">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                 android:layout_height="?android:attr/actionBarSize"
-            android:layout_width="match_parent"
-                android:theme="@style/ToolbarStyle"
-                />
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <EditText
-            android:id="@+id/edit_text_account"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:hint="@string/manual_account_hint"
-            android:inputType="textPersonName"
-            android:minHeight="48dp" />
-
-        <EditText
-            android:id="@+id/edit_text_issuer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:hint="@string/manual_issuer_hint"
-            android:inputType="textPersonName"
-            android:minHeight="48dp" />
+            android:theme="@style/ToolbarStyle"
+            />
+    </com.google.android.material.appbar.AppBarLayout>
 
+    <ScrollView
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        >
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/text_secret"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="@string/manual_secret_text"
-                android:textSize="18sp"
-                android:textStyle="bold" />
+            android:layout_margin="@dimen/margin"
+            android:orientation="vertical"
+            >
+            <EditText
+                android:id="@+id/edit_text_account"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:hint="@string/manual_account_hint"
+                android:inputType="textPersonName"
+                android:minHeight="48dp" />
 
             <EditText
-                android:id="@+id/edit_text_secret"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="2"
+                android:id="@+id/edit_text_issuer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:ems="10"
-                android:hint="@string/manual_secret_base32_text"
+                android:hint="@string/manual_issuer_hint"
                 android:inputType="textPersonName"
                 android:minHeight="48dp" />
-        </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/text_type"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="@string/manual_type_text"
-                android:textSize="18sp"
-                android:textStyle="bold" />
-
-            <RadioGroup
-                android:id="@+id/radio_grp_type"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="2"
-                android:checkedButton="@+id/button_hotp"
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <RadioButton
-                    android:id="@+id/button_totp"
+                <TextView
+                    android:id="@+id/text_secret"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:text="@string/manual_button_totp_text" />
+                    android:gravity="center"
+                    android:text="@string/manual_secret_text"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <EditText
+                    android:id="@+id/edit_text_secret"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:ems="10"
+                    android:hint="@string/manual_secret_base32_text"
+                    android:inputType="textPersonName"
+                    android:minHeight="48dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
-                <RadioButton
-                    android:id="@+id/button_hotp"
+                <TextView
+                    android:id="@+id/text_type"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:text="@string/manual_button_hotp_text" />
-            </RadioGroup>
-        </LinearLayout>
+                    android:gravity="center"
+                    android:text="@string/manual_type_text"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/text_digits"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="@string/manual_digits_text"
-                android:textSize="18sp"
-                android:textStyle="bold" />
-
-            <RadioGroup
-                android:id="@+id/radio_grp_digits"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="2"
-                android:checkedButton="@+id/button_six"
+                <RadioGroup
+                    android:id="@+id/radio_grp_type"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:checkedButton="@+id/button_hotp"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/button_totp"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/manual_button_totp_text" />
+
+                    <RadioButton
+                        android:id="@+id/button_hotp"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/manual_button_hotp_text" />
+                </RadioGroup>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <RadioButton
-                    android:id="@+id/button_six"
+                <TextView
+                    android:id="@+id/text_digits"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:text="@string/manual_button_digits_six" />
+                    android:gravity="center"
+                    android:text="@string/manual_digits_text"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <RadioGroup
+                    android:id="@+id/radio_grp_digits"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:checkedButton="@+id/button_six"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/button_six"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/manual_button_digits_six" />
+
+                    <RadioButton
+                        android:id="@+id/button_eight"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/manual_button_digits_eight" />
+                </RadioGroup>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
-                <RadioButton
-                    android:id="@+id/button_eight"
+                <TextView
+                    android:id="@+id/text_algorithm"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:text="@string/manual_button_digits_eight" />
-            </RadioGroup>
-        </LinearLayout>
+                    android:gravity="center"
+                    android:text="@string/manual_algorithm"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/text_algorithm"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="@string/manual_algorithm"
-                android:textSize="18sp"
-                android:textStyle="bold" />
-
-            <Spinner
-                android:id="@+id/spinner_algorithms"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="2"
-                android:contentDescription="@string/manual_accessibility_algorithm"
-                android:minHeight="48dp" />
-        </LinearLayout>
+                <Spinner
+                    android:id="@+id/spinner_algorithms"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:contentDescription="@string/manual_accessibility_algorithm"
+                    android:minHeight="48dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/text_interval"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="@string/manual_interval"
-                android:textSize="18sp"
-                android:textStyle="bold" />
-
-            <Spinner
-                android:id="@+id/spinner_intervals"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="2"
-                android:contentDescription="@string/manual_accessibility_interval"
-                android:minHeight="48dp" />
-        </LinearLayout>
+                <TextView
+                    android:id="@+id/text_interval"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="@string/manual_interval"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+                <Spinner
+                    android:id="@+id/spinner_intervals"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="2"
+                    android:contentDescription="@string/manual_accessibility_interval"
+                    android:minHeight="48dp" />
+            </LinearLayout>
 
             <Button
                 android:id="@+id/button_add"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:onClick="addToken"
-                android:text="@string/manual_add_token"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </LinearLayout>
-</ScrollView>
+                android:text="@string/manual_add_token" />
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>

From 664183b722a8a0813ab48cd71dfd3312437e4146 Mon Sep 17 00:00:00 2001
From: Jonathan GUILLOT <jonathan@joggee.fr>
Date: Wed, 8 May 2024 23:48:17 +0200
Subject: [PATCH 4/8] Nest password activity in scroll view

It should fix display issue for small screens.
Position of the Done button has also been changed, moving from stuck
to bottom right to simply bottom of content.
---
 .../src/main/res/layout/activity_password.xml | 124 +++++++++---------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/mobile/src/main/res/layout/activity_password.xml b/mobile/src/main/res/layout/activity_password.xml
index 0308a864..b68d009d 100644
--- a/mobile/src/main/res/layout/activity_password.xml
+++ b/mobile/src/main/res/layout/activity_password.xml
@@ -35,88 +35,88 @@
             />
     </com.google.android.material.appbar.AppBarLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
+    <ScrollView
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:layout_margin="@dimen/margin">
-        <androidx.appcompat.widget.AppCompatTextView
-            android:text="@string/password_info"
-            android:id="@+id/info"
-
-            android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        >
+        <LinearLayout
             android:layout_width="match_parent"
-            />
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_margin="@dimen/margin">
+            <androidx.appcompat.widget.AppCompatTextView
+                android:text="@string/password_info"
+                android:id="@+id/info"
+
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <com.google.android.material.textfield.TextInputLayout
+                    style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+                    android:id="@+id/password_layout"
+                    app:endIconMode="password_toggle"
+                    app:hintAnimationEnabled="true"
+                    app:errorEnabled="true"
+                    android:hint="@string/password"
+
+                    android:layout_marginTop="@dimen/margin"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    >
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:layout_height="wrap_content"
+                        android:layout_width="match_parent"
+                        android:inputType="textPassword"
+                        android:id="@+id/password"
+                        />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <ProgressBar
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:layout_marginBottom="36dp"
+                    android:layout_marginEnd="18dp"
+                    android:layout_gravity="bottom|end"
+
+                    android:visibility="invisible"
+                    android:id="@+id/progress"
+                    />
+            </FrameLayout>
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
             <com.google.android.material.textfield.TextInputLayout
                 style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
-                android:id="@+id/password_layout"
                 app:endIconMode="password_toggle"
                 app:hintAnimationEnabled="true"
                 app:errorEnabled="true"
-                android:hint="@string/password"
 
-                android:layout_marginTop="@dimen/margin"
+                android:id="@+id/confirm_layout"
+                android:hint="@string/password_confirm"
+                android:visibility="invisible"
+                tools:visibility="visible"
+
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                >
+                android:layout_width="match_parent">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:layout_height="wrap_content"
                     android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:inputType="textPassword"
-                    android:id="@+id/password"
+                    android:id="@+id/confirm"
                     />
             </com.google.android.material.textfield.TextInputLayout>
 
-            <ProgressBar
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_marginBottom="36dp"
-                android:layout_marginEnd="18dp"
-                android:layout_gravity="bottom|end"
-
-                android:visibility="invisible"
-                android:id="@+id/progress"
-                />
-        </FrameLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
-            app:endIconMode="password_toggle"
-            app:hintAnimationEnabled="true"
-            app:errorEnabled="true"
-
-            android:id="@+id/confirm_layout"
-            android:hint="@string/password_confirm"
-            android:visibility="invisible"
-
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="textPassword"
-                android:id="@+id/confirm"
-                />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
             <com.google.android.material.button.MaterialButton
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="bottom|end"
-
                 android:enabled="false"
                 android:id="@+id/done"
                 android:text="@string/done"
                 />
-        </FrameLayout>
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>

From f8aca8e46cb3624d2cbcd7b32fec9bcabbaa5c5a Mon Sep 17 00:00:00 2001
From: Jonathan GUILLOT <jonathan@joggee.fr>
Date: Thu, 9 May 2024 00:28:46 +0200
Subject: [PATCH 5/8] Add select on long click on item

Add same behavior on long click on token item than click on its icon.
---
 .../java/org/fedorahosted/freeotp/main/ViewHolder.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mobile/src/main/java/org/fedorahosted/freeotp/main/ViewHolder.java b/mobile/src/main/java/org/fedorahosted/freeotp/main/ViewHolder.java
index 517b7847..d6445876 100644
--- a/mobile/src/main/java/org/fedorahosted/freeotp/main/ViewHolder.java
+++ b/mobile/src/main/java/org/fedorahosted/freeotp/main/ViewHolder.java
@@ -225,6 +225,13 @@ public void onAnimationStart(Animator animation) {
         mImageActive.setOnClickListener(mSelectClick);
         mShare.setOnClickListener(mShareClick);
         mView.setOnClickListener(mViewClick);
+        mView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                mSelectClick.onClick(mIcons);
+                return true;
+            }
+        });
     }
 
 

From 1cf4492d776486380931b10837f165537cbab57d Mon Sep 17 00:00:00 2001
From: Jonathan GUILLOT <jonathan@joggee.fr>
Date: Tue, 21 May 2024 22:59:58 +0200
Subject: [PATCH 6/8] Fix hyperlink in backup fragment

Hyperlink in backup fragment during on boarding was not correctly
displayed. Use HtmlCompat.fromHtml() to create a spanned text to fix the
issue.
---
 .../main/java/org/fedorahosted/freeotp/BackupsFragment.java | 3 +++
 mobile/src/main/res/layout/fragment_backups.xml             | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mobile/src/main/java/org/fedorahosted/freeotp/BackupsFragment.java b/mobile/src/main/java/org/fedorahosted/freeotp/BackupsFragment.java
index 50fe3a59..d67b3476 100644
--- a/mobile/src/main/java/org/fedorahosted/freeotp/BackupsFragment.java
+++ b/mobile/src/main/java/org/fedorahosted/freeotp/BackupsFragment.java
@@ -4,6 +4,8 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
+
+import androidx.core.text.HtmlCompat;
 import androidx.fragment.app.Fragment;
 
 import android.preference.PreferenceManager;
@@ -21,6 +23,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         View view = inflater.inflate(R.layout.fragment_backups, container, false);
 
         TextView textView = view.findViewById(R.id.textViewGoogle);
+        textView.setText(HtmlCompat.fromHtml(getString(R.string.google_auto_backup_link), HtmlCompat.FROM_HTML_MODE_LEGACY));
         textView.setMovementMethod(LinkMovementMethod.getInstance());
 
         Button doneButton = view.findViewById(R.id.button_onboard_done);
diff --git a/mobile/src/main/res/layout/fragment_backups.xml b/mobile/src/main/res/layout/fragment_backups.xml
index e5324111..dfe885f2 100644
--- a/mobile/src/main/res/layout/fragment_backups.xml
+++ b/mobile/src/main/res/layout/fragment_backups.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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="match_parent">
+    android:layout_height="match_parent"
+    >
 
     <ImageView
         android:id="@+id/imageView"
@@ -37,7 +39,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         app:layout_constraintWidth_percent=".80"
-        android:text="@string/google_auto_backup_link"
+        tools:text="@string/google_auto_backup_link"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textViewTitle" />

From 6715409a125f91781adf09c99bfa1a24a9159d2f Mon Sep 17 00:00:00 2001
From: Jonathan GUILLOT <jonathan@joggee.fr>
Date: Tue, 21 May 2024 23:06:15 +0200
Subject: [PATCH 7/8] Replace deprecated Html.fromHtml()

With HtmlCompat.fromHtml() managing API level itself.
---
 .../src/main/java/org/fedorahosted/freeotp/main/Activity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/src/main/java/org/fedorahosted/freeotp/main/Activity.java b/mobile/src/main/java/org/fedorahosted/freeotp/main/Activity.java
index bef8aac2..deccaff9 100644
--- a/mobile/src/main/java/org/fedorahosted/freeotp/main/Activity.java
+++ b/mobile/src/main/java/org/fedorahosted/freeotp/main/Activity.java
@@ -36,7 +36,6 @@
 import android.os.Bundle;
 import android.security.keystore.KeyPermanentlyInvalidatedException;
 import android.security.keystore.UserNotAuthenticatedException;
-import android.text.Html;
 import android.text.InputType;
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
@@ -83,6 +82,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
+import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 public class Activity extends AppCompatActivity
@@ -442,7 +442,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     final AlertDialog dialog = new AlertDialog.Builder(this)
                             .setTitle(r.getString(R.string.main_about_title,
                                     info.versionName, info.versionCode))
-                            .setMessage(Html.fromHtml(r.getString(R.string.main_about_message)))
+                            .setMessage(HtmlCompat.fromHtml(r.getString(R.string.main_about_message), HtmlCompat.FROM_HTML_MODE_LEGACY))
                             .setPositiveButton(R.string.close, null)
                             .create();
 

From f4037f2969a9cd74083583870fff7ae9ddc99f77 Mon Sep 17 00:00:00 2001
From: Jonathan GUILLOT <jonathan@joggee.fr>
Date: Tue, 21 May 2024 23:12:49 +0200
Subject: [PATCH 8/8] Remove unused View.OnClickListener interface from backup
 fragment

---
 .../main/java/org/fedorahosted/freeotp/BackupsFragment.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/mobile/src/main/java/org/fedorahosted/freeotp/BackupsFragment.java b/mobile/src/main/java/org/fedorahosted/freeotp/BackupsFragment.java
index d67b3476..db6a5cde 100644
--- a/mobile/src/main/java/org/fedorahosted/freeotp/BackupsFragment.java
+++ b/mobile/src/main/java/org/fedorahosted/freeotp/BackupsFragment.java
@@ -16,7 +16,7 @@
 import android.widget.TextView;
 import android.widget.Button;
 
-public class BackupsFragment extends Fragment implements View.OnClickListener {
+public class BackupsFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -36,8 +36,4 @@ public void onboardDone(View view) {
         sharedPreferencesEditor.putBoolean(COMPLETED_ONBOARDING, true).apply();
         requireActivity().finish();
     }
-
-    @Override
-    public void onClick(View view) {
-    }
 }
\ No newline at end of file