diff --git a/.gitignore b/.gitignore index 09c4af8f6..bb697e9f5 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,5 @@ core/model/build/kotlin/compileDebugKotlin/cacheable/ core/designsystem/build/kotlin/compileDebugKotlin/cacheable/ core/designsystem/build/outputs/aar/ core/model/build/outputs/aar/ -core/designsystem/build/tmp/kotlin-classes/debug/META-INF \ No newline at end of file +core/designsystem/build/tmp/kotlin-classes/debug/META-INF +core/designsystem/build/tmp diff --git a/app/google-services.json b/app/google-services.json index 984764e9c..f392b96ce 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -7,7 +7,7 @@ "client": [ { "client_info": { - "mobilesdk_app_id": "1:260494595521:android:4082b77d97edb83f428b40", + "mobilesdk_app_id": "1:260494595521:android:43c64ea8b41b8833428b40", "android_client_info": { "package_name": "com.kusitms.connectdog" } @@ -23,6 +23,25 @@ "other_platform_oauth_client": [] } } + }, + { + "client_info": { + "mobilesdk_app_id": "1:260494595521:android:a5be6ee857dccfc3428b40", + "android_client_info": { + "package_name": "com.kusitms.connectdog.feature.main" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyDqQ5mEJVaoopO1yxSahoDXJ4D6EvUf15U" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } } ], "configuration_version": "1" diff --git a/core/data/src/main/java/com/kusitms/connectdog/core/data/mapper/ReviewMapper.kt b/core/data/src/main/java/com/kusitms/connectdog/core/data/mapper/ReviewMapper.kt index 54a79793d..cb3c32fc5 100644 --- a/core/data/src/main/java/com/kusitms/connectdog/core/data/mapper/ReviewMapper.kt +++ b/core/data/src/main/java/com/kusitms/connectdog/core/data/mapper/ReviewMapper.kt @@ -30,6 +30,7 @@ fun ReviewDetailResponse.toData(): Review { location = "$departureLoc → $arrivalLoc", organization = intermediaryName, content = content, - intermediaryId = intermediaryId + intermediaryId = intermediaryId, + postMainImage = postMainImage ) } diff --git a/core/designsystem/build/kotlin/compileReleaseKotlin/cacheable/last-build.bin b/core/designsystem/build/kotlin/compileReleaseKotlin/cacheable/last-build.bin index 0e00156cb..81e968720 100644 Binary files a/core/designsystem/build/kotlin/compileReleaseKotlin/cacheable/last-build.bin and b/core/designsystem/build/kotlin/compileReleaseKotlin/cacheable/last-build.bin differ diff --git a/core/designsystem/build/kotlin/compileReleaseKotlin/local-state/build-history.bin b/core/designsystem/build/kotlin/compileReleaseKotlin/local-state/build-history.bin index 3be66ebb7..5c8c24fe5 100644 Binary files a/core/designsystem/build/kotlin/compileReleaseKotlin/local-state/build-history.bin and b/core/designsystem/build/kotlin/compileReleaseKotlin/local-state/build-history.bin differ diff --git a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-4$1.class b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-4$1.class index a294216eb..d35f2ccfc 100644 Binary files a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-4$1.class and b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-4$1.class differ diff --git a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-5$1.class b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-5$1.class index 4b72a2ad9..bdcd4601c 100644 Binary files a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-5$1.class and b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-5$1.class differ diff --git a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-6$1.class b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-6$1.class index 61308a167..a00582457 100644 Binary files a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-6$1.class and b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-6$1.class differ diff --git a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-7$1.class b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-7$1.class index 2a1f135e8..fbab870b3 100644 Binary files a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-7$1.class and b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-7$1.class differ diff --git a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-8$1.class b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-8$1.class index 27d8f0cba..7f25ff58d 100644 Binary files a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-8$1.class and b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-8$1.class differ diff --git a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-9$1.class b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-9$1.class index 1479dd697..4107faf1d 100644 Binary files a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-9$1.class and b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt$lambda-9$1.class differ diff --git a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt.class b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt.class index 125de7750..4d04c3723 100644 Binary files a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt.class and b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/ComposableSingletons$TopAppBarKt.class differ diff --git a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarKt$ConnectDogTopAppBar$icon$1$1.class b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarKt$ConnectDogTopAppBar$icon$1$1.class index 0813e04da..3b2daa6bb 100644 Binary files a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarKt$ConnectDogTopAppBar$icon$1$1.class and b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarKt$ConnectDogTopAppBar$icon$1$1.class differ diff --git a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarKt$ConnectDogTopAppBar$icon$1.class b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarKt$ConnectDogTopAppBar$icon$1.class index 92e4ddd66..2809dfd75 100644 Binary files a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarKt$ConnectDogTopAppBar$icon$1.class and b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarKt$ConnectDogTopAppBar$icon$1.class differ diff --git a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarKt.class b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarKt.class index 9e8543c4f..2435b7e28 100644 Binary files a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarKt.class and b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarKt.class differ diff --git a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarNavigationType.class b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarNavigationType.class index d77901079..f0229b2bd 100644 Binary files a/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarNavigationType.class and b/core/designsystem/build/tmp/kotlin-classes/release/com/kusitms/connectdog/core/designsystem/component/TopAppBarNavigationType.class differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab index c3a8f76e3..2b9d16218 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at index 99da06a7a..8694ee8ce 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab index aeb4d17c1..c3ca54408 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at index 375884850..ac65f4acd 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab index 317546c12..d726bf7a8 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at index cf02ebb1a..5cf06f957 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab index c4720d01e..d726bf7a8 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at index cf02ebb1a..5cf06f957 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab index 928090105..3349b0cfe 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at index 3b6f0697e..8b8a3ecec 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab index 0b33961fe..4c6ad8378 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at index 7e731e7ee..25a7dcc9d 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/counters.tab b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/counters.tab index 9153a30ef..920202f82 100644 --- a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/counters.tab +++ b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/counters.tab @@ -1,2 +1,2 @@ -12 +11 0 \ No newline at end of file diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab index 339d2897b..f5ab49026 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at index 09947d11c..afce831e8 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab index c4061dbb1..bfc127c57 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream index 82dcce2b4..b73411eda 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len index 1ff194f2e..296694d3c 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len index a363176c8..a54135646 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at index 22a05ed9c..f49494259 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i index 8452381f8..fd274018e 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab index 6f1ee20dd..5d1798fe6 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at index e5ed63d3b..8bd51fcfa 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/cacheable/last-build.bin b/core/model/build/kotlin/compileReleaseKotlin/cacheable/last-build.bin index 9b589642e..f0f71798f 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/cacheable/last-build.bin and b/core/model/build/kotlin/compileReleaseKotlin/cacheable/last-build.bin differ diff --git a/core/model/build/kotlin/compileReleaseKotlin/local-state/build-history.bin b/core/model/build/kotlin/compileReleaseKotlin/local-state/build-history.bin index 9e148f58c..e57907006 100644 Binary files a/core/model/build/kotlin/compileReleaseKotlin/local-state/build-history.bin and b/core/model/build/kotlin/compileReleaseKotlin/local-state/build-history.bin differ diff --git a/core/model/src/main/java/com/kusitms/connectdog/core/model/Review.kt b/core/model/src/main/java/com/kusitms/connectdog/core/model/Review.kt index ebaa5bae7..ceb1507e0 100644 --- a/core/model/src/main/java/com/kusitms/connectdog/core/model/Review.kt +++ b/core/model/src/main/java/com/kusitms/connectdog/core/model/Review.kt @@ -10,5 +10,6 @@ data class Review( val organization: String, val content: String, val contentImages: List?, - val intermediaryId: Long? = null + val intermediaryId: Long? = null, + val postMainImage: String = "" ) diff --git a/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/CertificationScreen.kt b/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/CertificationScreen.kt deleted file mode 100644 index 263cac57f..000000000 --- a/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/CertificationScreen.kt +++ /dev/null @@ -1,171 +0,0 @@ -package com.kusitms.connectdog.feature.home.screen - -import android.annotation.SuppressLint -import android.util.Log -import android.widget.Toast -import androidx.compose.foundation.clickable -import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Scaffold -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.collectAsState -import androidx.compose.runtime.getValue -import androidx.compose.runtime.remember -import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalFocusManager -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.input.KeyboardType -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.hilt.navigation.compose.hiltViewModel -import com.kusitms.connectdog.core.designsystem.R -import com.kusitms.connectdog.core.designsystem.component.ConnectDogNormalButton -import com.kusitms.connectdog.core.designsystem.component.ConnectDogTextField -import com.kusitms.connectdog.core.designsystem.component.ConnectDogTextFieldWithButton -import com.kusitms.connectdog.core.designsystem.component.ConnectDogTopAppBar -import com.kusitms.connectdog.core.designsystem.component.TopAppBarNavigationType -import com.kusitms.connectdog.core.designsystem.theme.Orange40 -import com.kusitms.connectdog.core.designsystem.theme.PetOrange -import com.kusitms.connectdog.feature.home.CertificationViewModel - -@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") -@Composable -fun CertificationScreen( - onBackClick: () -> Unit, - onApplyClick: (Long) -> Unit, - onSendMessageClick: (String) -> Unit, - onVerifyCodeClick: (String, (Boolean) -> Unit) -> Unit, - postId: Long, - imeHeight: Int, - viewModel: CertificationViewModel = hiltViewModel() -) { - Scaffold( - topBar = { - ConnectDogTopAppBar( - titleRes = R.string.apply_volunter, - navigationType = TopAppBarNavigationType.BACK, - navigationIconContentDescription = "Navigation icon", - onNavigationClick = onBackClick - ) - } - ) { - Content( - onApplyClick = { onApplyClick(it) }, - postId = postId, - onSendMessageClick = onSendMessageClick, - onVerifyCodeClick = onVerifyCodeClick, - viewModel = viewModel, - imeHeight = imeHeight - ) - } -} - -@Composable -private fun Content( - imeHeight: Int, - postId: Long, - onApplyClick: (Long) -> Unit, - onSendMessageClick: (String) -> Unit, - onVerifyCodeClick: (String, (Boolean) -> Unit) -> Unit, - viewModel: CertificationViewModel -) { - val focusManager = LocalFocusManager.current - val interactionSource = remember { MutableInteractionSource() } - val context = LocalContext.current - val isSendNumber by remember { viewModel.isSendNumber }.collectAsState() - val isCertified by remember { viewModel.isCertified }.collectAsState() - - Column( - modifier = Modifier - .padding(start = 20.dp, end = 20.dp, top = 32.dp) - .clickable( - onClick = { focusManager.clearFocus() }, - indication = null, - interactionSource = interactionSource - ) - ) { - Spacer(modifier = Modifier.height(48.dp)) - Text( - text = "이동봉사를 신청하려면,\n이름과 휴대폰 번호 인증이 필요해요!", - fontSize = 20.sp, - fontWeight = FontWeight.Bold - ) - Spacer(modifier = Modifier.height(40.dp)) - ConnectDogTextField( - text = viewModel.name, - label = "이름", - placeholder = "이름 입력", - keyboardType = KeyboardType.Text, - onTextChanged = { viewModel.updateName(it) } - ) - Spacer(modifier = Modifier.height(12.dp)) - ConnectDogTextFieldWithButton( - text = viewModel.phoneNumber, - width = 62, - height = 27, - textFieldLabel = "휴대폰 번호", - placeholder = "'-'빼고 입력", - buttonLabel = "인증 요청", - keyboardType = KeyboardType.Number, - padding = 5, - onTextChanged = { viewModel.updatePhoneNumber(it) }, - onClick = { - if (viewModel.phoneNumber.isEmpty()) { - Toast.makeText(context, "휴대폰 번호를 입력해주세요", Toast.LENGTH_SHORT).show() - } else { - onSendMessageClick(it) - viewModel.updateIsSendNumber(true) - } - } - ) - Spacer(modifier = Modifier.height(12.dp)) - ConnectDogTextFieldWithButton( - text = viewModel.certificationNumber, - width = 62, - height = 27, - textFieldLabel = "인증번호", - placeholder = "숫자 6자리", - buttonLabel = "인증 확인", - keyboardType = KeyboardType.Number, - padding = 5, - onTextChanged = { viewModel.updateCertificationNumber(it) }, - onClick = { - Log.d("send", isSendNumber.toString()) - viewModel.updateIsCertified(true) -// if (!isSendNumber) { -// Toast.makeText(context, "먼저 인증번호를 전송해주세요", Toast.LENGTH_SHORT).show() -// } else { -// if (viewModel.certificationNumber.isEmpty()) { -// Toast.makeText(context, "인증 번호를 입력해주세요", Toast.LENGTH_SHORT).show() -// } else { -// onVerifyCodeClick(it) { -// viewModel.updateIsCertified(it) -// Log.d("casz", isCertified.toString()) -// } -// } -// } - } - ) - Spacer(modifier = Modifier.weight(1f)) - ConnectDogNormalButton( - content = "다음", - color = if (viewModel.name.isNotEmpty() && isCertified) { PetOrange } else { Orange40 }, - modifier = Modifier - .fillMaxWidth() - .height(56.dp), - onClick = { - if (viewModel.name.isNotEmpty() && isCertified) { - viewModel.postAdditionalAuth() - onApplyClick(postId) - } - } - ) - Spacer(modifier = Modifier.height((imeHeight + 32).dp)) - } -} diff --git a/feature/main/google-services.json b/feature/main/google-services.json index c0b115c93..2578900fb 100644 --- a/feature/main/google-services.json +++ b/feature/main/google-services.json @@ -5,6 +5,25 @@ "storage_bucket": "connectdog-8ace1.appspot.com" }, "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:260494595521:android:ddc97a53f6eb3fae428b40", + "android_client_info": { + "package_name": "com.kusitms.connectdog" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyDqQ5mEJVaoopO1yxSahoDXJ4D6EvUf15U" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + }, { "client_info": { "mobilesdk_app_id": "1:260494595521:android:a5be6ee857dccfc3428b40", diff --git a/feature/signup/src/main/java/com/kusitms/connectdog/signup/navigation/SignUpNavigation.kt b/feature/signup/src/main/java/com/kusitms/connectdog/signup/navigation/SignUpNavigation.kt index 90db83947..707bb6f25 100644 --- a/feature/signup/src/main/java/com/kusitms/connectdog/signup/navigation/SignUpNavigation.kt +++ b/feature/signup/src/main/java/com/kusitms/connectdog/signup/navigation/SignUpNavigation.kt @@ -7,13 +7,13 @@ import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument import com.kusitms.connectdog.core.util.UserType +import com.kusitms.connectdog.signup.screen.common.CertificationScreen import com.kusitms.connectdog.signup.screen.common.CompleteSignUpScreen import com.kusitms.connectdog.signup.screen.common.RegisterEmailScreen import com.kusitms.connectdog.signup.screen.common.RegisterPasswordScreen import com.kusitms.connectdog.signup.screen.common.SignUpRoute import com.kusitms.connectdog.signup.screen.intermediator.IntermediatorInformationScreen import com.kusitms.connectdog.signup.screen.intermediator.IntermediatorProfileScreen -import com.kusitms.connectdog.signup.screen.volunteer.CertificationScreen import com.kusitms.connectdog.signup.screen.volunteer.SelectProfileImageScreen import com.kusitms.connectdog.signup.screen.volunteer.VolunteerProfileScreen import com.kusitms.connectdog.signup.viewmodel.SignUpViewModel diff --git a/feature/signup/src/main/java/com/kusitms/connectdog/signup/screen/volunteer/CeritificationScreen.kt b/feature/signup/src/main/java/com/kusitms/connectdog/signup/screen/common/CeritificationScreen.kt similarity index 86% rename from feature/signup/src/main/java/com/kusitms/connectdog/signup/screen/volunteer/CeritificationScreen.kt rename to feature/signup/src/main/java/com/kusitms/connectdog/signup/screen/common/CeritificationScreen.kt index 7866a7ce4..c1f3d7583 100644 --- a/feature/signup/src/main/java/com/kusitms/connectdog/signup/screen/volunteer/CeritificationScreen.kt +++ b/feature/signup/src/main/java/com/kusitms/connectdog/signup/screen/common/CeritificationScreen.kt @@ -1,7 +1,6 @@ -package com.kusitms.connectdog.signup.screen.volunteer +package com.kusitms.connectdog.signup.screen.common import android.annotation.SuppressLint -import android.util.Log import android.widget.Toast import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource @@ -93,7 +92,6 @@ private fun Content( val context = LocalContext.current val isSendNumber by remember { viewModel.isSendNumber }.collectAsState() val isCertified by remember { viewModel.isCertified }.collectAsState() -// val isDuplicatePhoneNumber = signUpViewModel.isDuplicatePhoneNumber.collectAsState() LaunchedEffect(key1 = signUpViewModel) { signUpViewModel.isDuplicatePhoneNumber.collect { @@ -139,13 +137,15 @@ private fun Content( buttonLabel = "인증 요청", keyboardType = KeyboardType.Number, padding = 5, - onTextChanged = { viewModel.updatePhoneNumber(it) }, + onTextChanged = { if (it.length <= 11) viewModel.updatePhoneNumber(it) }, onClick = { if (viewModel.phoneNumber.isEmpty()) { Toast.makeText(context, "휴대폰 번호를 입력해주세요", Toast.LENGTH_SHORT).show() - } else { + } else if (viewModel.phoneNumber.length == 11) { signUpViewModel.checkIsDuplicatePhoneNumber(userType, viewModel.phoneNumber) viewModel.updateIsSendNumber(true) + } else { + Toast.makeText(context, "올바른 휴대폰 번호를 입력해주세요", Toast.LENGTH_SHORT).show() } } ) @@ -159,22 +159,19 @@ private fun Content( buttonLabel = "인증 확인", keyboardType = KeyboardType.Number, padding = 5, - onTextChanged = { viewModel.updateCertificationNumber(it) }, + onTextChanged = { if (it.length <= 6) viewModel.updateCertificationNumber(it) }, onClick = { - Log.d("send", isSendNumber.toString()) - viewModel.updateIsCertified(true) -// if (!isSendNumber) { -// Toast.makeText(context, "먼저 인증번호를 전송해주세요", Toast.LENGTH_SHORT).show() -// } else { -// if (viewModel.certificationNumber.isEmpty()) { -// Toast.makeText(context, "인증 번호를 입력해주세요", Toast.LENGTH_SHORT).show() -// } else { -// onVerifyCodeClick(it) { -// viewModel.updateIsCertified(it) -// Log.d("casz", isCertified.toString()) -// } -// } -// } + if (!isSendNumber) { + Toast.makeText(context, "먼저 인증번호를 전송해주세요", Toast.LENGTH_SHORT).show() + } else { + if (viewModel.certificationNumber.isEmpty()) { + Toast.makeText(context, "인증 번호를 입력해주세요", Toast.LENGTH_SHORT).show() + } else if (viewModel.certificationNumber.length == 6) { + onVerifyCodeClick(it) { viewModel.updateIsCertified(it) } + } else { + Toast.makeText(context, "인증 번호는 6자리로 입력해주세요", Toast.LENGTH_SHORT).show() + } + } } ) Spacer(modifier = Modifier.weight(1f))