Merge pull request #84 from adessoTurkey/feature/map-screen

Map Screen

Author: senaaydin

androidApp/build.gradle.kts

@@ -1,7 +1,10 @@
+import movee.util.requireStringProperty
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose)
+    alias(libs.plugins.maps.secrets)
 }
 
 android {
@@ -15,6 +18,14 @@ android {
         versionCode = 1
         versionName = "1.0"
     }
+    signingConfigs {
+        getByName("debug") {
+            storeFile = file(requireStringProperty("SIGNING_STORE_FILE"))
+            storePassword = requireStringProperty("SIGNING_STORE_PASSWORD")
+            keyAlias = requireStringProperty("SIGNING_KEY_ALIAS")
+            keyPassword = requireStringProperty("SIGNING_KEY_PASSWORD")
+        }
+    }
     buildFeatures {
         compose = true
     }
@@ -35,6 +46,9 @@ android {
                 "proguard-rules.pro"
             )
         }
+        getByName("debug") {
+            signingConfig = signingConfigs.getByName("debug")
+        }
     }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
@@ -58,3 +72,8 @@ dependencies {
         implementation(core)
     }
 }
+
+secrets {
+    defaultPropertiesFileName = "default.local.properties"
+    propertiesFileName = "local.properties"
+}

androidApp/gradle.properties

@@ -0,0 +1,4 @@
+SIGNING_STORE_FILE=../debug.jks
+SIGNING_STORE_PASSWORD=movee1234
+SIGNING_KEY_ALIAS=key0
+SIGNING_KEY_PASSWORD=movee1234

androidApp/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-<uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <application
         android:name=".MoveeApplication"
         android:allowBackup="false"
@@ -16,5 +18,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <meta-data android:name="com.google.android.geo.API_KEY" android:value="${MAPS_API_KEY}"/>
+        <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
     </application>
 </manifest>

build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
     alias(libs.plugins.moko.resources).apply(false)
     alias(libs.plugins.buildKonfig).apply(false)
     alias(libs.plugins.kotlin.cocoapods).apply(false)
+    alias(libs.plugins.maps.secrets).apply(false)
 }
 
 tasks.register("clean", Delete::class) {

…e/moveApp-Compose-KMM/util/ProjectExt.kt …c/src/main/java/movee/util/ProjectExt.ktbuildSrc/src/main/java/com/example/moveApp-Compose-KMM/util/ProjectExt.kt renamed to buildSrc/src/main/java/movee/util/ProjectExt.kt buildSrc/src/main/java/com/example/moveApp-Compose-KMM/util/ProjectExt.kt renamed to buildSrc/src/main/java/movee/util/ProjectExt.kt

@@ -1,4 +1,4 @@
-package com.example.moveeapp_compose_kmm.util
+package movee.util
 
 import org.gradle.api.Project
 

debug.jks

@@ -0,0 +1,2 @@
+# set MAPS_API_KEY at local.properties
+MAPS_API_KEY=STUB_FOR_GOOGLE_MAPS_API_KEY

default.local.properties

@@ -21,6 +21,10 @@ koin = "3.5.0"
 koin-compose = "1.1.0"
 moko = "0.23.0"
 seiko = "1.5.1"
+mapsCompose = "2.15.0"
+playServicesMaps = "18.1.0"
+playServicesLocation = "21.0.1"
+maps-secrets = "2.0.1"
 
 [libraries]
 
@@ -30,6 +34,9 @@ androidx-activity-compose = { module = "androidx.activity:activity-compose", ver
 androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "compose" }
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
 androidx-compose-ui-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
+maps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "mapsCompose" }
+play-services-maps = { module = "com.google.android.gms:play-services-maps", version.ref = "playServicesMaps" }
+play-services-location = { module = "com.google.android.gms:play-services-location", version.ref = "playServicesLocation" }
 
 desugar-jdk-libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" }
 
@@ -78,3 +85,4 @@ android-library = { id = "com.android.library", version.ref = "agp" }
 buildKonfig = { id = "com.codingfeline.buildkonfig", version.ref = "buildKonfig" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 moko-resources = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko" }
+maps-secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "maps-secrets" }

gradle/libs.versions.toml

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -404,6 +404,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
+				DEVELOPMENT_TEAM = ET37P8CM79;
 				ENABLE_PREVIEWS = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -435,6 +436,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
+				DEVELOPMENT_TEAM = 3KLVB8AAXN;
 				ENABLE_PREVIEWS = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

iosApp/iosApp.xcodeproj/project.pbxproj

@@ -48,6 +48,8 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>If you want to see the weather for your location, grant the permission.</string>
 	<key>UILaunchScreen</key>
 	<dict/>
 </dict>