Merge pull request #14 from icanerdogan/hotfix/1.1.0

Hotfix/1.1.0
icanerdogan · Oct 13, 2023 · d0f4ef4 · d0f4ef4
2 parents 980080b + a7eeb6f
commit d0f4ef4
Show file tree

Hide file tree

Showing 60 changed files with 27 additions and 48 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 def versionMajor = 1
-def versionMinor = 0
+def versionMinor = 1
 def versionPatch = 0
 
 android {

diff --git a/app/signing/ValorantSignJks b/app/signing/ValorantSignJks
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,9 +10,9 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher_light"
+        android:icon="@mipmap/ic_launcher_illustration"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_light_round"
+        android:roundIcon="@mipmap/ic_launcher_illustration_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.ValorantGuideApp.Splash"
         tools:targetApi="31">

diff --git a/app/src/main/ic_launcher_illustration-playstore.png b/app/src/main/ic_launcher_illustration-playstore.png
diff --git a/app/src/main/java/com/ibrahimcanerdogan/valorantguideapp/data/database/Converters.kt b/app/src/main/java/com/ibrahimcanerdogan/valorantguideapp/data/database/Converters.kt
@@ -92,12 +92,12 @@ class Converters {
 
 
     @TypeConverter
-    fun fromAgentVoiceLine(voiceLine: AgentVoiceLine): String {
+    fun fromAgentVoiceLine(voiceLine: AgentVoiceLine?): String {
         return gson.toJson(voiceLine)
     }
 
     @TypeConverter
-    fun toAgentVoiceLine(voiceLineString: String): AgentVoiceLine {
+    fun toAgentVoiceLine(voiceLineString: String): AgentVoiceLine? {
         return gson.fromJson(voiceLineString, AgentVoiceLine::class.java)
     }
 

diff --git a/app/src/main/java/com/ibrahimcanerdogan/valorantguideapp/data/model/agent/AgentData.kt b/app/src/main/java/com/ibrahimcanerdogan/valorantguideapp/data/model/agent/AgentData.kt
@@ -39,5 +39,5 @@ data class AgentData(
     @SerializedName("abilities")
     val agentAbilities: List<AgentAbility>,
     @SerializedName("voiceLine")
-    val agentVoiceLine: AgentVoiceLine
+    val agentVoiceLine: AgentVoiceLine?
 )
diff --git a/...rc/main/java/com/ibrahimcanerdogan/valorantguideapp/view/adapter/agent/AgentViewHolder.kt b/...rc/main/java/com/ibrahimcanerdogan/valorantguideapp/view/adapter/agent/AgentViewHolder.kt
@@ -140,11 +140,13 @@ class AgentViewHolder(
 
     private fun setAgentVoiceData(agentData: AgentData) {
         binding.imageViewAgentPortrait.setOnClickListener {
-            // Check if MediaPlayer is already playing
-            if (mediaPlayer?.isPlaying == true) {
-                stopMediaPlayer()
-            } else {
-                startMediaPlayer(agentData.agentVoiceLine.mediaList[0].mediaWave)
+            agentData.agentVoiceLine?.let {
+                // Check if MediaPlayer is already playing
+                if (mediaPlayer?.isPlaying == true) {
+                    stopMediaPlayer()
+                } else {
+                    startMediaPlayer(it.mediaList[0].mediaWave)
+                }
             }
         }
     }

diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_dark.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_dark.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_dark_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_dark_round.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_illustration.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_illustration.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_illustration_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_illustration_foreground"/>
+</adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_illustration_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_illustration_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_illustration_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_illustration_foreground"/>
+</adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_light_round.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_dark.png b/app/src/main/res/mipmap-hdpi/ic_launcher_dark.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_dark_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_dark_foreground.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_dark_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_dark_round.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_illustration.png b/app/src/main/res/mipmap-hdpi/ic_launcher_illustration.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_illustration_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_illustration_foreground.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_illustration_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_illustration_round.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light.png b/app/src/main/res/mipmap-hdpi/ic_launcher_light.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_light_foreground.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_light_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_light_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_dark.png b/app/src/main/res/mipmap-mdpi/ic_launcher_dark.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_dark_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_dark_foreground.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_dark_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_dark_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_illustration.png b/app/src/main/res/mipmap-mdpi/ic_launcher_illustration.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_illustration_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_illustration_foreground.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_illustration_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_illustration_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_light.png b/app/src/main/res/mipmap-mdpi/ic_launcher_light.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_light_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_light_foreground.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_light_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_light_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_dark.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_dark.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_dark_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_dark_foreground.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_dark_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_dark_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_illustration.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_illustration.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_illustration_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_illustration_foreground.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_illustration_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_illustration_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_light.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_foreground.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_light_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_light_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_dark.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_dark.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_dark_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_dark_foreground.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_dark_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_dark_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_illustration.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_illustration.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_illustration_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_illustration_foreground.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_illustration_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_illustration_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_foreground.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_light_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_dark.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_dark.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_dark_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_dark_foreground.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_dark_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_dark_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_illustration.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_illustration.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_illustration_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_illustration_foreground.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_illustration_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_illustration_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_foreground.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_light_round.png
diff --git a/app/src/main/res/values/ic_launcher_illustration_background.xml b/app/src/main/res/values/ic_launcher_illustration_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_illustration_background">#000000</color>
+</resources>