Skip to content

Map type selector #126

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

Open
bryantran24 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Map type selector #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c1ca5cc
Map type button
bryantran24 Nov 14, 2025
efb4a82
Merge branch 'main' into map_type_selector
bryantran24 Nov 20, 2025
aa82199
Refactor Mapscreen buttons
bryantran24 Dec 12, 2025
3a15462
Update map type icon and colorblind mode
bryantran24 Dec 12, 2025
3bed8b5
Save maptype preference
bryantran24 Dec 13, 2025
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
16 changes: 16 additions & 0 deletions app/src/main/java/edu/rpi/shuttletracker/data/repositories/UserPreferencesRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.floatPreferencesKey
import androidx.datastore.preferences.core.intPreferencesKey
import androidx.datastore.preferences.core.stringPreferencesKey
import com.google.maps.android.compose.MapType
import dagger.Lazy
import dagger.hilt.android.qualifiers.ApplicationContext
import edu.rpi.shuttletracker.R
Expand Down Expand Up @@ -43,6 +44,7 @@ class UserPreferencesRepository
private val ALLOW_ANALYTICS = booleanPreferencesKey("allow_analytics")
private val DEV_OPTIONS_ACTIVE = booleanPreferencesKey("dev_options_active")
private val THEME_MODE = stringPreferencesKey("theme_mode")
private val MAP_TYPE = stringPreferencesKey("map_type")
}

suspend fun getUserId(): String =
Expand Down Expand Up @@ -80,6 +82,20 @@ class UserPreferencesRepository
apiRepository.get().sendAnalytics(Event(colorBlindModeToggled = colorBlindMode))
}

fun getMapType(): Flow<MapType> =
dataStore.data.map {
when (it[MAP_TYPE]) {
MapType.HYBRID.name -> MapType.HYBRID
else -> MapType.NORMAL
}
}

suspend fun saveMapType(mapType: MapType) {
dataStore.edit {
it[MAP_TYPE] = mapType.name
}
}

fun getPrivacyPolicyAccepted(): Flow<Boolean> =
dataStore.data.map {
it[PRIVACY_POLICY_ACCEPTED] ?: false
Expand Down
Loading