Skip to content

fix: move Add Activity button below activity list #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JanJetze merged 1 commit into from
Mar 7, 2026
Merged

fix: move Add Activity button below activity list #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions app/src/main/java/com/podometer/ui/activities/ActivitiesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.DatePicker
import androidx.compose.material3.DatePickerDialog
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
Expand Down Expand Up @@ -74,25 +74,6 @@ fun ActivitiesScreen(
title = { Text(text = stringResource(R.string.screen_activities)) },
)
},
floatingActionButton = {
if (!uiState.isLoading && uiState.windows.isNotEmpty()) {
FloatingActionButton(
onClick = {
val dayStart = DateTimeUtils.startOfDayMillis(uiState.selectedDate)
val noon = dayStart + 12 * 3_600_000L
editingSession = ActivitySession(
activity = ActivityState.WALKING,
startTime = noon,
endTime = noon + ActivitySession.DEFAULT_DURATION_MS,
startTransitionId = 0,
isManualOverride = false,
)
},
) {
Icon(Icons.Default.Add, contentDescription = "Add activity")
}
}
},
modifier = modifier,
) { innerPadding ->
if (uiState.isLoading) {
Expand Down Expand Up @@ -182,6 +163,29 @@ fun ActivitiesScreen(
nowMillis = if (uiState.isToday) nowMillis else dayEndMillis,
)

Spacer(modifier = Modifier.height(8.dp))
}

if (uiState.windows.isNotEmpty()) {
FilledTonalButton(
onClick = {
val dayStart = DateTimeUtils.startOfDayMillis(uiState.selectedDate)
val noon = dayStart + 12 * 3_600_000L
editingSession = ActivitySession(
activity = ActivityState.WALKING,
startTime = noon,
endTime = noon + ActivitySession.DEFAULT_DURATION_MS,
startTransitionId = 0,
isManualOverride = false,
)
},
modifier = Modifier.fillMaxWidth(),
) {
Icon(Icons.Default.Add, contentDescription = null)
Spacer(modifier = Modifier.padding(horizontal = 4.dp))
Text(text = stringResource(R.string.add_activity))
}

Spacer(modifier = Modifier.height(16.dp))
}
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<string name="activities_no_data">No sensor data available for this date</string>
<string name="activities_previous_day">Previous day</string>
<string name="activities_next_day">Next day</string>
<string name="add_activity">Add activity</string>

<!-- ActivityTimeline accessibility -->
<string name="cd_timeline_no_data">Activity timeline: no activity data available.</string>
Expand Down