inhale/fuel-fuel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

first commit

Browse Source
This commit is contained in:
inhale-dir
2024-12-10 19:36:08 +01:00
commit 35a2074539
47 changed files with 3651 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/.gitignore
+1
View File
@@ -0,0 +1 @@
/build
app/build.gradle.kts
+91
View File
@@ -0,0 +1,91 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
}
android {
namespace = "com.example.tank"
compileSdk = 34
defaultConfig {
applicationId = "com.example.tank"
minSdk = 24
targetSdk = 34
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
}
buildFeatures {
compose = true
buildConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
}
}
dependencies {
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.ui)
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.material3)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.ui.test.junit4)
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)
// Maps & Location
implementation("org.osmdroid:osmdroid-android:6.1.18")
implementation("com.google.android.gms:play-services-location:21.2.0")
// Geocoding for search
implementation("com.google.android.gms:play-services-maps:18.2.0")
implementation("com.google.android.gms:play-services-places:17.0.0")
implementation("com.google.android.libraries.places:places:3.3.0")
// Network
implementation("com.squareup.retrofit2:retrofit:2.9.0")
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
// DataStore for settings
implementation("androidx.datastore:datastore-preferences:1.0.0")
// Navigation
implementation("androidx.navigation:navigation-compose:2.7.7")
// Add Material Icons
implementation(libs.androidx.material.icons)
// Add pull-to-refresh support
implementation("androidx.compose.material:material:1.6.2")
implementation("androidx.compose.material:material-icons-core:1.6.2")
implementation("androidx.compose.material:material-icons-extended:1.6.2")
implementation("androidx.compose.material3:material3:1.2.0")
}
app/proguard-rules.pro
Vendored
+21
View File
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
app/src/androidTest/java/com/example/tank/ExampleInstrumentedTest.kt
+24
View File
@@ -0,0 +1,24 @@
package com.example.tank
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.Assert.*
/**
* Instrumented test, which will execute on an Android device.
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
@RunWith(AndroidJUnit4::class)
class ExampleInstrumentedTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.example.tank", appContext.packageName)
}
}
app/src/main/AndroidManifest.xml
+36
View File
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.VIBRATE"/>
<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Tank"
android:usesCleartextTraffic="true"
tools:targetApi="31">
<activity
android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.Tank">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
app/src/main/java/com/example/tank/MainActivity.kt
+20
View File
@@ -0,0 +1,20 @@
package com.example.tank
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import com.example.tank.ui.screens.MainScreen
import com.example.tank.ui.theme.TankTheme
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContent {
TankTheme {
MainScreen()
}
}
}
}
app/src/main/java/com/example/tank/data/SettingsDataStore.kt
+88
View File
@@ -0,0 +1,88 @@
package com.example.tank.data
import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.*
import androidx.datastore.preferences.preferencesDataStore
import com.example.tank.di.NetworkModule
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map
private val Context.dataStore by preferencesDataStore(name = "settings")
class SettingsDataStore(private val context: Context) {
private object PreferencesKeys {
val LAT_KEY = doublePreferencesKey("lat")
val LNG_KEY = doublePreferencesKey("lng")
val FUEL_TYPE_KEY = stringPreferencesKey("fuel_type")
val RADIUS = intPreferencesKey("radius")
val API_KEY = stringPreferencesKey("api_key")
val FAVORITE_STATIONS = stringPreferencesKey("favorite_stations")
}
val selectedLocation: Flow<Pair<Double, Double>> = context.dataStore.data.map { preferences ->
Pair(
preferences[PreferencesKeys.LAT_KEY] ?: 52.520008, // Default to Berlin
preferences[PreferencesKeys.LNG_KEY] ?: 13.404954
)
}
val selectedFuelType: Flow<String> = context.dataStore.data.map { preferences ->
preferences[PreferencesKeys.FUEL_TYPE_KEY] ?: "e5"
}
val selectedRadius = context.dataStore.data.map { preferences ->
preferences[PreferencesKeys.RADIUS] ?: 5 // Default to 5km
}
val apiKey = context.dataStore.data.map { preferences ->
preferences[PreferencesKeys.API_KEY] ?: NetworkModule.DEFAULT_API_KEY
}
val favoriteStations = context.dataStore.data.map { preferences ->
val favoritesString = preferences[PreferencesKeys.FAVORITE_STATIONS] ?: ""
if (favoritesString.isEmpty()) setOf() else favoritesString.split(",").toSet()
}
suspend fun saveLocation(latitude: Double, longitude: Double) {
context.dataStore.edit { preferences ->
preferences[PreferencesKeys.LAT_KEY] = latitude
preferences[PreferencesKeys.LNG_KEY] = longitude
}
}
suspend fun saveFuelType(fuelType: String) {
context.dataStore.edit { preferences ->
preferences[PreferencesKeys.FUEL_TYPE_KEY] = fuelType
}
}
suspend fun saveRadius(radius: Int) {
context.dataStore.edit { preferences ->
preferences[PreferencesKeys.RADIUS] = radius
}
}
suspend fun saveApiKey(apiKey: String) {
context.dataStore.edit { preferences ->
preferences[PreferencesKeys.API_KEY] = apiKey
}
}
suspend fun toggleFavorite(stationId: String) {
context.dataStore.edit { preferences ->
val currentFavorites = (preferences[PreferencesKeys.FAVORITE_STATIONS] ?: "")
.split(",")
.filter { it.isNotEmpty() }
.toMutableSet()
if (currentFavorites.contains(stationId)) {
currentFavorites.remove(stationId)
} else {
currentFavorites.add(stationId)
}
preferences[PreferencesKeys.FAVORITE_STATIONS] = currentFavorites.joinToString(",")
}
}
}
app/src/main/java/com/example/tank/data/api/TankerkoenigApi.kt
+16
View File
@@ -0,0 +1,16 @@
package com.example.tank.data.api
import com.example.tank.data.model.StationsResponse
import retrofit2.http.GET
import retrofit2.http.Query
interface TankerkoenigApi {
@GET("list.php")
suspend fun getStations(
@Query("lat") lat: Double,
@Query("lng") lng: Double,
@Query("rad") radius: Int,
@Query("apikey") apiKey: String,
@Query("type") type: String = "all"
): StationsResponse
}
app/src/main/java/com/example/tank/data/model/Station.kt
+24
View File
@@ -0,0 +1,24 @@
package com.example.tank.data.model
data class Station(
val id: String,
val name: String,
val brand: String,
val street: String,
val place: String,
val lat: Double,
val lng: Double,
val dist: Double,
val diesel: Double?,
val e5: Double?,
val e10: Double?,
val isOpen: Boolean,
val houseNumber: String
)
data class StationsResponse(
val status: String,
val stations: List<Station>? = null,
val message: String? = null,
val ok: Boolean = false
)
app/src/main/java/com/example/tank/data/repository/StationsRepository.kt
+75
View File
@@ -0,0 +1,75 @@
package com.example.tank.data.repository
import com.example.tank.data.api.TankerkoenigApi
import com.example.tank.data.model.Station
import com.example.tank.di.NetworkModule
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import android.util.Log
class StationsRepository(
private val api: TankerkoenigApi = NetworkModule.tankerkoenigApi
) {
sealed class Result {
data class Success(val stations: List<Station>) : Result()
data class Error(val message: String) : Result()
}
suspend fun getStations(
latitude: Double,
longitude: Double,
radius: Int = 5
): Result = withContext(Dispatchers.IO) {
try {
Log.d("StationsRepository", "Requesting stations for lat: $latitude, lng: $longitude, radius: $radius")
val response = api.getStations(
lat = latitude,
lng = longitude,
radius = radius,
apiKey = NetworkModule.getApiKey()
)
Log.d("StationsRepository", "Raw response: $response")
if (response == null) {
Log.e("StationsRepository", "Received null response from API")
return@withContext Result.Error("Server returned no data")
}
Log.d("StationsRepository", "Response status: ${response.status}, message: ${response.message}, stations: ${response.stations}")
when {
response.status == "ok" && response.stations != null -> Result.Success(response.stations)
response.status == "ok" && response.stations == null -> {
Log.e("StationsRepository", "Status OK but stations is null")
Result.Error("No stations data available")
}
response.status == "error" -> {
Log.e("StationsRepository", "API returned error status: ${response.message}")
Result.Error(response.message ?: "Unknown API error")
}
else -> {
Log.e("StationsRepository", "Unknown status: ${response.status}, message: ${response.message}")
Result.Error(response.message ?: "Unknown error occurred")
}
}
} catch (e: Exception) {
Log.e("StationsRepository", "Error fetching stations", e)
e.printStackTrace()
when (e) {
is java.net.UnknownHostException -> Result.Error("No internet connection")
is retrofit2.HttpException -> {
when (e.code()) {
429 -> Result.Error("Too many requests. Please try again later.")
401 -> Result.Error("API key is invalid or expired")
else -> Result.Error("Network error (${e.code()}): ${e.message()}")
}
}
is NullPointerException -> {
Log.e("StationsRepository", "NullPointerException", e)
Result.Error("Invalid data received from server")
}
else -> Result.Error("Error: ${e.message}")
}
}
}
}
app/src/main/java/com/example/tank/di/NetworkModule.kt
+35
View File
@@ -0,0 +1,35 @@
package com.example.tank.di
import com.example.tank.BuildConfig
import com.example.tank.data.api.TankerkoenigApi
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
object NetworkModule {
private const val BASE_URL = "https://creativecommons.tankerkoenig.de/json/"
const val DEFAULT_API_KEY = "9336f42d-2ebe-3a41-7100-11861d00ad04"
private var currentApiKey: String = DEFAULT_API_KEY
fun updateApiKey(newKey: String) {
currentApiKey = newKey
}
fun getApiKey(): String = currentApiKey
private val okHttpClient = OkHttpClient.Builder()
.addInterceptor(HttpLoggingInterceptor().apply {
level = HttpLoggingInterceptor.Level.BODY
})
.build()
private val retrofit = Retrofit.Builder()
.baseUrl(BASE_URL)
.client(okHttpClient)
.addConverterFactory(GsonConverterFactory.create())
.build()
val tankerkoenigApi: TankerkoenigApi = retrofit.create(TankerkoenigApi::class.java)
}
app/src/main/java/com/example/tank/ui/screens/MainScreen.kt
+44
View File
@@ -0,0 +1,44 @@
package com.example.tank.ui.screens
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Modifier
import androidx.compose.foundation.layout.padding
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun MainScreen() {
val navController = rememberNavController()
Scaffold(
topBar = {
CenterAlignedTopAppBar(
title = { Text("Fuel Prices") },
actions = {
IconButton(onClick = {
navController.navigate("settings") {
launchSingleTop = true
}
}) {
Icon(Icons.Default.Settings, contentDescription = "Settings")
}
}
)
}
) { padding ->
NavHost(
navController = navController,
startDestination = "prices",
modifier = Modifier.padding(padding)
) {
composable("prices") { PricesScreen() }
composable("settings") { SettingsScreen(navController = navController) }
composable("map") { MapScreen(navController = navController) }
}
}
}
app/src/main/java/com/example/tank/ui/screens/MapScreen.kt
+177
View File
@@ -0,0 +1,177 @@
package com.example.tank.ui.screens
import android.content.Context
import android.location.Geocoder
import android.util.Log
import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Search
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.navigation.NavController
import com.example.tank.data.SettingsDataStore
import kotlinx.coroutines.launch
import org.osmdroid.config.Configuration
import org.osmdroid.events.MapEventsReceiver
import org.osmdroid.tileprovider.tilesource.TileSourceFactory
import org.osmdroid.util.GeoPoint
import org.osmdroid.views.MapView
import org.osmdroid.views.overlay.MapEventsOverlay
import org.osmdroid.views.overlay.Marker
@Composable
fun MapScreen(navController: NavController) {
val context = LocalContext.current
val settingsDataStore = remember { SettingsDataStore(context) }
val scope = rememberCoroutineScope()
var selectedLocation by remember { mutableStateOf<GeoPoint?>(null) }
var mapView by remember { mutableStateOf<MapView?>(null) }
var searchQuery by remember { mutableStateOf("") }
var isSearching by remember { mutableStateOf(false) }
LaunchedEffect(Unit) {
Configuration.getInstance().load(context, context.getSharedPreferences("osmdroid", Context.MODE_PRIVATE))
}
Column(modifier = Modifier.fillMaxSize()) {
// Search Bar
TextField(
value = searchQuery,
onValueChange = { searchQuery = it },
modifier = Modifier
.fillMaxWidth()
.padding(16.dp),
placeholder = { Text("Search location...") },
trailingIcon = {
if (searchQuery.isNotEmpty()) {
IconButton(onClick = {
scope.launch {
isSearching = true
try {
val geocoder = Geocoder(context)
// Use the new API for Android 13+ (API 33+)
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
geocoder.getFromLocationName(searchQuery, 1) { addresses ->
if (addresses.isNotEmpty()) {
val address = addresses[0]
val location = GeoPoint(address.latitude, address.longitude)
selectedLocation = location
mapView?.controller?.animateTo(location)
mapView?.controller?.setZoom(15.0)
// Update marker
mapView?.overlays?.removeAll { it is Marker }
val marker = Marker(mapView)
marker.position = location
marker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
mapView?.overlays?.add(marker)
mapView?.invalidate()
}
}
} else {
// Legacy approach for older Android versions
@Suppress("DEPRECATION")
val addresses = geocoder.getFromLocationName(searchQuery, 1)
if (!addresses.isNullOrEmpty()) {
val address = addresses[0]
val location = GeoPoint(address.latitude, address.longitude)
selectedLocation = location
mapView?.controller?.animateTo(location)
mapView?.controller?.setZoom(15.0)
// Update marker
mapView?.overlays?.removeAll { it is Marker }
val marker = Marker(mapView)
marker.position = location
marker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
mapView?.overlays?.add(marker)
mapView?.invalidate()
}
}
} catch (e: Exception) {
Log.e("MapScreen", "Error searching location", e)
} finally {
isSearching = false
}
}
}) {
if (isSearching) {
CircularProgressIndicator(modifier = Modifier.size(24.dp))
} else {
Icon(Icons.Default.Search, contentDescription = "Search")
}
}
}
}
)
Box(modifier = Modifier.weight(1f)) {
AndroidView(
factory = { context ->
MapView(context).apply {
setTileSource(TileSourceFactory.MAPNIK)
setMultiTouchControls(true) // Enable pinch-to-zoom
controller.setZoom(6.0)
controller.setCenter(GeoPoint(51.1657, 10.4515)) // Germany center
// Configure zoom controls
zoomController.setVisibility(org.osmdroid.views.CustomZoomButtonsController.Visibility.SHOW_AND_FADEOUT)
// Add tap listener
overlays.add(MapEventsOverlay(object : MapEventsReceiver {
override fun singleTapConfirmedHelper(p: GeoPoint): Boolean {
selectedLocation = p
overlays.removeAll { it is Marker }
val marker = Marker(this@apply)
marker.position = p
marker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
overlays.add(marker)
invalidate()
return true
}
override fun longPressHelper(p: GeoPoint): Boolean = false
}))
mapView = this
}
},
modifier = Modifier.fillMaxSize()
)
Button(
onClick = {
scope.launch {
selectedLocation?.let {
settingsDataStore.saveLocation(it.latitude, it.longitude)
}
// Navigate all the way back to the prices screen
navController.navigate("prices") {
popUpTo("prices") { inclusive = false }
}
}
},
modifier = Modifier
.align(Alignment.BottomCenter)
.padding(16.dp)
.fillMaxWidth(),
enabled = selectedLocation != null
) {
Text("Save and Return")
}
}
}
DisposableEffect(Unit) {
onDispose {
mapView?.onDetach()
}
}
}
app/src/main/java/com/example/tank/ui/screens/PricesScreen.kt
+1989
View File
File diff suppressed because it is too large Load Diff
app/src/main/java/com/example/tank/ui/screens/SettingsScreen.kt
+210
View File
@@ -0,0 +1,210 @@
package com.example.tank.ui.screens
import androidx.compose.foundation.layout.*
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import androidx.navigation.compose.rememberNavController
import com.example.tank.data.SettingsDataStore
import com.example.tank.di.NetworkModule
import kotlinx.coroutines.launch
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun SettingsScreen(navController: NavController) {
val context = LocalContext.current
val settingsDataStore = remember { SettingsDataStore(context) }
val scope = rememberCoroutineScope()
var fuelExpanded by remember { mutableStateOf(false) }
var selectedFuelType by remember { mutableStateOf("") }
var selectedLocation by remember { mutableStateOf<Pair<Double, Double>?>(null) }
var radiusExpanded by remember { mutableStateOf(false) }
var selectedRadius by remember { mutableStateOf(5) }
var apiKey by remember { mutableStateOf("") }
val fuelTypes = listOf(
"E5" to "Super E5",
"E10" to "Super E10",
"Diesel" to "Diesel"
)
val radiusOptions = listOf(5, 10, 15, 20)
LaunchedEffect(Unit) {
settingsDataStore.selectedFuelType.collect { fuelType ->
selectedFuelType = fuelType.uppercase()
}
}
LaunchedEffect(Unit) {
settingsDataStore.selectedLocation.collect { (lat, lng) ->
if (lat != 0.0 && lng != 0.0) {
selectedLocation = Pair(lat, lng)
}
}
}
LaunchedEffect(Unit) {
settingsDataStore.selectedRadius.collect { radius ->
selectedRadius = radius
}
}
LaunchedEffect(Unit) {
settingsDataStore.apiKey.collect { key ->
apiKey = key ?: NetworkModule.DEFAULT_API_KEY
}
}
Column(
modifier = Modifier
.fillMaxSize()
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(16.dp)
) {
Text(
text = "Settings",
style = MaterialTheme.typography.headlineMedium
)
// Add API Key TextField
OutlinedTextField(
value = apiKey,
onValueChange = { apiKey = it },
label = { Text("API Key") },
modifier = Modifier.fillMaxWidth(),
singleLine = true,
supportingText = { Text("Leave empty to use default key") }
)
// Location Selection
Text(
text = "Select Location",
style = MaterialTheme.typography.titleMedium
)
Button(
onClick = { navController.navigate("map") },
modifier = Modifier.fillMaxWidth()
) {
Text(if (selectedLocation != null) {
"Selected: ${String.format("%.4f", selectedLocation!!.first)}, ${String.format("%.4f", selectedLocation!!.second)}"
} else {
"Select Location on Map"
})
}
// Fuel Type Selection
Text(
text = "Select Fuel Type",
style = MaterialTheme.typography.titleMedium
)
ExposedDropdownMenuBox(
expanded = fuelExpanded,
onExpandedChange = { fuelExpanded = !fuelExpanded }
) {
TextField(
value = when (selectedFuelType.uppercase()) {
"E5" -> "Super E5"
"E10" -> "Super E10"
"DIESEL" -> "Diesel"
else -> ""
},
onValueChange = {},
readOnly = true,
placeholder = { Text("Select fuel type") },
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = fuelExpanded) },
modifier = Modifier.menuAnchor()
)
ExposedDropdownMenu(
expanded = fuelExpanded,
onDismissRequest = { fuelExpanded = false }
) {
fuelTypes.forEach { (type, label) ->
DropdownMenuItem(
text = { Text(label) },
onClick = {
selectedFuelType = type
fuelExpanded = false
scope.launch {
settingsDataStore.saveFuelType(type.lowercase())
}
}
)
}
}
}
// Radius Selection
Text(
text = "Search Radius",
style = MaterialTheme.typography.titleMedium
)
ExposedDropdownMenuBox(
expanded = radiusExpanded,
onExpandedChange = { radiusExpanded = !radiusExpanded }
) {
TextField(
value = "$selectedRadius km",
onValueChange = {},
readOnly = true,
placeholder = { Text("Select radius") },
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = radiusExpanded) },
modifier = Modifier.menuAnchor()
)
ExposedDropdownMenu(
expanded = radiusExpanded,
onDismissRequest = { radiusExpanded = false }
) {
radiusOptions.forEach { radius ->
DropdownMenuItem(
text = { Text("$radius km") },
onClick = {
selectedRadius = radius
radiusExpanded = false
scope.launch {
settingsDataStore.saveRadius(radius)
}
}
)
}
}
}
Spacer(modifier = Modifier.weight(1f))
Button(
onClick = {
scope.launch {
selectedLocation?.let {
settingsDataStore.saveLocation(it.first, it.second)
}
if (selectedFuelType.isNotEmpty()) {
settingsDataStore.saveFuelType(selectedFuelType.lowercase())
}
// Save API key
settingsDataStore.saveApiKey(apiKey)
// Update NetworkModule
NetworkModule.updateApiKey(apiKey)
navController.popBackStack()
}
},
modifier = Modifier
.fillMaxWidth()
.padding(bottom = 16.dp),
enabled = selectedLocation != null && selectedFuelType.isNotEmpty()
) {
Text("Save and Return")
}
}
}
app/src/main/java/com/example/tank/ui/theme/Color.kt
+11
View File
@@ -0,0 +1,11 @@
package com.example.tank.ui.theme
import androidx.compose.ui.graphics.Color
val Purple80 = Color(0xFFD0BCFF)
val PurpleGrey80 = Color(0xFFCCC2DC)
val Pink80 = Color(0xFFEFB8C8)
val Purple40 = Color(0xFF6650a4)
val PurpleGrey40 = Color(0xFF625b71)
val Pink40 = Color(0xFF7D5260)
app/src/main/java/com/example/tank/ui/theme/Theme.kt
+58
View File
@@ -0,0 +1,58 @@
package com.example.tank.ui.theme
import android.app.Activity
import android.os.Build
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.darkColorScheme
import androidx.compose.material3.dynamicDarkColorScheme
import androidx.compose.material3.dynamicLightColorScheme
import androidx.compose.material3.lightColorScheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext
private val DarkColorScheme = darkColorScheme(
primary = Purple80,
secondary = PurpleGrey80,
tertiary = Pink80
)
private val LightColorScheme = lightColorScheme(
primary = Purple40,
secondary = PurpleGrey40,
tertiary = Pink40
/* Other default colors to override
background = Color(0xFFFFFBFE),
surface = Color(0xFFFFFBFE),
onPrimary = Color.White,
onSecondary = Color.White,
onTertiary = Color.White,
onBackground = Color(0xFF1C1B1F),
onSurface = Color(0xFF1C1B1F),
*/
)
@Composable
fun TankTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
// Dynamic color is available on Android 12+
dynamicColor: Boolean = true,
content: @Composable () -> Unit
) {
val colorScheme = when {
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
val context = LocalContext.current
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
}
darkTheme -> DarkColorScheme
else -> LightColorScheme
}
MaterialTheme(
colorScheme = colorScheme,
typography = Typography,
content = content
)
}
app/src/main/java/com/example/tank/ui/theme/Type.kt
+34
View File
@@ -0,0 +1,34 @@
package com.example.tank.ui.theme
import androidx.compose.material3.Typography
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.sp
// Set of Material typography styles to start with
val Typography = Typography(
bodyLarge = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal,
fontSize = 16.sp,
lineHeight = 24.sp,
letterSpacing = 0.5.sp
)
/* Other default text styles to override
titleLarge = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal,
fontSize = 22.sp,
lineHeight = 28.sp,
letterSpacing = 0.sp
),
labelSmall = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Medium,
fontSize = 11.sp,
lineHeight = 16.sp,
letterSpacing = 0.5.sp
)
*/
)
app/src/main/java/com/example/tank/ui/viewmodel/StationsViewModel.kt
+52
View File
@@ -0,0 +1,52 @@
package com.example.tank.ui.viewmodel
import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.example.tank.data.model.Station
import com.example.tank.data.repository.StationsRepository
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
class StationsViewModel(
private val repository: StationsRepository = StationsRepository()
) : ViewModel() {
private val _stations = MutableStateFlow<List<Station>>(emptyList())
val stations: StateFlow<List<Station>> = _stations.asStateFlow()
private val _isLoading = MutableStateFlow(false)
val isLoading: StateFlow<Boolean> = _isLoading.asStateFlow()
private val _error = MutableStateFlow<String?>(null)
val error: StateFlow<String?> = _error.asStateFlow()
fun loadStations(latitude: Double, longitude: Double, radius: Int = 5) {
viewModelScope.launch {
_isLoading.value = true
_error.value = null
try {
Log.d("StationsViewModel", "Loading stations for lat: $latitude, lng: $longitude, radius: $radius")
when (val result = repository.getStations(latitude, longitude, radius)) {
is StationsRepository.Result.Success -> {
Log.d("StationsViewModel", "Loaded ${result.stations.size} stations")
_stations.value = result.stations
_error.value = null
}
is StationsRepository.Result.Error -> {
Log.e("StationsViewModel", "Error: ${result.message}")
_stations.value = emptyList()
_error.value = result.message
}
}
} catch (e: Exception) {
Log.e("StationsViewModel", "Error loading stations", e)
_stations.value = emptyList()
_error.value = "Unexpected error: ${e.message}"
} finally {
_isLoading.value = false
}
}
}
}
app/src/main/res/drawable/ic_launcher_background.xml
+170
View File
@@ -0,0 +1,170 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
</vector>
app/src/main/res/drawable/ic_launcher_foreground.xml
+30
View File
@@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
app/src/main/res/mipmap-hdpi/ic_launcher.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

app/src/main/res/mipmap-mdpi/ic_launcher.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 982 B

app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

app/src/main/res/mipmap-xhdpi/ic_launcher.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

app/src/main/res/values/colors.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
</resources>
app/src/main/res/values/strings.xml
+3
View File
@@ -0,0 +1,3 @@
<resources>
<string name="app_name">tank</string>
</resources>
app/src/main/res/values/themes.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.Tank" parent="android:Theme.Material.Light.NoActionBar" />
</resources>
app/src/main/res/xml/backup_rules.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?><!--
Sample backup rules file; uncomment and customize as necessary.
See https://developer.android.com/guide/topics/data/autobackup
for details.
Note: This file is ignored for devices older that API 31
See https://developer.android.com/about/versions/12/backup-restore
-->
<full-backup-content>
<!--
<include domain="sharedpref" path="."/>
<exclude domain="sharedpref" path="device.xml"/>
-->
</full-backup-content>
app/src/main/res/xml/data_extraction_rules.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?><!--
Sample data extraction rules file; uncomment and customize as necessary.
See https://developer.android.com/about/versions/12/backup-restore#xml-changes
for details.
-->
<data-extraction-rules>
<cloud-backup>
<!-- TODO: Use <include> and <exclude> to control what is backed up.
<include .../>
<exclude .../>
-->
</cloud-backup>
<!--
<device-transfer>
<include .../>
<exclude .../>
</device-transfer>
-->
</data-extraction-rules>
app/src/test/java/com/example/tank/ExampleUnitTest.kt
+17
View File
@@ -0,0 +1,17 @@
package com.example.tank
import org.junit.Test
import org.junit.Assert.*
/**
* Example local unit test, which will execute on the development machine (host).
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
class ExampleUnitTest {
@Test
fun addition_isCorrect() {
assertEquals(4, 2 + 2)
}
}