Skip to content

Commit 472eb67

Browse files
pablo03vpablo03v
committed
- fixes wrong dialog shown and color adjustments
1 parent 8f6bf08 commit 472eb67

17 files changed

+116
-43
lines changed

‎app/src/main/java/cloud/pablos/overload/data/category/CategoryEvent.kt

+2
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ sealed interface CategoryEvent {
2424
data class SetSelectedCategory(val selectedCategory: Int) : CategoryEvent
2525

2626
data class SetIsCreateCategoryDialogOpenHome(val isCreateCategoryDialogOpenHome: Boolean) : CategoryEvent
27+
28+
data class SetIsSwitchCategoryDialogOpenHome(val isSwitchCategoryDialogOpenHome: Boolean) : CategoryEvent
2729
}

‎app/src/main/java/cloud/pablos/overload/data/category/CategoryState.kt

+1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ data class CategoryState(
1717
val selectedCategoryConfigurations: Int = 1,
1818
val selectedCategory: Int = 1,
1919
val isCreateCategoryDialogOpenHome: Boolean = false,
20+
val isSwitchCategoryDialogOpenHome: Boolean = false,
2021
)

‎app/src/main/java/cloud/pablos/overload/data/category/CategoryViewModel.kt

+8
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,14 @@ class CategoryViewModel(
153153
)
154154
}
155155
}
156+
157+
is CategoryEvent.SetIsSwitchCategoryDialogOpenHome -> {
158+
_state.update {
159+
it.copy(
160+
isSwitchCategoryDialogOpenHome = event.isSwitchCategoryDialogOpenHome,
161+
)
162+
}
163+
}
156164
}
157165
}
158166
}

‎app/src/main/java/cloud/pablos/overload/ui/OverloadApp.kt

+1
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ fun OverloadAppContent(
330330
if (forgotDialogState) {
331331
ForgotToStopDialog(
332332
onClose = { itemEvent(ItemEvent.SetForgotToStopDialogShown(false)) },
333+
categoryState,
333334
itemEvent,
334335
)
335336
}

‎app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationComponents.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ fun OverloadNavigationRail(
9292
verticalArrangement = Arrangement.spacedBy(4.dp),
9393
) {
9494
AnimatedVisibility(
95-
visible = true, // state.isDeletingHome.not(),
95+
visible = true,
9696
) {
9797
NavigationRailItem(
9898
selected = false,

‎app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationFab.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ fun OverloadNavigationFab(
163163
SmallFloatingActionButton(
164164
onClick = {
165165
itemEvent(ItemEvent.SetIsFabOpen(false))
166-
categoryEvent(CategoryEvent.SetIsCreateCategoryDialogOpenHome(true))
166+
categoryEvent(CategoryEvent.SetIsSwitchCategoryDialogOpenHome(true))
167167
onDrawerClicked()
168168
},
169169
containerColor = MaterialTheme.colorScheme.primaryContainer,

‎app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationFabSmall.kt

+5-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ import androidx.compose.ui.platform.LocalViewConfiguration
2525
import androidx.compose.ui.res.stringResource
2626
import androidx.compose.ui.unit.dp
2727
import cloud.pablos.overload.R
28-
import cloud.pablos.overload.data.Helpers
28+
import cloud.pablos.overload.data.Helpers.Companion.decideBackground
29+
import cloud.pablos.overload.data.Helpers.Companion.decideForeground
2930
import cloud.pablos.overload.data.Helpers.Companion.getItems
3031
import cloud.pablos.overload.data.category.CategoryEvent
3132
import cloud.pablos.overload.data.category.CategoryState
@@ -45,8 +46,8 @@ fun OverloadNavigationFabSmall(
4546
itemState: ItemState,
4647
itemEvent: (ItemEvent) -> Unit,
4748
) {
48-
val backgroundColor = Helpers.decideBackground(categoryState)
49-
val foregroundColor = Helpers.decideForeground(backgroundColor)
49+
val backgroundColor = decideBackground(categoryState)
50+
val foregroundColor = decideForeground(backgroundColor)
5051

5152
val date = LocalDate.now()
5253

@@ -118,7 +119,7 @@ fun OverloadNavigationFabSmall(
118119
SmallFloatingActionButton(
119120
onClick = {
120121
itemEvent(ItemEvent.SetIsFabOpen(false))
121-
categoryEvent(CategoryEvent.SetIsCreateCategoryDialogOpenHome(true))
122+
categoryEvent(CategoryEvent.SetIsSwitchCategoryDialogOpenHome(true))
122123
},
123124
containerColor = MaterialTheme.colorScheme.primaryContainer,
124125
contentColor = MaterialTheme.colorScheme.onPrimaryContainer,

‎app/src/main/java/cloud/pablos/overload/ui/tabs/home/HomeTab.kt

+13-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import androidx.compose.ui.Modifier
3030
import androidx.compose.ui.res.stringResource
3131
import androidx.compose.ui.text.font.FontWeight
3232
import androidx.compose.ui.unit.Dp
33-
import cloud.pablos.overload.data.Helpers
33+
import cloud.pablos.overload.data.Helpers.Companion.decideBackground
3434
import cloud.pablos.overload.data.category.CategoryEvent
3535
import cloud.pablos.overload.data.category.CategoryState
3636
import cloud.pablos.overload.data.item.ItemEvent
@@ -39,6 +39,7 @@ import cloud.pablos.overload.ui.navigation.OverloadRoute
3939
import cloud.pablos.overload.ui.navigation.OverloadTopAppBar
4040
import cloud.pablos.overload.ui.tabs.configurations.ConfigurationsTabCreateCategoryDialog
4141
import cloud.pablos.overload.ui.utils.OverloadNavigationType
42+
import cloud.pablos.overload.ui.views.SwitchCategoryDialog
4243
import cloud.pablos.overload.ui.views.TextView
4344
import kotlinx.coroutines.launch
4445
import java.time.LocalDate
@@ -55,7 +56,7 @@ fun HomeTab(
5556
itemState: ItemState,
5657
itemEvent: (ItemEvent) -> Unit,
5758
) {
58-
val backgroundColor = Helpers.decideBackground(categoryState)
59+
val backgroundColor = decideBackground(categoryState)
5960

6061
val pagerState =
6162
rememberPagerState(
@@ -153,6 +154,16 @@ fun HomeTab(
153154
categoryEvent,
154155
)
155156
}
157+
158+
if (categoryState.isSwitchCategoryDialogOpenHome) {
159+
SwitchCategoryDialog(
160+
categoryState,
161+
categoryEvent,
162+
onClose = {
163+
categoryEvent(CategoryEvent.SetIsSwitchCategoryDialogOpenHome(false))
164+
},
165+
)
166+
}
156167
}
157168

158169
fun getFormattedDate(

‎app/src/main/java/cloud/pablos/overload/ui/tabs/home/HomeTabFab.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import androidx.compose.ui.platform.LocalViewConfiguration
3434
import androidx.compose.ui.res.stringResource
3535
import androidx.compose.ui.unit.dp
3636
import cloud.pablos.overload.R
37-
import cloud.pablos.overload.data.Helpers
3837
import cloud.pablos.overload.data.Helpers.Companion.decideBackground
38+
import cloud.pablos.overload.data.Helpers.Companion.decideForeground
3939
import cloud.pablos.overload.data.Helpers.Companion.getItems
4040
import cloud.pablos.overload.data.category.CategoryEvent
4141
import cloud.pablos.overload.data.category.CategoryState
@@ -55,8 +55,8 @@ fun HomeTabFab(
5555
itemState: ItemState,
5656
itemEvent: (ItemEvent) -> Unit,
5757
) {
58-
val backgroundColor = Helpers.decideBackground(categoryState)
59-
val foregroundColor = Helpers.decideForeground(backgroundColor)
58+
val backgroundColor = decideBackground(categoryState)
59+
val foregroundColor = decideForeground(backgroundColor)
6060

6161
val date = LocalDate.now()
6262

@@ -116,7 +116,7 @@ fun HomeTabFab(
116116
SmallFloatingActionButton(
117117
onClick = {
118118
itemEvent(ItemEvent.SetIsFabOpen(false))
119-
categoryEvent(CategoryEvent.SetIsCreateCategoryDialogOpenHome(true))
119+
categoryEvent(CategoryEvent.SetIsSwitchCategoryDialogOpenHome(true))
120120
},
121121
containerColor = MaterialTheme.colorScheme.primaryContainer,
122122
contentColor = MaterialTheme.colorScheme.onPrimaryContainer,

‎app/src/main/java/cloud/pablos/overload/ui/tabs/home/HomeTabManualDialog.kt

+39-10
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ import androidx.compose.ui.text.style.TextAlign
3737
import androidx.compose.ui.unit.dp
3838
import cloud.pablos.overload.R
3939
import cloud.pablos.overload.data.Converters.Companion.convertStringToLocalDateTime
40+
import cloud.pablos.overload.data.Helpers.Companion.decideBackground
41+
import cloud.pablos.overload.data.Helpers.Companion.decideForeground
4042
import cloud.pablos.overload.data.Helpers.Companion.getItems
4143
import cloud.pablos.overload.data.category.CategoryState
4244
import cloud.pablos.overload.data.item.ItemEvent
@@ -54,6 +56,9 @@ fun HomeTabManualDialog(
5456
itemState: ItemState,
5557
itemEvent: (ItemEvent) -> Unit,
5658
) {
59+
val backgroundColor = decideBackground(categoryState)
60+
val foregroundColor = decideForeground(backgroundColor)
61+
5762
val context = LocalContext.current
5863

5964
val date = LocalDate.now()
@@ -206,26 +211,26 @@ fun HomeTabManualDialog(
206211
) {
207212
TextView(
208213
text = selectedStartDateText,
209-
color = MaterialTheme.colorScheme.onTertiaryContainer,
214+
color = foregroundColor,
210215
modifier =
211216
Modifier
212217
.clip(RoundedCornerShape(12.dp))
213218
.clickable {
214219
startDatePicker.show()
215220
}
216-
.background(color = MaterialTheme.colorScheme.tertiaryContainer)
221+
.background(color = backgroundColor)
217222
.padding(horizontal = 10.dp, vertical = 6.dp),
218223
)
219224
TextView(
220225
text = selectedStartTimeText,
221-
color = MaterialTheme.colorScheme.onTertiaryContainer,
226+
color = foregroundColor,
222227
modifier =
223228
Modifier
224229
.clip(RoundedCornerShape(12.dp))
225230
.clickable {
226231
startTimePicker.show()
227232
}
228-
.background(color = MaterialTheme.colorScheme.tertiaryContainer)
233+
.background(color = backgroundColor)
229234
.padding(horizontal = 10.dp, vertical = 6.dp),
230235
)
231236
}
@@ -239,26 +244,26 @@ fun HomeTabManualDialog(
239244
) {
240245
TextView(
241246
text = selectedEndDateText,
242-
color = MaterialTheme.colorScheme.onTertiaryContainer,
247+
color = foregroundColor,
243248
modifier =
244249
Modifier
245250
.clip(RoundedCornerShape(12.dp))
246251
.clickable {
247252
endDatePicker.show()
248253
}
249-
.background(color = MaterialTheme.colorScheme.tertiaryContainer)
254+
.background(color = backgroundColor)
250255
.padding(horizontal = 10.dp, vertical = 6.dp),
251256
)
252257
TextView(
253258
text = selectedEndTimeText,
254-
color = MaterialTheme.colorScheme.onTertiaryContainer,
259+
color = foregroundColor,
255260
modifier =
256261
Modifier
257262
.clip(RoundedCornerShape(12.dp))
258263
.clickable {
259264
endTimePicker.show()
260265
}
261-
.background(color = MaterialTheme.colorScheme.tertiaryContainer)
266+
.background(color = backgroundColor)
262267
.padding(horizontal = 10.dp, vertical = 6.dp),
263268
)
264269
}
@@ -271,6 +276,18 @@ fun HomeTabManualDialog(
271276
verticalAlignment = Alignment.CenterVertically,
272277
) {
273278
FilterChip(
279+
colors =
280+
FilterChipDefaults.filterChipColors(
281+
selectedContainerColor = backgroundColor,
282+
labelColor = foregroundColor,
283+
iconColor = foregroundColor,
284+
),
285+
border =
286+
FilterChipDefaults.filterChipBorder(
287+
enabled = true,
288+
selected = selectedPause,
289+
borderColor = backgroundColor,
290+
),
274291
onClick = { selectedPause = true },
275292
label = {
276293
TextView(
@@ -290,6 +307,18 @@ fun HomeTabManualDialog(
290307
)
291308

292309
FilterChip(
310+
colors =
311+
FilterChipDefaults.filterChipColors(
312+
selectedContainerColor = backgroundColor,
313+
labelColor = foregroundColor,
314+
iconColor = foregroundColor,
315+
),
316+
border =
317+
FilterChipDefaults.filterChipBorder(
318+
enabled = true,
319+
selected = selectedPause,
320+
borderColor = backgroundColor,
321+
),
293322
onClick = { selectedPause = false },
294323
label = {
295324
TextView(
@@ -326,8 +355,8 @@ fun HomeTabManualDialog(
326355
},
327356
colors =
328357
ButtonDefaults.buttonColors(
329-
containerColor = MaterialTheme.colorScheme.primaryContainer,
330-
contentColor = MaterialTheme.colorScheme.onPrimaryContainer,
358+
containerColor = backgroundColor,
359+
contentColor = foregroundColor,
331360
),
332361
) {
333362
TextView(stringResource(id = R.string.save))

‎app/src/main/java/cloud/pablos/overload/ui/views/AdjustEndDialog.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ import androidx.core.content.ContextCompat
3939
import androidx.core.net.toUri
4040
import cloud.pablos.overload.R
4141
import cloud.pablos.overload.data.Converters.Companion.convertStringToLocalDateTime
42+
import cloud.pablos.overload.data.Helpers.Companion.decideBackground
43+
import cloud.pablos.overload.data.Helpers.Companion.decideForeground
4244
import cloud.pablos.overload.data.Helpers.Companion.getItemsPastDays
4345
import cloud.pablos.overload.data.category.CategoryState
4446
import cloud.pablos.overload.data.item.Item
@@ -55,6 +57,9 @@ fun AdjustEndDialog(
5557
itemState: ItemState,
5658
itemEvent: (ItemEvent) -> Unit,
5759
) {
60+
val backgroundColor = decideBackground(categoryState)
61+
val foregroundColor = decideForeground(backgroundColor)
62+
5863
val context = LocalContext.current
5964
val learnMoreLink = "https://codeberg.org/pabloscloud/Overload#spread-acorss-days".toUri()
6065

@@ -169,8 +174,8 @@ fun AdjustEndDialog(
169174
},
170175
colors =
171176
ButtonDefaults.buttonColors(
172-
containerColor = MaterialTheme.colorScheme.primaryContainer,
173-
contentColor = MaterialTheme.colorScheme.onPrimaryContainer,
177+
containerColor = backgroundColor,
178+
contentColor = foregroundColor,
174179
),
175180
) {
176181
TextView(stringResource(R.string.save))

‎app/src/main/java/cloud/pablos/overload/ui/views/ChangeCategoryButton.kt

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import androidx.compose.runtime.mutableStateOf
1010
import androidx.compose.runtime.remember
1111
import androidx.compose.ui.Modifier
1212
import androidx.compose.ui.unit.dp
13-
import cloud.pablos.overload.data.Helpers
13+
import cloud.pablos.overload.data.Helpers.Companion.decideBackground
14+
import cloud.pablos.overload.data.Helpers.Companion.decideForeground
1415
import cloud.pablos.overload.data.Helpers.Companion.getSelectedCategory
1516
import cloud.pablos.overload.data.category.CategoryEvent
1617
import cloud.pablos.overload.data.category.CategoryState
@@ -27,8 +28,8 @@ fun ChangeCategoryButton(
2728
val selectedCategory = getSelectedCategory(categoryState)
2829

2930
if (categoriesCount > 1 && selectedCategory != null) {
30-
val backgroundColor = Helpers.decideBackground(categoryState)
31-
val foregroundColor = Helpers.decideForeground(backgroundColor)
31+
val backgroundColor = decideBackground(categoryState)
32+
val foregroundColor = decideForeground(backgroundColor)
3233

3334
Button(
3435
onClick = { categoryDialogState.value = true },
@@ -42,7 +43,7 @@ fun ChangeCategoryButton(
4243
TextView(selectedCategory.emoji)
4344
}
4445
if (categoryDialogState.value) {
45-
ChooseCategoryDialog(
46+
SwitchCategoryDialog(
4647
categoryState,
4748
categoryEvent,
4849
onClose = { categoryDialogState.value = false },

‎app/src/main/java/cloud/pablos/overload/ui/views/DayViewItemNotOngoing.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ import androidx.compose.ui.text.style.TextAlign
3030
import androidx.compose.ui.unit.dp
3131
import cloud.pablos.overload.R
3232
import cloud.pablos.overload.data.Converters.Companion.convertStringToLocalDateTime
33-
import cloud.pablos.overload.data.Helpers
33+
import cloud.pablos.overload.data.Helpers.Companion.decideBackground
34+
import cloud.pablos.overload.data.Helpers.Companion.decideForeground
3435
import cloud.pablos.overload.data.category.CategoryState
3536
import cloud.pablos.overload.data.item.Item
3637
import cloud.pablos.overload.data.item.ItemState
@@ -45,8 +46,8 @@ fun DayViewItemNotOngoing(
4546
itemState: ItemState,
4647
isSelected: Boolean,
4748
) {
48-
val backgroundColorCategory = Helpers.decideBackground(categoryState)
49-
val foregroundColorCategory = Helpers.decideForeground(backgroundColorCategory)
49+
val backgroundColorCategory = decideBackground(categoryState)
50+
val foregroundColorCategory = decideForeground(backgroundColorCategory)
5051

5152
var backgroundColor: Color
5253
var foregroundColor: Color

‎app/src/main/java/cloud/pablos/overload/ui/views/DayViewItemOngoing.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ import androidx.compose.ui.text.style.TextAlign
3939
import androidx.compose.ui.unit.dp
4040
import cloud.pablos.overload.R
4141
import cloud.pablos.overload.data.Converters.Companion.convertStringToLocalDateTime
42-
import cloud.pablos.overload.data.Helpers
42+
import cloud.pablos.overload.data.Helpers.Companion.decideBackground
43+
import cloud.pablos.overload.data.Helpers.Companion.decideForeground
4344
import cloud.pablos.overload.data.category.CategoryState
4445
import cloud.pablos.overload.data.item.Item
4546
import cloud.pablos.overload.data.item.ItemState
@@ -59,8 +60,8 @@ fun DayViewItemOngoing(
5960
showDate: Boolean = false,
6061
hideEnd: Boolean = false,
6162
) {
62-
val backgroundColorCategory = Helpers.decideBackground(categoryState)
63-
val foregroundColorCategory = Helpers.decideForeground(backgroundColorCategory)
63+
val backgroundColorCategory = decideBackground(categoryState)
64+
val foregroundColorCategory = decideForeground(backgroundColorCategory)
6465

6566
var backgroundColor: Color
6667
var foregroundColor: Color

0 commit comments

Comments
 (0)