Merge pull request #172 from kookmin-sw/android/develop/v4

Android/develop/v4
kookmin-sw · May 22, 2024 · e48ee23 · e48ee23
2 parents 3ca8bcd + 8ff758a
commit e48ee23
Show file tree

Hide file tree

Showing 397 changed files with 10,591 additions and 2,945 deletions.
diff --git a/Android/moment-android/.gitignore b/Android/moment-android/.gitignore
@@ -13,7 +13,7 @@
 .externalNativeBuild
 .cxx
 local.properties
-
+/app/release/output-metadata.json
 # Created by https://www.toptal.com/developers/gitignore/api/android,androidstudio,kotlin,java,windows,macos
 # Edit at https://www.toptal.com/developers/gitignore?templates=android,androidstudio,kotlin,java,windows,macos
 

diff --git a/Android/moment-android/app/build.gradle.kts b/Android/moment-android/app/build.gradle.kts
@@ -1,11 +1,14 @@
-import org.jetbrains.kotlin.kapt3.base.Kapt.kapt
+
 
 plugins {
     kotlin("plugin.serialization") version "1.5.0"
     kotlin("kapt")
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("dagger.hilt.android.plugin")
+    id("com.google.gms.google-services")
+
+
 }
 
 android {
@@ -16,23 +19,47 @@ android {
         applicationId = "com.capstone.android.application"
         minSdk = 24
         targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 3
+        versionName = "1.2.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary = true
         }
     }
 
+
+
+    signingConfigs {
+        create("release") {
+            keyAlias = "moment-release-key2"
+            keyPassword = "rlaalswnd1"
+            storeFile = file("/Users/kimminjung/AndroidStudioProjects/moment-key-manage/release/moment-releasekeystore2")
+            storePassword = "rlaalswnd1"
+        }
+    }
+
     buildTypes {
+
+//        배포 준비 할 때 디버그 모드와 릴리즈 모드 나누기
+//        debug {
+//            applicationIdSuffix = ".debug"
+//            isDebuggable = true
+//
+//        }
+
         release {
+
             isMinifyEnabled = false
+            signingConfig = signingConfigs.getByName("release")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
         }
+        getByName("debug") {
+            signingConfig = signingConfigs.getByName("debug")
+        }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -72,6 +99,8 @@ dependencies {
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("com.google.android.material:material:1.11.0")
     implementation("androidx.compose.material3:material3-android:1.2.1")
+    implementation("com.google.android.gms:play-services-location:21.2.0")
+    implementation("com.google.android.gms:play-services-wearable:18.1.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
@@ -118,4 +147,14 @@ dependencies {
 
     // AsyncImage
     implementation("io.coil-kt:coil-compose:2.6.0")
-}
+
+    // Timber
+    implementation("com.jakewharton.timber:timber:5.0.1")
+
+    // Glide-Compose
+    implementation("com.github.bumptech.glide:compose:1.0.0-beta01")
+
+    // firebase
+    implementation("com.google.firebase:firebase-messaging:21.1.0")
+
+}
diff --git a/Android/moment-android/app/src/main/AndroidManifest.xml b/Android/moment-android/app/src/main/AndroidManifest.xml
@@ -4,17 +4,27 @@
 
     <!-- 인터텟 권한 -->
     <uses-permission android:name="android.permission.INTERNET"/>
+
+    <!-- 녹음 권한 -->
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
 
+    <!-- 위치 권한 -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
+    <!-- 알람 권한 -->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
     <application
         android:usesCleartextTraffic="true"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:name=".app.ApplicationClass"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_moent_appicon"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_moent_appicon_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Application"
         tools:targetApi="31">
@@ -28,14 +38,59 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+
         </activity>
 
-        <activity android:name=".MainActivity"/>
+        <activity
+            android:name=".MainActivity"
+            android:launchMode="singleTask"
+            android:excludeFromRecents="true"
+            android:exported="true"
+            />
         <activity android:name=".ui.OnboardingActivity"/>
         <activity android:name=".ui.PostTripActivity"/>
         <activity android:name=".ui.CardActivity"/>
         <activity android:name=".ui.TripFileActivity"/>
         <activity android:name=".ui.ReciptActivity"/>
+        <activity android:name=".ui.PatchTripActivity"/>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="com.capstone.android.application.provider"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
+        <service android:name=".app.utile.firebase.MyFirebaseMessagingService"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
+
+        <service android:name=".app.utile.DataLayerListenerService" android:exported="true" >
+            <intent-filter>
+                <!-- listeners receive events that match the action and data filters -->
+                <action android:name="com.google.android.gms.wearable.DATA_CHANGED" />
+                <data
+                    android:host="*"
+                    android:pathPrefix="/count"
+                    android:scheme="wear" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.google.android.gms.wearable.MESSAGE_RECEIVED" />
+                <data
+                    android:host="*"
+                    android:pathPrefix="/voice_transcription"
+                    android:scheme="wear" />
+            </intent-filter>
+        </service>
+
+
     </application>
 
 </manifest>
diff --git a/Android/moment-android/app/src/main/ic_moent_appicon-playstore.png b/Android/moment-android/app/src/main/ic_moent_appicon-playstore.png