Reformat. Remove unneeded application restart after language change.
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2023-01-05 18:18:48 +01:00
parent ec765b5fec
commit f8b35bddda
7 changed files with 18 additions and 19 deletions

View File

@@ -9,7 +9,8 @@ import androidx.core.os.LocaleListCompat
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
abstract class BaseActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceChangeListener { abstract class BaseActivity : AppCompatActivity(),
SharedPreferences.OnSharedPreferenceChangeListener {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@@ -18,17 +19,20 @@ abstract class BaseActivity : AppCompatActivity(), SharedPreferences.OnSharedPre
keepScreenOn(sharedPreferences.getBoolean("screen_on", false)) keepScreenOn(sharedPreferences.getBoolean("screen_on", false))
updateTheme(sharedPreferences.getString("theme", null)) updateTheme(sharedPreferences.getString("theme", null))
PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this) PreferenceManager.getDefaultSharedPreferences(this)
.registerOnSharedPreferenceChangeListener(this)
} }
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this) PreferenceManager.getDefaultSharedPreferences(this)
.registerOnSharedPreferenceChangeListener(this)
} }
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(this) PreferenceManager.getDefaultSharedPreferences(this)
.unregisterOnSharedPreferenceChangeListener(this)
} }
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) { override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
@@ -74,9 +78,6 @@ abstract class BaseActivity : AppCompatActivity(), SharedPreferences.OnSharedPre
if (locale != null && locale != currentLocale) { if (locale != null && locale != currentLocale) {
val newLocale = LocaleListCompat.forLanguageTags(locale) val newLocale = LocaleListCompat.forLanguageTags(locale)
AppCompatDelegate.setApplicationLocales(newLocale) AppCompatDelegate.setApplicationLocales(newLocale)
finish()
startActivity(intent)
} }
} }
} }

View File

@@ -1,14 +1,13 @@
package me.zobrist.tichucounter package me.zobrist.tichucounter
import android.os.Bundle import android.os.Bundle
import android.view.Menu import androidx.drawerlayout.widget.DrawerLayout
import com.google.android.material.navigation.NavigationView
import androidx.navigation.findNavController import androidx.navigation.findNavController
import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.navigateUp import androidx.navigation.ui.navigateUp
import androidx.navigation.ui.setupActionBarWithNavController import androidx.navigation.ui.setupActionBarWithNavController
import androidx.navigation.ui.setupWithNavController import androidx.navigation.ui.setupWithNavController
import androidx.drawerlayout.widget.DrawerLayout import com.google.android.material.navigation.NavigationView
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import me.zobrist.tichucounter.databinding.ActivityDrawerBinding import me.zobrist.tichucounter.databinding.ActivityDrawerBinding
@@ -42,7 +41,6 @@ class MainActivity : BaseActivity() {
navView.setupWithNavController(navController) navView.setupWithNavController(navController)
} }
override fun onSupportNavigateUp(): Boolean { override fun onSupportNavigateUp(): Boolean {

View File

@@ -6,7 +6,6 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.viewbinding.ViewBinding import androidx.viewbinding.ViewBinding
import dagger.hilt.android.AndroidEntryPoint
abstract class FragmentBase<VB : ViewBinding> : Fragment() { abstract class FragmentBase<VB : ViewBinding> : Fragment() {

View File

@@ -10,7 +10,8 @@ import me.zobrist.tichucounter.repository.GameRepository
import javax.inject.Inject import javax.inject.Inject
@HiltViewModel @HiltViewModel
class KeyboardViewModel @Inject constructor(private val gameRepository: GameRepository) : ViewModel() { class KeyboardViewModel @Inject constructor(private val gameRepository: GameRepository) :
ViewModel() {
private val _scoreA: MutableLiveData<Int?> = MutableLiveData() private val _scoreA: MutableLiveData<Int?> = MutableLiveData()
private val _scoreB: MutableLiveData<Int?> = MutableLiveData() private val _scoreB: MutableLiveData<Int?> = MutableLiveData()
private val _enableSubmitButton: MutableLiveData<Boolean> = MutableLiveData() private val _enableSubmitButton: MutableLiveData<Boolean> = MutableLiveData()

View File

@@ -23,7 +23,8 @@ import javax.inject.Inject
@AndroidEntryPoint @AndroidEntryPoint
class CounterFragment : FragmentBase<FragmentCounterBinding>(), MenuProvider { class CounterFragment : FragmentBase<FragmentCounterBinding>(), MenuProvider {
@Inject lateinit var gameRepository: GameRepository @Inject
lateinit var gameRepository: GameRepository
override val bindingInflater: (LayoutInflater, ViewGroup?, Boolean) -> FragmentCounterBinding override val bindingInflater: (LayoutInflater, ViewGroup?, Boolean) -> FragmentCounterBinding
get() = FragmentCounterBinding::inflate get() = FragmentCounterBinding::inflate
@@ -89,10 +90,10 @@ class CounterFragment : FragmentBase<FragmentCounterBinding>(), MenuProvider {
return when (menuItem.itemId) { return when (menuItem.itemId) {
R.id.action_clear -> { R.id.action_clear -> {
val builder = context?.let { AlertDialog.Builder(it) } val builder = context?.let { AlertDialog.Builder(it) }
if(builder != null) if (builder != null) {
{
builder.setMessage(getString(R.string.confirmClear)).setTitle(R.string.clear) 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() dialog.dismiss()
viewLifecycleOwner.lifecycleScope.launch { viewLifecycleOwner.lifecycleScope.launch {
gameRepository.newGame() gameRepository.newGame()

View File

@@ -4,7 +4,6 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.TextView
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import me.zobrist.tichucounter.databinding.FragmentSlideshowBinding import me.zobrist.tichucounter.databinding.FragmentSlideshowBinding

View File

@@ -20,5 +20,5 @@
<fragment <fragment
android:id="@+id/nav_settings" android:id="@+id/nav_settings"
android:name="me.zobrist.tichucounter.ui.settings.SettingsFragment" android:name="me.zobrist.tichucounter.ui.settings.SettingsFragment"
android:label="@string/menu_settings"/> android:label="@string/menu_settings" />
</navigation> </navigation>