From 4cc43a410baa7f7cbc5b7014264ed52367aa3d14 Mon Sep 17 00:00:00 2001 From: Redsandy <34872843+Redsandyg@users.noreply.github.com> Date: Sat, 14 Mar 2026 21:40:43 +0300 Subject: [PATCH] Initial commit: GeoZoner Android app scaffolding - Full Android project with Gradle wrapper - Hilt DI, Room DB, Retrofit networking - Auth flow with JWT token management - Bottom navigation with 4 tabs - Material 3 theme (light/dark) - Stub screens ready for implementation - Ready for Mapbox integration --- .gitignore | 59 +++++++ app/build.gradle.kts | 148 ++++++++++++++++++ app/proguard-rules.pro | 34 ++++ app/src/main/AndroidManifest.xml | 67 ++++++++ .../main/java/com/geozoner/app/GeoZonerApp.kt | 43 +++++ .../geozoner/app/data/local/TokenStorage.kt | 52 ++++++ .../app/data/local/dao/CachedZoneDao.kt | 30 ++++ .../app/data/local/dao/PendingActivityDao.kt | 27 ++++ .../app/data/local/db/GeoZonerDatabase.kt | 21 +++ .../app/data/local/entity/CachedZoneEntity.kt | 18 +++ .../local/entity/PendingActivityEntity.kt | 18 +++ .../app/data/remote/AuthInterceptor.kt | 40 +++++ .../app/data/remote/TokenAuthenticator.kt | 54 +++++++ .../app/data/remote/api/ActivityApi.kt | 25 +++ .../geozoner/app/data/remote/api/AuthApi.kt | 21 +++ .../geozoner/app/data/remote/api/FriendApi.kt | 21 +++ .../app/data/remote/api/LeaderboardApi.kt | 10 ++ .../geozoner/app/data/remote/api/UserApi.kt | 21 +++ .../geozoner/app/data/remote/api/ZoneApi.kt | 18 +++ .../app/data/remote/dto/ActivityDto.kt | 47 ++++++ .../geozoner/app/data/remote/dto/AuthDto.kt | 29 ++++ .../geozoner/app/data/remote/dto/FriendDto.kt | 8 + .../app/data/remote/dto/LeaderboardDto.kt | 15 ++ .../geozoner/app/data/remote/dto/UserDto.kt | 31 ++++ .../geozoner/app/data/remote/dto/ZoneDto.kt | 27 ++++ .../com/geozoner/app/di/DatabaseModule.kt | 38 +++++ .../java/com/geozoner/app/di/NetworkModule.kt | 101 ++++++++++++ .../app/service/LocationTrackingService.kt | 66 ++++++++ .../java/com/geozoner/app/ui/MainActivity.kt | 92 +++++++++++ .../app/ui/activity/TrackActivityScreen.kt | 53 +++++++ .../com/geozoner/app/ui/auth/AuthViewModel.kt | 77 +++++++++ .../com/geozoner/app/ui/auth/LoginScreen.kt | 115 ++++++++++++++ .../geozoner/app/ui/auth/RegisterScreen.kt | 127 +++++++++++++++ .../geozoner/app/ui/friends/FriendsScreen.kt | 52 ++++++ .../app/ui/history/ActivityHistoryScreen.kt | 50 ++++++ .../app/ui/leaderboard/LeaderboardScreen.kt | 46 ++++++ .../java/com/geozoner/app/ui/map/MapScreen.kt | 26 +++ .../geozoner/app/ui/navigation/NavGraph.kt | 106 +++++++++++++ .../com/geozoner/app/ui/navigation/Screen.kt | 36 +++++ .../geozoner/app/ui/profile/ProfileScreen.kt | 68 ++++++++ .../java/com/geozoner/app/ui/theme/Color.kt | 56 +++++++ .../java/com/geozoner/app/ui/theme/Theme.kt | 83 ++++++++++ .../java/com/geozoner/app/ui/theme/Type.kt | 70 +++++++++ .../java/com/geozoner/app/util/Constants.kt | 27 ++++ app/src/main/res/values/colors.xml | 7 + app/src/main/res/values/strings.xml | 52 ++++++ app/src/main/res/values/themes.xml | 7 + app/src/main/res/xml/backup_rules.xml | 5 + build.gradle.kts | 9 ++ gradle.properties | 19 +++ gradle/libs.versions.toml | 116 ++++++++++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 135 ++++++++++++++++ gradlew.bat | 90 +++++++++++ settings.gradle.kts | 34 ++++ 56 files changed, 2654 insertions(+) create mode 100644 .gitignore create mode 100644 app/build.gradle.kts create mode 100644 app/proguard-rules.pro create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/geozoner/app/GeoZonerApp.kt create mode 100644 app/src/main/java/com/geozoner/app/data/local/TokenStorage.kt create mode 100644 app/src/main/java/com/geozoner/app/data/local/dao/CachedZoneDao.kt create mode 100644 app/src/main/java/com/geozoner/app/data/local/dao/PendingActivityDao.kt create mode 100644 app/src/main/java/com/geozoner/app/data/local/db/GeoZonerDatabase.kt create mode 100644 app/src/main/java/com/geozoner/app/data/local/entity/CachedZoneEntity.kt create mode 100644 app/src/main/java/com/geozoner/app/data/local/entity/PendingActivityEntity.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/AuthInterceptor.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/TokenAuthenticator.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/api/ActivityApi.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/api/AuthApi.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/api/FriendApi.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/api/LeaderboardApi.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/api/UserApi.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/api/ZoneApi.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/dto/ActivityDto.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/dto/AuthDto.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/dto/FriendDto.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/dto/LeaderboardDto.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/dto/UserDto.kt create mode 100644 app/src/main/java/com/geozoner/app/data/remote/dto/ZoneDto.kt create mode 100644 app/src/main/java/com/geozoner/app/di/DatabaseModule.kt create mode 100644 app/src/main/java/com/geozoner/app/di/NetworkModule.kt create mode 100644 app/src/main/java/com/geozoner/app/service/LocationTrackingService.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/MainActivity.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/activity/TrackActivityScreen.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/auth/AuthViewModel.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/auth/LoginScreen.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/auth/RegisterScreen.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/friends/FriendsScreen.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/history/ActivityHistoryScreen.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/leaderboard/LeaderboardScreen.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/map/MapScreen.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/navigation/NavGraph.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/navigation/Screen.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/profile/ProfileScreen.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/theme/Color.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/theme/Theme.kt create mode 100644 app/src/main/java/com/geozoner/app/ui/theme/Type.kt create mode 100644 app/src/main/java/com/geozoner/app/util/Constants.kt create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/xml/backup_rules.xml create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0d8135f --- /dev/null +++ b/.gitignore @@ -0,0 +1,59 @@ +# Built application files +*.apk +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle/ +build/ +gradle-app.setting + +# Local configuration file (sdk path, etc) +local.properties + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea/ + +# Keystore files +*.jks +*.keystore + +# Google Services (API keys) +google-services.json + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild +.cxx/ + +# Secrets +secrets.properties +MAPBOX_PUBLIC_TOKEN +MAPBOX_DOWNLOADS_TOKEN + +# OS specific files +.DS_Store +Thumbs.db + +# Uncomment this if your app uses Mapbox +# app/src/main/res/values/mapbox_access_token.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..d9feb98 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,148 @@ +import java.util.Properties + +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.serialization) + alias(libs.plugins.compose.compiler) + alias(libs.plugins.ksp) + alias(libs.plugins.hilt) +} + +// Load local.properties for Mapbox token +val localProperties = Properties().apply { + val localPropsFile = rootProject.file("local.properties") + if (localPropsFile.exists()) { + load(localPropsFile.inputStream()) + } +} + +android { + namespace = "com.geozoner.app" + compileSdk = 35 + + defaultConfig { + applicationId = "com.geozoner.app" + minSdk = 29 + targetSdk = 35 + versionCode = 1 + versionName = "0.1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + + // Inject Mapbox public token as a BuildConfig field + buildConfigField( + "String", + "MAPBOX_PUBLIC_TOKEN", + "\"${localProperties.getProperty("MAPBOX_PUBLIC_TOKEN", "")}\"" + ) + + // Backend base URL + buildConfigField( + "String", + "BASE_URL", + "\"http://10.0.2.2:8000\"" + ) + } + + buildTypes { + release { + isMinifyEnabled = true + isShrinkResources = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + buildConfigField( + "String", + "BASE_URL", + "\"https://api.geozoner.com\"" + ) + } + debug { + isMinifyEnabled = false + applicationIdSuffix = ".debug" + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = "17" + } + + buildFeatures { + compose = true + buildConfig = true + } +} + +dependencies { + // AndroidX Core + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.navigation.compose) + implementation(libs.androidx.datastore.preferences) + implementation(libs.androidx.work.runtime.ktx) + implementation(libs.androidx.security.crypto) + + // Compose + implementation(platform(libs.compose.bom)) + implementation(libs.compose.ui) + implementation(libs.compose.ui.graphics) + implementation(libs.compose.ui.tooling.preview) + implementation(libs.compose.material3) + implementation(libs.compose.material.icons.extended) + debugImplementation(libs.compose.ui.tooling) + debugImplementation(libs.compose.ui.test.manifest) + + // Room + implementation(libs.room.runtime) + implementation(libs.room.ktx) + ksp(libs.room.compiler) + + // Hilt + implementation(libs.hilt.android) + ksp(libs.hilt.android.compiler) + implementation(libs.hilt.navigation.compose) + implementation(libs.hilt.work) + ksp(libs.hilt.work.compiler) + + // Networking + implementation(libs.retrofit) + implementation(libs.okhttp) + implementation(libs.okhttp.logging) + implementation(libs.kotlinx.serialization.json) + implementation(libs.retrofit.kotlinx.serialization) + + // Mapbox (uncomment after setting MAPBOX_DOWNLOADS_TOKEN in local.properties) + // implementation(libs.mapbox.maps) + + // Firebase (uncomment when google-services.json is added) + // implementation(platform(libs.firebase.bom)) + // implementation(libs.firebase.messaging) + // implementation(libs.firebase.analytics) + + // Coroutines + implementation(libs.kotlinx.coroutines.android) + implementation(libs.kotlinx.coroutines.core) + + // Image loading + implementation(libs.coil.compose) + + // Health Connect (Phase 2) + // implementation(libs.androidx.health.connect) + + // Testing + testImplementation(libs.junit) + androidTestImplementation(libs.junit.ext) + androidTestImplementation(libs.espresso.core) + androidTestImplementation(platform(libs.compose.bom)) + androidTestImplementation(libs.compose.ui.test.junit4) +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..d8ecd3e --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,34 @@ +# Add project specific ProGuard rules here. + +# Retrofit +-keepattributes Signature +-keepattributes *Annotation* +-keep class retrofit2.** { *; } +-keepclasseswithmembers class * { + @retrofit2.http.* ; +} + +# Kotlinx Serialization +-keepattributes *Annotation*, InnerClasses +-dontnote kotlinx.serialization.AnnotationsKt +-keepclassmembers class kotlinx.serialization.json.** { + *** Companion; +} +-keepclasseswithmembers class kotlinx.serialization.json.** { + kotlinx.serialization.KSerializer serializer(...); +} +-keep,includedescriptorclasses class com.geozoner.app.**$$serializer { *; } +-keepclassmembers class com.geozoner.app.** { + *** Companion; +} +-keepclasseswithmembers class com.geozoner.app.** { + kotlinx.serialization.KSerializer serializer(...); +} + +# OkHttp +-dontwarn okhttp3.** +-dontwarn okio.** + +# Room +-keep class * extends androidx.room.RoomDatabase +-keep @androidx.room.Entity class * diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..0b155e8 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/geozoner/app/GeoZonerApp.kt b/app/src/main/java/com/geozoner/app/GeoZonerApp.kt new file mode 100644 index 0000000..53fe243 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/GeoZonerApp.kt @@ -0,0 +1,43 @@ +package com.geozoner.app + +import android.app.Application +import android.app.NotificationChannel +import android.app.NotificationManager +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class GeoZonerApp : Application() { + + override fun onCreate() { + super.onCreate() + createNotificationChannels() + } + + private fun createNotificationChannels() { + val manager = getSystemService(NotificationManager::class.java) + + val trackingChannel = NotificationChannel( + CHANNEL_TRACKING, + getString(R.string.tracking_notification_channel), + NotificationManager.IMPORTANCE_LOW + ).apply { + description = "Shows notification while tracking activity" + setShowBadge(false) + } + + val socialChannel = NotificationChannel( + CHANNEL_SOCIAL, + "Social", + NotificationManager.IMPORTANCE_DEFAULT + ).apply { + description = "Zone captures, friend updates, leaderboard changes" + } + + manager.createNotificationChannels(listOf(trackingChannel, socialChannel)) + } + + companion object { + const val CHANNEL_TRACKING = "tracking" + const val CHANNEL_SOCIAL = "social" + } +} diff --git a/app/src/main/java/com/geozoner/app/data/local/TokenStorage.kt b/app/src/main/java/com/geozoner/app/data/local/TokenStorage.kt new file mode 100644 index 0000000..2555984 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/local/TokenStorage.kt @@ -0,0 +1,52 @@ +package com.geozoner.app.data.local + +import android.content.Context +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.stringPreferencesKey +import androidx.datastore.preferences.preferencesDataStore +import dagger.hilt.android.qualifiers.ApplicationContext +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.map +import javax.inject.Inject +import javax.inject.Singleton + +private val Context.dataStore: DataStore by preferencesDataStore(name = "auth_prefs") + +@Singleton +class TokenStorage @Inject constructor( + @ApplicationContext private val context: Context, +) { + private val accessTokenKey = stringPreferencesKey("access_token") + private val refreshTokenKey = stringPreferencesKey("refresh_token") + private val userIdKey = stringPreferencesKey("user_id") + + val accessToken: Flow = context.dataStore.data.map { it[accessTokenKey] } + val refreshToken: Flow = context.dataStore.data.map { it[refreshTokenKey] } + val userId: Flow = context.dataStore.data.map { it[userIdKey] } + + val isLoggedIn: Flow = accessToken.map { it != null } + + suspend fun saveTokens(accessToken: String, refreshToken: String) { + context.dataStore.edit { prefs -> + prefs[accessTokenKey] = accessToken + prefs[refreshTokenKey] = refreshToken + } + } + + suspend fun saveUserId(userId: String) { + context.dataStore.edit { prefs -> + prefs[userIdKey] = userId + } + } + + suspend fun getAccessTokenOnce(): String? = accessToken.first() + + suspend fun getRefreshTokenOnce(): String? = refreshToken.first() + + suspend fun clear() { + context.dataStore.edit { it.clear() } + } +} diff --git a/app/src/main/java/com/geozoner/app/data/local/dao/CachedZoneDao.kt b/app/src/main/java/com/geozoner/app/data/local/dao/CachedZoneDao.kt new file mode 100644 index 0000000..5361bec --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/local/dao/CachedZoneDao.kt @@ -0,0 +1,30 @@ +package com.geozoner.app.data.local.dao + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import com.geozoner.app.data.local.entity.CachedZoneEntity +import kotlinx.coroutines.flow.Flow + +@Dao +interface CachedZoneDao { + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertAll(zones: List) + + @Query("SELECT * FROM cached_zones WHERE isOwn = 1") + fun getOwnZones(): Flow> + + @Query("SELECT * FROM cached_zones WHERE isOwn = 0") + fun getFriendZones(): Flow> + + @Query("SELECT * FROM cached_zones") + fun getAllZones(): Flow> + + @Query("DELETE FROM cached_zones WHERE isOwn = :isOwn") + suspend fun deleteByOwnership(isOwn: Boolean) + + @Query("DELETE FROM cached_zones") + suspend fun deleteAll() +} diff --git a/app/src/main/java/com/geozoner/app/data/local/dao/PendingActivityDao.kt b/app/src/main/java/com/geozoner/app/data/local/dao/PendingActivityDao.kt new file mode 100644 index 0000000..3a2bb14 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/local/dao/PendingActivityDao.kt @@ -0,0 +1,27 @@ +package com.geozoner.app.data.local.dao + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import com.geozoner.app.data.local.entity.PendingActivityEntity +import kotlinx.coroutines.flow.Flow + +@Dao +interface PendingActivityDao { + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insert(activity: PendingActivityEntity): Long + + @Query("SELECT * FROM pending_activities ORDER BY createdAt ASC") + fun getAll(): Flow> + + @Query("SELECT * FROM pending_activities ORDER BY createdAt ASC") + suspend fun getAllOnce(): List + + @Query("DELETE FROM pending_activities WHERE id = :id") + suspend fun deleteById(id: Long) + + @Query("SELECT COUNT(*) FROM pending_activities") + fun count(): Flow +} diff --git a/app/src/main/java/com/geozoner/app/data/local/db/GeoZonerDatabase.kt b/app/src/main/java/com/geozoner/app/data/local/db/GeoZonerDatabase.kt new file mode 100644 index 0000000..cbdc67c --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/local/db/GeoZonerDatabase.kt @@ -0,0 +1,21 @@ +package com.geozoner.app.data.local.db + +import androidx.room.Database +import androidx.room.RoomDatabase +import com.geozoner.app.data.local.dao.CachedZoneDao +import com.geozoner.app.data.local.dao.PendingActivityDao +import com.geozoner.app.data.local.entity.CachedZoneEntity +import com.geozoner.app.data.local.entity.PendingActivityEntity + +@Database( + entities = [ + PendingActivityEntity::class, + CachedZoneEntity::class, + ], + version = 1, + exportSchema = false, +) +abstract class GeoZonerDatabase : RoomDatabase() { + abstract fun pendingActivityDao(): PendingActivityDao + abstract fun cachedZoneDao(): CachedZoneDao +} diff --git a/app/src/main/java/com/geozoner/app/data/local/entity/CachedZoneEntity.kt b/app/src/main/java/com/geozoner/app/data/local/entity/CachedZoneEntity.kt new file mode 100644 index 0000000..70d4c28 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/local/entity/CachedZoneEntity.kt @@ -0,0 +1,18 @@ +package com.geozoner.app.data.local.entity + +import androidx.room.Entity +import androidx.room.PrimaryKey + +/** + * Local cache of zone data for offline map rendering. + */ +@Entity(tableName = "cached_zones") +data class CachedZoneEntity( + @PrimaryKey val id: String, + val ownerId: String, + val polygonGeojson: String, // JSON string of GeoJSON polygon + val areaM2: Double, + val defenseLevel: Int, + val isOwn: Boolean, // true = current user's zone, false = friend's zone + val lastUpdated: Long = System.currentTimeMillis(), +) diff --git a/app/src/main/java/com/geozoner/app/data/local/entity/PendingActivityEntity.kt b/app/src/main/java/com/geozoner/app/data/local/entity/PendingActivityEntity.kt new file mode 100644 index 0000000..7f33452 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/local/entity/PendingActivityEntity.kt @@ -0,0 +1,18 @@ +package com.geozoner.app.data.local.entity + +import androidx.room.Entity +import androidx.room.PrimaryKey + +/** + * Stores activity data locally when offline. + * Will be uploaded to server when connectivity is restored. + */ +@Entity(tableName = "pending_activities") +data class PendingActivityEntity( + @PrimaryKey(autoGenerate = true) val id: Long = 0, + val type: String, + val startedAt: String, + val endedAt: String, + val gpsTrackJson: String, // JSON array of GpsPoints + val createdAt: Long = System.currentTimeMillis(), +) diff --git a/app/src/main/java/com/geozoner/app/data/remote/AuthInterceptor.kt b/app/src/main/java/com/geozoner/app/data/remote/AuthInterceptor.kt new file mode 100644 index 0000000..b0f2e52 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/AuthInterceptor.kt @@ -0,0 +1,40 @@ +package com.geozoner.app.data.remote + +import com.geozoner.app.data.local.TokenStorage +import kotlinx.coroutines.runBlocking +import okhttp3.Interceptor +import okhttp3.Response +import javax.inject.Inject +import javax.inject.Singleton + +/** + * Adds Authorization header with Bearer token to all requests + * except auth endpoints (login, register, refresh). + */ +@Singleton +class AuthInterceptor @Inject constructor( + private val tokenStorage: TokenStorage, +) : Interceptor { + + override fun intercept(chain: Interceptor.Chain): Response { + val request = chain.request() + + // Skip auth endpoints + val path = request.url.encodedPath + if (path.contains("/auth/")) { + return chain.proceed(request) + } + + val token = runBlocking { tokenStorage.getAccessTokenOnce() } + + val authenticatedRequest = if (token != null) { + request.newBuilder() + .header("Authorization", "Bearer $token") + .build() + } else { + request + } + + return chain.proceed(authenticatedRequest) + } +} diff --git a/app/src/main/java/com/geozoner/app/data/remote/TokenAuthenticator.kt b/app/src/main/java/com/geozoner/app/data/remote/TokenAuthenticator.kt new file mode 100644 index 0000000..eb2ecf4 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/TokenAuthenticator.kt @@ -0,0 +1,54 @@ +package com.geozoner.app.data.remote + +import com.geozoner.app.data.local.TokenStorage +import com.geozoner.app.data.remote.api.AuthApi +import com.geozoner.app.data.remote.dto.RefreshRequest +import kotlinx.coroutines.runBlocking +import okhttp3.Authenticator +import okhttp3.Request +import okhttp3.Response +import okhttp3.Route +import javax.inject.Inject +import javax.inject.Singleton + +/** + * Handles 401 responses by refreshing the JWT token. + * If refresh fails, clears tokens (forcing re-login). + */ +@Singleton +class TokenAuthenticator @Inject constructor( + private val tokenStorage: TokenStorage, + private val authApiProvider: dagger.Lazy, +) : Authenticator { + + override fun authenticate(route: Route?, response: Response): Request? { + // Prevent infinite refresh loops + if (response.request.header("X-Retry-Auth") != null) { + runBlocking { tokenStorage.clear() } + return null + } + + val refreshToken = runBlocking { tokenStorage.getRefreshTokenOnce() } ?: return null + + return try { + val tokenResponse = runBlocking { + authApiProvider.get().refresh(RefreshRequest(refreshToken)) + } + + runBlocking { + tokenStorage.saveTokens( + accessToken = tokenResponse.accessToken, + refreshToken = tokenResponse.refreshToken, + ) + } + + response.request.newBuilder() + .header("Authorization", "Bearer ${tokenResponse.accessToken}") + .header("X-Retry-Auth", "true") + .build() + } catch (e: Exception) { + runBlocking { tokenStorage.clear() } + null + } + } +} diff --git a/app/src/main/java/com/geozoner/app/data/remote/api/ActivityApi.kt b/app/src/main/java/com/geozoner/app/data/remote/api/ActivityApi.kt new file mode 100644 index 0000000..869c915 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/api/ActivityApi.kt @@ -0,0 +1,25 @@ +package com.geozoner.app.data.remote.api + +import com.geozoner.app.data.remote.dto.ActivityCreateRequest +import com.geozoner.app.data.remote.dto.ActivityDetailResponse +import com.geozoner.app.data.remote.dto.ActivityResponse +import retrofit2.http.Body +import retrofit2.http.GET +import retrofit2.http.POST +import retrofit2.http.Path +import retrofit2.http.Query + +interface ActivityApi { + + @POST("activities") + suspend fun createActivity(@Body request: ActivityCreateRequest): ActivityDetailResponse + + @GET("activities") + suspend fun getActivities( + @Query("limit") limit: Int = 50, + @Query("offset") offset: Int = 0, + ): List + + @GET("activities/{activityId}") + suspend fun getActivity(@Path("activityId") activityId: String): ActivityDetailResponse +} diff --git a/app/src/main/java/com/geozoner/app/data/remote/api/AuthApi.kt b/app/src/main/java/com/geozoner/app/data/remote/api/AuthApi.kt new file mode 100644 index 0000000..b1c3c6b --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/api/AuthApi.kt @@ -0,0 +1,21 @@ +package com.geozoner.app.data.remote.api + +import com.geozoner.app.data.remote.dto.LoginRequest +import com.geozoner.app.data.remote.dto.RefreshRequest +import com.geozoner.app.data.remote.dto.RegisterRequest +import com.geozoner.app.data.remote.dto.TokenResponse +import com.geozoner.app.data.remote.dto.UserResponse +import retrofit2.http.Body +import retrofit2.http.POST + +interface AuthApi { + + @POST("auth/register") + suspend fun register(@Body request: RegisterRequest): UserResponse + + @POST("auth/login") + suspend fun login(@Body request: LoginRequest): TokenResponse + + @POST("auth/refresh") + suspend fun refresh(@Body request: RefreshRequest): TokenResponse +} diff --git a/app/src/main/java/com/geozoner/app/data/remote/api/FriendApi.kt b/app/src/main/java/com/geozoner/app/data/remote/api/FriendApi.kt new file mode 100644 index 0000000..c1ba989 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/api/FriendApi.kt @@ -0,0 +1,21 @@ +package com.geozoner.app.data.remote.api + +import com.geozoner.app.data.remote.dto.MessageResponse +import com.geozoner.app.data.remote.dto.UserResponse +import retrofit2.http.DELETE +import retrofit2.http.GET +import retrofit2.http.POST +import retrofit2.http.Path +import retrofit2.http.Query + +interface FriendApi { + + @POST("friends") + suspend fun addFriend(@Query("username") username: String): MessageResponse + + @GET("friends") + suspend fun getFriends(): List + + @DELETE("friends/{friendId}") + suspend fun removeFriend(@Path("friendId") friendId: String) +} diff --git a/app/src/main/java/com/geozoner/app/data/remote/api/LeaderboardApi.kt b/app/src/main/java/com/geozoner/app/data/remote/api/LeaderboardApi.kt new file mode 100644 index 0000000..d35d336 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/api/LeaderboardApi.kt @@ -0,0 +1,10 @@ +package com.geozoner.app.data.remote.api + +import com.geozoner.app.data.remote.dto.LeaderboardEntryResponse +import retrofit2.http.GET + +interface LeaderboardApi { + + @GET("leaderboard") + suspend fun getLeaderboard(): List +} diff --git a/app/src/main/java/com/geozoner/app/data/remote/api/UserApi.kt b/app/src/main/java/com/geozoner/app/data/remote/api/UserApi.kt new file mode 100644 index 0000000..37ff741 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/api/UserApi.kt @@ -0,0 +1,21 @@ +package com.geozoner.app.data.remote.api + +import com.geozoner.app.data.remote.dto.UserResponse +import com.geozoner.app.data.remote.dto.UserStatsResponse +import com.geozoner.app.data.remote.dto.UserUpdateRequest +import retrofit2.http.Body +import retrofit2.http.GET +import retrofit2.http.PATCH +import retrofit2.http.Path + +interface UserApi { + + @GET("users/me") + suspend fun getMe(): UserResponse + + @PATCH("users/me") + suspend fun updateMe(@Body request: UserUpdateRequest): UserResponse + + @GET("users/{userId}/stats") + suspend fun getUserStats(@Path("userId") userId: String): UserStatsResponse +} diff --git a/app/src/main/java/com/geozoner/app/data/remote/api/ZoneApi.kt b/app/src/main/java/com/geozoner/app/data/remote/api/ZoneApi.kt new file mode 100644 index 0000000..6fdddec --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/api/ZoneApi.kt @@ -0,0 +1,18 @@ +package com.geozoner.app.data.remote.api + +import com.geozoner.app.data.remote.dto.ZoneBriefResponse +import com.geozoner.app.data.remote.dto.ZoneDetailResponse +import retrofit2.http.GET +import retrofit2.http.Path + +interface ZoneApi { + + @GET("zones") + suspend fun getMyZones(): List + + @GET("zones/friends") + suspend fun getFriendZones(): List + + @GET("zones/{zoneId}") + suspend fun getZone(@Path("zoneId") zoneId: String): ZoneDetailResponse +} diff --git a/app/src/main/java/com/geozoner/app/data/remote/dto/ActivityDto.kt b/app/src/main/java/com/geozoner/app/data/remote/dto/ActivityDto.kt new file mode 100644 index 0000000..0855a40 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/dto/ActivityDto.kt @@ -0,0 +1,47 @@ +package com.geozoner.app.data.remote.dto + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class GpsPointDto( + val lat: Double, + val lon: Double, + val timestamp: String? = null, + val altitude: Double? = null, + val hdop: Double? = null, +) + +@Serializable +data class ActivityCreateRequest( + val type: String, + @SerialName("started_at") val startedAt: String, + @SerialName("ended_at") val endedAt: String, + @SerialName("gps_track") val gpsTrack: List, +) + +@Serializable +data class ActivityResponse( + val id: String, + @SerialName("user_id") val userId: String, + val type: String, + @SerialName("started_at") val startedAt: String? = null, + @SerialName("ended_at") val endedAt: String? = null, + @SerialName("distance_m") val distanceM: Double? = null, + val status: String, + @SerialName("created_at") val createdAt: String, +) + +@Serializable +data class ActivityDetailResponse( + val id: String, + @SerialName("user_id") val userId: String, + val type: String, + @SerialName("started_at") val startedAt: String? = null, + @SerialName("ended_at") val endedAt: String? = null, + @SerialName("distance_m") val distanceM: Double? = null, + val status: String, + @SerialName("created_at") val createdAt: String, + @SerialName("zone_id") val zoneId: String? = null, + @SerialName("area_m2") val areaM2: Double? = null, +) diff --git a/app/src/main/java/com/geozoner/app/data/remote/dto/AuthDto.kt b/app/src/main/java/com/geozoner/app/data/remote/dto/AuthDto.kt new file mode 100644 index 0000000..354cf4d --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/dto/AuthDto.kt @@ -0,0 +1,29 @@ +package com.geozoner.app.data.remote.dto + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class RegisterRequest( + val username: String, + val email: String, + val password: String, +) + +@Serializable +data class LoginRequest( + val username: String, + val password: String, +) + +@Serializable +data class RefreshRequest( + @SerialName("refresh_token") val refreshToken: String, +) + +@Serializable +data class TokenResponse( + @SerialName("access_token") val accessToken: String, + @SerialName("refresh_token") val refreshToken: String, + @SerialName("token_type") val tokenType: String, +) diff --git a/app/src/main/java/com/geozoner/app/data/remote/dto/FriendDto.kt b/app/src/main/java/com/geozoner/app/data/remote/dto/FriendDto.kt new file mode 100644 index 0000000..29f7b42 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/dto/FriendDto.kt @@ -0,0 +1,8 @@ +package com.geozoner.app.data.remote.dto + +import kotlinx.serialization.Serializable + +@Serializable +data class MessageResponse( + val detail: String, +) diff --git a/app/src/main/java/com/geozoner/app/data/remote/dto/LeaderboardDto.kt b/app/src/main/java/com/geozoner/app/data/remote/dto/LeaderboardDto.kt new file mode 100644 index 0000000..5514d0a --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/dto/LeaderboardDto.kt @@ -0,0 +1,15 @@ +package com.geozoner.app.data.remote.dto + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class LeaderboardEntryResponse( + @SerialName("user_id") val userId: String, + val username: String, + @SerialName("avatar_url") val avatarUrl: String? = null, + @SerialName("total_pts") val totalPts: Int, + @SerialName("total_area_m2") val totalAreaM2: Double, + @SerialName("zone_count") val zoneCount: Int, + val rank: Int, +) diff --git a/app/src/main/java/com/geozoner/app/data/remote/dto/UserDto.kt b/app/src/main/java/com/geozoner/app/data/remote/dto/UserDto.kt new file mode 100644 index 0000000..44fca29 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/dto/UserDto.kt @@ -0,0 +1,31 @@ +package com.geozoner.app.data.remote.dto + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class UserResponse( + val id: String, + val username: String, + val email: String, + @SerialName("avatar_url") val avatarUrl: String? = null, + @SerialName("created_at") val createdAt: String, +) + +@Serializable +data class UserUpdateRequest( + val username: String? = null, + @SerialName("avatar_url") val avatarUrl: String? = null, + @SerialName("fcm_token") val fcmToken: String? = null, +) + +@Serializable +data class UserStatsResponse( + val id: String, + val username: String, + @SerialName("avatar_url") val avatarUrl: String? = null, + @SerialName("total_area_m2") val totalAreaM2: Double, + @SerialName("total_points") val totalPoints: Int, + @SerialName("zone_count") val zoneCount: Int, + @SerialName("activity_count") val activityCount: Int, +) diff --git a/app/src/main/java/com/geozoner/app/data/remote/dto/ZoneDto.kt b/app/src/main/java/com/geozoner/app/data/remote/dto/ZoneDto.kt new file mode 100644 index 0000000..2d77ecb --- /dev/null +++ b/app/src/main/java/com/geozoner/app/data/remote/dto/ZoneDto.kt @@ -0,0 +1,27 @@ +package com.geozoner.app.data.remote.dto + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable +import kotlinx.serialization.json.JsonObject + +@Serializable +data class ZoneBriefResponse( + val id: String, + @SerialName("owner_id") val ownerId: String, + @SerialName("polygon_geojson") val polygonGeojson: JsonObject, + @SerialName("area_m2") val areaM2: Double, + @SerialName("defense_level") val defenseLevel: Int, +) + +@Serializable +data class ZoneDetailResponse( + val id: String, + @SerialName("owner_id") val ownerId: String, + @SerialName("activity_id") val activityId: String, + @SerialName("polygon_geojson") val polygonGeojson: JsonObject, + @SerialName("area_m2") val areaM2: Double, + @SerialName("defense_level") val defenseLevel: Int, + @SerialName("defense_runs") val defenseRuns: Int, + @SerialName("created_at") val createdAt: String, + @SerialName("last_reinforced_at") val lastReinforcedAt: String? = null, +) diff --git a/app/src/main/java/com/geozoner/app/di/DatabaseModule.kt b/app/src/main/java/com/geozoner/app/di/DatabaseModule.kt new file mode 100644 index 0000000..14dc889 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/di/DatabaseModule.kt @@ -0,0 +1,38 @@ +package com.geozoner.app.di + +import android.content.Context +import androidx.room.Room +import com.geozoner.app.data.local.dao.CachedZoneDao +import com.geozoner.app.data.local.dao.PendingActivityDao +import com.geozoner.app.data.local.db.GeoZonerDatabase +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +object DatabaseModule { + + @Provides + @Singleton + fun provideDatabase(@ApplicationContext context: Context): GeoZonerDatabase { + return Room.databaseBuilder( + context, + GeoZonerDatabase::class.java, + "geozoner.db", + ) + .fallbackToDestructiveMigration() + .build() + } + + @Provides + fun providePendingActivityDao(db: GeoZonerDatabase): PendingActivityDao = + db.pendingActivityDao() + + @Provides + fun provideCachedZoneDao(db: GeoZonerDatabase): CachedZoneDao = + db.cachedZoneDao() +} diff --git a/app/src/main/java/com/geozoner/app/di/NetworkModule.kt b/app/src/main/java/com/geozoner/app/di/NetworkModule.kt new file mode 100644 index 0000000..ff0fa80 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/di/NetworkModule.kt @@ -0,0 +1,101 @@ +package com.geozoner.app.di + +import com.geozoner.app.BuildConfig +import com.geozoner.app.data.remote.AuthInterceptor +import com.geozoner.app.data.remote.TokenAuthenticator +import com.geozoner.app.data.remote.api.ActivityApi +import com.geozoner.app.data.remote.api.AuthApi +import com.geozoner.app.data.remote.api.FriendApi +import com.geozoner.app.data.remote.api.LeaderboardApi +import com.geozoner.app.data.remote.api.UserApi +import com.geozoner.app.data.remote.api.ZoneApi +import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import kotlinx.serialization.json.Json +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor +import retrofit2.Retrofit +import java.util.concurrent.TimeUnit +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +object NetworkModule { + + @Provides + @Singleton + fun provideJson(): Json = Json { + ignoreUnknownKeys = true + coerceInputValues = true + encodeDefaults = true + } + + @Provides + @Singleton + fun provideOkHttpClient( + authInterceptor: AuthInterceptor, + tokenAuthenticator: TokenAuthenticator, + ): OkHttpClient { + val builder = OkHttpClient.Builder() + .addInterceptor(authInterceptor) + .authenticator(tokenAuthenticator) + .connectTimeout(30, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .writeTimeout(60, TimeUnit.SECONDS) + + if (BuildConfig.DEBUG) { + builder.addInterceptor( + HttpLoggingInterceptor().apply { + level = HttpLoggingInterceptor.Level.BODY + } + ) + } + + return builder.build() + } + + @Provides + @Singleton + fun provideRetrofit(okHttpClient: OkHttpClient, json: Json): Retrofit { + val contentType = "application/json".toMediaType() + return Retrofit.Builder() + .baseUrl(BuildConfig.BASE_URL.trimEnd('/') + "/") + .client(okHttpClient) + .addConverterFactory(json.asConverterFactory(contentType)) + .build() + } + + @Provides + @Singleton + fun provideAuthApi(retrofit: Retrofit): AuthApi = + retrofit.create(AuthApi::class.java) + + @Provides + @Singleton + fun provideUserApi(retrofit: Retrofit): UserApi = + retrofit.create(UserApi::class.java) + + @Provides + @Singleton + fun provideActivityApi(retrofit: Retrofit): ActivityApi = + retrofit.create(ActivityApi::class.java) + + @Provides + @Singleton + fun provideZoneApi(retrofit: Retrofit): ZoneApi = + retrofit.create(ZoneApi::class.java) + + @Provides + @Singleton + fun provideFriendApi(retrofit: Retrofit): FriendApi = + retrofit.create(FriendApi::class.java) + + @Provides + @Singleton + fun provideLeaderboardApi(retrofit: Retrofit): LeaderboardApi = + retrofit.create(LeaderboardApi::class.java) +} diff --git a/app/src/main/java/com/geozoner/app/service/LocationTrackingService.kt b/app/src/main/java/com/geozoner/app/service/LocationTrackingService.kt new file mode 100644 index 0000000..41d7db4 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/service/LocationTrackingService.kt @@ -0,0 +1,66 @@ +package com.geozoner.app.service + +import android.app.Notification +import android.app.PendingIntent +import android.app.Service +import android.content.Intent +import android.os.IBinder +import androidx.core.app.NotificationCompat +import com.geozoner.app.GeoZonerApp +import com.geozoner.app.R +import com.geozoner.app.ui.MainActivity +import dagger.hilt.android.AndroidEntryPoint + +/** + * Foreground service for GPS tracking during activity recording. + * TODO: Implement FusedLocationProviderClient, GPS point collection, + * loop detection, and broadcasting location updates to UI. + */ +@AndroidEntryPoint +class LocationTrackingService : Service() { + + override fun onBind(intent: Intent?): IBinder? = null + + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + when (intent?.action) { + ACTION_START -> startTracking() + ACTION_STOP -> stopTracking() + } + return START_STICKY + } + + private fun startTracking() { + val notification = createNotification() + startForeground(NOTIFICATION_ID, notification) + // TODO: Start GPS location updates via FusedLocationProviderClient + } + + private fun stopTracking() { + // TODO: Stop GPS location updates, collect final track + stopForeground(STOP_FOREGROUND_REMOVE) + stopSelf() + } + + private fun createNotification(): Notification { + val pendingIntent = PendingIntent.getActivity( + this, + 0, + Intent(this, MainActivity::class.java), + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT, + ) + + return NotificationCompat.Builder(this, GeoZonerApp.CHANNEL_TRACKING) + .setContentTitle(getString(R.string.tracking_notification_title)) + .setContentText(getString(R.string.tracking_notification_text)) + .setSmallIcon(android.R.drawable.ic_menu_mylocation) + .setContentIntent(pendingIntent) + .setOngoing(true) + .build() + } + + companion object { + const val ACTION_START = "ACTION_START_TRACKING" + const val ACTION_STOP = "ACTION_STOP_TRACKING" + private const val NOTIFICATION_ID = 1001 + } +} diff --git a/app/src/main/java/com/geozoner/app/ui/MainActivity.kt b/app/src/main/java/com/geozoner/app/ui/MainActivity.kt new file mode 100644 index 0000000..1d2290b --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/MainActivity.kt @@ -0,0 +1,92 @@ +package com.geozoner.app.ui + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Icon +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.hilt.navigation.compose.hiltViewModel +import androidx.navigation.NavDestination.Companion.hierarchy +import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.rememberNavController +import com.geozoner.app.data.local.TokenStorage +import com.geozoner.app.ui.navigation.BottomNavItem +import com.geozoner.app.ui.navigation.NavGraph +import com.geozoner.app.ui.navigation.Screen +import com.geozoner.app.ui.theme.GeoZonerTheme +import dagger.hilt.android.AndroidEntryPoint +import javax.inject.Inject + +@AndroidEntryPoint +class MainActivity : ComponentActivity() { + + @Inject + lateinit var tokenStorage: TokenStorage + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + GeoZonerTheme { + val isLoggedIn by tokenStorage.isLoggedIn.collectAsState(initial = false) + GeoZonerApp(isLoggedIn = isLoggedIn) + } + } + } +} + +@Composable +fun GeoZonerApp(isLoggedIn: Boolean) { + val navController = rememberNavController() + val startDestination = if (isLoggedIn) Screen.Map.route else Screen.Login.route + + val navBackStackEntry by navController.currentBackStackEntryAsState() + val currentDestination = navBackStackEntry?.destination + + // Show bottom nav only on main screens + val showBottomBar = currentDestination?.hierarchy?.any { dest -> + BottomNavItem.entries.any { it.screen.route == dest.route } + } == true + + Scaffold( + bottomBar = { + if (showBottomBar) { + NavigationBar { + BottomNavItem.entries.forEach { item -> + val selected = currentDestination?.hierarchy?.any { + it.route == item.screen.route + } == true + + NavigationBarItem( + icon = { Icon(item.icon, contentDescription = item.label) }, + label = { Text(item.label) }, + selected = selected, + onClick = { + navController.navigate(item.screen.route) { + popUpTo(Screen.Map.route) { saveState = true } + launchSingleTop = true + restoreState = true + } + }, + ) + } + } + } + }, + ) { innerPadding -> + NavGraph( + navController = navController, + startDestination = startDestination, + modifier = Modifier.padding(innerPadding), + ) + } +} diff --git a/app/src/main/java/com/geozoner/app/ui/activity/TrackActivityScreen.kt b/app/src/main/java/com/geozoner/app/ui/activity/TrackActivityScreen.kt new file mode 100644 index 0000000..ae4734a --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/activity/TrackActivityScreen.kt @@ -0,0 +1,53 @@ +package com.geozoner.app.ui.activity + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Button +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.geozoner.app.R + +/** + * Activity tracking screen — will show real-time GPS track on map, + * distance/time counters, and start/stop controls. + * TODO: GPS foreground service, live map polyline, loop detection. + */ +@Composable +fun TrackActivityScreen( + onActivityFinished: () -> Unit, +) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(24.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + text = "Track Activity", + style = MaterialTheme.typography.headlineMedium, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = "GPS tracking will be implemented here.\nSelect activity type, start recording, see live route.", + style = MaterialTheme.typography.bodyLarge, + ) + + Spacer(modifier = Modifier.height(32.dp)) + + Button(onClick = onActivityFinished) { + Text(stringResource(R.string.start_activity)) + } + } +} diff --git a/app/src/main/java/com/geozoner/app/ui/auth/AuthViewModel.kt b/app/src/main/java/com/geozoner/app/ui/auth/AuthViewModel.kt new file mode 100644 index 0000000..8e54088 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/auth/AuthViewModel.kt @@ -0,0 +1,77 @@ +package com.geozoner.app.ui.auth + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.geozoner.app.data.local.TokenStorage +import com.geozoner.app.data.remote.api.AuthApi +import com.geozoner.app.data.remote.api.UserApi +import com.geozoner.app.data.remote.dto.LoginRequest +import com.geozoner.app.data.remote.dto.RegisterRequest +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.launch +import javax.inject.Inject + +data class AuthUiState( + val isLoading: Boolean = false, + val error: String? = null, + val isSuccess: Boolean = false, +) + +@HiltViewModel +class AuthViewModel @Inject constructor( + private val authApi: AuthApi, + private val userApi: UserApi, + private val tokenStorage: TokenStorage, +) : ViewModel() { + + private val _loginState = MutableStateFlow(AuthUiState()) + val loginState: StateFlow = _loginState.asStateFlow() + + private val _registerState = MutableStateFlow(AuthUiState()) + val registerState: StateFlow = _registerState.asStateFlow() + + fun login(username: String, password: String) { + viewModelScope.launch { + _loginState.value = AuthUiState(isLoading = true) + try { + val tokens = authApi.login(LoginRequest(username, password)) + tokenStorage.saveTokens(tokens.accessToken, tokens.refreshToken) + + // Fetch user info to store user ID + val user = userApi.getMe() + tokenStorage.saveUserId(user.id) + + _loginState.value = AuthUiState(isSuccess = true) + } catch (e: Exception) { + _loginState.value = AuthUiState( + error = e.message ?: "Login failed" + ) + } + } + } + + fun register(username: String, email: String, password: String) { + viewModelScope.launch { + _registerState.value = AuthUiState(isLoading = true) + try { + authApi.register(RegisterRequest(username, email, password)) + _registerState.value = AuthUiState(isSuccess = true) + } catch (e: Exception) { + _registerState.value = AuthUiState( + error = e.message ?: "Registration failed" + ) + } + } + } + + fun clearLoginError() { + _loginState.value = _loginState.value.copy(error = null) + } + + fun clearRegisterError() { + _registerState.value = _registerState.value.copy(error = null) + } +} diff --git a/app/src/main/java/com/geozoner/app/ui/auth/LoginScreen.kt b/app/src/main/java/com/geozoner/app/ui/auth/LoginScreen.kt new file mode 100644 index 0000000..fb6d5dd --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/auth/LoginScreen.kt @@ -0,0 +1,115 @@ +package com.geozoner.app.ui.auth + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.Button +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import com.geozoner.app.R + +@Composable +fun LoginScreen( + onLoginSuccess: () -> Unit, + onNavigateToRegister: () -> Unit, + viewModel: AuthViewModel = hiltViewModel(), +) { + val state by viewModel.loginState.collectAsState() + var username by rememberSaveable { mutableStateOf("") } + var password by rememberSaveable { mutableStateOf("") } + + LaunchedEffect(state.isSuccess) { + if (state.isSuccess) onLoginSuccess() + } + + Column( + modifier = Modifier + .fillMaxSize() + .padding(24.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + text = stringResource(R.string.login_title), + style = MaterialTheme.typography.headlineLarge, + ) + + Spacer(modifier = Modifier.height(32.dp)) + + OutlinedTextField( + value = username, + onValueChange = { username = it }, + label = { Text(stringResource(R.string.username_hint)) }, + singleLine = true, + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next), + modifier = Modifier.fillMaxWidth(), + ) + + Spacer(modifier = Modifier.height(12.dp)) + + OutlinedTextField( + value = password, + onValueChange = { password = it }, + label = { Text(stringResource(R.string.password_hint)) }, + singleLine = true, + visualTransformation = PasswordVisualTransformation(), + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), + modifier = Modifier.fillMaxWidth(), + ) + + if (state.error != null) { + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = state.error!!, + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodySmall, + ) + } + + Spacer(modifier = Modifier.height(24.dp)) + + Button( + onClick = { viewModel.login(username.trim(), password) }, + enabled = username.isNotBlank() && password.isNotBlank() && !state.isLoading, + modifier = Modifier.fillMaxWidth(), + ) { + if (state.isLoading) { + CircularProgressIndicator( + modifier = Modifier.height(20.dp), + color = MaterialTheme.colorScheme.onPrimary, + strokeWidth = 2.dp, + ) + } else { + Text(stringResource(R.string.login_button)) + } + } + + Spacer(modifier = Modifier.height(12.dp)) + + TextButton(onClick = onNavigateToRegister) { + Text(stringResource(R.string.switch_to_register)) + } + } +} diff --git a/app/src/main/java/com/geozoner/app/ui/auth/RegisterScreen.kt b/app/src/main/java/com/geozoner/app/ui/auth/RegisterScreen.kt new file mode 100644 index 0000000..acef899 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/auth/RegisterScreen.kt @@ -0,0 +1,127 @@ +package com.geozoner.app.ui.auth + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.Button +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import com.geozoner.app.R + +@Composable +fun RegisterScreen( + onRegisterSuccess: () -> Unit, + onNavigateToLogin: () -> Unit, + viewModel: AuthViewModel = hiltViewModel(), +) { + val state by viewModel.registerState.collectAsState() + var username by rememberSaveable { mutableStateOf("") } + var email by rememberSaveable { mutableStateOf("") } + var password by rememberSaveable { mutableStateOf("") } + + LaunchedEffect(state.isSuccess) { + if (state.isSuccess) onRegisterSuccess() + } + + Column( + modifier = Modifier + .fillMaxSize() + .padding(24.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + text = stringResource(R.string.register_title), + style = MaterialTheme.typography.headlineLarge, + ) + + Spacer(modifier = Modifier.height(32.dp)) + + OutlinedTextField( + value = username, + onValueChange = { username = it }, + label = { Text(stringResource(R.string.username_hint)) }, + singleLine = true, + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next), + modifier = Modifier.fillMaxWidth(), + ) + + Spacer(modifier = Modifier.height(12.dp)) + + OutlinedTextField( + value = email, + onValueChange = { email = it }, + label = { Text(stringResource(R.string.email_hint)) }, + singleLine = true, + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next), + modifier = Modifier.fillMaxWidth(), + ) + + Spacer(modifier = Modifier.height(12.dp)) + + OutlinedTextField( + value = password, + onValueChange = { password = it }, + label = { Text(stringResource(R.string.password_hint)) }, + singleLine = true, + visualTransformation = PasswordVisualTransformation(), + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), + modifier = Modifier.fillMaxWidth(), + ) + + if (state.error != null) { + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = state.error!!, + color = MaterialTheme.colorScheme.error, + style = MaterialTheme.typography.bodySmall, + ) + } + + Spacer(modifier = Modifier.height(24.dp)) + + Button( + onClick = { viewModel.register(username.trim(), email.trim(), password) }, + enabled = username.isNotBlank() && email.isNotBlank() && password.isNotBlank() && !state.isLoading, + modifier = Modifier.fillMaxWidth(), + ) { + if (state.isLoading) { + CircularProgressIndicator( + modifier = Modifier.height(20.dp), + color = MaterialTheme.colorScheme.onPrimary, + strokeWidth = 2.dp, + ) + } else { + Text(stringResource(R.string.register_button)) + } + } + + Spacer(modifier = Modifier.height(12.dp)) + + TextButton(onClick = onNavigateToLogin) { + Text(stringResource(R.string.switch_to_login)) + } + } +} diff --git a/app/src/main/java/com/geozoner/app/ui/friends/FriendsScreen.kt b/app/src/main/java/com/geozoner/app/ui/friends/FriendsScreen.kt new file mode 100644 index 0000000..23a9fb8 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/friends/FriendsScreen.kt @@ -0,0 +1,52 @@ +package com.geozoner.app.ui.friends + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.geozoner.app.R + +/** + * Friends screen — list friends, add by username, remove. + * TODO: Fetch from GET /friends, POST /friends, DELETE /friends/{id}. + */ +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun FriendsScreen( + onNavigateBack: () -> Unit, +) { + Column(modifier = Modifier.fillMaxSize()) { + TopAppBar( + title = { Text(stringResource(R.string.friends_title)) }, + navigationIcon = { + IconButton(onClick = onNavigateBack) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back") + } + }, + ) + + Column( + modifier = Modifier + .fillMaxSize() + .padding(24.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + text = "Friends list will appear here", + style = MaterialTheme.typography.bodyLarge, + ) + } + } +} diff --git a/app/src/main/java/com/geozoner/app/ui/history/ActivityHistoryScreen.kt b/app/src/main/java/com/geozoner/app/ui/history/ActivityHistoryScreen.kt new file mode 100644 index 0000000..ac07e88 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/history/ActivityHistoryScreen.kt @@ -0,0 +1,50 @@ +package com.geozoner.app.ui.history + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + +/** + * Activity history screen — list past activities with stats. + * TODO: Fetch from GET /activities, show distance/duration/zone area. + */ +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ActivityHistoryScreen( + onNavigateBack: () -> Unit, +) { + Column(modifier = Modifier.fillMaxSize()) { + TopAppBar( + title = { Text("Activity History") }, + navigationIcon = { + IconButton(onClick = onNavigateBack) { + Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back") + } + }, + ) + + Column( + modifier = Modifier + .fillMaxSize() + .padding(24.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + text = "Activity history will appear here", + style = MaterialTheme.typography.bodyLarge, + ) + } + } +} diff --git a/app/src/main/java/com/geozoner/app/ui/leaderboard/LeaderboardScreen.kt b/app/src/main/java/com/geozoner/app/ui/leaderboard/LeaderboardScreen.kt new file mode 100644 index 0000000..cc4d34f --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/leaderboard/LeaderboardScreen.kt @@ -0,0 +1,46 @@ +package com.geozoner.app.ui.leaderboard + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.geozoner.app.R + +/** + * Leaderboard screen — shows friend ranking by total points. + * TODO: Fetch from GET /leaderboard, display ranked list with stats. + */ +@Composable +fun LeaderboardScreen( + onNavigateToFriends: () -> Unit, +) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(24.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + text = stringResource(R.string.leaderboard_title), + style = MaterialTheme.typography.headlineMedium, + ) + + Text( + text = "Friend leaderboard will appear here", + style = MaterialTheme.typography.bodyLarge, + ) + + TextButton(onClick = onNavigateToFriends) { + Text(stringResource(R.string.add_friend)) + } + } +} diff --git a/app/src/main/java/com/geozoner/app/ui/map/MapScreen.kt b/app/src/main/java/com/geozoner/app/ui/map/MapScreen.kt new file mode 100644 index 0000000..44af90d --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/map/MapScreen.kt @@ -0,0 +1,26 @@ +package com.geozoner.app.ui.map + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier + +/** + * Map screen — will display Mapbox map with zone polygons. + * TODO: Integrate Mapbox SDK, render own + friend zones, live GPS track. + */ +@Composable +fun MapScreen() { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center, + ) { + Text( + text = "Map Screen\n(Mapbox integration pending)", + style = MaterialTheme.typography.headlineMedium, + ) + } +} diff --git a/app/src/main/java/com/geozoner/app/ui/navigation/NavGraph.kt b/app/src/main/java/com/geozoner/app/ui/navigation/NavGraph.kt new file mode 100644 index 0000000..2faa18f --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/navigation/NavGraph.kt @@ -0,0 +1,106 @@ +package com.geozoner.app.ui.navigation + +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.navigation.NavHostController +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import com.geozoner.app.ui.auth.LoginScreen +import com.geozoner.app.ui.auth.RegisterScreen +import com.geozoner.app.ui.map.MapScreen +import com.geozoner.app.ui.activity.TrackActivityScreen +import com.geozoner.app.ui.leaderboard.LeaderboardScreen +import com.geozoner.app.ui.profile.ProfileScreen +import com.geozoner.app.ui.friends.FriendsScreen +import com.geozoner.app.ui.history.ActivityHistoryScreen + +@Composable +fun NavGraph( + navController: NavHostController, + startDestination: String, + modifier: Modifier = Modifier, +) { + NavHost( + navController = navController, + startDestination = startDestination, + modifier = modifier, + ) { + // Auth flow + composable(Screen.Login.route) { + LoginScreen( + onLoginSuccess = { + navController.navigate(Screen.Map.route) { + popUpTo(Screen.Login.route) { inclusive = true } + } + }, + onNavigateToRegister = { + navController.navigate(Screen.Register.route) + }, + ) + } + + composable(Screen.Register.route) { + RegisterScreen( + onRegisterSuccess = { + navController.navigate(Screen.Login.route) { + popUpTo(Screen.Register.route) { inclusive = true } + } + }, + onNavigateToLogin = { + navController.popBackStack() + }, + ) + } + + // Main flow + composable(Screen.Map.route) { + MapScreen() + } + + composable(Screen.TrackActivity.route) { + TrackActivityScreen( + onActivityFinished = { + navController.navigate(Screen.Map.route) { + popUpTo(Screen.Map.route) { inclusive = true } + } + }, + ) + } + + composable(Screen.Leaderboard.route) { + LeaderboardScreen( + onNavigateToFriends = { + navController.navigate(Screen.Friends.route) + }, + ) + } + + composable(Screen.Profile.route) { + ProfileScreen( + onLogout = { + navController.navigate(Screen.Login.route) { + popUpTo(0) { inclusive = true } + } + }, + onNavigateToHistory = { + navController.navigate(Screen.ActivityHistory.route) + }, + onNavigateToFriends = { + navController.navigate(Screen.Friends.route) + }, + ) + } + + composable(Screen.Friends.route) { + FriendsScreen( + onNavigateBack = { navController.popBackStack() }, + ) + } + + composable(Screen.ActivityHistory.route) { + ActivityHistoryScreen( + onNavigateBack = { navController.popBackStack() }, + ) + } + } +} diff --git a/app/src/main/java/com/geozoner/app/ui/navigation/Screen.kt b/app/src/main/java/com/geozoner/app/ui/navigation/Screen.kt new file mode 100644 index 0000000..d5eb6de --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/navigation/Screen.kt @@ -0,0 +1,36 @@ +package com.geozoner.app.ui.navigation + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.EmojiEvents +import androidx.compose.material.icons.filled.Map +import androidx.compose.material.icons.filled.Person +import androidx.compose.material.icons.automirrored.filled.DirectionsRun +import androidx.compose.ui.graphics.vector.ImageVector + +sealed class Screen(val route: String) { + // Auth + data object Login : Screen("login") + data object Register : Screen("register") + + // Main + data object Map : Screen("map") + data object TrackActivity : Screen("track_activity") + data object Leaderboard : Screen("leaderboard") + data object Profile : Screen("profile") + data object Friends : Screen("friends") + data object ActivityHistory : Screen("activity_history") + data object ActivityDetail : Screen("activity_detail/{activityId}") { + fun createRoute(activityId: String) = "activity_detail/$activityId" + } +} + +enum class BottomNavItem( + val screen: Screen, + val icon: ImageVector, + val label: String, +) { + Map(Screen.Map, Icons.Default.Map, "Map"), + Activity(Screen.TrackActivity, Icons.AutoMirrored.Filled.DirectionsRun, "Activity"), + Leaderboard(Screen.Leaderboard, Icons.Default.EmojiEvents, "Leaderboard"), + Profile(Screen.Profile, Icons.Default.Person, "Profile"), +} diff --git a/app/src/main/java/com/geozoner/app/ui/profile/ProfileScreen.kt b/app/src/main/java/com/geozoner/app/ui/profile/ProfileScreen.kt new file mode 100644 index 0000000..6913a3f --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/profile/ProfileScreen.kt @@ -0,0 +1,68 @@ +package com.geozoner.app.ui.profile + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Button +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import com.geozoner.app.R + +/** + * Profile screen — shows user stats, avatar, links to friends and history. + * TODO: Fetch from GET /users/me and GET /users/{id}/stats. + */ +@Composable +fun ProfileScreen( + onLogout: () -> Unit, + onNavigateToHistory: () -> Unit, + onNavigateToFriends: () -> Unit, +) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(24.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + text = stringResource(R.string.profile_title), + style = MaterialTheme.typography.headlineMedium, + ) + + Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = "User stats will appear here", + style = MaterialTheme.typography.bodyLarge, + ) + + Spacer(modifier = Modifier.height(24.dp)) + + OutlinedButton(onClick = onNavigateToHistory) { + Text("Activity History") + } + + Spacer(modifier = Modifier.height(8.dp)) + + OutlinedButton(onClick = onNavigateToFriends) { + Text(stringResource(R.string.friends_title)) + } + + Spacer(modifier = Modifier.height(24.dp)) + + Button(onClick = onLogout) { + Text(stringResource(R.string.logout)) + } + } +} diff --git a/app/src/main/java/com/geozoner/app/ui/theme/Color.kt b/app/src/main/java/com/geozoner/app/ui/theme/Color.kt new file mode 100644 index 0000000..85158e0 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/theme/Color.kt @@ -0,0 +1,56 @@ +package com.geozoner.app.ui.theme + +import androidx.compose.ui.graphics.Color + +// Primary — Green (territory / nature) +val Green10 = Color(0xFF0A3A0A) +val Green20 = Color(0xFF1B5E20) +val Green30 = Color(0xFF2E7D32) +val Green40 = Color(0xFF388E3C) +val Green80 = Color(0xFFA5D6A7) +val Green90 = Color(0xFFC8E6C9) + +// Secondary — Cyan (water / exploration) +val Cyan10 = Color(0xFF003F47) +val Cyan20 = Color(0xFF006064) +val Cyan30 = Color(0xFF00838F) +val Cyan40 = Color(0xFF00ACC1) +val Cyan80 = Color(0xFF80DEEA) +val Cyan90 = Color(0xFFB2EBF2) + +// Tertiary — Amber (achievements / energy) +val Amber10 = Color(0xFF3E2700) +val Amber20 = Color(0xFF5D3F00) +val Amber30 = Color(0xFF7C5800) +val Amber40 = Color(0xFFFFA000) +val Amber80 = Color(0xFFFFE082) +val Amber90 = Color(0xFFFFF8E1) + +// Error +val Red10 = Color(0xFF410002) +val Red20 = Color(0xFF690005) +val Red30 = Color(0xFF93000A) +val Red40 = Color(0xFFB3261E) +val Red80 = Color(0xFFF2B8B5) +val Red90 = Color(0xFFF9DEDC) + +// Neutral +val Grey10 = Color(0xFF1C1B1F) +val Grey20 = Color(0xFF313033) +val Grey90 = Color(0xFFE6E1E5) +val Grey95 = Color(0xFFF4EFF4) +val Grey99 = Color(0xFFFFFBFE) + +// Zone colors — one per player on the map +val ZoneColors = listOf( + Color(0xFF4CAF50), // Green + Color(0xFF2196F3), // Blue + Color(0xFFFF9800), // Orange + Color(0xFF9C27B0), // Purple + Color(0xFFF44336), // Red + Color(0xFF009688), // Teal + Color(0xFFFF5722), // Deep Orange + Color(0xFF3F51B5), // Indigo + Color(0xFFCDDC39), // Lime + Color(0xFFE91E63), // Pink +) diff --git a/app/src/main/java/com/geozoner/app/ui/theme/Theme.kt b/app/src/main/java/com/geozoner/app/ui/theme/Theme.kt new file mode 100644 index 0000000..cdc6d39 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/theme/Theme.kt @@ -0,0 +1,83 @@ +package com.geozoner.app.ui.theme + +import android.app.Activity +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +private val LightColorScheme = lightColorScheme( + primary = Green40, + onPrimary = Grey99, + primaryContainer = Green90, + onPrimaryContainer = Green10, + secondary = Cyan40, + onSecondary = Grey99, + secondaryContainer = Cyan90, + onSecondaryContainer = Cyan10, + tertiary = Amber40, + onTertiary = Grey99, + tertiaryContainer = Amber90, + onTertiaryContainer = Amber10, + error = Red40, + onError = Grey99, + errorContainer = Red90, + onErrorContainer = Red10, + background = Grey99, + onBackground = Grey10, + surface = Grey99, + onSurface = Grey10, + surfaceVariant = Grey95, + onSurfaceVariant = Grey20, +) + +private val DarkColorScheme = darkColorScheme( + primary = Green80, + onPrimary = Green20, + primaryContainer = Green30, + onPrimaryContainer = Green90, + secondary = Cyan80, + onSecondary = Cyan20, + secondaryContainer = Cyan30, + onSecondaryContainer = Cyan90, + tertiary = Amber80, + onTertiary = Amber20, + tertiaryContainer = Amber30, + onTertiaryContainer = Amber90, + error = Red80, + onError = Red20, + errorContainer = Red30, + onErrorContainer = Red90, + background = Grey10, + onBackground = Grey90, + surface = Grey10, + onSurface = Grey90, + surfaceVariant = Grey20, + onSurfaceVariant = Grey90, +) + +@Composable +fun GeoZonerTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + content: @Composable () -> Unit, +) { + val colorScheme = if (darkTheme) DarkColorScheme else LightColorScheme + + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content, + ) +} diff --git a/app/src/main/java/com/geozoner/app/ui/theme/Type.kt b/app/src/main/java/com/geozoner/app/ui/theme/Type.kt new file mode 100644 index 0000000..137fa70 --- /dev/null +++ b/app/src/main/java/com/geozoner/app/ui/theme/Type.kt @@ -0,0 +1,70 @@ +package com.geozoner.app.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 + +val Typography = Typography( + displayLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 57.sp, + lineHeight = 64.sp, + letterSpacing = (-0.25).sp, + ), + headlineLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Bold, + fontSize = 32.sp, + lineHeight = 40.sp, + ), + headlineMedium = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Bold, + fontSize = 28.sp, + lineHeight = 36.sp, + ), + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.SemiBold, + fontSize = 22.sp, + lineHeight = 28.sp, + ), + titleMedium = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.15.sp, + ), + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp, + ), + bodyMedium = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 14.sp, + lineHeight = 20.sp, + letterSpacing = 0.25.sp, + ), + labelLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 14.sp, + lineHeight = 20.sp, + letterSpacing = 0.1.sp, + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp, + ), +) diff --git a/app/src/main/java/com/geozoner/app/util/Constants.kt b/app/src/main/java/com/geozoner/app/util/Constants.kt new file mode 100644 index 0000000..384e88c --- /dev/null +++ b/app/src/main/java/com/geozoner/app/util/Constants.kt @@ -0,0 +1,27 @@ +package com.geozoner.app.util + +/** + * App-wide constants derived from the GeoZoner PRD. + */ +object Constants { + // GPS settings + const val GPS_INTERVAL_FOREGROUND_MS = 3_000L + const val GPS_INTERVAL_BACKGROUND_MS = 5_000L + const val MAX_HDOP = 4.0 + const val MAX_GPS_ACCURACY_M = 20f + + // Zone rules + const val LOOP_CLOSURE_RADIUS_M = 50.0 + const val MIN_ZONE_AREA_M2 = 5_000.0 + + // Anti-cheat + const val MAX_RUN_SPEED_KMH = 60.0 + + // Scoring + const val POINTS_PER_1000_M2 = 1 + const val CAPTURE_BONUS_PTS = 50 + const val ACTIVITY_BONUS_PTS_PER_KM = 10 + const val DEFENSE_BONUS_MULTIPLIER = 0.20 + const val STREAK_MULTIPLIER_PER_DAY = 0.05 + const val MAX_STREAK_MULTIPLIER = 2.0 +} diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..8ea43b9 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,7 @@ + + + #FF2E7D32 + #FF1B5E20 + #FF00ACC1 + #FFFAFAFA + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..e68eeaf --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,52 @@ + + + GeoZoner + + + Map + Activity + Leaderboard + Profile + + + Welcome back + Create account + Username + Email + Password + Log in + Sign up + Don\'t have an account? Sign up + Already have an account? Log in + + + Start Activity + Finish + Loop detected ✓ + Select activity type + Run + Cycle + Walk + Hike + + + Activity Tracking + Recording activity + GeoZoner is tracking your route + + + Friends + Add friend + Enter username + + + Leaderboard + + + Profile + Total Area + Total Points + Zones + Activities + Log out + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..8ac099d --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..8ee7063 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..f012474 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,9 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.serialization) apply false + alias(libs.plugins.compose.compiler) apply false + alias(libs.plugins.ksp) apply false + alias(libs.plugins.hilt) apply false +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..4e4fd4d --- /dev/null +++ b/gradle.properties @@ -0,0 +1,19 @@ +# Project-wide Gradle settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.parallel=true +org.gradle.configuration-cache=true + +# Use Android Studio's bundled JDK (JBR 21) to run Gradle +org.gradle.java.home=C:\\Program Files\\Android\\Android Studio\\jbr + +# AndroidX +android.useAndroidX=true + +# Kotlin +kotlin.code.style=official + +# Non-transitive R classes +android.nonTransitiveRClass=true + +# Mapbox token (set in local.properties or CI env) +# MAPBOX_DOWNLOADS_TOKEN=sk.xxx diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..d7160d8 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,116 @@ +[versions] +agp = "8.7.3" +kotlin = "2.1.0" +ksp = "2.1.0-1.0.29" + +# AndroidX +coreKtx = "1.15.0" +lifecycleRuntimeKtx = "2.8.7" +activityCompose = "1.9.3" +navigationCompose = "2.8.5" +datastore = "1.1.1" +workRuntime = "2.10.0" +room = "2.6.1" +securityCrypto = "1.1.0-alpha06" +healthConnect = "1.1.0-alpha11" + +# Compose +composeBom = "2024.12.01" + +# Hilt +hilt = "2.53.1" +hiltNavigationCompose = "1.2.0" + +# Networking +retrofit = "2.11.0" +okhttp = "4.12.0" +kotlinxSerialization = "1.7.3" +retrofitKotlinxSerialization = "1.0.0" + +# Mapbox +mapbox = "11.8.2" + +# Firebase +firebaseBom = "33.7.0" + +# Coroutines +coroutines = "1.9.0" + +# Image loading +coil = "2.7.0" + +# Testing +junit = "4.13.2" +junitExt = "1.2.1" +espresso = "3.6.1" + +[libraries] +# AndroidX Core +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntimeKtx" } +androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleRuntimeKtx" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" } +androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" } +androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "workRuntime" } +androidx-security-crypto = { group = "androidx.security", name = "security-crypto", version.ref = "securityCrypto" } +androidx-health-connect = { group = "androidx.health.connect", name = "connect-client", version.ref = "healthConnect" } + +# Compose BOM +compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +compose-ui = { group = "androidx.compose.ui", name = "ui" } +compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +compose-material3 = { group = "androidx.compose.material3", name = "material3" } +compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" } + +# Room +room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } +room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } +room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } + +# Hilt +hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" } +hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" } +hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltNavigationCompose" } +hilt-work = { group = "androidx.hilt", name = "hilt-work", version.ref = "hiltNavigationCompose" } +hilt-work-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "hiltNavigationCompose" } + +# Networking +retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } +okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" } +okhttp-logging = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" } +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } +retrofit-kotlinx-serialization = { group = "com.jakewharton.retrofit", name = "retrofit2-kotlinx-serialization-converter", version.ref = "retrofitKotlinxSerialization" } + +# Mapbox +mapbox-maps = { group = "com.mapbox.maps", name = "android", version.ref = "mapbox" } + +# Firebase +firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" } +firebase-messaging = { group = "com.google.firebase", name = "firebase-messaging-ktx" } +firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics-ktx" } + +# Coroutines +kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" } + +# Image loading +coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } + +# Testing +junit = { group = "junit", name = "junit", version.ref = "junit" } +junit-ext = { group = "androidx.test.ext", name = "junit", version.ref = "junitExt" } +espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" } +compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e2847c8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..5183a2e --- /dev/null +++ b/gradlew @@ -0,0 +1,135 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +app_path=$0 +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld -- "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NonStop* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 ; then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + ;; + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + ;; + esac +fi + +# Collect all arguments for the java command, stracks://gradle.org/badging +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + JAVACMD=$( cygpath --unix "$JAVACMD" ) +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# temporary variables to preserve quoting and provide a way for the user to +# override the default options. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xeli" is unset, for security reasons +unset GREP_OPTIONS + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8d78a21 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%\bin\java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %OS%==Windows_NT endlocal + +:omega +exit /b %ERRORLEVEL% + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..93236ba --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,34 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { + url = uri("https://api.mapbox.com/downloads/v2/releases/maven") + credentials.username = "mapbox" + credentials.password = providers.gradleProperty("MAPBOX_DOWNLOADS_TOKEN") + .orElse(providers.environmentVariable("MAPBOX_DOWNLOADS_TOKEN")) + .getOrElse("") + authentication { + create("basic") + } + } + } +} + +rootProject.name = "GeoZoner" +include(":app")