Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 64 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: CI

on:
push:
branches: [ main ]
pull_request:

jobs:
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '17'
- uses: gradle/actions/setup-gradle@v4
- name: Run lint
run: ./gradlew lintDebug
- name: Upload lint report
if: always()
uses: actions/upload-artifact@v4
with:
name: lint-report
path: app/build/reports/lint-results-debug.html

unit-tests:
name: Unit tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '17'
- uses: gradle/actions/setup-gradle@v4
- name: Run unit tests
run: ./gradlew testDebugUnitTest
- name: Publish test report
uses: mikepenz/action-junit-report@v4
if: always()
with:
report_paths: '**/build/test-results/testDebugUnitTest/TEST-*.xml'
check_name: Unit test results

build:
name: Build APK
runs-on: ubuntu-latest
needs: [lint, unit-tests]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '17'
- uses: gradle/actions/setup-gradle@v4
- name: Assemble debug APK
run: ./gradlew assembleDebug
- name: Upload APK artifact
uses: actions/upload-artifact@v4
with:
name: debug-apk
path: app/build/outputs/apk/debug/app-debug.apk
59 changes: 25 additions & 34 deletions app/src/main/java/com/jdluu/flexinsight/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
Expand All @@ -27,7 +26,6 @@ import com.jdluu.flexinsight.ui.navigation.FlexAppNavigation
import com.jdluu.flexinsight.ui.navigation.Screen
import com.jdluu.flexinsight.ui.theme.FlexInsightTheme
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
import javax.inject.Inject

@AndroidEntryPoint
Expand Down Expand Up @@ -86,38 +84,31 @@ fun MainScreen(
)

val snackbarHostState = remember { SnackbarHostState() }
val context = LocalContext.current

LaunchedEffect(Unit) {
kotlinx.coroutines.coroutineScope {
launch {
syncPreferencesManager.pendingNewWorkoutsFlow.collect { pending ->
if (pending > 0) {
snackbarHostState.showSnackbar(
message = context.getString(
R.string.sync_snackbar_new_workouts,
pending
),
actionLabel = context.getString(R.string.done)
)
syncPreferencesManager.clearPendingNewWorkouts()
}
}
}
launch {
syncPreferencesManager.pendingDeletedWorkoutsFlow.collect { deleted ->
if (deleted > 0) {
snackbarHostState.showSnackbar(
message = context.getString(
R.string.sync_snackbar_deleted_workouts,
deleted
),
actionLabel = context.getString(R.string.done)
)
syncPreferencesManager.clearPendingDeletedWorkouts()
}
}
}

val pendingNewWorkouts: Int? by syncPreferencesManager.pendingNewWorkoutsFlow
.collectAsStateWithLifecycle(initialValue = null)
val pendingDeletedWorkouts: Int? by syncPreferencesManager.pendingDeletedWorkoutsFlow
.collectAsStateWithLifecycle(initialValue = null)

val doneLabel = stringResource(R.string.done)
val newWorkoutsMessage = pendingNewWorkouts?.takeIf { it > 0 }?.let {
stringResource(R.string.sync_snackbar_new_workouts, it)
}
val deletedWorkoutsMessage = pendingDeletedWorkouts?.takeIf { it > 0 }?.let {
stringResource(R.string.sync_snackbar_deleted_workouts, it)
}

LaunchedEffect(newWorkoutsMessage) {
newWorkoutsMessage?.let { message ->
snackbarHostState.showSnackbar(message = message, actionLabel = doneLabel)
syncPreferencesManager.clearPendingNewWorkouts()
}
}

LaunchedEffect(deletedWorkoutsMessage) {
deletedWorkoutsMessage?.let { message ->
snackbarHostState.showSnackbar(message = message, actionLabel = doneLabel)
syncPreferencesManager.clearPendingDeletedWorkouts()
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ fun FlexBottomNavigation(
NavItem("settings", stringResource(id = R.string.nav_profile), Icons.Default.Person)
)

Box(
Box(
modifier = modifier
.fillMaxWidth()
.windowInsetsPadding(WindowInsets.navigationBars)
Expand Down
45 changes: 25 additions & 20 deletions app/src/main/java/com/jdluu/flexinsight/ui/screens/PlannerScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.res.stringResource
Expand Down Expand Up @@ -73,8 +72,8 @@ fun PlannerScreen(
return
}

val context = LocalContext.current
var showRescheduleDialog by remember { mutableStateOf<PlannedWorkout?>(null) }
val movedTomorrowMessage = stringResource(R.string.planner_snackbar_moved_tomorrow)

showRescheduleDialog?.let { workout ->
PlannerRescheduleDialog(
Expand All @@ -85,8 +84,7 @@ fun PlannerScreen(
workout.id?.let { id ->
viewModel.rescheduleWorkout(id, calendar.timeInMillis)
}
val snackbarMsg = context.getString(R.string.planner_snackbar_moved_tomorrow)
scope.launch { snackbarHostState.showSnackbar(snackbarMsg) }
scope.launch { snackbarHostState.showSnackbar(movedTomorrowMessage) }
showRescheduleDialog = null
},
onDismiss = { showRescheduleDialog = null }
Expand Down Expand Up @@ -158,26 +156,33 @@ fun PlannerScreen(
)
}

val saveSuccessMessage: String? = when (val status = uiState.saveToHevyStatus) {
is SaveToHevyStatus.Success -> when {
status.usedPlaceholder ->
stringResource(R.string.planner_save_success_placeholder)
status.unmatchedNames.isEmpty() ->
stringResource(R.string.planner_save_success_matched, status.matchedCount)
status.matchedCount == 0 ->
stringResource(
R.string.planner_save_success_unmatched,
status.unmatchedNames.joinToString(", ")
)
else ->
stringResource(
R.string.planner_save_success_matched_and_unmatched,
status.matchedCount,
status.unmatchedNames.joinToString(", ")
)
}
else -> null
}

LaunchedEffect(uiState.saveToHevyStatus) {
when (val status = uiState.saveToHevyStatus) {
is SaveToHevyStatus.Success -> {
val message = when {
status.usedPlaceholder -> context.getString(R.string.planner_save_success_placeholder)
status.unmatchedNames.isEmpty() -> context.getString(
R.string.planner_save_success_matched,
status.matchedCount
)
status.matchedCount == 0 -> context.getString(
R.string.planner_save_success_unmatched,
status.unmatchedNames.joinToString(", ")
)
else -> context.getString(
R.string.planner_save_success_matched_and_unmatched,
status.matchedCount,
status.unmatchedNames.joinToString(", ")
)
saveSuccessMessage?.let { message ->
snackbarHostState.showSnackbar(message)
}
snackbarHostState.showSnackbar(message)
viewModel.clearSaveStatus()
}
is SaveToHevyStatus.Error -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,31 +54,37 @@ fun SettingsScreen(
var showHealthPermissionsExplain by remember { mutableStateOf(false) }
var showHealthPermissionsInfo by remember { mutableStateOf(false) }

val healthPermissionsDeniedMessage = stringResource(R.string.settings_health_permissions_denied)
val syncSuccessMessage = stringResource(R.string.settings_sync_success)
val syncStateFeedback: String? = when (val state = uiState.syncState) {
is LoadingState.Success -> syncSuccessMessage
is LoadingState.Error -> stringResource(R.string.settings_sync_failed, state.error.message ?: "")
else -> null
}
val exportSubject = stringResource(R.string.settings_export_subject)
val exportReportTitle = stringResource(R.string.settings_item_export_coach_report)
val exportFailedMessage = stringResource(R.string.settings_export_failed)
val contactSupportTitle = stringResource(R.string.settings_item_contact_support)
val supportEmail = stringResource(R.string.settings_support_email)
val supportSubject = stringResource(R.string.settings_support_subject)
val supportNoAppMessage = stringResource(R.string.settings_support_no_app)
val browserNoAppMessage = stringResource(R.string.settings_browser_no_app)

val permissionLauncher = rememberLauncherForActivityResult(
contract = PermissionController.createRequestPermissionResultContract()
) { granted ->
val allGranted = viewModel.getHealthConnectPermissions().all { it in granted }
viewModel.setHealthConnectEnabled(allGranted)
if (!allGranted) {
scope.launch {
snackbarHostState.showSnackbar(context.getString(R.string.settings_health_permissions_denied))
snackbarHostState.showSnackbar(healthPermissionsDeniedMessage)
}
}
}

// Sync Status Feedback
LaunchedEffect(uiState.syncState) {
when (val state = uiState.syncState) {
is LoadingState.Success -> {
snackbarHostState.showSnackbar(context.getString(R.string.settings_sync_success))
}
is LoadingState.Error -> {
snackbarHostState.showSnackbar(
context.getString(R.string.settings_sync_failed, state.error.message ?: "")
)
}
else -> {}
}
syncStateFeedback?.let { snackbarHostState.showSnackbar(it) }
}

Scaffold(
Expand Down Expand Up @@ -241,26 +247,26 @@ fun SettingsScreen(
item {
SectionTitle(stringResource(id = R.string.settings_section_data_privacy))
PreferenceItem(
title = stringResource(id = R.string.settings_item_export_coach_report),
title = exportReportTitle,
icon = Icons.Default.Download,
value = null,
onClick = {
scope.launch {
val report = viewModel.exportCoachReport()
val intent = android.content.Intent(android.content.Intent.ACTION_SEND).apply {
type = "text/plain"
putExtra(android.content.Intent.EXTRA_SUBJECT, context.getString(R.string.settings_export_subject))
putExtra(android.content.Intent.EXTRA_SUBJECT, exportSubject)
putExtra(android.content.Intent.EXTRA_TEXT, report)
}
try {
context.startActivity(
android.content.Intent.createChooser(
intent,
context.getString(R.string.settings_item_export_coach_report)
exportReportTitle
)
)
} catch (e: Exception) {
snackbarHostState.showSnackbar(context.getString(R.string.settings_export_failed))
snackbarHostState.showSnackbar(exportFailedMessage)
}
}
}
Expand All @@ -276,19 +282,19 @@ fun SettingsScreen(
item {
SectionTitle(stringResource(id = R.string.settings_section_help_feedback))
PreferenceItem(
title = stringResource(id = R.string.settings_item_contact_support),
title = contactSupportTitle,
icon = Icons.Default.Email,
value = null,
onClick = {
val intent = android.content.Intent(android.content.Intent.ACTION_SENDTO).apply {
data = android.net.Uri.parse("mailto:")
putExtra(android.content.Intent.EXTRA_EMAIL, arrayOf(context.getString(R.string.settings_support_email)))
putExtra(android.content.Intent.EXTRA_SUBJECT, context.getString(R.string.settings_support_subject))
putExtra(android.content.Intent.EXTRA_EMAIL, arrayOf(supportEmail))
putExtra(android.content.Intent.EXTRA_SUBJECT, supportSubject)
}
try {
context.startActivity(android.content.Intent.createChooser(intent, context.getString(R.string.settings_item_contact_support)))
context.startActivity(android.content.Intent.createChooser(intent, contactSupportTitle))
} catch (e: Exception) {
scope.launch { snackbarHostState.showSnackbar(context.getString(R.string.settings_support_no_app)) }
scope.launch { snackbarHostState.showSnackbar(supportNoAppMessage) }
}
}
)
Expand All @@ -301,7 +307,7 @@ fun SettingsScreen(
try {
context.startActivity(intent)
} catch (e: Exception) {
scope.launch { snackbarHostState.showSnackbar(context.getString(R.string.settings_browser_no_app)) }
scope.launch { snackbarHostState.showSnackbar(browserNoAppMessage) }
}
}
)
Expand Down
Loading
Loading