From f8b35bddda10dffe64a4f058c9208b724f32dcf1 Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Thu, 5 Jan 2023 18:18:48 +0100 Subject: [PATCH] Reformat. Remove unneeded application restart after language change. --- .../java/me/zobrist/tichucounter/BaseActivity.kt | 15 ++++++++------- .../java/me/zobrist/tichucounter/MainActivity.kt | 6 ++---- .../tichucounter/fragments/FragmentBase.kt | 1 - .../tichucounter/fragments/KeyboardViewModel.kt | 3 ++- .../tichucounter/ui/counter/CounterFragment.kt | 9 +++++---- .../ui/slideshow/SlideshowFragment.kt | 1 - app/src/main/res/navigation/mobile_navigation.xml | 2 +- 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/me/zobrist/tichucounter/BaseActivity.kt b/app/src/main/java/me/zobrist/tichucounter/BaseActivity.kt index c4a0330..81d8896 100644 --- a/app/src/main/java/me/zobrist/tichucounter/BaseActivity.kt +++ b/app/src/main/java/me/zobrist/tichucounter/BaseActivity.kt @@ -9,7 +9,8 @@ import androidx.core.os.LocaleListCompat import androidx.preference.PreferenceManager -abstract class BaseActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceChangeListener { +abstract class BaseActivity : AppCompatActivity(), + SharedPreferences.OnSharedPreferenceChangeListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -18,17 +19,20 @@ abstract class BaseActivity : AppCompatActivity(), SharedPreferences.OnSharedPre keepScreenOn(sharedPreferences.getBoolean("screen_on", false)) updateTheme(sharedPreferences.getString("theme", null)) - PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this) + PreferenceManager.getDefaultSharedPreferences(this) + .registerOnSharedPreferenceChangeListener(this) } override fun onResume() { super.onResume() - PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this) + PreferenceManager.getDefaultSharedPreferences(this) + .registerOnSharedPreferenceChangeListener(this) } override fun onPause() { super.onPause() - PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(this) + PreferenceManager.getDefaultSharedPreferences(this) + .unregisterOnSharedPreferenceChangeListener(this) } override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) { @@ -74,9 +78,6 @@ abstract class BaseActivity : AppCompatActivity(), SharedPreferences.OnSharedPre if (locale != null && locale != currentLocale) { val newLocale = LocaleListCompat.forLanguageTags(locale) AppCompatDelegate.setApplicationLocales(newLocale) - - finish() - startActivity(intent) } } } \ No newline at end of file diff --git a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt index 3fa088b..31dbfb2 100644 --- a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt +++ b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt @@ -1,14 +1,13 @@ package me.zobrist.tichucounter import android.os.Bundle -import android.view.Menu -import com.google.android.material.navigation.NavigationView +import androidx.drawerlayout.widget.DrawerLayout import androidx.navigation.findNavController import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.navigateUp import androidx.navigation.ui.setupActionBarWithNavController import androidx.navigation.ui.setupWithNavController -import androidx.drawerlayout.widget.DrawerLayout +import com.google.android.material.navigation.NavigationView import dagger.hilt.android.AndroidEntryPoint import me.zobrist.tichucounter.databinding.ActivityDrawerBinding @@ -42,7 +41,6 @@ class MainActivity : BaseActivity() { navView.setupWithNavController(navController) - } override fun onSupportNavigateUp(): Boolean { diff --git a/app/src/main/java/me/zobrist/tichucounter/fragments/FragmentBase.kt b/app/src/main/java/me/zobrist/tichucounter/fragments/FragmentBase.kt index 76d0dfb..f1f619e 100644 --- a/app/src/main/java/me/zobrist/tichucounter/fragments/FragmentBase.kt +++ b/app/src/main/java/me/zobrist/tichucounter/fragments/FragmentBase.kt @@ -6,7 +6,6 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.viewbinding.ViewBinding -import dagger.hilt.android.AndroidEntryPoint abstract class FragmentBase : Fragment() { diff --git a/app/src/main/java/me/zobrist/tichucounter/fragments/KeyboardViewModel.kt b/app/src/main/java/me/zobrist/tichucounter/fragments/KeyboardViewModel.kt index ef632e3..d2328a7 100644 --- a/app/src/main/java/me/zobrist/tichucounter/fragments/KeyboardViewModel.kt +++ b/app/src/main/java/me/zobrist/tichucounter/fragments/KeyboardViewModel.kt @@ -10,7 +10,8 @@ import me.zobrist.tichucounter.repository.GameRepository import javax.inject.Inject @HiltViewModel -class KeyboardViewModel @Inject constructor(private val gameRepository: GameRepository) : ViewModel() { +class KeyboardViewModel @Inject constructor(private val gameRepository: GameRepository) : + ViewModel() { private val _scoreA: MutableLiveData = MutableLiveData() private val _scoreB: MutableLiveData = MutableLiveData() private val _enableSubmitButton: MutableLiveData = MutableLiveData() diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/counter/CounterFragment.kt b/app/src/main/java/me/zobrist/tichucounter/ui/counter/CounterFragment.kt index 1456a05..0a11e37 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/counter/CounterFragment.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/counter/CounterFragment.kt @@ -23,7 +23,8 @@ import javax.inject.Inject @AndroidEntryPoint class CounterFragment : FragmentBase(), MenuProvider { - @Inject lateinit var gameRepository: GameRepository + @Inject + lateinit var gameRepository: GameRepository override val bindingInflater: (LayoutInflater, ViewGroup?, Boolean) -> FragmentCounterBinding get() = FragmentCounterBinding::inflate @@ -89,10 +90,10 @@ class CounterFragment : FragmentBase(), MenuProvider { return when (menuItem.itemId) { R.id.action_clear -> { val builder = context?.let { AlertDialog.Builder(it) } - if(builder != null) - { + if (builder != null) { builder.setMessage(getString(R.string.confirmClear)).setTitle(R.string.clear) - .setCancelable(false).setPositiveButton(getString(R.string.yes)) { dialog, _ -> + .setCancelable(false) + .setPositiveButton(getString(R.string.yes)) { dialog, _ -> dialog.dismiss() viewLifecycleOwner.lifecycleScope.launch { gameRepository.newGame() diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/slideshow/SlideshowFragment.kt b/app/src/main/java/me/zobrist/tichucounter/ui/slideshow/SlideshowFragment.kt index 5b5dd1c..55e6f59 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/slideshow/SlideshowFragment.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/slideshow/SlideshowFragment.kt @@ -4,7 +4,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import me.zobrist.tichucounter.databinding.FragmentSlideshowBinding diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index e48af6b..93e6b15 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -20,5 +20,5 @@ + android:label="@string/menu_settings" /> \ No newline at end of file