2.3_12_03

Author: queuejw

app/build.gradle

@@ -16,7 +16,7 @@ android {
         minSdk 21
         targetSdk = 34
         versionCode 9
-        versionName '2.3_12_02'
+        versionName '2.3_12_03'
         multiDexEnabled false
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/ru/dimon6018/neko11/NekoApplication.kt

@@ -56,15 +56,14 @@ class NekoApplication : Application() {
         @JvmStatic
         fun getCatMood(context: Context, cat: Cat): String {
             val prefs = PrefState(context)
-            val result = when (prefs.getMoodPref(cat)) {
+            return when (prefs.getMoodPref(cat)) {
                 1 -> context.getString(R.string.mood1)
                 2 -> context.getString(R.string.mood2)
                 3 -> context.getString(R.string.mood3)
                 4 -> context.getString(R.string.mood4)
                 5 -> context.getString(R.string.mood5)
                 else -> context.getString(R.string.mood1)
             }
-            return result
         }
 
         @JvmStatic

app/src/main/java/ru/dimon6018/neko11/ui/fragments/NekoLandFragment.kt

@@ -192,6 +192,7 @@ class NekoLandFragment : Fragment(), PrefsListener {
         bottomsheet!!.dismissWithAnimation = true
         val bottomSheetInternal: View? = bottomsheet!!.findViewById(com.google.android.material.R.id.design_bottom_sheet)
         BottomSheetBehavior.from(bottomSheetInternal!!).peekHeight = resources.getDimensionPixelSize(R.dimen.bottomsheet)
+        BottomSheetBehavior.from(bottomSheetInternal).state = BottomSheetBehavior.STATE_HALF_EXPANDED
         icon = cat.createIconBitmap(iconSize!!, iconSize!!, mPrefs!!.getIconBackground()).toDrawable(resources)
         textLayout = bottomSheetInternal.findViewById(R.id.catNameField)
         catEditor = bottomSheetInternal.findViewById(R.id.catEditName)
@@ -211,6 +212,7 @@ class NekoLandFragment : Fragment(), PrefsListener {
             catEditor!!.setText(cat.name)
         } catch (e: ClassCastException) {
             mood!!.text = getString(R.string.error)
+            mPrefs!!.removeMood(cat)
             mPrefs!!.setMood(cat, 3)
         }
         catImage?.setImageDrawable(icon)
@@ -233,7 +235,7 @@ class NekoLandFragment : Fragment(), PrefsListener {
                     .setMessage(R.string.name_changed)
                     .setNegativeButton(android.R.string.ok, null)
                     .show()
-            cat.name = catEditor!!.getText().toString().trim { it <= ' ' }
+            cat.name = catEditor!!.text.toString().trim { it <= ' ' }
             bottomsheet = null
             mPrefs!!.addCat(cat)
         }
@@ -259,8 +261,8 @@ class NekoLandFragment : Fragment(), PrefsListener {
             val item1 = v.findViewById<MaterialCardView>(R.id.luckyBooster)
             counter0.text = getString(R.string.booster_items, mPrefs!!.moodBoosters)
             counter1.text = getString(R.string.booster_items, mPrefs!!.luckyBoosters)
-            item0.setEnabled(mPrefs!!.moodBoosters != 0)
-            item1.setEnabled(mPrefs!!.luckyBoosters != 0)
+            item0.isEnabled = mPrefs!!.moodBoosters != 0
+            item1.isEnabled = mPrefs!!.luckyBoosters != 0
             dialog.setCancelable(true)
             dialog.setNegativeButton(android.R.string.cancel, null)
             val alertd = dialog.create()
@@ -469,12 +471,12 @@ class NekoLandFragment : Fragment(), PrefsListener {
 
     private fun updateCatActions(cat: Cat, wash: View, caress: View, touch: View, actionsLimit: View) {
         if (mPrefs!!.isCanInteract(cat) <= 0) {
-            wash.setEnabled(false)
-            wash.setAlpha(0.5f)
-            caress.setEnabled(false)
-            caress.setAlpha(0.5f)
-            touch.setEnabled(false)
-            touch.setAlpha(0.5f)
+            wash.isEnabled = false
+            wash.alpha = 0.5f
+            caress.isEnabled = false
+            caress.alpha = 0.5f
+            touch.isEnabled = false
+            touch.alpha = 0.5f
             actionsLimit.visibility = View.VISIBLE
         }
     }
@@ -508,7 +510,7 @@ class NekoLandFragment : Fragment(), PrefsListener {
     }
 
     private fun showCatFull(cat: Cat) {
-        val context: Context = if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) ContextThemeWrapper(context, requireActivity().getTheme()) else requireActivity()
+        val context: Context = if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) ContextThemeWrapper(context, requireActivity().theme) else requireActivity()
         val view = LayoutInflater.from(context).inflate(R.layout.cat_fullscreen_view, null)
         val ico = view.findViewById<ImageView>(R.id.cat_ico)
         ico.setImageBitmap(cat.createIconBitmap(EXPORT_BITMAP_SIZE, EXPORT_BITMAP_SIZE, 0))

app/src/main/java/ru/dimon6018/neko11/workers/PrefState.kt

@@ -20,6 +20,7 @@ package ru.dimon6018.neko11.workers
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
+import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import ru.dimon6018.neko11.ui.activities.NekoSettingsActivity
 import ru.dimon6018.neko11.ui.fragments.NekoLandFragment
@@ -45,6 +46,11 @@ class PrefState(private val mContext: Context) : OnSharedPreferenceChangeListene
                 .putInt(CAT_KEY_PREFIX_MOOD + cat.seed, mood)
                 .apply()
     }
+    fun removeMood(cat: Cat) {
+        mPrefs.edit()
+                .remove(CAT_KEY_PREFIX_MOOD + cat.seed)
+                .apply()
+    }
     fun setAge(cat: Cat, age: Int) {
         mPrefs.edit()
                 .putInt(CAT_AGE + cat.seed, age)
@@ -142,7 +148,13 @@ class PrefState(private val mContext: Context) : OnSharedPreferenceChangeListene
     }
 
     fun getMoodPref(cat: Cat): Int {
-        return mPrefs.getInt(CAT_KEY_PREFIX_MOOD + cat.seed, 3)
+        return try {
+            mPrefs.getInt(CAT_KEY_PREFIX_MOOD + cat.seed, 3)
+        } catch (e: ClassCastException) {
+            removeMood(cat)
+            setMood(cat, 3)
+            3
+        }
     }
     fun getCatAge(seed: Long): Int {
         return mPrefs.getInt(CAT_AGE + seed, 2)