Fix: A lot of errors

luizlealdev · Aug 5, 2024 · 883d957 · 883d957
1 parent f280809
commit 883d957
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 22 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -57,7 +57,7 @@ dependencies {
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
-    implementation(platform("com.google.firebase:firebase-bom:33.1.0"))
-    implementation("com.google.firebase:firebase-analytics")
-    implementation("com.google.firebase:firebase-database-ktx:21.0.0")
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.analytics)
+    implementation(libs.firebase.database.ktx)
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -13,9 +15,9 @@
         android:theme="@style/Theme.TabuadaDeGlécio"
         tools:targetApi="31">
         <activity
-            android:screenOrientation="portrait"
             android:name=".ui.SettingsActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.LeaderboardActivity"
             android:exported="false"

diff --git a/app/src/main/java/dev/luizleal/tabuadaglecio/fragments/GameFragment.kt b/app/src/main/java/dev/luizleal/tabuadaglecio/fragments/GameFragment.kt
@@ -21,9 +21,9 @@ import dev.luizleal.tabuadaglecio.content.SecurityPreferences
 import dev.luizleal.tabuadaglecio.databinding.FragmentGameBinding
 import dev.luizleal.tabuadaglecio.model.LeaderboardUser
 import dev.luizleal.tabuadaglecio.model.Multiplication
-import dev.luizleal.tabuadaglecio.util.ViewUtils.Companion.setButtonPressedAnimation
-import dev.luizleal.tabuadaglecio.util.ViewUtils.Companion.setButtonPressedAnimationToAll
-import dev.luizleal.tabuadaglecio.util.ViewUtils.Companion.setScaleAnimation
+import dev.luizleal.tabuadaglecio.util.AnimationController.Companion.setButtonPressedAnimation
+import dev.luizleal.tabuadaglecio.util.AnimationController.Companion.setButtonPressedAnimationToAll
+import dev.luizleal.tabuadaglecio.util.AnimationController.Companion.setScaleAnimation
 import kotlin.random.Random
 
 class GameFragment : Fragment(R.layout.fragment_game) {
@@ -74,8 +74,8 @@ class GameFragment : Fragment(R.layout.fragment_game) {
         )
 
         binding.apply {
-            textNumpadEnter.setButtonPressedAnimation()
-            textNumpadBackspace.setButtonPressedAnimation()
+            textNumpadEnter.setButtonPressedAnimation(requireContext())
+            textNumpadBackspace.setButtonPressedAnimation(requireContext())
         }
 
         securityPreferences = SecurityPreferences(requireContext())
@@ -87,7 +87,7 @@ class GameFragment : Fragment(R.layout.fragment_game) {
         databaseReference = firebaseDatabase?.getReference("leaderboard")
         databaseGlobalLeaderboardReference = firebaseDatabase?.getReference("leaderboard_global")
 
-        setButtonPressedAnimationToAll(numpadButtons)
+        setButtonPressedAnimationToAll(requireContext(), numpadButtons)
         setNumpadButtonsAction(numpadButtons)
 
         startTimer()
@@ -211,7 +211,7 @@ class GameFragment : Fragment(R.layout.fragment_game) {
             "${currentMultiplication.firstNumber} x ${currentMultiplication.secondNumber}"
         )
 
-        if (animationState) textMultiplication.setScaleAnimation()
+        if (animationState) textMultiplication.setScaleAnimation(requireContext())
     }
 
     private fun generateNewMultiplication() {

diff --git a/app/src/main/java/dev/luizleal/tabuadaglecio/fragments/HomeFragment.kt b/app/src/main/java/dev/luizleal/tabuadaglecio/fragments/HomeFragment.kt
@@ -12,7 +12,7 @@ import dev.luizleal.tabuadaglecio.content.SecurityPreferences
 import dev.luizleal.tabuadaglecio.databinding.FragmentHomeBinding
 import dev.luizleal.tabuadaglecio.ui.LeaderboardActivity
 import dev.luizleal.tabuadaglecio.ui.SettingsActivity
-import dev.luizleal.tabuadaglecio.util.ViewUtils.Companion.setButtonPressedAnimation
+import dev.luizleal.tabuadaglecio.util.AnimationController.Companion.setButtonPressedAnimation
 
 class HomeFragment : Fragment(R.layout.fragment_home) {
     private lateinit var binding: FragmentHomeBinding
@@ -33,8 +33,8 @@ class HomeFragment : Fragment(R.layout.fragment_home) {
 
         securityPreferences = SecurityPreferences(requireContext())
 
-        binding.buttonStart.setButtonPressedAnimation()
-        binding.buttonViewLeaderboard.setButtonPressedAnimation()
+        binding.buttonStart.setButtonPressedAnimation(requireContext())
+        binding.buttonViewLeaderboard.setButtonPressedAnimation(requireContext())
 
         if (securityPreferences.getString("maxScore").isEmpty()) {
             securityPreferences.storeString("maxScore", "0")

diff --git a/app/src/main/java/dev/luizleal/tabuadaglecio/fragments/RestartFragment.kt b/app/src/main/java/dev/luizleal/tabuadaglecio/fragments/RestartFragment.kt
@@ -13,7 +13,7 @@ import dev.luizleal.tabuadaglecio.content.SecurityPreferences
 import dev.luizleal.tabuadaglecio.databinding.FragmentRestartBinding
 import dev.luizleal.tabuadaglecio.ui.LeaderboardActivity
 import dev.luizleal.tabuadaglecio.ui.SettingsActivity
-import dev.luizleal.tabuadaglecio.util.ViewUtils.Companion.setButtonPressedAnimation
+import dev.luizleal.tabuadaglecio.util.AnimationController.Companion.setButtonPressedAnimation
 
 class RestartFragment : Fragment(R.layout.fragment_restart) {
     private var restartBinding: FragmentRestartBinding? = null
@@ -35,11 +35,13 @@ class RestartFragment : Fragment(R.layout.fragment_restart) {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        securityPreferences = SecurityPreferences(requireContext())
+
         setScore()
 
         binding.apply {
-            buttonRestart.setButtonPressedAnimation()
-            buttonViewLeaderboard.setButtonPressedAnimation()
+            buttonRestart.setButtonPressedAnimation(requireContext())
+            buttonViewLeaderboard.setButtonPressedAnimation(requireContext())
 
             buttonRestart.setOnClickListener {
                 it.findNavController().popBackStack(R.id.gameFragment, false)
@@ -67,4 +69,8 @@ class RestartFragment : Fragment(R.layout.fragment_restart) {
         binding.textCountRight.setText(args.correctAnswers)
         binding.textCountWrong.setText(args.wrongAnswers)
     }
+
+    private fun setupAnimationsInButton() {
+
+    }
 }
diff --git a/app/src/main/java/dev/luizleal/tabuadaglecio/util/AnimationController.kt b/app/src/main/java/dev/luizleal/tabuadaglecio/util/AnimationController.kt
@@ -0,0 +1,36 @@
+package dev.luizleal.tabuadaglecio.util
+
+import android.content.Context
+import android.view.View
+import dev.luizleal.tabuadaglecio.content.SecurityPreferences
+import dev.luizleal.tabuadaglecio.util.ViewUtils.Companion.setButtonPressedAnimation
+import dev.luizleal.tabuadaglecio.util.ViewUtils.Companion.setButtonPressedAnimationToAll
+import dev.luizleal.tabuadaglecio.util.ViewUtils.Companion.setScaleAnimation
+
+class AnimationController private constructor() {
+    companion object {
+        fun View.setScaleAnimation(context: Context) {
+            val securityPreferences = SecurityPreferences(context)
+
+            if (securityPreferences.getString("animations").toBoolean()) {
+                this.setScaleAnimation()
+            }
+        }
+
+        fun View.setButtonPressedAnimation(context: Context) {
+            val securityPreferences = SecurityPreferences(context)
+
+            if (securityPreferences.getString("animations").toBoolean()) {
+                this.setButtonPressedAnimation()
+            }
+        }
+
+        fun setButtonPressedAnimationToAll(context: Context, buttons: List<View>) {
+            val securityPreferences = SecurityPreferences(context)
+
+            if (securityPreferences.getString("animations").toBoolean()) {
+                ViewUtils.setButtonPressedAnimationToAll(buttons)
+            }
+        }
+    }
+}
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
@@ -12,6 +12,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
             android:id="@+id/main"
             android:padding="16dp">
 

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -130,7 +130,7 @@
             android:focusable="true"
             android:fontFamily="@font/fredoka_one"
             android:paddingVertical="8dp"
-            android:text="Ver código fonte"
+            android:text="@string/ver_c_digo_fonte"
             android:textColor="@color/textColorSecondary"
             android:textSize="20sp"
             app:drawableStartCompat="@drawable/ic_github"

diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
@@ -101,7 +101,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/fredoka_one"
-            android:text="v1.0.0"
+            android:text="@string/app_version"
             android:textColor="@color/textColorSecondary"
             android:textSize="18sp"
             app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/layout/fragment_restart.xml b/app/src/main/res/layout/fragment_restart.xml
@@ -149,7 +149,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/fredoka_one"
-            android:text="v1.0.0"
+            android:text="@string/app_version"
             android:textColor="@color/textColorSecondary"
             android:textSize="18sp"
             app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <resources>
     <string name="app_name">Tabuada do Glécio</string>
+    <string name="app_version">v1.0.3</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="teste_seus_conhecimentos_e_treine_para_n_o_passar_vergonha">Teste seus conhecimentos e treine para não passar vergonha.</string>
@@ -49,6 +50,7 @@
     <string name="excluir_progresso">Excluir progresso</string>
     <string name="visitar_site">Visitar site</string>
     <string name="feito_com_por_luiz_leal_e_lucas_davi_n_inform_tica_2022_2024">Feito com ❤️ por Luiz Leal e Lucas Davi \n (Informática 2022 - 2024)</string>
+    <string name="ver_c_digo_fonte">Ver código fonte</string>
     <string-array name="theme_mode">
         <item>Sistema</item>
         <item>Claro</item>

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,7 @@
 [versions]
 agp = "8.4.1"
+firebaseBom = "33.1.2"
+firebaseDatabaseKtx = "21.0.0"
 kotlin = "1.9.0"
 coreKtx = "1.13.1"
 junit = "4.13.2"
@@ -21,6 +23,9 @@ viewpager2 = "1.1.0"
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-navigation-safe-args-gradle-plugin = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "navigationFragmentKtx" }
+firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
+firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
+firebase-database-ktx = { module = "com.google.firebase:firebase-database-ktx", version.ref = "firebaseDatabaseKtx" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }