Fix/small issues (#364)

* fixed small text close #363 * moved logout to bottom * avoid restarting app when logging out if no credentials are found close #360 * updated libraries * bumped version for release * updated workflow
LivingWithHippos · Feb 20, 2024 · 7bddde0 · 7bddde0
1 parent ec60e35
commit 7bddde0
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 35 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -16,9 +16,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -28,9 +28,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -46,17 +46,17 @@ jobs:
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
         run: ./gradlew clean assembleRelease --stacktrace
       - name: Save apk
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apk
           path: /home/runner/work/unchained-android/unchained-android/app/app/build/outputs/apk/release/*.apk
   build-debug:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -72,7 +72,7 @@ jobs:
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
         run: ./gradlew clean assembleDebug --stacktrace
       - name: Save apk
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apk-debug
           path: /home/runner/work/unchained-android/unchained-android/app/app/build/outputs/apk/debug/*.apk
diff --git a/app/app/build.gradle b/app/app/build.gradle
@@ -54,8 +54,8 @@ android {
         applicationId "com.github.livingwithhippos.unchained"
         minSdk 22
         targetSdk 34
-        versionCode 42
-        versionName "1.2.0"
+        versionCode 43
+        versionName "1.2.1"
         // limit resources for a list of locales
         // resConfigs "en", "it"
 

diff --git a/...app/src/main/java/com/github/livingwithhippos/unchained/settings/view/SettingsFragment.kt b/...app/src/main/java/com/github/livingwithhippos/unchained/settings/view/SettingsFragment.kt
@@ -134,6 +134,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
                     context?.showToast(R.string.user_logged_out)
                     activity?.finishAffinity()
                 }
+                SettingEvent.LogoutNoCredentials -> {
+                    context?.showToast(R.string.no_credentials_found)
+                }
                 null -> {
                     // do nothing
                 }

diff --git a/...c/main/java/com/github/livingwithhippos/unchained/settings/viewmodel/SettingsViewModel.kt b/...c/main/java/com/github/livingwithhippos/unchained/settings/viewmodel/SettingsViewModel.kt
@@ -58,12 +58,19 @@ constructor(
 
     fun userLogout() {
         viewModelScope.launch {
-            protoStore.deleteCredentials()
-            eventLiveData.postEvent(SettingEvent.Logout)
+            val credentials = protoStore.getCredentials()
+            if (credentials.accessToken.isBlank() && credentials.clientId.isBlank()) {
+                eventLiveData.postEvent(SettingEvent.LogoutNoCredentials)
+            } else {
+                protoStore.deleteCredentials()
+                eventLiveData.postEvent(SettingEvent.Logout)
+            }
         }
     }
 }
 
 sealed class SettingEvent {
-    object Logout : SettingEvent()
+    data object Logout : SettingEvent()
+
+    data object LogoutNoCredentials : SettingEvent()
 }
diff --git a/app/app/src/main/res/layout/fragment_torrent_details.xml b/app/app/src/main/res/layout/fragment_torrent_details.xml
@@ -79,7 +79,7 @@
                         app:srcCompat="@drawable/icon_share" />
 
                     <TextView
-                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        style="@style/TextAppearance.UnchainedTheme.Body2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="5dp"
@@ -104,7 +104,7 @@
                         app:srcCompat="@drawable/icon_open_external" />
 
                     <TextView
-                        android:textAppearance="?attr/textAppearanceLabelSmall"
+                        style="@style/TextAppearance.UnchainedTheme.Body2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="5dp"

diff --git a/app/app/src/main/res/values-es/strings.xml b/app/app/src/main/res/values-es/strings.xml
@@ -524,4 +524,5 @@
     <string name="services_search_description">Utiliza servicios como Jackett, Prowlarr o cualquier app de Torznab.</string>
     <string name="all">todos</string>
     <string name="search_options">Opciones de búsqueda</string>
+    <string name="no_credentials_found">No se han encontrado credenciales</string>
 </resources>
diff --git a/app/app/src/main/res/values-fr/strings.xml b/app/app/src/main/res/values-fr/strings.xml
@@ -524,4 +524,5 @@
     <string name="services_search_description">Utilisez des services tels que Jackett, Prowlarr ou toute autre application Torznab.</string>
     <string name="all">tous</string>
     <string name="search_options">Options de recherche</string>
+    <string name="no_credentials_found">Aucun justificatif n\'a été trouvé</string>
 </resources>
diff --git a/app/app/src/main/res/values-it/strings.xml b/app/app/src/main/res/values-it/strings.xml
@@ -527,4 +527,5 @@
     <string name="services_search_description">Utilizza servizi come Jackett, Prowlarr o qualunque server Torznab.</string>
     <string name="all">tutti</string>
     <string name="search_options">Opzioni ricerca</string>
+    <string name="no_credentials_found">Nessuna credenziale trovata</string>
 </resources>
diff --git a/app/app/src/main/res/values/strings.xml b/app/app/src/main/res/values/strings.xml
@@ -740,4 +740,5 @@
     <string name="services_search_description">Use services such as Jackett, Prowlarr or any Torznab app.</string>
     <string name="all">all</string>
     <string name="search_options">Search Options</string>
+    <string name="no_credentials_found">No credentials found</string>
 </resources>
diff --git a/app/app/src/main/res/xml/settings.xml b/app/app/src/main/res/xml/settings.xml
@@ -2,12 +2,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-
-    <Preference
-        android:key="user_logout"
-        app:title="@string/logout"
-        />
-
     <PreferenceCategory
         android:summary="@string/restart_to_apply"
         android:title="@string/title_aspect">
@@ -33,14 +27,13 @@
     <PreferenceCategory android:title="@string/download">
 
         <SeekBarPreference
-            app:title="@string/loading_size"
-            app:key="paging_size"
-            app:summary="@string/summary_loading_size"
-            android:min="50"
-            android:max="2500"
             android:defaultValue="50"
+            android:max="2500"
+            android:min="50"
+            app:key="paging_size"
             app:showSeekBarValue="true"
-            />
+            app:summary="@string/summary_loading_size"
+            app:title="@string/loading_size" />
 
         <DropDownPreference
             android:defaultValue="download_manager_system"
@@ -88,8 +81,7 @@
         <Preference
             app:key="install_plugins_instructions"
             app:summary="@string/install_plugins_summary"
-            app:title="@string/install_plugins"
-            />
+            app:title="@string/install_plugins" />
 
         <Preference
             app:key="delete_external_plugins"
@@ -140,18 +132,15 @@
                 android:title="@string/default_media_player"
                 app:useSimpleSummaryProvider="true" />
 
-            <Preference
-                android:summary="@string/custom_media_player_summary"
-                />
+            <Preference android:summary="@string/custom_media_player_summary" />
 
             <EditTextPreference
                 android:defaultValue=""
                 android:key="custom_media_player"
                 android:selectAllOnFocus="true"
                 android:singleLine="true"
                 android:title="@string/custom_media_player"
-                app:useSimpleSummaryProvider="true"
-                />
+                app:useSimpleSummaryProvider="true" />
         </PreferenceCategory>
     </PreferenceCategory>
 
@@ -227,6 +216,10 @@
 
     <PreferenceCategory android:title="@string/title_various">
 
+        <Preference
+            android:key="user_logout"
+            app:title="@string/logout" />
+
         <EditTextPreference
             android:defaultValue="10"
             android:inputType="number"

diff --git a/app/versions.gradle b/app/versions.gradle
@@ -10,7 +10,7 @@ versions.constraint_layout = "2.1.4"
 versions.coil = "2.5.0"
 versions.core_ktx = "1.12.0"
 versions.coroutines = "1.8.0"
-versions.countly = "24.1.0"
+versions.countly = "24.1.1"
 versions.dagger = "2.50"
 versions.espresso = "3.5.1"
 versions.datastore = "1.0.0"