Remove loadingbutton library lib

nekomangaorg · Aug 24, 2024 · 13f69eb · 13f69eb
1 parent 51a2fcb
commit 13f69eb
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 245 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -165,7 +165,6 @@ dependencies {
 
     // UI
     implementation(libs.bundles.fastadapter)
-    implementation(libs.loadingButtonAndroid)
 
     implementation(libs.bundles.flexibleadapter)
 

diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/KomgaLoginDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/KomgaLoginDialog.kt
@@ -4,7 +4,6 @@ import android.app.Dialog
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
-import br.com.simplepass.loadingbutton.animatedDrawables.ProgressType
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.merged.komga.Komga
@@ -51,10 +50,8 @@ class KomgaLoginDialog(bundle: Bundle? = null) :
 
     override fun checkLogin() {
         v?.apply {
-            binding.login.apply {
-                progressType = ProgressType.INDETERMINATE
-                startAnimation()
-            }
+            binding.progress.visibility = View.VISIBLE
+            binding.login.visibility = View.GONE
 
             if (binding.username.text.isNullOrBlank() ||
                 binding.password.text.isNullOrBlank() ||
@@ -102,9 +99,9 @@ class KomgaLoginDialog(bundle: Bundle? = null) :
         v?.apply {
             dialog?.setCancelable(true)
             dialog?.setCanceledOnTouchOutside(true)
-            binding.login.revertAnimation {
-                binding.login.text = activity!!.getText(R.string.unknown_error)
-            }
+            binding.progress.visibility = View.GONE
+            binding.login.visibility = View.VISIBLE
+            scope.launch { context.toast(R.string.unknown_error) }
         }
     }
 

diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/TrackLoginDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/TrackLoginDialog.kt
@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.widget.preference
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.StringRes
-import br.com.simplepass.loadingbutton.animatedDrawables.ProgressType
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.TrackService
 import eu.kanade.tachiyomi.util.system.toast
@@ -36,10 +35,9 @@ class TrackLoginDialog(@StringRes usernameLabelRes: Int? = null, bundle: Bundle?
 
     override fun checkLogin() {
         v?.apply {
-            binding.login.apply {
-                progressType = ProgressType.INDETERMINATE
-                startAnimation()
-            }
+            binding.progress.visibility = View.VISIBLE
+            binding.login.visibility = View.GONE
+
             if (binding.username.text.isNullOrBlank() || binding.password.text.isNullOrBlank()) {
                 errorResult()
                 context.toast(R.string.username_must_not_be_blank)
@@ -72,9 +70,9 @@ class TrackLoginDialog(@StringRes usernameLabelRes: Int? = null, bundle: Bundle?
         v?.apply {
             dialog?.setCancelable(true)
             dialog?.setCanceledOnTouchOutside(true)
-            binding.login.revertAnimation {
-                binding.login.text = activity!!.getText(R.string.unknown_error)
-            }
+            binding.progress.visibility = View.GONE
+            binding.login.visibility = View.VISIBLE
+            scope.launch { context.toast(R.string.unknown_error) }
         }
     }
 

diff --git a/app/src/main/res/layout/list_stats_details.xml b/app/src/main/res/layout/list_stats_details.xml
diff --git a/app/src/main/res/layout/pref_account_login.xml b/app/src/main/res/layout/pref_account_login.xml
@@ -66,21 +66,28 @@
             android:inputType="textNoSuggestions" />
     </com.google.android.material.textfield.TextInputLayout>
 
-
-    <br.com.simplepass.loadingbutton.customViews.CircularProgressButton
+    <Button
         android:id="@+id/login"
-        style="@style/Theme.Widget.Button.Primary"
+        style="@style/Widget.Material3.Button.TonalButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginTop="20dp"
         android:scaleType="fitCenter"
         android:text="@string/log_in"
-        android:textSize="16sp"
-        app:finalCornerAngle="50dp"
-        app:initialCornerAngle="2dp"
-        app:spinning_bar_color="@color/md_white_1000"
-        app:spinning_bar_padding="6dp"
-        app:spinning_bar_width="3dp" />
+        android:textSize="16sp" />
+
+    <com.google.android.material.progressindicator.LinearProgressIndicator
+        android:id="@+id/progress"
+        style="@style/Widget.Material3.LinearProgressIndicator"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        tools:visibility="visible"
+        android:indeterminate="true"
+        app:showAnimationBehavior="inward"
+        app:hideAnimationBehavior="outward"
+        android:visibility="invisible" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/pref_site_login.xml b/app/src/main/res/layout/pref_site_login.xml
@@ -71,19 +71,27 @@
         tools:visibility="visible"
         android:text="@string/two_factor" />
 
-    <br.com.simplepass.loadingbutton.customViews.CircularProgressButton
+    <Button
         android:id="@+id/login"
-        style="@style/Theme.Widget.Button.Primary"
+        style="@style/Widget.Material3.Button.TonalButton"
         android:layout_width="match_parent"
         android:layout_height="55dp"
         android:layout_gravity="center"
         android:scaleType="fitCenter"
         android:text="@string/log_in"
-        android:textSize="16sp"
-        app:finalCornerAngle="50dp"
-        app:initialCornerAngle="2dp"
-        app:spinning_bar_color="@color/md_white_1000"
-        app:spinning_bar_padding="6dp"
-        app:spinning_bar_width="3dp" />
+        android:textSize="16sp" />
 
-</LinearLayout>
+
+    <com.google.android.material.progressindicator.LinearProgressIndicator
+        android:id="@+id/progress"
+        style="@style/Widget.Material3.LinearProgressIndicator"
+        android:layout_width="match_parent"
+        android:layout_height="3dp"
+        android:paddingTop="2dp"
+        tools:visibility="visible"
+        android:indeterminate="true"
+        app:showAnimationBehavior="inward"
+        app:hideAnimationBehavior="outward"
+        android:visibility="gone" />
+
+</LinearLayout>
diff --git a/gradle/kotlinx.versions.toml b/gradle/kotlinx.versions.toml
@@ -12,7 +12,6 @@ coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-androi
 
 serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serializationVersion" }
 serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "serializationVersion" }
-serialization-gradle = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlinVersion" }
 serialization-okio = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-okio", version.ref = "serializationVersion" }
 
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,12 +12,9 @@ iconicsVersion = "5.4.0"
 injektCoreVersion = "65b0440"
 kotlinResultVersion = "2.0.0"
 ktfmtVersion = "0.19.0"
-loadingButtonAndroidVersion = "2.2.0"
-nucleusVersion = "3.0.0"
 okhttpVersion = "5.0.0-alpha.14"
 photoViewVersion = "2.3.0"
 retrofitVersion = "2.11.0"
-roboelectricVersion = "4.8.1"
 rxbindingVersion = "1.0.1"
 sandwichVersion = "2.0.8"
 simpleIconsVersion = "1.0.0"
@@ -31,7 +28,6 @@ viewTooltipVersion = "f79a8955ef"
 cascade-compose = { module = "me.saket.cascade:cascade-compose", version.ref = "cascadeComposeVersion" }
 cascade = { module = "me.saket.cascade:cascade", version.ref = "cascadeVersion" }
 injekt-core = { module = "com.github.inorichi.injekt:injekt-core", version.ref = "injektCoreVersion" }
-loadingButtonAndroid = { module = "com.github.leandroBorgesFerreira:LoadingButtonAndroid", version.ref = "loadingButtonAndroidVersion" }
 material = "com.google.android.material:material:1.12.0"
 desugaring = "com.android.tools:desugar_jdk_libs:2.0.4"
 photoView = { module = "com.github.chrisbanes:PhotoView", version.ref = "photoViewVersion" }