Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kaffeekasse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Broeckmann
Kaffeekasse
Commits
d6c57e99
Commit
d6c57e99
authored
6 months ago
by
Jonas Broeckmann
Browse files
Options
Downloads
Patches
Plain Diff
Fix stuck indicator
parent
85e3a8f8
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/Overview.kt
+70
-60
70 additions, 60 deletions
...t/novagamestudios/kaffeekasse/ui/hiwi_tracker/Overview.kt
with
70 additions
and
60 deletions
app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/Overview.kt
+
70
−
60
View file @
d6c57e99
...
...
@@ -237,72 +237,82 @@ class OverviewContent(provider: ScreenModelProvider<OverviewScreenModel>) : AppS
fun
Overview
(
model
:
OverviewScreenModel
,
modifier
:
Modifier
=
Modifier
)
=
PullToRefreshBox
(
isRefreshing
=
false
,
onRefresh
=
{
model
.
refreshMonth
(
model
.
currentMonth
)
},
modifier
.
fillMaxSize
()
)
{
LaunchedEffect
(
Unit
)
{
model
.
keepMonthDataUpToDate
()
}
Column
{
MonthSelection
(
model
,
Modifier
.
align
(
Alignment
.
CenterHorizontally
)
.
padding
(
horizontal
=
16
.
dp
,
vertical
=
8
.
dp
)
)
when
(
val
data
=
model
.
dataForMonthState
(
model
.
currentMonth
).
value
)
{
is
RichData
.
Loading
->
BoxCenter
(
Modifier
.
fillMaxSize
())
{
CircularProgressIndicator
(
data
.
progress
)
}
is
RichData
.
Data
->
Column
{
synchronizePagerState
(
pagerState
=
model
.
pagerState
,
property
=
model
::
currentMonth
)
HorizontalKeyedPager
(
state
=
model
.
pagerState
)
{
key
->
BoxCenter
(
Modifier
.
fillMaxWidth
())
{
val
pagerData
=
model
.
dataForMonthState
(
key
).
dataOrNull
if
(
pagerData
!=
null
)
CalendarForMonth
(
pagerData
,
onClick
=
model
::
onClickDate
,
Modifier
.
padding
(
horizontal
=
32
.
dp
)
.
padding
(
bottom
=
8
.
dp
)
)
// Bad fix because "isRefreshing = false" results in indicator not disappearing
var
isRefreshingQuickFix
by
remember
{
mutableStateOf
(
false
)
}
PullToRefreshBox
(
isRefreshing
=
isRefreshingQuickFix
.
also
{
isRefreshingQuickFix
=
false
},
onRefresh
=
{
isRefreshingQuickFix
=
true
model
.
refreshMonth
(
model
.
currentMonth
)
},
modifier
.
fillMaxSize
()
)
{
LaunchedEffect
(
Unit
)
{
model
.
keepMonthDataUpToDate
()
}
Column
{
MonthSelection
(
model
,
Modifier
.
align
(
Alignment
.
CenterHorizontally
)
.
padding
(
horizontal
=
16
.
dp
,
vertical
=
8
.
dp
)
)
when
(
val
data
=
model
.
dataForMonthState
(
model
.
currentMonth
).
value
)
{
is
RichData
.
Loading
->
BoxCenter
(
Modifier
.
fillMaxSize
())
{
CircularProgressIndicator
(
data
.
progress
)
}
is
RichData
.
Data
->
Column
{
synchronizePagerState
(
pagerState
=
model
.
pagerState
,
property
=
model
::
currentMonth
)
HorizontalKeyedPager
(
state
=
model
.
pagerState
)
{
key
->
BoxCenter
(
Modifier
.
fillMaxWidth
())
{
val
pagerData
=
model
.
dataForMonthState
(
key
).
dataOrNull
if
(
pagerData
!=
null
)
CalendarForMonth
(
pagerData
,
onClick
=
model
::
onClickDate
,
Modifier
.
padding
(
horizontal
=
32
.
dp
)
.
padding
(
bottom
=
8
.
dp
)
)
}
}
HorizontalDivider
()
val
scrollState
=
rememberScrollState
()
MonthContent
(
model
,
Modifier
.
weight
(
1f
)
.
verticalScroll
(
scrollState
)
)
LaunchedEffect
(
model
.
currentMonth
)
{
scrollState
.
animateScrollTo
(
0
)
}
}
HorizontalDivider
()
val
scrollState
=
rememberScrollState
()
MonthContent
(
model
,
Modifier
.
weight
(
1f
)
.
verticalScroll
(
scrollState
)
is
RichData
.
Error
->
FailureRetryScreen
(
message
=
"Failed to fetch data"
,
Modifier
.
fillMaxSize
(),
exceptions
=
data
.
exceptions
,
onRetry
=
{
model
.
refreshMonth
(
model
.
currentMonth
)
}
)
LaunchedEffect
(
model
.
currentMonth
)
{
scrollState
.
animateScrollTo
(
0
)
}
else
->
{}
}
is
RichData
.
Error
->
FailureRetryScreen
(
message
=
"Failed to fetch data"
,
Modifier
.
fillMaxSize
(),
exceptions
=
data
.
exceptions
,
onRetry
=
{
model
.
refreshMonth
(
model
.
currentMonth
)
}
)
else
->
{
}
}
}
model
.
enterWorkingHoursState
?.
let
{
subVM
->
val
sheetState
=
rememberModalBottomSheetState
(
skipPartiallyExpanded
=
true
)
ModalBottomSheet
(
onDismissRequest
=
{
model
.
enterWorkingHoursState
=
null
},
sheetState
=
sheetState
)
{
EnterWorkingHoursForm
(
subVM
)
if
(
model
.
enterDone
)
LaunchedEffect
(
Unit
)
{
launch
{
sheetState
.
hide
()
}.
invokeOnCompletion
{
model
.
enterWorkingHoursState
=
null
}
model
.
enterWorkingHoursState
?.
let
{
subVM
->
val
sheetState
=
rememberModalBottomSheetState
(
skipPartiallyExpanded
=
true
)
ModalBottomSheet
(
onDismissRequest
=
{
model
.
enterWorkingHoursState
=
null
},
sheetState
=
sheetState
)
{
EnterWorkingHoursForm
(
subVM
)
if
(
model
.
enterDone
)
LaunchedEffect
(
Unit
)
{
launch
{
sheetState
.
hide
()
}.
invokeOnCompletion
{
model
.
enterWorkingHoursState
=
null
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment