zobrist/TichuCounter
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases 9 Wiki Activity

Request review on victory dialog closed. Reformat cod
All checks were successful
Build Android / build (push) Has been cancelled
Details

Browse Source 
closes: #51
This commit is contained in:
Fabian Zobrist
2023-09-23 13:41:26 +02:00
parent c968d2ee91
commit c087425d50
5 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/me/zobrist/tichucounter/MainActivity.kt
View File

@@ -43,9 +43,7 @@ import androidx.navigation.compose.rememberNavController
import com.google.accompanist.systemuicontroller.rememberSystemUiController
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch
import me.zobrist.tichucounter.data.entity.Game
import me.zobrist.tichucounter.domain.DrawerItem
import me.zobrist.tichucounter.domain.KeepScreenOn
import me.zobrist.tichucounter.domain.Language
@@ -88,7 +86,7 @@ class MainActivity : AppCompatActivity() {
private val settingsViewModel: SettingsViewModel by viewModels()
private val mainViewModel: MainViewModel by viewModels()
private var newGame: Game? = null
private var requestReview: Boolean = false
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -115,15 +113,16 @@ class MainActivity : AppCompatActivity() {
}
lifecycleScope.launch {
repository.getNewGameStarted().collect{
if(newGame == null)
{
newGame = it
settingsAdapter.gameFinished.collect {
if (!requestReview) {
requestReview = true
return@collect
}
if (it) {
reviewService.request()
}
}
}
setContent {
AppTheme {

7
app/src/main/java/me/zobrist/tichucounter/repository/GameRepository.kt
View File

@@ -14,7 +14,6 @@ import me.zobrist.tichucounter.data.GameWithScores
import me.zobrist.tichucounter.data.RoundDao
import me.zobrist.tichucounter.data.entity.Game
import me.zobrist.tichucounter.data.entity.Round
import me.zobrist.tichucounter.domain.KeepScreenOn
import java.util.Date
import javax.inject.Inject
@@ -23,7 +22,8 @@ class GameRepository @Inject constructor(
private val roundDao: RoundDao
) {
private var activeGame: Game = Game(true, "TeamA", "TeamB", Date(), Date())
var activeGame: Game = Game(true, "TeamA", "TeamB", Date(), Date())
private set
private val newGameFlow = MutableStateFlow(Game())
@@ -140,8 +140,7 @@ class GameRepository @Inject constructor(
return gameDao.getDistinctTeamNames()
}
fun getNewGameStarted(): Flow<Game>
{
fun getNewGameStarted(): Flow<Game> {
return newGameFlow
}
}

4
app/src/main/java/me/zobrist/tichucounter/ui/MainViewModel.kt
View File

@@ -7,7 +7,6 @@ import androidx.compose.runtime.setValue
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch
import me.zobrist.tichucounter.data.entity.Game
import me.zobrist.tichucounter.data.entity.Round
@@ -52,8 +51,7 @@ class MainViewModel @Inject constructor(
viewModelScope.launch {
gameRepository.getNewGameStarted().collect {
if(newGame == null)
{
if (newGame == null) {
newGame = it
return@collect
}

8
app/src/main/java/me/zobrist/tichucounter/ui/counter/CounterViewModel.kt
View File

@@ -6,12 +6,10 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.compose.ui.focus.FocusRequester
import androidx.lifecycle.ViewModel
import androidx.lifecycle.asLiveData
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch
import me.zobrist.tichucounter.data.entity.Game
import me.zobrist.tichucounter.data.entity.Round
@@ -186,8 +184,7 @@ class CounterViewModel @Inject constructor(
buildTeamNameSuggestions()
if (it.game.uid != lastGame?.uid) {
if(lastGame != null)
{
if (lastGame != null) {
settings.gameFinished.value = false
}
lastGame = it.game
@@ -211,8 +208,7 @@ class CounterViewModel @Inject constructor(
}
viewModelScope.launch {
settings.victoryPoints.collect {
if(lastVictoryPoints == null)
{
if (lastVictoryPoints == null) {
lastVictoryPoints = it
return@collect
}

10
app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt
View File

@@ -48,7 +48,6 @@ import androidx.compose.ui.Alignment.Companion.CenterVertically
import androidx.compose.ui.Alignment.Companion.TopEnd
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
@@ -168,7 +167,9 @@ fun HistoryList(
if (it.game.active) {
HistoryListItem(
it,
Modifier.animateItemPlacement().padding(2.dp)
Modifier
.animateItemPlacement()
.padding(2.dp)
)
} else {
DismissibleHistoryListItem(
@@ -278,7 +279,10 @@ fun DismissibleHistoryListItem(
horizontalAlignment = Alignment.CenterHorizontally
) {
Icon(
icon, contentDescription = null, modifier = Modifier.scale(scale), tint = textColor
icon,
contentDescription = null,
modifier = Modifier.scale(scale),
tint = textColor
)
Text(text = text, color = textColor)
}