From c5596870fb8ef3e8d3ba683a91112d86d8594772 Mon Sep 17 00:00:00 2001 From: vrubelroman Date: Thu, 9 Jul 2026 19:05:49 +0000 Subject: [PATCH] Add Android app skeleton (Kotlin/Compose, Catppuccin Mocha theme) Full app scaffold wired to the backend: onboarding, content-length picker, map screen (permission flow + text-search fallback), guide screen with a swipeable place-card stack driven by on-device TTS narration and a 60s re-scan loop, place detail screen with mute/favorite controls, favorites (Room-backed), and settings. Hilt for DI, Retrofit+kotlinx.serialization for the API client, DataStore for onboarding/content-length prefs, FusedLocationProviderClient for location. The 2GIS MapKit integration is isolated behind map/DgisMapView.kt (currently a placeholder) since its exact Maven coordinates need confirming from the 2GIS developer portal. Verified by actually building it: installed a minimal Android SDK (platform 34 + build-tools, no emulator) and JDK 17 locally, then ran :app:compileDebugKotlin, :app:assembleDebug (produced a real debug APK), and :app:lintDebug (0 errors, 44 non-blocking warnings, mostly "newer dependency version available"). Caught and fixed two real bugs this way: a wrong Maven artifact for the Retrofit kotlinx.serialization converter, and missing ExperimentalMaterial3Api opt-in. Co-Authored-By: Claude Sonnet 5 --- android/app/build.gradle.kts | 115 ++++++++++ android/app/proguard-rules.pro | 2 + android/app/src/main/AndroidManifest.xml | 28 +++ .../java/com/guidecity/app/GuideCityApp.kt | 7 + .../java/com/guidecity/app/MainActivity.kt | 22 ++ .../app/data/local/db/AppDatabase.kt | 9 + .../app/data/local/db/FavoritePlaceDao.kt | 27 +++ .../app/data/local/db/FavoritePlaceEntity.kt | 15 ++ .../app/data/local/prefs/ContentLength.kt | 11 + .../data/local/prefs/UserPrefsDataStore.kt | 41 ++++ .../guidecity/app/data/remote/ApiService.kt | 51 +++++ .../app/data/remote/RetrofitClient.kt | 40 ++++ .../guidecity/app/data/remote/dto/CityDto.kt | 23 ++ .../app/data/remote/dto/NearbyDto.kt | 26 +++ .../guidecity/app/data/remote/dto/PlaceDto.kt | 35 ++++ .../data/repository/FavoritesRepository.kt | 20 ++ .../app/data/repository/PlacesRepository.kt | 45 ++++ .../java/com/guidecity/app/di/AppModule.kt | 32 +++ .../app/location/LocationProvider.kt | 43 ++++ .../app/location/SelectedLocationHolder.kt | 22 ++ .../java/com/guidecity/app/map/DgisMapView.kt | 87 ++++++++ .../com/guidecity/app/navigation/NavGraph.kt | 117 +++++++++++ .../java/com/guidecity/app/theme/Color.kt | 44 ++++ .../java/com/guidecity/app/theme/Theme.kt | 44 ++++ .../main/java/com/guidecity/app/theme/Type.kt | 31 +++ .../java/com/guidecity/app/tts/TtsManager.kt | 92 ++++++++ .../app/ui/detail/PlaceDetailScreen.kt | 109 ++++++++++ .../app/ui/detail/PlaceDetailViewModel.kt | 93 +++++++++ .../app/ui/favorites/FavoritesScreen.kt | 67 ++++++ .../app/ui/favorites/FavoritesViewModel.kt | 19 ++ .../com/guidecity/app/ui/guide/GuideScreen.kt | 89 ++++++++ .../guidecity/app/ui/guide/GuideViewModel.kt | 139 +++++++++++++ .../com/guidecity/app/ui/guide/PlaceCard.kt | 48 +++++ .../guidecity/app/ui/guide/PlaceCardStack.kt | 69 ++++++ .../com/guidecity/app/ui/map/MapScreen.kt | 151 ++++++++++++++ .../com/guidecity/app/ui/map/MapViewModel.kt | 82 ++++++++ .../app/ui/onboarding/OnboardingScreen.kt | 40 ++++ .../app/ui/onboarding/OnboardingViewModel.kt | 20 ++ .../app/ui/preference/ContentLengthScreen.kt | 77 +++++++ .../ui/preference/ContentLengthViewModel.kt | 32 +++ .../app/ui/settings/SettingsScreen.kt | 89 ++++++++ .../app/ui/settings/SettingsViewModel.kt | 24 +++ .../res/drawable/ic_launcher_background.xml | 10 + .../res/drawable/ic_launcher_foreground.xml | 14 ++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + .../app/src/main/res/values-ru/strings.xml | 32 +++ android/app/src/main/res/values/colors.xml | 8 + android/app/src/main/res/values/strings.xml | 32 +++ android/app/src/main/res/values/themes.xml | 9 + android/build.gradle.kts | 8 + android/gradle.properties | 4 + android/gradle/libs.versions.toml | 67 ++++++ android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43504 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + android/gradlew | 196 ++++++++++++++++++ android/gradlew.bat | 89 ++++++++ android/local.properties.example | 11 + android/settings.gradle.kts | 21 ++ 59 files changed, 2695 insertions(+) create mode 100644 android/app/build.gradle.kts create mode 100644 android/app/proguard-rules.pro create mode 100644 android/app/src/main/AndroidManifest.xml create mode 100644 android/app/src/main/java/com/guidecity/app/GuideCityApp.kt create mode 100644 android/app/src/main/java/com/guidecity/app/MainActivity.kt create mode 100644 android/app/src/main/java/com/guidecity/app/data/local/db/AppDatabase.kt create mode 100644 android/app/src/main/java/com/guidecity/app/data/local/db/FavoritePlaceDao.kt create mode 100644 android/app/src/main/java/com/guidecity/app/data/local/db/FavoritePlaceEntity.kt create mode 100644 android/app/src/main/java/com/guidecity/app/data/local/prefs/ContentLength.kt create mode 100644 android/app/src/main/java/com/guidecity/app/data/local/prefs/UserPrefsDataStore.kt create mode 100644 android/app/src/main/java/com/guidecity/app/data/remote/ApiService.kt create mode 100644 android/app/src/main/java/com/guidecity/app/data/remote/RetrofitClient.kt create mode 100644 android/app/src/main/java/com/guidecity/app/data/remote/dto/CityDto.kt create mode 100644 android/app/src/main/java/com/guidecity/app/data/remote/dto/NearbyDto.kt create mode 100644 android/app/src/main/java/com/guidecity/app/data/remote/dto/PlaceDto.kt create mode 100644 android/app/src/main/java/com/guidecity/app/data/repository/FavoritesRepository.kt create mode 100644 android/app/src/main/java/com/guidecity/app/data/repository/PlacesRepository.kt create mode 100644 android/app/src/main/java/com/guidecity/app/di/AppModule.kt create mode 100644 android/app/src/main/java/com/guidecity/app/location/LocationProvider.kt create mode 100644 android/app/src/main/java/com/guidecity/app/location/SelectedLocationHolder.kt create mode 100644 android/app/src/main/java/com/guidecity/app/map/DgisMapView.kt create mode 100644 android/app/src/main/java/com/guidecity/app/navigation/NavGraph.kt create mode 100644 android/app/src/main/java/com/guidecity/app/theme/Color.kt create mode 100644 android/app/src/main/java/com/guidecity/app/theme/Theme.kt create mode 100644 android/app/src/main/java/com/guidecity/app/theme/Type.kt create mode 100644 android/app/src/main/java/com/guidecity/app/tts/TtsManager.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/detail/PlaceDetailScreen.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/detail/PlaceDetailViewModel.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/favorites/FavoritesScreen.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/favorites/FavoritesViewModel.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/guide/GuideScreen.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/guide/GuideViewModel.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/guide/PlaceCard.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/guide/PlaceCardStack.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/map/MapScreen.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/map/MapViewModel.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/onboarding/OnboardingScreen.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/onboarding/OnboardingViewModel.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/preference/ContentLengthScreen.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/preference/ContentLengthViewModel.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/settings/SettingsScreen.kt create mode 100644 android/app/src/main/java/com/guidecity/app/ui/settings/SettingsViewModel.kt create mode 100644 android/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 android/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 android/app/src/main/res/values-ru/strings.xml create mode 100644 android/app/src/main/res/values/colors.xml create mode 100644 android/app/src/main/res/values/strings.xml create mode 100644 android/app/src/main/res/values/themes.xml create mode 100644 android/build.gradle.kts create mode 100644 android/gradle.properties create mode 100644 android/gradle/libs.versions.toml create mode 100644 android/gradle/wrapper/gradle-wrapper.jar create mode 100644 android/gradle/wrapper/gradle-wrapper.properties create mode 100755 android/gradlew create mode 100644 android/gradlew.bat create mode 100644 android/local.properties.example create mode 100644 android/settings.gradle.kts diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts new file mode 100644 index 0000000..85db5b1 --- /dev/null +++ b/android/app/build.gradle.kts @@ -0,0 +1,115 @@ +import java.util.Properties + +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.serialization) + alias(libs.plugins.hilt.android) + alias(libs.plugins.ksp) +} + +val localProperties = Properties().apply { + val file = rootProject.file("local.properties") + if (file.exists()) { + file.inputStream().use { load(it) } + } +} + +fun localProp(key: String, default: String): String = + (localProperties.getProperty(key) ?: System.getenv(key) ?: default) + +android { + namespace = "com.guidecity.app" + compileSdk = 34 + + defaultConfig { + applicationId = "com.guidecity.app" + minSdk = 26 + targetSdk = 34 + versionCode = 1 + versionName = "0.1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + + buildConfigField( + "String", + "DGIS_API_KEY", + "\"${localProp("DGIS_API_KEY", "")}\"", + ) + buildConfigField( + "String", + "API_BASE_URL", + "\"${localProp("API_BASE_URL", "http://10.0.2.2:8000/")}\"", + ) + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = "17" + freeCompilerArgs += listOf( + "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api", + ) + } + + buildFeatures { + compose = true + buildConfig = true + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.androidx.activity.compose) + + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + implementation(libs.androidx.material.icons.extended) + implementation(libs.androidx.navigation.compose) + debugImplementation(libs.androidx.ui.tooling) + + implementation(libs.hilt.android) + ksp(libs.hilt.compiler) + implementation(libs.hilt.navigation.compose) + + implementation(libs.retrofit.core) + implementation(libs.retrofit.kotlinx.serialization.converter) + implementation(libs.okhttp.logging.interceptor) + implementation(libs.kotlinx.serialization.json) + + implementation(libs.androidx.room.runtime) + implementation(libs.androidx.room.ktx) + ksp(libs.androidx.room.compiler) + + implementation(libs.androidx.datastore.preferences) + + implementation(libs.play.services.location) + implementation(libs.kotlinx.coroutines.play.services) + + // 2GIS MapKit SDK: add once the exact Maven coordinates/repository are + // confirmed from https://docs.2gis.com/ — see map/DgisMapView.kt for the + // isolated integration point in the meantime. + + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.test.manifest) +} diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro new file mode 100644 index 0000000..70bba3b --- /dev/null +++ b/android/app/proguard-rules.pro @@ -0,0 +1,2 @@ +# Add project specific ProGuard rules here. +# See https://developer.android.com/studio/build/shrink-code for details. diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..f2af286 --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/java/com/guidecity/app/GuideCityApp.kt b/android/app/src/main/java/com/guidecity/app/GuideCityApp.kt new file mode 100644 index 0000000..deece02 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/GuideCityApp.kt @@ -0,0 +1,7 @@ +package com.guidecity.app + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class GuideCityApp : Application() diff --git a/android/app/src/main/java/com/guidecity/app/MainActivity.kt b/android/app/src/main/java/com/guidecity/app/MainActivity.kt new file mode 100644 index 0000000..8920f00 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/MainActivity.kt @@ -0,0 +1,22 @@ +package com.guidecity.app + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import com.guidecity.app.navigation.GuideCityNavHost +import com.guidecity.app.theme.GuideCityTheme +import dagger.hilt.android.AndroidEntryPoint + +@AndroidEntryPoint +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + GuideCityTheme { + GuideCityNavHost() + } + } + } +} diff --git a/android/app/src/main/java/com/guidecity/app/data/local/db/AppDatabase.kt b/android/app/src/main/java/com/guidecity/app/data/local/db/AppDatabase.kt new file mode 100644 index 0000000..fb2b1f5 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/data/local/db/AppDatabase.kt @@ -0,0 +1,9 @@ +package com.guidecity.app.data.local.db + +import androidx.room.Database +import androidx.room.RoomDatabase + +@Database(entities = [FavoritePlaceEntity::class], version = 1, exportSchema = false) +abstract class AppDatabase : RoomDatabase() { + abstract fun favoritePlaceDao(): FavoritePlaceDao +} diff --git a/android/app/src/main/java/com/guidecity/app/data/local/db/FavoritePlaceDao.kt b/android/app/src/main/java/com/guidecity/app/data/local/db/FavoritePlaceDao.kt new file mode 100644 index 0000000..a1093d0 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/data/local/db/FavoritePlaceDao.kt @@ -0,0 +1,27 @@ +package com.guidecity.app.data.local.db + +import androidx.room.Dao +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import kotlinx.coroutines.flow.Flow + +@Dao +interface FavoritePlaceDao { + + @Query("SELECT * FROM favorite_places ORDER BY savedAt DESC") + fun observeAll(): Flow> + + @Query("SELECT EXISTS(SELECT 1 FROM favorite_places WHERE placeId = :placeId)") + fun isFavorite(placeId: Int): Flow + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insert(place: FavoritePlaceEntity) + + @Delete + suspend fun delete(place: FavoritePlaceEntity) + + @Query("DELETE FROM favorite_places WHERE placeId = :placeId") + suspend fun deleteById(placeId: Int) +} diff --git a/android/app/src/main/java/com/guidecity/app/data/local/db/FavoritePlaceEntity.kt b/android/app/src/main/java/com/guidecity/app/data/local/db/FavoritePlaceEntity.kt new file mode 100644 index 0000000..b10ecf4 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/data/local/db/FavoritePlaceEntity.kt @@ -0,0 +1,15 @@ +package com.guidecity.app.data.local.db + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "favorite_places") +data class FavoritePlaceEntity( + @PrimaryKey val placeId: Int, + val slug: String, + val name: String, + val category: String, + val lat: Double, + val lon: Double, + val savedAt: Long, +) diff --git a/android/app/src/main/java/com/guidecity/app/data/local/prefs/ContentLength.kt b/android/app/src/main/java/com/guidecity/app/data/local/prefs/ContentLength.kt new file mode 100644 index 0000000..b223b65 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/data/local/prefs/ContentLength.kt @@ -0,0 +1,11 @@ +package com.guidecity.app.data.local.prefs + +enum class ContentLength { + SHORT, + MEDIUM, + LONG, + ; + + /** The lowercase value the backend API expects for the `length` query param. */ + fun toApiValue(): String = name.lowercase() +} diff --git a/android/app/src/main/java/com/guidecity/app/data/local/prefs/UserPrefsDataStore.kt b/android/app/src/main/java/com/guidecity/app/data/local/prefs/UserPrefsDataStore.kt new file mode 100644 index 0000000..4a1c6cc --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/data/local/prefs/UserPrefsDataStore.kt @@ -0,0 +1,41 @@ +package com.guidecity.app.data.local.prefs + +import android.content.Context +import androidx.datastore.preferences.core.booleanPreferencesKey +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.map +import javax.inject.Inject +import javax.inject.Singleton + +private val Context.dataStore by preferencesDataStore(name = "guide_city_prefs") + +@Singleton +class UserPrefsDataStore @Inject constructor( + @ApplicationContext private val context: Context, +) { + private object Keys { + val ONBOARDING_SEEN = booleanPreferencesKey("onboarding_seen") + val CONTENT_LENGTH = stringPreferencesKey("content_length_pref") + } + + val onboardingSeen: Flow = + context.dataStore.data.map { it[Keys.ONBOARDING_SEEN] ?: false } + + suspend fun setOnboardingSeen(seen: Boolean) { + context.dataStore.edit { it[Keys.ONBOARDING_SEEN] = seen } + } + + /** Null until the user has made a choice on the content-length picker screen. */ + val contentLength: Flow = + context.dataStore.data.map { prefs -> + prefs[Keys.CONTENT_LENGTH]?.let { runCatching { ContentLength.valueOf(it) }.getOrNull() } + } + + suspend fun setContentLength(length: ContentLength) { + context.dataStore.edit { it[Keys.CONTENT_LENGTH] = length.name } + } +} diff --git a/android/app/src/main/java/com/guidecity/app/data/remote/ApiService.kt b/android/app/src/main/java/com/guidecity/app/data/remote/ApiService.kt new file mode 100644 index 0000000..a7646f2 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/data/remote/ApiService.kt @@ -0,0 +1,51 @@ +package com.guidecity.app.data.remote + +import com.guidecity.app.data.remote.dto.CityDto +import com.guidecity.app.data.remote.dto.NearbyResponseDto +import com.guidecity.app.data.remote.dto.PlaceDetailDto +import com.guidecity.app.data.remote.dto.PlaceListItemDto +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface ApiService { + + @GET("api/v1/cities") + suspend fun getCities(): List + + @GET("api/v1/cities/{citySlug}/places") + suspend fun getCityPlaces( + @Path("citySlug") citySlug: String, + @Query("lang") lang: String = "ru", + @Query("category") category: String? = null, + @Query("district") district: String? = null, + @Query("q") q: String? = null, + ): List + + @GET("api/v1/places/{placeId}") + suspend fun getPlace( + @Path("placeId") placeId: Int, + @Query("lang") lang: String = "ru", + @Query("length") length: String = "medium", + ): PlaceDetailDto + + @GET("api/v1/places/search") + suspend fun searchPlaces( + @Query("q") q: String, + @Query("city_slug") citySlug: String? = null, + @Query("lang") lang: String = "ru", + ): List + + @GET("api/v1/nearby") + suspend fun getNearby( + @Query("lat") lat: Double, + @Query("lon") lon: Double, + @Query("city_slug") citySlug: String? = null, + @Query("lang") lang: String = "ru", + @Query("length") length: String = "medium", + @Query("min_results") minResults: Int = 5, + @Query("initial_radius_m") initialRadiusM: Int = 300, + @Query("step_m") stepM: Int = 200, + @Query("max_radius_m") maxRadiusM: Int = 5000, + ): NearbyResponseDto +} diff --git a/android/app/src/main/java/com/guidecity/app/data/remote/RetrofitClient.kt b/android/app/src/main/java/com/guidecity/app/data/remote/RetrofitClient.kt new file mode 100644 index 0000000..198ff83 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/data/remote/RetrofitClient.kt @@ -0,0 +1,40 @@ +package com.guidecity.app.data.remote + +import com.guidecity.app.BuildConfig +import kotlinx.serialization.json.Json +import okhttp3.MediaType.Companion.toMediaType +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor +import retrofit2.Retrofit +import retrofit2.converter.kotlinx.serialization.asConverterFactory + +object RetrofitClient { + + private val json = Json { + ignoreUnknownKeys = true + isLenient = true + } + + private val okHttpClient: OkHttpClient by lazy { + OkHttpClient.Builder() + .addInterceptor( + HttpLoggingInterceptor().apply { + level = if (BuildConfig.DEBUG) { + HttpLoggingInterceptor.Level.BODY + } else { + HttpLoggingInterceptor.Level.NONE + } + }, + ) + .build() + } + + val apiService: ApiService by lazy { + Retrofit.Builder() + .baseUrl(BuildConfig.API_BASE_URL) + .client(okHttpClient) + .addConverterFactory(json.asConverterFactory("application/json".toMediaType())) + .build() + .create(ApiService::class.java) + } +} diff --git a/android/app/src/main/java/com/guidecity/app/data/remote/dto/CityDto.kt b/android/app/src/main/java/com/guidecity/app/data/remote/dto/CityDto.kt new file mode 100644 index 0000000..1f68595 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/data/remote/dto/CityDto.kt @@ -0,0 +1,23 @@ +package com.guidecity.app.data.remote.dto + +import kotlinx.serialization.Serializable + +@Serializable +data class LatLonDto( + val lat: Double, + val lon: Double, +) + +@Serializable +data class LocalizedNameDto( + val ru: String, + val en: String, +) + +@Serializable +data class CityDto( + val id: Int, + val slug: String, + val name: LocalizedNameDto, + val center: LatLonDto? = null, +) diff --git a/android/app/src/main/java/com/guidecity/app/data/remote/dto/NearbyDto.kt b/android/app/src/main/java/com/guidecity/app/data/remote/dto/NearbyDto.kt new file mode 100644 index 0000000..131070f --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/data/remote/dto/NearbyDto.kt @@ -0,0 +1,26 @@ +package com.guidecity.app.data.remote.dto + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class NearbyPlaceDto( + val id: Int, + val slug: String, + val category: String, + val location: LatLonDto, + val address: String? = null, + val district: String? = null, + @SerialName("built_year") val builtYear: String? = null, + @SerialName("architect_builder") val architectBuilder: String? = null, + @SerialName("architectural_style") val architecturalStyle: String? = null, + val content: ContentDto, + @SerialName("distance_m") val distanceM: Double, +) + +@Serializable +data class NearbyResponseDto( + @SerialName("search_radius_m") val searchRadiusM: Int, + val count: Int, + val places: List, +) diff --git a/android/app/src/main/java/com/guidecity/app/data/remote/dto/PlaceDto.kt b/android/app/src/main/java/com/guidecity/app/data/remote/dto/PlaceDto.kt new file mode 100644 index 0000000..58ff89b --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/data/remote/dto/PlaceDto.kt @@ -0,0 +1,35 @@ +package com.guidecity.app.data.remote.dto + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class ContentDto( + val language: String, + val length: String, + val title: String, + val body: String, +) + +@Serializable +data class PlaceListItemDto( + val id: Int, + val slug: String, + val category: String, + val name: String, + val location: LatLonDto, +) + +@Serializable +data class PlaceDetailDto( + val id: Int, + val slug: String, + val category: String, + val location: LatLonDto, + val address: String? = null, + val district: String? = null, + @SerialName("built_year") val builtYear: String? = null, + @SerialName("architect_builder") val architectBuilder: String? = null, + @SerialName("architectural_style") val architecturalStyle: String? = null, + val content: ContentDto, +) diff --git a/android/app/src/main/java/com/guidecity/app/data/repository/FavoritesRepository.kt b/android/app/src/main/java/com/guidecity/app/data/repository/FavoritesRepository.kt new file mode 100644 index 0000000..503000d --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/data/repository/FavoritesRepository.kt @@ -0,0 +1,20 @@ +package com.guidecity.app.data.repository + +import com.guidecity.app.data.local.db.FavoritePlaceDao +import com.guidecity.app.data.local.db.FavoritePlaceEntity +import kotlinx.coroutines.flow.Flow +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class FavoritesRepository @Inject constructor( + private val dao: FavoritePlaceDao, +) { + fun observeFavorites(): Flow> = dao.observeAll() + + fun isFavorite(placeId: Int): Flow = dao.isFavorite(placeId) + + suspend fun addFavorite(place: FavoritePlaceEntity) = dao.insert(place) + + suspend fun removeFavorite(placeId: Int) = dao.deleteById(placeId) +} diff --git a/android/app/src/main/java/com/guidecity/app/data/repository/PlacesRepository.kt b/android/app/src/main/java/com/guidecity/app/data/repository/PlacesRepository.kt new file mode 100644 index 0000000..1890d6e --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/data/repository/PlacesRepository.kt @@ -0,0 +1,45 @@ +package com.guidecity.app.data.repository + +import com.guidecity.app.data.remote.ApiService +import com.guidecity.app.data.remote.dto.CityDto +import com.guidecity.app.data.remote.dto.NearbyResponseDto +import com.guidecity.app.data.remote.dto.PlaceDetailDto +import com.guidecity.app.data.remote.dto.PlaceListItemDto +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class PlacesRepository @Inject constructor( + private val apiService: ApiService, +) { + suspend fun getCities(): List = apiService.getCities() + + suspend fun getPlace(placeId: Int, lang: String, length: String): PlaceDetailDto = + apiService.getPlace(placeId, lang, length) + + suspend fun searchPlaces(query: String, citySlug: String?, lang: String): List = + apiService.searchPlaces(query, citySlug, lang) + + /** + * Fetches nearby places sorted by distance, iteratively expanding the + * search radius server-side until at least [minResults] are found. + * + * `speed`/`heading`-aware filtering is a reserved v2 extension on the + * backend (see nearby_search.py); this client doesn't send them yet. + */ + suspend fun getNearby( + lat: Double, + lon: Double, + citySlug: String?, + lang: String, + length: String, + minResults: Int = 5, + ): NearbyResponseDto = apiService.getNearby( + lat = lat, + lon = lon, + citySlug = citySlug, + lang = lang, + length = length, + minResults = minResults, + ) +} diff --git a/android/app/src/main/java/com/guidecity/app/di/AppModule.kt b/android/app/src/main/java/com/guidecity/app/di/AppModule.kt new file mode 100644 index 0000000..4f22d86 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/di/AppModule.kt @@ -0,0 +1,32 @@ +package com.guidecity.app.di + +import android.content.Context +import androidx.room.Room +import com.guidecity.app.data.local.db.AppDatabase +import com.guidecity.app.data.local.db.FavoritePlaceDao +import com.guidecity.app.data.remote.ApiService +import com.guidecity.app.data.remote.RetrofitClient +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 AppModule { + + @Provides + @Singleton + fun provideApiService(): ApiService = RetrofitClient.apiService + + @Provides + @Singleton + fun provideAppDatabase(@ApplicationContext context: Context): AppDatabase = + Room.databaseBuilder(context, AppDatabase::class.java, "guide_city.db").build() + + @Provides + @Singleton + fun provideFavoritePlaceDao(database: AppDatabase): FavoritePlaceDao = database.favoritePlaceDao() +} diff --git a/android/app/src/main/java/com/guidecity/app/location/LocationProvider.kt b/android/app/src/main/java/com/guidecity/app/location/LocationProvider.kt new file mode 100644 index 0000000..c62bac0 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/location/LocationProvider.kt @@ -0,0 +1,43 @@ +package com.guidecity.app.location + +import android.Manifest +import android.annotation.SuppressLint +import android.content.Context +import android.content.pm.PackageManager +import androidx.core.content.ContextCompat +import com.google.android.gms.location.FusedLocationProviderClient +import com.google.android.gms.location.LocationServices +import com.google.android.gms.location.Priority +import dagger.hilt.android.qualifiers.ApplicationContext +import kotlinx.coroutines.tasks.await +import javax.inject.Inject +import javax.inject.Singleton + +data class LatLon(val lat: Double, val lon: Double) + +@Singleton +class LocationProvider @Inject constructor( + @ApplicationContext private val context: Context, +) { + private val fusedClient: FusedLocationProviderClient by lazy { + LocationServices.getFusedLocationProviderClient(context) + } + + fun hasLocationPermission(): Boolean { + val fine = ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) + val coarse = ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) + return fine == PackageManager.PERMISSION_GRANTED || coarse == PackageManager.PERMISSION_GRANTED + } + + /** Returns null if permission isn't granted or no location could be resolved. */ + @SuppressLint("MissingPermission") + suspend fun getCurrentLocation(): LatLon? { + if (!hasLocationPermission()) return null + + val current = fusedClient + .getCurrentLocation(Priority.PRIORITY_BALANCED_POWER_ACCURACY, null) + .await() + val location = current ?: fusedClient.lastLocation.await() + return location?.let { LatLon(it.latitude, it.longitude) } + } +} diff --git a/android/app/src/main/java/com/guidecity/app/location/SelectedLocationHolder.kt b/android/app/src/main/java/com/guidecity/app/location/SelectedLocationHolder.kt new file mode 100644 index 0000000..231310b --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/location/SelectedLocationHolder.kt @@ -0,0 +1,22 @@ +package com.guidecity.app.location + +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import javax.inject.Inject +import javax.inject.Singleton + +/** + * Carries the location resolved on the map screen (via GPS or a typed-place + * search fallback) over to the guide screen, without threading it through + * Compose Navigation arguments. + */ +@Singleton +class SelectedLocationHolder @Inject constructor() { + private val _location = MutableStateFlow(null) + val location: StateFlow = _location.asStateFlow() + + fun set(latLon: LatLon) { + _location.value = latLon + } +} diff --git a/android/app/src/main/java/com/guidecity/app/map/DgisMapView.kt b/android/app/src/main/java/com/guidecity/app/map/DgisMapView.kt new file mode 100644 index 0000000..6c3af65 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/map/DgisMapView.kt @@ -0,0 +1,87 @@ +package com.guidecity.app.map + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.background +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 +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.unit.dp +import com.guidecity.app.data.remote.dto.NearbyPlaceDto +import com.guidecity.app.location.LatLon +import com.guidecity.app.theme.Mocha +import kotlin.math.cos + +/** + * Isolated integration point for the 2GIS MapKit SDK. + * + * This currently renders a lightweight placeholder (user location centered, + * nearby places plotted by relative lat/lon offset) so the rest of the app + * — permission flow, nearby fetch, navigation to place detail — is fully + * functional and demoable before the real SDK is wired in. + * + * To integrate the real map: replace the Canvas placeholder below with the + * 2GIS MapKit view (see android/build.gradle.kts and settings.gradle.kts for + * the pending dependency/repository TODOs — the exact Maven coordinates need + * confirming from https://docs.2gis.com/), keeping this function's signature + * so callers (MapScreen, GuideScreen) don't need to change. + */ +@Composable +fun DgisMapView( + userLocation: LatLon?, + places: List, + onPlaceClick: (placeId: Int) -> Unit, + modifier: Modifier = Modifier, +) { + Box( + modifier = modifier + .fillMaxSize() + .background(Mocha.Mantle), + contentAlignment = Alignment.Center, + ) { + if (userLocation == null) { + Text( + text = "Map placeholder — waiting for location", + color = Mocha.Subtext1, + style = MaterialTheme.typography.bodyLarge, + ) + return@Box + } + + Canvas(modifier = Modifier.fillMaxSize()) { + val centerX = size.width / 2f + val centerY = size.height / 2f + val metersPerDegreeLat = 111_320.0 + val metersPerDegreeLon = 111_320.0 * cos(Math.toRadians(userLocation.lat)) + val pixelsPerMeter = 0.6f + + fun offsetFor(lat: Double, lon: Double): Offset { + val dyMeters = (lat - userLocation.lat) * metersPerDegreeLat + val dxMeters = (lon - userLocation.lon) * metersPerDegreeLon + return Offset( + x = centerX + (dxMeters * pixelsPerMeter).toFloat(), + y = centerY - (dyMeters * pixelsPerMeter).toFloat(), + ) + } + + // User location marker. + drawCircle(color = Mocha.Blue, radius = 14f, center = Offset(centerX, centerY)) + drawCircle( + color = Mocha.Blue, + radius = 22f, + center = Offset(centerX, centerY), + style = Stroke(width = 3f), + ) + + places.forEach { place -> + val point = offsetFor(place.location.lat, place.location.lon) + drawCircle(color = Mocha.Peach, radius = 10f, center = point) + } + } + } +} diff --git a/android/app/src/main/java/com/guidecity/app/navigation/NavGraph.kt b/android/app/src/main/java/com/guidecity/app/navigation/NavGraph.kt new file mode 100644 index 0000000..8e4d03d --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/navigation/NavGraph.kt @@ -0,0 +1,117 @@ +package com.guidecity.app.navigation + +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.Surface +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.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import com.guidecity.app.data.local.prefs.UserPrefsDataStore +import com.guidecity.app.ui.detail.PlaceDetailScreen +import com.guidecity.app.ui.favorites.FavoritesScreen +import com.guidecity.app.ui.guide.GuideScreen +import com.guidecity.app.ui.map.MapScreen +import com.guidecity.app.ui.onboarding.OnboardingScreen +import com.guidecity.app.ui.preference.ContentLengthScreen +import com.guidecity.app.ui.settings.SettingsScreen +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.stateIn +import javax.inject.Inject + +object Routes { + const val ONBOARDING = "onboarding" + const val CONTENT_LENGTH_PICKER = "content_length_picker" + const val MAP = "map" + const val GUIDE = "guide" + const val DETAIL = "detail/{placeId}" + const val FAVORITES = "favorites" + const val SETTINGS = "settings" + + fun detail(placeId: Int) = "detail/$placeId" +} + +/** Decides the start destination from persisted onboarding/content-length prefs. */ +@HiltViewModel +class AppEntryViewModel @Inject constructor( + userPrefsDataStore: UserPrefsDataStore, +) : ViewModel() { + val startDestination = combine( + userPrefsDataStore.onboardingSeen, + userPrefsDataStore.contentLength, + ) { seen, length -> + when { + !seen -> Routes.ONBOARDING + length == null -> Routes.CONTENT_LENGTH_PICKER + else -> Routes.MAP + } + }.stateIn(viewModelScope, SharingStarted.Eagerly, null) +} + +@Composable +fun GuideCityNavHost() { + val navController = rememberNavController() + val entryViewModel: AppEntryViewModel = hiltViewModel() + val startDestination by entryViewModel.startDestination.collectAsState() + + Surface(modifier = Modifier.fillMaxSize()) { + val resolvedStart = startDestination ?: return@Surface // waiting on first DataStore emission + + NavHost(navController = navController, startDestination = resolvedStart) { + composable(Routes.ONBOARDING) { + OnboardingScreen( + onContinue = { + navController.navigate(Routes.CONTENT_LENGTH_PICKER) { + popUpTo(Routes.ONBOARDING) { inclusive = true } + } + }, + ) + } + composable(Routes.CONTENT_LENGTH_PICKER) { + ContentLengthScreen( + onContinue = { + navController.navigate(Routes.MAP) { + popUpTo(Routes.CONTENT_LENGTH_PICKER) { inclusive = true } + } + }, + ) + } + composable(Routes.MAP) { + MapScreen( + onLocationResolved = { navController.navigate(Routes.GUIDE) }, + onOpenFavorites = { navController.navigate(Routes.FAVORITES) }, + onOpenSettings = { navController.navigate(Routes.SETTINGS) }, + ) + } + composable(Routes.GUIDE) { + GuideScreen( + onOpenDetail = { placeId -> navController.navigate(Routes.detail(placeId)) }, + onOpenFavorites = { navController.navigate(Routes.FAVORITES) }, + onOpenSettings = { navController.navigate(Routes.SETTINGS) }, + ) + } + composable(Routes.DETAIL) { backStackEntry -> + val placeId = backStackEntry.arguments?.getString("placeId")?.toIntOrNull() + if (placeId != null) { + PlaceDetailScreen(placeId = placeId, onBack = { navController.popBackStack() }) + } + } + composable(Routes.FAVORITES) { + FavoritesScreen( + onBack = { navController.popBackStack() }, + onOpenDetail = { placeId -> navController.navigate(Routes.detail(placeId)) }, + ) + } + composable(Routes.SETTINGS) { + SettingsScreen(onBack = { navController.popBackStack() }) + } + } + } +} diff --git a/android/app/src/main/java/com/guidecity/app/theme/Color.kt b/android/app/src/main/java/com/guidecity/app/theme/Color.kt new file mode 100644 index 0000000..3aed29b --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/theme/Color.kt @@ -0,0 +1,44 @@ +package com.guidecity.app.theme + +import androidx.compose.ui.graphics.Color + +// Catppuccin Mocha palette — https://github.com/catppuccin/catppuccin +object Mocha { + val Rosewater = Color(0xFFF5E0DC) + val Flamingo = Color(0xFFF2CDCD) + val Pink = Color(0xFFF5C2E7) + val Mauve = Color(0xFFCBA6F7) + val Red = Color(0xFFF38BA8) + val Maroon = Color(0xFFEBA0AC) + val Peach = Color(0xFFFAB387) + val Yellow = Color(0xFFF9E2AF) + val Green = Color(0xFFA6E3A1) + val Teal = Color(0xFF94E2D5) + val Sky = Color(0xFF89DCEB) + val Sapphire = Color(0xFF74C7EC) + val Blue = Color(0xFF89B4FA) + val Lavender = Color(0xFFB4BEFE) + val Text = Color(0xFFCDD6F4) + val Subtext1 = Color(0xFFBAC2DE) + val Subtext0 = Color(0xFFA6ADC8) + val Overlay2 = Color(0xFF9399B2) + val Overlay1 = Color(0xFF7F849C) + val Overlay0 = Color(0xFF6C7086) + val Surface2 = Color(0xFF585B70) + val Surface1 = Color(0xFF45475A) + val Surface0 = Color(0xFF313244) + val Base = Color(0xFF1E1E2E) + val Mantle = Color(0xFF181825) + val Crust = Color(0xFF11111B) +} + +/** + * Semantic colors for the guide card stack, distinct from Material3 roles: + * which card is currently narrating, which is done, which hasn't played yet. + */ +object GuideStackColors { + val ActiveCard = Mocha.Green + val DoneCard = Mocha.Overlay0 + val UpcomingCard = Mocha.Surface2 + val FavoriteMark = Mocha.Pink +} diff --git a/android/app/src/main/java/com/guidecity/app/theme/Theme.kt b/android/app/src/main/java/com/guidecity/app/theme/Theme.kt new file mode 100644 index 0000000..5cdaf19 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/theme/Theme.kt @@ -0,0 +1,44 @@ +package com.guidecity.app.theme + +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.runtime.Composable + +/** + * guideCity ships a single Catppuccin Mocha (dark) palette. It's mapped onto + * both the dark and light color schemes so the app looks the same regardless + * of the system theme, rather than inverting to a light palette. + */ +private val MochaColorScheme = darkColorScheme( + primary = Mocha.Mauve, + onPrimary = Mocha.Crust, + primaryContainer = Mocha.Surface0, + onPrimaryContainer = Mocha.Text, + secondary = Mocha.Sky, + onSecondary = Mocha.Crust, + secondaryContainer = Mocha.Surface1, + onSecondaryContainer = Mocha.Text, + tertiary = Mocha.Peach, + onTertiary = Mocha.Crust, + background = Mocha.Base, + onBackground = Mocha.Text, + surface = Mocha.Mantle, + onSurface = Mocha.Text, + surfaceVariant = Mocha.Surface0, + onSurfaceVariant = Mocha.Subtext1, + outline = Mocha.Overlay1, + error = Mocha.Red, + onError = Mocha.Crust, + errorContainer = Mocha.Maroon, +) + +@Composable +fun GuideCityTheme(content: @Composable () -> Unit) { + // The Mocha palette is used for both system themes rather than swapping + // to a light variant, so isSystemInDarkTheme() is deliberately unused. + MaterialTheme( + colorScheme = MochaColorScheme, + typography = GuideCityTypography, + content = content, + ) +} diff --git a/android/app/src/main/java/com/guidecity/app/theme/Type.kt b/android/app/src/main/java/com/guidecity/app/theme/Type.kt new file mode 100644 index 0000000..4181450 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/theme/Type.kt @@ -0,0 +1,31 @@ +package com.guidecity.app.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +val GuideCityTypography = Typography( + bodyLarge = TextStyle( + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp, + ), + titleLarge = TextStyle( + fontWeight = FontWeight.SemiBold, + fontSize = 22.sp, + lineHeight = 28.sp, + ), + titleMedium = TextStyle( + fontWeight = FontWeight.Medium, + fontSize = 18.sp, + lineHeight = 24.sp, + ), + labelLarge = TextStyle( + fontWeight = FontWeight.Medium, + fontSize = 14.sp, + lineHeight = 20.sp, + letterSpacing = 0.1.sp, + ), +) diff --git a/android/app/src/main/java/com/guidecity/app/tts/TtsManager.kt b/android/app/src/main/java/com/guidecity/app/tts/TtsManager.kt new file mode 100644 index 0000000..7a1c145 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/tts/TtsManager.kt @@ -0,0 +1,92 @@ +package com.guidecity.app.tts + +import android.content.Context +import android.speech.tts.TextToSpeech +import android.speech.tts.UtteranceProgressListener +import dagger.hilt.android.qualifiers.ApplicationContext +import java.util.Locale +import java.util.UUID +import javax.inject.Inject +import javax.inject.Singleton + +/** + * Wraps Android's built-in, on-device [TextToSpeech] engine — this satisfies + * the app's "local voice narration" requirement without a custom ML model. + * + * A single app-wide instance is shared by the guide screen and the place + * detail screen (both injected via Hilt) so only one narration plays at a + * time; calling [speak] naturally interrupts whatever was playing before via + * [TextToSpeech.QUEUE_FLUSH]. + */ +@Singleton +class TtsManager @Inject constructor( + @ApplicationContext context: Context, +) { + private var isReady = false + private var pendingUtterance: Pair Unit)?>? = null + private var onDoneCallback: (() -> Unit)? = null + private var lastSpokenText: String? = null + + var isMuted: Boolean = false + private set + + private val tts: TextToSpeech = TextToSpeech(context) { status -> + isReady = status == TextToSpeech.SUCCESS + pendingUtterance?.let { (text, onDone) -> speakInternal(text, onDone) } + pendingUtterance = null + }.apply { + setOnUtteranceProgressListener( + object : UtteranceProgressListener() { + override fun onStart(utteranceId: String?) = Unit + + override fun onDone(utteranceId: String?) { + onDoneCallback?.invoke() + } + + @Deprecated("Deprecated in Java, but still the callback the platform invokes") + override fun onError(utteranceId: String?) = Unit + }, + ) + } + + fun setLanguage(locale: Locale) { + tts.language = locale + } + + /** Speaks [text], calling [onDone] on the main thread once narration finishes. */ + fun speak(text: String, onDone: (() -> Unit)? = null) { + lastSpokenText = text + onDoneCallback = onDone + if (isMuted) return + if (!isReady) { + pendingUtterance = text to onDone + return + } + speakInternal(text, onDone) + } + + private fun speakInternal(text: String, onDone: (() -> Unit)?) { + onDoneCallback = onDone + tts.speak(text, TextToSpeech.QUEUE_FLUSH, null, UUID.randomUUID().toString()) + } + + /** Stops narration and suppresses further [speak] calls until [unmute]. */ + fun mute() { + isMuted = true + tts.stop() + } + + /** Resumes narration from the start of the last spoken text. */ + fun unmute() { + isMuted = false + lastSpokenText?.let { speakInternal(it, onDoneCallback) } + } + + fun stop() { + tts.stop() + } + + fun shutdown() { + tts.shutdown() + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/detail/PlaceDetailScreen.kt b/android/app/src/main/java/com/guidecity/app/ui/detail/PlaceDetailScreen.kt new file mode 100644 index 0000000..0c77b9c --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/detail/PlaceDetailScreen.kt @@ -0,0 +1,109 @@ +package com.guidecity.app.ui.detail + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.filled.Favorite +import androidx.compose.material.icons.filled.FavoriteBorder +import androidx.compose.material.icons.filled.VolumeOff +import androidx.compose.material.icons.filled.VolumeUp +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import com.guidecity.app.R +import com.guidecity.app.theme.GuideStackColors + +@Composable +fun PlaceDetailScreen( + placeId: Int, + onBack: () -> Unit, + viewModel: PlaceDetailViewModel = hiltViewModel(), +) { + val state by viewModel.uiState.collectAsState() + val isFavorite by viewModel.isFavorite.collectAsState() + + Scaffold( + topBar = { + TopAppBar( + title = { Text(state.place?.content?.title.orEmpty()) }, + navigationIcon = { + IconButton(onClick = onBack) { + Icon(Icons.Filled.ArrowBack, contentDescription = null) + } + }, + actions = { + IconButton(onClick = { viewModel.toggleMute() }) { + Icon( + imageVector = if (state.isMuted) Icons.Filled.VolumeOff else Icons.Filled.VolumeUp, + contentDescription = stringResource( + if (state.isMuted) R.string.guide_unmute else R.string.guide_mute, + ), + ) + } + IconButton(onClick = { viewModel.toggleFavorite() }) { + Icon( + imageVector = if (isFavorite) Icons.Filled.Favorite else Icons.Filled.FavoriteBorder, + contentDescription = stringResource( + if (isFavorite) R.string.guide_favorite_remove else R.string.guide_favorite_add, + ), + tint = if (isFavorite) { + GuideStackColors.FavoriteMark + } else { + MaterialTheme.colorScheme.onSurface + }, + ) + } + }, + ) + }, + ) { padding -> + Box( + modifier = Modifier + .fillMaxSize() + .padding(padding), + ) { + val place = state.place + when { + state.isLoading -> { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator() + } + } + + place == null -> { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text(text = stringResource(R.string.place_not_found)) + } + } + + else -> { + Column( + modifier = Modifier + .fillMaxSize() + .verticalScroll(rememberScrollState()) + .padding(16.dp), + ) { + Text(text = place.content.body, style = MaterialTheme.typography.bodyLarge) + } + } + } + } + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/detail/PlaceDetailViewModel.kt b/android/app/src/main/java/com/guidecity/app/ui/detail/PlaceDetailViewModel.kt new file mode 100644 index 0000000..5253e79 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/detail/PlaceDetailViewModel.kt @@ -0,0 +1,93 @@ +package com.guidecity.app.ui.detail + +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.guidecity.app.data.local.db.FavoritePlaceEntity +import com.guidecity.app.data.local.prefs.ContentLength +import com.guidecity.app.data.local.prefs.UserPrefsDataStore +import com.guidecity.app.data.remote.dto.PlaceDetailDto +import com.guidecity.app.data.repository.FavoritesRepository +import com.guidecity.app.data.repository.PlacesRepository +import com.guidecity.app.tts.TtsManager +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch +import javax.inject.Inject + +data class PlaceDetailUiState( + val isLoading: Boolean = true, + val place: PlaceDetailDto? = null, + val isMuted: Boolean = false, +) + +/** + * Self-contained per-place narrator: works whether reached from the guide + * card stack, favorites, or search. On narration completion the user goes + * back manually — auto-advancing straight to the *next* nearby place's + * detail (as in the original spec) would need this screen to share + * GuideViewModel's ordered list, which only exists when arriving from the + * guide screen; left as a follow-up once that shared-state wiring is added. + */ +@HiltViewModel +class PlaceDetailViewModel @Inject constructor( + savedStateHandle: SavedStateHandle, + private val placesRepository: PlacesRepository, + private val favoritesRepository: FavoritesRepository, + private val userPrefsDataStore: UserPrefsDataStore, + private val ttsManager: TtsManager, +) : ViewModel() { + + private val placeId: Int = checkNotNull(savedStateHandle.get("placeId")).toInt() + + private val _uiState = MutableStateFlow(PlaceDetailUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + val isFavorite: StateFlow = favoritesRepository.isFavorite(placeId) + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), false) + + init { + viewModelScope.launch { + val length = (userPrefsDataStore.contentLength.first() ?: ContentLength.MEDIUM).toApiValue() + val place = runCatching { placesRepository.getPlace(placeId, lang = "ru", length = length) }.getOrNull() + _uiState.value = _uiState.value.copy(isLoading = false, place = place) + place?.let { ttsManager.speak(it.content.body) } + } + } + + fun toggleMute() { + if (ttsManager.isMuted) ttsManager.unmute() else ttsManager.mute() + _uiState.value = _uiState.value.copy(isMuted = ttsManager.isMuted) + } + + fun toggleFavorite() { + val place = _uiState.value.place ?: return + viewModelScope.launch { + if (isFavorite.value) { + favoritesRepository.removeFavorite(placeId) + } else { + favoritesRepository.addFavorite( + FavoritePlaceEntity( + placeId = placeId, + slug = place.slug, + name = place.content.title, + category = place.category, + lat = place.location.lat, + lon = place.location.lon, + savedAt = System.currentTimeMillis(), + ), + ) + } + } + } + + override fun onCleared() { + super.onCleared() + ttsManager.stop() + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/favorites/FavoritesScreen.kt b/android/app/src/main/java/com/guidecity/app/ui/favorites/FavoritesScreen.kt new file mode 100644 index 0000000..edf3cca --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/favorites/FavoritesScreen.kt @@ -0,0 +1,67 @@ +package com.guidecity.app.ui.favorites + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.ListItem +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.hilt.navigation.compose.hiltViewModel +import com.guidecity.app.R + +@Composable +fun FavoritesScreen( + onBack: () -> Unit, + onOpenDetail: (placeId: Int) -> Unit, + viewModel: FavoritesViewModel = hiltViewModel(), +) { + val favorites by viewModel.favorites.collectAsState() + + Scaffold( + topBar = { + TopAppBar( + title = { Text(stringResource(R.string.favorites_title)) }, + navigationIcon = { + IconButton(onClick = onBack) { + Icon(Icons.Filled.ArrowBack, contentDescription = null) + } + }, + ) + }, + ) { padding -> + Box( + modifier = Modifier + .fillMaxSize() + .padding(padding), + ) { + if (favorites.isEmpty()) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text(text = stringResource(R.string.favorites_empty)) + } + } else { + LazyColumn { + items(favorites, key = { it.placeId }) { favorite -> + ListItem( + headlineContent = { Text(favorite.name) }, + modifier = Modifier.clickable { onOpenDetail(favorite.placeId) }, + ) + } + } + } + } + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/favorites/FavoritesViewModel.kt b/android/app/src/main/java/com/guidecity/app/ui/favorites/FavoritesViewModel.kt new file mode 100644 index 0000000..aa6e104 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/favorites/FavoritesViewModel.kt @@ -0,0 +1,19 @@ +package com.guidecity.app.ui.favorites + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.guidecity.app.data.local.db.FavoritePlaceEntity +import com.guidecity.app.data.repository.FavoritesRepository +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.stateIn +import javax.inject.Inject + +@HiltViewModel +class FavoritesViewModel @Inject constructor( + favoritesRepository: FavoritesRepository, +) : ViewModel() { + val favorites: StateFlow> = favoritesRepository.observeFavorites() + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), emptyList()) +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/guide/GuideScreen.kt b/android/app/src/main/java/com/guidecity/app/ui/guide/GuideScreen.kt new file mode 100644 index 0000000..b0c40e3 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/guide/GuideScreen.kt @@ -0,0 +1,89 @@ +package com.guidecity.app.ui.guide + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Favorite +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material.icons.filled.VolumeOff +import androidx.compose.material.icons.filled.VolumeUp +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.hilt.navigation.compose.hiltViewModel +import com.guidecity.app.R + +@Composable +fun GuideScreen( + onOpenDetail: (placeId: Int) -> Unit, + onOpenFavorites: () -> Unit, + onOpenSettings: () -> Unit, + viewModel: GuideViewModel = hiltViewModel(), +) { + val state by viewModel.uiState.collectAsState() + + Scaffold( + topBar = { + TopAppBar( + title = { Text(stringResource(R.string.app_name)) }, + actions = { + IconButton(onClick = { viewModel.toggleMute() }) { + Icon( + imageVector = if (state.isMuted) Icons.Filled.VolumeOff else Icons.Filled.VolumeUp, + contentDescription = stringResource( + if (state.isMuted) R.string.guide_unmute else R.string.guide_mute, + ), + ) + } + IconButton(onClick = onOpenFavorites) { + Icon(Icons.Filled.Favorite, contentDescription = stringResource(R.string.favorites_title)) + } + IconButton(onClick = onOpenSettings) { + Icon(Icons.Filled.Settings, contentDescription = stringResource(R.string.settings_title)) + } + }, + ) + }, + ) { padding -> + Box( + modifier = Modifier + .fillMaxSize() + .padding(padding), + ) { + when { + state.isLoading -> { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator() + } + } + + state.places.isEmpty() -> { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text(text = stringResource(R.string.guide_no_places_nearby)) + } + } + + else -> { + PlaceCardStack( + places = state.places, + activeIndex = state.activeIndex, + doneIndices = state.doneIndices, + onCardClick = onOpenDetail, + onPageChanged = { viewModel.setActiveIndex(it) }, + modifier = Modifier.fillMaxSize(), + ) + } + } + } + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/guide/GuideViewModel.kt b/android/app/src/main/java/com/guidecity/app/ui/guide/GuideViewModel.kt new file mode 100644 index 0000000..425037b --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/guide/GuideViewModel.kt @@ -0,0 +1,139 @@ +package com.guidecity.app.ui.guide + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.guidecity.app.data.local.prefs.ContentLength +import com.guidecity.app.data.local.prefs.UserPrefsDataStore +import com.guidecity.app.data.remote.dto.NearbyPlaceDto +import com.guidecity.app.data.repository.PlacesRepository +import com.guidecity.app.location.LocationProvider +import com.guidecity.app.location.SelectedLocationHolder +import com.guidecity.app.tts.TtsManager +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch +import java.util.Locale +import javax.inject.Inject + +data class GuideUiState( + val isLoading: Boolean = true, + val places: List = emptyList(), + val activeIndex: Int = 0, + val doneIndices: Set = emptySet(), + val isMuted: Boolean = false, +) + +/** + * Owns the nearby-places list, which card is actively narrating, which ones + * have finished, and the 60-second re-scan loop. Re-scanning currently only + * re-sorts by fresh distance (TODO(v2): factor in the user's speed/heading + * once the backend's reserved `speed`/`heading` nearby params are used, to + * auto-pick a shorter content length when moving fast through a dense area). + */ +@HiltViewModel +class GuideViewModel @Inject constructor( + private val placesRepository: PlacesRepository, + private val locationProvider: LocationProvider, + private val selectedLocationHolder: SelectedLocationHolder, + private val userPrefsDataStore: UserPrefsDataStore, + private val ttsManager: TtsManager, +) : ViewModel() { + + private val _uiState = MutableStateFlow(GuideUiState()) + val uiState: StateFlow = _uiState.asStateFlow() + + private var contentLength: ContentLength = ContentLength.MEDIUM + private var rescanStarted = false + + init { + viewModelScope.launch { + contentLength = userPrefsDataStore.contentLength.first() ?: ContentLength.MEDIUM + ttsManager.setLanguage(Locale("ru")) + loadNearby(startNarration = true) + startRescanLoop() + } + } + + private fun startRescanLoop() { + if (rescanStarted) return + rescanStarted = true + viewModelScope.launch { + while (isActive) { + delay(60_000) + loadNearby(startNarration = false) + } + } + } + + private suspend fun loadNearby(startNarration: Boolean) { + val location = selectedLocationHolder.location.value ?: locationProvider.getCurrentLocation() + if (location == null) { + _uiState.value = _uiState.value.copy(isLoading = false) + return + } + + val response = runCatching { + placesRepository.getNearby( + lat = location.lat, + lon = location.lon, + citySlug = "moscow", + lang = "ru", + length = contentLength.toApiValue(), + ) + }.getOrNull() ?: return + + _uiState.value = _uiState.value.copy( + isLoading = false, + places = response.places, + activeIndex = 0, + doneIndices = emptySet(), + ) + + if (startNarration) { + narrateActive() + } + } + + private fun narrateActive() { + val state = _uiState.value + val place = state.places.getOrNull(state.activeIndex) ?: return + ttsManager.speak(place.content.body) { onNarrationDone() } + } + + private fun onNarrationDone() { + val state = _uiState.value + val nextIndex = state.activeIndex + 1 + if (nextIndex >= state.places.size) { + _uiState.value = state.copy(doneIndices = state.doneIndices + state.activeIndex) + return + } + _uiState.value = state.copy( + doneIndices = state.doneIndices + state.activeIndex, + activeIndex = nextIndex, + ) + narrateActive() + } + + /** User manually swiped to a different card; doesn't force-complete skipped ones. */ + fun setActiveIndex(index: Int) { + val state = _uiState.value + if (index !in state.places.indices || index == state.activeIndex) return + _uiState.value = state.copy(activeIndex = index) + narrateActive() + } + + fun toggleMute() { + if (ttsManager.isMuted) ttsManager.unmute() else ttsManager.mute() + _uiState.value = _uiState.value.copy(isMuted = ttsManager.isMuted) + } + + override fun onCleared() { + super.onCleared() + ttsManager.stop() + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/guide/PlaceCard.kt b/android/app/src/main/java/com/guidecity/app/ui/guide/PlaceCard.kt new file mode 100644 index 0000000..0f4fd0c --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/guide/PlaceCard.kt @@ -0,0 +1,48 @@ +package com.guidecity.app.ui.guide + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import com.guidecity.app.data.remote.dto.NearbyPlaceDto +import com.guidecity.app.theme.GuideStackColors +import com.guidecity.app.theme.Mocha + +enum class CardState { ACTIVE, DONE, UPCOMING } + +@Composable +fun PlaceCard( + place: NearbyPlaceDto, + state: CardState, + modifier: Modifier = Modifier, +) { + val borderColor = when (state) { + CardState.ACTIVE -> GuideStackColors.ActiveCard + CardState.DONE -> GuideStackColors.DoneCard + CardState.UPCOMING -> GuideStackColors.UpcomingCard + } + Card( + modifier = modifier.fillMaxWidth(), + colors = CardDefaults.cardColors(containerColor = Mocha.Surface0), + border = BorderStroke(2.dp, borderColor), + ) { + Column(modifier = Modifier.padding(16.dp)) { + Text(text = place.content.title, style = MaterialTheme.typography.titleMedium, color = Mocha.Text) + Text( + text = place.content.body, + style = MaterialTheme.typography.bodyLarge, + color = Mocha.Subtext1, + maxLines = 2, + overflow = TextOverflow.Ellipsis, + ) + } + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/guide/PlaceCardStack.kt b/android/app/src/main/java/com/guidecity/app/ui/guide/PlaceCardStack.kt new file mode 100644 index 0000000..381ba67 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/guide/PlaceCardStack.kt @@ -0,0 +1,69 @@ +package com.guidecity.app.ui.guide + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.pager.HorizontalPager +import androidx.compose.foundation.pager.rememberPagerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.snapshotFlow +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import com.guidecity.app.data.remote.dto.NearbyPlaceDto +import kotlinx.coroutines.flow.distinctUntilChanged + +/** + * Tinder-style swipeable stack of place preview cards, ordered by distance. + * Swiping changes which card is "active" ([onPageChanged]); tapping a card + * opens its full detail screen ([onCardClick]). Done cards stay in the + * pager (dimmed via [CardState.DONE]) rather than being removed, so the + * user can still swipe back to review one that already finished narrating. + */ +@Composable +fun PlaceCardStack( + places: List, + activeIndex: Int, + doneIndices: Set, + onCardClick: (placeId: Int) -> Unit, + onPageChanged: (index: Int) -> Unit, + modifier: Modifier = Modifier, +) { + if (places.isEmpty()) return + + val pagerState = rememberPagerState(initialPage = activeIndex) { places.size } + + LaunchedEffect(activeIndex) { + if (pagerState.currentPage != activeIndex) { + pagerState.animateScrollToPage(activeIndex) + } + } + + LaunchedEffect(pagerState) { + snapshotFlow { pagerState.currentPage } + .distinctUntilChanged() + .collect { page -> if (page != activeIndex) onPageChanged(page) } + } + + HorizontalPager( + state = pagerState, + modifier = modifier + .fillMaxWidth() + .height(200.dp), + ) { page -> + val place = places[page] + val cardState = when { + page == activeIndex -> CardState.ACTIVE + page in doneIndices -> CardState.DONE + else -> CardState.UPCOMING + } + PlaceCard( + place = place, + state = cardState, + modifier = Modifier + .padding(12.dp) + .clickable { onCardClick(place.id) }, + ) + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/map/MapScreen.kt b/android/app/src/main/java/com/guidecity/app/ui/map/MapScreen.kt new file mode 100644 index 0000000..7888355 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/map/MapScreen.kt @@ -0,0 +1,151 @@ +package com.guidecity.app.ui.map + +import android.Manifest +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +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.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Favorite +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material3.Button +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.ListItem +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +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.remember +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.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import com.guidecity.app.R +import com.guidecity.app.map.DgisMapView + +@Composable +fun MapScreen( + onLocationResolved: () -> Unit, + onOpenFavorites: () -> Unit, + onOpenSettings: () -> Unit, + viewModel: MapViewModel = hiltViewModel(), +) { + val uiState by viewModel.uiState.collectAsState() + val searchResults by viewModel.searchResults.collectAsState() + var query by remember { mutableStateOf("") } + + val permissionLauncher = rememberLauncherForActivityResult( + contract = ActivityResultContracts.RequestMultiplePermissions(), + ) { results -> + viewModel.onPermissionResult(results.values.any { it }, onLocationResolved) + } + + LaunchedEffect(Unit) { + viewModel.checkInitialPermission(onLocationResolved) + } + + Scaffold( + topBar = { + TopAppBar( + title = { Text(stringResource(R.string.app_name)) }, + actions = { + IconButton(onClick = onOpenFavorites) { + Icon(Icons.Filled.Favorite, contentDescription = stringResource(R.string.favorites_title)) + } + IconButton(onClick = onOpenSettings) { + Icon(Icons.Filled.Settings, contentDescription = stringResource(R.string.settings_title)) + } + }, + ) + }, + ) { padding -> + Box( + modifier = Modifier + .fillMaxSize() + .padding(padding), + ) { + DgisMapView( + userLocation = null, + places = emptyList(), + onPlaceClick = {}, + modifier = Modifier.fillMaxSize(), + ) + + when (uiState) { + MapUiState.NeedsPermission -> { + Column( + modifier = Modifier + .fillMaxSize() + .padding(24.dp), + verticalArrangement = Arrangement.Center, + ) { + Text(stringResource(R.string.map_location_permission_rationale)) + Spacer(modifier = Modifier.height(16.dp)) + Button( + onClick = { + permissionLauncher.launch( + arrayOf( + Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.ACCESS_COARSE_LOCATION, + ), + ) + }, + ) { + Text(stringResource(R.string.map_grant_permission)) + } + } + } + + MapUiState.SearchFallback -> { + Column(modifier = Modifier.fillMaxSize()) { + OutlinedTextField( + value = query, + onValueChange = { + query = it + viewModel.searchPlaces(it) + }, + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + placeholder = { Text(stringResource(R.string.map_search_placeholder)) }, + ) + LazyColumn { + items(searchResults) { place -> + ListItem( + headlineContent = { Text(place.name) }, + modifier = Modifier.clickable { + viewModel.selectSearchResult(place, onLocationResolved) + }, + ) + } + } + } + } + + MapUiState.ResolvingLocation, MapUiState.CheckingPermission -> { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + CircularProgressIndicator() + } + } + } + } + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/map/MapViewModel.kt b/android/app/src/main/java/com/guidecity/app/ui/map/MapViewModel.kt new file mode 100644 index 0000000..92df0f7 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/map/MapViewModel.kt @@ -0,0 +1,82 @@ +package com.guidecity.app.ui.map + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.guidecity.app.data.remote.dto.PlaceListItemDto +import com.guidecity.app.data.repository.PlacesRepository +import com.guidecity.app.location.LatLon +import com.guidecity.app.location.LocationProvider +import com.guidecity.app.location.SelectedLocationHolder +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 + +sealed interface MapUiState { + data object CheckingPermission : MapUiState + data object NeedsPermission : MapUiState + data object ResolvingLocation : MapUiState + data object SearchFallback : MapUiState +} + +@HiltViewModel +class MapViewModel @Inject constructor( + private val locationProvider: LocationProvider, + private val selectedLocationHolder: SelectedLocationHolder, + private val placesRepository: PlacesRepository, +) : ViewModel() { + + private val _uiState = MutableStateFlow(MapUiState.CheckingPermission) + val uiState: StateFlow = _uiState.asStateFlow() + + private val _searchResults = MutableStateFlow>(emptyList()) + val searchResults: StateFlow> = _searchResults.asStateFlow() + + fun checkInitialPermission(onLocationResolved: () -> Unit) { + if (locationProvider.hasLocationPermission()) { + resolveLocation(onLocationResolved) + } else { + _uiState.value = MapUiState.NeedsPermission + } + } + + fun onPermissionResult(granted: Boolean, onLocationResolved: () -> Unit) { + if (granted) { + resolveLocation(onLocationResolved) + } else { + _uiState.value = MapUiState.SearchFallback + } + } + + private fun resolveLocation(onLocationResolved: () -> Unit) { + _uiState.value = MapUiState.ResolvingLocation + viewModelScope.launch { + val location = locationProvider.getCurrentLocation() + if (location != null) { + selectedLocationHolder.set(location) + onLocationResolved() + } else { + _uiState.value = MapUiState.SearchFallback + } + } + } + + fun searchPlaces(query: String) { + if (query.isBlank()) { + _searchResults.value = emptyList() + return + } + viewModelScope.launch { + _searchResults.value = runCatching { + placesRepository.searchPlaces(query, citySlug = "moscow", lang = "ru") + }.getOrDefault(emptyList()) + } + } + + fun selectSearchResult(place: PlaceListItemDto, onLocationResolved: () -> Unit) { + selectedLocationHolder.set(LatLon(place.location.lat, place.location.lon)) + onLocationResolved() + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/onboarding/OnboardingScreen.kt b/android/app/src/main/java/com/guidecity/app/ui/onboarding/OnboardingScreen.kt new file mode 100644 index 0000000..4e08240 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/onboarding/OnboardingScreen.kt @@ -0,0 +1,40 @@ +package com.guidecity.app.ui.onboarding + +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 androidx.hilt.navigation.compose.hiltViewModel +import com.guidecity.app.R + +@Composable +fun OnboardingScreen( + onContinue: () -> Unit, + viewModel: OnboardingViewModel = hiltViewModel(), +) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(32.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text(text = stringResource(R.string.onboarding_title), style = MaterialTheme.typography.titleLarge) + Spacer(modifier = Modifier.height(16.dp)) + Text(text = stringResource(R.string.onboarding_body), style = MaterialTheme.typography.bodyLarge) + Spacer(modifier = Modifier.height(32.dp)) + Button(onClick = { viewModel.markOnboardingSeen(onContinue) }) { + Text(text = stringResource(R.string.onboarding_ok)) + } + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/onboarding/OnboardingViewModel.kt b/android/app/src/main/java/com/guidecity/app/ui/onboarding/OnboardingViewModel.kt new file mode 100644 index 0000000..219c432 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/onboarding/OnboardingViewModel.kt @@ -0,0 +1,20 @@ +package com.guidecity.app.ui.onboarding + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.guidecity.app.data.local.prefs.UserPrefsDataStore +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class OnboardingViewModel @Inject constructor( + private val userPrefsDataStore: UserPrefsDataStore, +) : ViewModel() { + fun markOnboardingSeen(onDone: () -> Unit) { + viewModelScope.launch { + userPrefsDataStore.setOnboardingSeen(true) + onDone() + } + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/preference/ContentLengthScreen.kt b/android/app/src/main/java/com/guidecity/app/ui/preference/ContentLengthScreen.kt new file mode 100644 index 0000000..b2fab5f --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/preference/ContentLengthScreen.kt @@ -0,0 +1,77 @@ +package com.guidecity.app.ui.preference + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +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.selection.selectable +import androidx.compose.material3.Button +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import com.guidecity.app.R +import com.guidecity.app.data.local.prefs.ContentLength + +@Composable +fun ContentLengthScreen( + onContinue: () -> Unit, + viewModel: ContentLengthViewModel = hiltViewModel(), +) { + val selected by viewModel.selected.collectAsState() + + Column( + modifier = Modifier + .fillMaxSize() + .padding(32.dp), + verticalArrangement = Arrangement.Center, + ) { + Text(text = stringResource(R.string.content_length_title), style = MaterialTheme.typography.titleLarge) + Spacer(modifier = Modifier.height(24.dp)) + + ContentLengthOption( + label = stringResource(R.string.content_length_short), + selected = selected == ContentLength.SHORT, + onSelect = { viewModel.select(ContentLength.SHORT) }, + ) + ContentLengthOption( + label = stringResource(R.string.content_length_medium), + selected = selected == ContentLength.MEDIUM, + onSelect = { viewModel.select(ContentLength.MEDIUM) }, + ) + ContentLengthOption( + label = stringResource(R.string.content_length_long), + selected = selected == ContentLength.LONG, + onSelect = { viewModel.select(ContentLength.LONG) }, + ) + + Spacer(modifier = Modifier.height(24.dp)) + Button(onClick = { viewModel.confirmSelection(onContinue) }) { + Text(text = stringResource(R.string.content_length_continue)) + } + } +} + +@Composable +private fun ContentLengthOption(label: String, selected: Boolean, onSelect: () -> Unit) { + Row( + modifier = Modifier + .fillMaxWidth() + .selectable(selected = selected, onClick = onSelect), + verticalAlignment = Alignment.CenterVertically, + ) { + RadioButton(selected = selected, onClick = onSelect) + Text(text = label, style = MaterialTheme.typography.bodyLarge) + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/preference/ContentLengthViewModel.kt b/android/app/src/main/java/com/guidecity/app/ui/preference/ContentLengthViewModel.kt new file mode 100644 index 0000000..7310fe2 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/preference/ContentLengthViewModel.kt @@ -0,0 +1,32 @@ +package com.guidecity.app.ui.preference + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.guidecity.app.data.local.prefs.ContentLength +import com.guidecity.app.data.local.prefs.UserPrefsDataStore +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 + +@HiltViewModel +class ContentLengthViewModel @Inject constructor( + private val userPrefsDataStore: UserPrefsDataStore, +) : ViewModel() { + + private val _selected = MutableStateFlow(ContentLength.MEDIUM) + val selected: StateFlow = _selected.asStateFlow() + + fun select(length: ContentLength) { + _selected.value = length + } + + fun confirmSelection(onDone: () -> Unit) { + viewModelScope.launch { + userPrefsDataStore.setContentLength(_selected.value) + onDone() + } + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/settings/SettingsScreen.kt b/android/app/src/main/java/com/guidecity/app/ui/settings/SettingsScreen.kt new file mode 100644 index 0000000..b8aa6c5 --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/settings/SettingsScreen.kt @@ -0,0 +1,89 @@ +package com.guidecity.app.ui.settings + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.selection.selectable +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.hilt.navigation.compose.hiltViewModel +import com.guidecity.app.R +import com.guidecity.app.data.local.prefs.ContentLength + +@Composable +fun SettingsScreen( + onBack: () -> Unit, + viewModel: SettingsViewModel = hiltViewModel(), +) { + val selected by viewModel.contentLength.collectAsState() + + Scaffold( + topBar = { + TopAppBar( + title = { Text(stringResource(R.string.settings_title)) }, + navigationIcon = { + IconButton(onClick = onBack) { + Icon(Icons.Filled.ArrowBack, contentDescription = null) + } + }, + ) + }, + ) { padding -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(padding) + .padding(16.dp), + ) { + Text( + text = stringResource(R.string.settings_content_length_label), + style = MaterialTheme.typography.titleMedium, + ) + + SettingsOption( + label = stringResource(R.string.content_length_short), + isSelected = selected == ContentLength.SHORT, + onSelect = { viewModel.setContentLength(ContentLength.SHORT) }, + ) + SettingsOption( + label = stringResource(R.string.content_length_medium), + isSelected = selected == ContentLength.MEDIUM, + onSelect = { viewModel.setContentLength(ContentLength.MEDIUM) }, + ) + SettingsOption( + label = stringResource(R.string.content_length_long), + isSelected = selected == ContentLength.LONG, + onSelect = { viewModel.setContentLength(ContentLength.LONG) }, + ) + } + } +} + +@Composable +private fun SettingsOption(label: String, isSelected: Boolean, onSelect: () -> Unit) { + Row( + modifier = Modifier + .fillMaxWidth() + .selectable(selected = isSelected, onClick = onSelect), + verticalAlignment = Alignment.CenterVertically, + ) { + RadioButton(selected = isSelected, onClick = onSelect) + Text(text = label) + } +} diff --git a/android/app/src/main/java/com/guidecity/app/ui/settings/SettingsViewModel.kt b/android/app/src/main/java/com/guidecity/app/ui/settings/SettingsViewModel.kt new file mode 100644 index 0000000..bf98ceb --- /dev/null +++ b/android/app/src/main/java/com/guidecity/app/ui/settings/SettingsViewModel.kt @@ -0,0 +1,24 @@ +package com.guidecity.app.ui.settings + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.guidecity.app.data.local.prefs.ContentLength +import com.guidecity.app.data.local.prefs.UserPrefsDataStore +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class SettingsViewModel @Inject constructor( + private val userPrefsDataStore: UserPrefsDataStore, +) : ViewModel() { + val contentLength: StateFlow = userPrefsDataStore.contentLength + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), null) + + fun setContentLength(length: ContentLength) { + viewModelScope.launch { userPrefsDataStore.setContentLength(length) } + } +} diff --git a/android/app/src/main/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..f6e17d7 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,10 @@ + + + + diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..a160e25 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6b78462 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6b78462 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml new file mode 100644 index 0000000..e2f6c8b --- /dev/null +++ b/android/app/src/main/res/values-ru/strings.xml @@ -0,0 +1,32 @@ + + + guideCity + + Добро пожаловать в guideCity + guideCity — это голосовой гид для прогулок по городу. Разрешите доступ к геолокации, и мы найдём интересные места поблизости и расскажем их историю прямо во время прогулки по Москве. + ОК + + Насколько подробный рассказ вы хотите слышать? + Кратко + Средне + Подробно + Продолжить + + guideCity нужен доступ к геолокации, чтобы найти места поблизости. Вы также можете ввести место вручную. + Разрешить доступ к геолокации + Введите место для поиска… + + Поблизости пока не найдено интересных мест. + Добавить в избранное + Убрать из избранного + Выключить озвучку + Включить озвучку + + Избранное + Пока нет избранных мест. Нажмите на значок сердца рядом с местом, чтобы сохранить его здесь. + + Настройки + Подробность рассказа + + Место не найдено. + diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..c5b2e2c --- /dev/null +++ b/android/app/src/main/res/values/colors.xml @@ -0,0 +1,8 @@ + + + + #1E1E2E + #CBA6F7 + diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..f52e75d --- /dev/null +++ b/android/app/src/main/res/values/strings.xml @@ -0,0 +1,32 @@ + + + guideCity + + Welcome to guideCity + guideCity is a walking tour guide. Grant location access and we\'ll find interesting places nearby and narrate their history as you explore Moscow on foot. + OK + + How much detail would you like? + Short + Medium + Long + Continue + + guideCity needs your location to find nearby places. You can also search for a place by name instead. + Grant location access + Search for a place instead… + + No places found nearby yet. + Add to favorites + Remove from favorites + Mute narration + Resume narration + + Favorites + No favorites yet. Tap the heart icon on a place to save it here. + + Settings + Content length + + Place not found. + diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..5beec49 --- /dev/null +++ b/android/app/src/main/res/values/themes.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/android/build.gradle.kts b/android/build.gradle.kts new file mode 100644 index 0000000..970835b --- /dev/null +++ b/android/build.gradle.kts @@ -0,0 +1,8 @@ +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.compose) apply false + alias(libs.plugins.kotlin.serialization) apply false + alias(libs.plugins.hilt.android) apply false + alias(libs.plugins.ksp) apply false +} diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 0000000..f0a2e55 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,4 @@ +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +android.useAndroidX=true +kotlin.code.style=official +android.nonTransitiveRClass=true diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml new file mode 100644 index 0000000..8b783f6 --- /dev/null +++ b/android/gradle/libs.versions.toml @@ -0,0 +1,67 @@ +[versions] +agp = "8.5.2" +kotlin = "2.0.20" +coreKtx = "1.13.1" +lifecycle = "2.8.6" +activityCompose = "1.9.2" +composeBom = "2024.09.02" +navigationCompose = "2.8.0" +hilt = "2.52" +hiltNavigationCompose = "1.2.0" +retrofit = "2.11.0" +okhttp = "4.12.0" +kotlinxSerializationJson = "1.7.3" +room = "2.6.1" +datastore = "1.1.1" +playServicesLocation = "21.3.0" +kotlinxCoroutinesPlayServices = "1.8.1" +ksp = "2.0.20-1.0.25" +junit = "4.13.2" +androidxTestExtJunit = "1.2.1" +espressoCore = "3.6.1" + +[libraries] +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 = "lifecycle" } +androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" } +androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" } + +hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" } +hilt-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" } + +retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } +retrofit-kotlinx-serialization-converter = { group = "com.squareup.retrofit2", name = "converter-kotlinx-serialization", version.ref = "retrofit" } +okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" } +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" } + +androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } +androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } +androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } + +androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" } + +play-services-location = { group = "com.google.android.gms", name = "play-services-location", version.ref = "playServicesLocation" } +kotlinx-coroutines-play-services = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-play-services", version.ref = "kotlinxCoroutinesPlayServices" } + +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxTestExtJunit" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-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-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2c3521197d7c4586c843d1d3e9090525f1898cde GIT binary patch literal 43504 zcma&N1CXTcmMvW9vTb(Rwr$&4wr$(C?dmSu>@vG-+vuvg^_??!{yS%8zW-#zn-LkA z5&1^$^{lnmUON?}LBF8_K|(?T0Ra(xUH{($5eN!MR#ZihR#HxkUPe+_R8Cn`RRs(P z_^*#_XlXmGv7!4;*Y%p4nw?{bNp@UZHv1?Um8r6)Fei3p@ClJn0ECfg1hkeuUU@Or zDaPa;U3fE=3L}DooL;8f;P0ipPt0Z~9P0)lbStMS)ag54=uL9ia-Lm3nh|@(Y?B`; zx_#arJIpXH!U{fbCbI^17}6Ri*H<>OLR%c|^mh8+)*h~K8Z!9)DPf zR2h?lbDZQ`p9P;&DQ4F0sur@TMa!Y}S8irn(%d-gi0*WxxCSk*A?3lGh=gcYN?FGl z7D=Js!i~0=u3rox^eO3i@$0=n{K1lPNU zwmfjRVmLOCRfe=seV&P*1Iq=^i`502keY8Uy-WNPwVNNtJFx?IwAyRPZo2Wo1+S(xF37LJZ~%i)kpFQ3Fw=mXfd@>%+)RpYQLnr}B~~zoof(JVm^^&f zxKV^+3D3$A1G;qh4gPVjhrC8e(VYUHv#dy^)(RoUFM?o%W-EHxufuWf(l*@-l+7vt z=l`qmR56K~F|v<^Pd*p~1_y^P0P^aPC##d8+HqX4IR1gu+7w#~TBFphJxF)T$2WEa zxa?H&6=Qe7d(#tha?_1uQys2KtHQ{)Qco)qwGjrdNL7thd^G5i8Os)CHqc>iOidS} z%nFEDdm=GXBw=yXe1W-ShHHFb?Cc70+$W~z_+}nAoHFYI1MV1wZegw*0y^tC*s%3h zhD3tN8b=Gv&rj}!SUM6|ajSPp*58KR7MPpI{oAJCtY~JECm)*m_x>AZEu>DFgUcby z1Qaw8lU4jZpQ_$;*7RME+gq1KySGG#Wql>aL~k9tLrSO()LWn*q&YxHEuzmwd1?aAtI zBJ>P=&$=l1efe1CDU;`Fd+_;&wI07?V0aAIgc(!{a z0Jg6Y=inXc3^n!U0Atk`iCFIQooHqcWhO(qrieUOW8X(x?(RD}iYDLMjSwffH2~tB z)oDgNBLB^AJBM1M^c5HdRx6fBfka`(LD-qrlh5jqH~);#nw|iyp)()xVYak3;Ybik z0j`(+69aK*B>)e_p%=wu8XC&9e{AO4c~O1U`5X9}?0mrd*m$_EUek{R?DNSh(=br# z#Q61gBzEpmy`$pA*6!87 zSDD+=@fTY7<4A?GLqpA?Pb2z$pbCc4B4zL{BeZ?F-8`s$?>*lXXtn*NC61>|*w7J* z$?!iB{6R-0=KFmyp1nnEmLsA-H0a6l+1uaH^g%c(p{iT&YFrbQ$&PRb8Up#X3@Zsk zD^^&LK~111%cqlP%!_gFNa^dTYT?rhkGl}5=fL{a`UViaXWI$k-UcHJwmaH1s=S$4 z%4)PdWJX;hh5UoK?6aWoyLxX&NhNRqKam7tcOkLh{%j3K^4Mgx1@i|Pi&}<^5>hs5 zm8?uOS>%)NzT(%PjVPGa?X%`N2TQCKbeH2l;cTnHiHppPSJ<7y-yEIiC!P*ikl&!B z%+?>VttCOQM@ShFguHVjxX^?mHX^hSaO_;pnyh^v9EumqSZTi+#f&_Vaija0Q-e*| z7ulQj6Fs*bbmsWp{`auM04gGwsYYdNNZcg|ph0OgD>7O}Asn7^Z=eI>`$2*v78;sj-}oMoEj&@)9+ycEOo92xSyY344^ z11Hb8^kdOvbf^GNAK++bYioknrpdN>+u8R?JxG=!2Kd9r=YWCOJYXYuM0cOq^FhEd zBg2puKy__7VT3-r*dG4c62Wgxi52EMCQ`bKgf*#*ou(D4-ZN$+mg&7$u!! z-^+Z%;-3IDwqZ|K=ah85OLwkO zKxNBh+4QHh)u9D?MFtpbl)us}9+V!D%w9jfAMYEb>%$A;u)rrI zuBudh;5PN}_6J_}l55P3l_)&RMlH{m!)ai-i$g)&*M`eN$XQMw{v^r@-125^RRCF0 z^2>|DxhQw(mtNEI2Kj(;KblC7x=JlK$@78`O~>V!`|1Lm-^JR$-5pUANAnb(5}B}JGjBsliK4& zk6y(;$e&h)lh2)L=bvZKbvh@>vLlreBdH8No2>$#%_Wp1U0N7Ank!6$dFSi#xzh|( zRi{Uw%-4W!{IXZ)fWx@XX6;&(m_F%c6~X8hx=BN1&q}*( zoaNjWabE{oUPb!Bt$eyd#$5j9rItB-h*5JiNi(v^e|XKAj*8(k<5-2$&ZBR5fF|JA z9&m4fbzNQnAU}r8ab>fFV%J0z5awe#UZ|bz?Ur)U9bCIKWEzi2%A+5CLqh?}K4JHi z4vtM;+uPsVz{Lfr;78W78gC;z*yTch~4YkLr&m-7%-xc ztw6Mh2d>_iO*$Rd8(-Cr1_V8EO1f*^@wRoSozS) zy1UoC@pruAaC8Z_7~_w4Q6n*&B0AjOmMWa;sIav&gu z|J5&|{=a@vR!~k-OjKEgPFCzcJ>#A1uL&7xTDn;{XBdeM}V=l3B8fE1--DHjSaxoSjNKEM9|U9#m2<3>n{Iuo`r3UZp;>GkT2YBNAh|b z^jTq-hJp(ebZh#Lk8hVBP%qXwv-@vbvoREX$TqRGTgEi$%_F9tZES@z8Bx}$#5eeG zk^UsLBH{bc2VBW)*EdS({yw=?qmevwi?BL6*=12k9zM5gJv1>y#ML4!)iiPzVaH9% zgSImetD@dam~e>{LvVh!phhzpW+iFvWpGT#CVE5TQ40n%F|p(sP5mXxna+Ev7PDwA zamaV4m*^~*xV+&p;W749xhb_X=$|LD;FHuB&JL5?*Y2-oIT(wYY2;73<^#46S~Gx| z^cez%V7x$81}UWqS13Gz80379Rj;6~WdiXWOSsdmzY39L;Hg3MH43o*y8ibNBBH`(av4|u;YPq%{R;IuYow<+GEsf@R?=@tT@!}?#>zIIn0CoyV!hq3mw zHj>OOjfJM3F{RG#6ujzo?y32m^tgSXf@v=J$ELdJ+=5j|=F-~hP$G&}tDZsZE?5rX ztGj`!S>)CFmdkccxM9eGIcGnS2AfK#gXwj%esuIBNJQP1WV~b~+D7PJTmWGTSDrR` zEAu4B8l>NPuhsk5a`rReSya2nfV1EK01+G!x8aBdTs3Io$u5!6n6KX%uv@DxAp3F@{4UYg4SWJtQ-W~0MDb|j-$lwVn znAm*Pl!?Ps&3wO=R115RWKb*JKoexo*)uhhHBncEDMSVa_PyA>k{Zm2(wMQ(5NM3# z)jkza|GoWEQo4^s*wE(gHz?Xsg4`}HUAcs42cM1-qq_=+=!Gk^y710j=66(cSWqUe zklbm8+zB_syQv5A2rj!Vbw8;|$@C!vfNmNV!yJIWDQ>{+2x zKjuFX`~~HKG~^6h5FntRpnnHt=D&rq0>IJ9#F0eM)Y-)GpRjiN7gkA8wvnG#K=q{q z9dBn8_~wm4J<3J_vl|9H{7q6u2A!cW{bp#r*-f{gOV^e=8S{nc1DxMHFwuM$;aVI^ zz6A*}m8N-&x8;aunp1w7_vtB*pa+OYBw=TMc6QK=mbA-|Cf* zvyh8D4LRJImooUaSb7t*fVfih<97Gf@VE0|z>NcBwBQze);Rh!k3K_sfunToZY;f2 z^HmC4KjHRVg+eKYj;PRN^|E0>Gj_zagfRbrki68I^#~6-HaHg3BUW%+clM1xQEdPYt_g<2K+z!$>*$9nQ>; zf9Bei{?zY^-e{q_*|W#2rJG`2fy@{%6u0i_VEWTq$*(ZN37|8lFFFt)nCG({r!q#9 z5VK_kkSJ3?zOH)OezMT{!YkCuSSn!K#-Rhl$uUM(bq*jY? zi1xbMVthJ`E>d>(f3)~fozjg^@eheMF6<)I`oeJYx4*+M&%c9VArn(OM-wp%M<-`x z7sLP1&3^%Nld9Dhm@$3f2}87!quhI@nwd@3~fZl_3LYW-B?Ia>ui`ELg z&Qfe!7m6ze=mZ`Ia9$z|ARSw|IdMpooY4YiPN8K z4B(ts3p%2i(Td=tgEHX z0UQ_>URBtG+-?0E;E7Ld^dyZ;jjw0}XZ(}-QzC6+NN=40oDb2^v!L1g9xRvE#@IBR zO!b-2N7wVfLV;mhEaXQ9XAU+>=XVA6f&T4Z-@AX!leJ8obP^P^wP0aICND?~w&NykJ#54x3_@r7IDMdRNy4Hh;h*!u(Ol(#0bJdwEo$5437-UBjQ+j=Ic>Q2z` zJNDf0yO6@mr6y1#n3)s(W|$iE_i8r@Gd@!DWDqZ7J&~gAm1#~maIGJ1sls^gxL9LLG_NhU!pTGty!TbhzQnu)I*S^54U6Yu%ZeCg`R>Q zhBv$n5j0v%O_j{QYWG!R9W?5_b&67KB$t}&e2LdMvd(PxN6Ir!H4>PNlerpBL>Zvyy!yw z-SOo8caEpDt(}|gKPBd$qND5#a5nju^O>V&;f890?yEOfkSG^HQVmEbM3Ugzu+UtH zC(INPDdraBN?P%kE;*Ae%Wto&sgw(crfZ#Qy(<4nk;S|hD3j{IQRI6Yq|f^basLY; z-HB&Je%Gg}Jt@={_C{L$!RM;$$|iD6vu#3w?v?*;&()uB|I-XqEKqZPS!reW9JkLewLb!70T7n`i!gNtb1%vN- zySZj{8-1>6E%H&=V}LM#xmt`J3XQoaD|@XygXjdZ1+P77-=;=eYpoEQ01B@L*a(uW zrZeZz?HJsw_4g0vhUgkg@VF8<-X$B8pOqCuWAl28uB|@r`19DTUQQsb^pfqB6QtiT z*`_UZ`fT}vtUY#%sq2{rchyfu*pCg;uec2$-$N_xgjZcoumE5vSI{+s@iLWoz^Mf; zuI8kDP{!XY6OP~q5}%1&L}CtfH^N<3o4L@J@zg1-mt{9L`s^z$Vgb|mr{@WiwAqKg zp#t-lhrU>F8o0s1q_9y`gQNf~Vb!F%70f}$>i7o4ho$`uciNf=xgJ>&!gSt0g;M>*x4-`U)ysFW&Vs^Vk6m%?iuWU+o&m(2Jm26Y(3%TL; zA7T)BP{WS!&xmxNw%J=$MPfn(9*^*TV;$JwRy8Zl*yUZi8jWYF>==j~&S|Xinsb%c z2?B+kpet*muEW7@AzjBA^wAJBY8i|#C{WtO_or&Nj2{=6JTTX05}|H>N2B|Wf!*3_ z7hW*j6p3TvpghEc6-wufFiY!%-GvOx*bZrhZu+7?iSrZL5q9}igiF^*R3%DE4aCHZ zqu>xS8LkW+Auv%z-<1Xs92u23R$nk@Pk}MU5!gT|c7vGlEA%G^2th&Q*zfg%-D^=f z&J_}jskj|Q;73NP4<4k*Y%pXPU2Thoqr+5uH1yEYM|VtBPW6lXaetokD0u z9qVek6Q&wk)tFbQ8(^HGf3Wp16gKmr>G;#G(HRBx?F`9AIRboK+;OfHaLJ(P>IP0w zyTbTkx_THEOs%Q&aPrxbZrJlio+hCC_HK<4%f3ZoSAyG7Dn`=X=&h@m*|UYO-4Hq0 z-Bq&+Ie!S##4A6OGoC~>ZW`Y5J)*ouaFl_e9GA*VSL!O_@xGiBw!AF}1{tB)z(w%c zS1Hmrb9OC8>0a_$BzeiN?rkPLc9%&;1CZW*4}CDDNr2gcl_3z+WC15&H1Zc2{o~i) z)LLW=WQ{?ricmC`G1GfJ0Yp4Dy~Ba;j6ZV4r{8xRs`13{dD!xXmr^Aga|C=iSmor% z8hi|pTXH)5Yf&v~exp3o+sY4B^^b*eYkkCYl*T{*=-0HniSA_1F53eCb{x~1k3*`W zr~};p1A`k{1DV9=UPnLDgz{aJH=-LQo<5%+Em!DNN252xwIf*wF_zS^!(XSm(9eoj z=*dXG&n0>)_)N5oc6v!>-bd(2ragD8O=M|wGW z!xJQS<)u70m&6OmrF0WSsr@I%T*c#Qo#Ha4d3COcX+9}hM5!7JIGF>7<~C(Ear^Sn zm^ZFkV6~Ula6+8S?oOROOA6$C&q&dp`>oR-2Ym3(HT@O7Sd5c~+kjrmM)YmgPH*tL zX+znN>`tv;5eOfX?h{AuX^LK~V#gPCu=)Tigtq9&?7Xh$qN|%A$?V*v=&-2F$zTUv z`C#WyIrChS5|Kgm_GeudCFf;)!WH7FI60j^0o#65o6`w*S7R@)88n$1nrgU(oU0M9 zx+EuMkC>(4j1;m6NoGqEkpJYJ?vc|B zOlwT3t&UgL!pX_P*6g36`ZXQ; z9~Cv}ANFnJGp(;ZhS(@FT;3e)0)Kp;h^x;$*xZn*k0U6-&FwI=uOGaODdrsp-!K$Ac32^c{+FhI-HkYd5v=`PGsg%6I`4d9Jy)uW0y%) zm&j^9WBAp*P8#kGJUhB!L?a%h$hJgQrx!6KCB_TRo%9{t0J7KW8!o1B!NC)VGLM5! zpZy5Jc{`r{1e(jd%jsG7k%I+m#CGS*BPA65ZVW~fLYw0dA-H_}O zrkGFL&P1PG9p2(%QiEWm6x;U-U&I#;Em$nx-_I^wtgw3xUPVVu zqSuKnx&dIT-XT+T10p;yjo1Y)z(x1fb8Dzfn8e yu?e%!_ptzGB|8GrCfu%p?(_ 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 TZiJi*F`$tkWLn) literal 0 HcmV?d00001 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..09523c0 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 0000000..ef7d318 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,196 @@ +#!/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. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit 1 + +# 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="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + 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*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# 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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 0000000..7303b0f --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,89 @@ +@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 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%" -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 %ERRORLEVEL% equ 0 goto mainEnd + +: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% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/local.properties.example b/android/local.properties.example new file mode 100644 index 0000000..67c4b36 --- /dev/null +++ b/android/local.properties.example @@ -0,0 +1,11 @@ +# Copy this file to local.properties (gitignored) and fill in real values. + +sdk.dir=/path/to/your/Android/Sdk + +# Test key provided for development; do not ship this as-is in a public repo. +DGIS_API_KEY=b4df01a8-61db-4cb9-8286-7e069495987d + +# Base URL of the guideCity backend API. +# Emulator -> host loopback: http://10.0.2.2:8000/ +# Physical device -> your machine's LAN IP, e.g. http://192.168.1.50:8000/ +API_BASE_URL=http://10.0.2.2:8000/ diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts new file mode 100644 index 0000000..66bc726 --- /dev/null +++ b/android/settings.gradle.kts @@ -0,0 +1,21 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + // TODO: add the 2GIS MapKit maven repository here once its exact URL is + // confirmed from the 2GIS developer portal (see android/README section + // on the map SDK integration point). + } +} + +rootProject.name = "guideCity" +include(":app")