Merge pull request #207 from YAPP-Github/feat/#206-qr-supported-brands

[feat] #206 QR 지원 브랜드 추가 (포토시그니처, 모노맨션)

Author: ikseong00

feature/photo-upload/impl/build.gradle.kts

@@ -30,9 +30,13 @@ android {
         buildConfigField("String", "LIFE_FOUR_CUT_IMAGE_URL", properties["LIFE_FOUR_CUT_IMAGE_URL"].toString())
         buildConfigField("String", "LIFE_FOUR_CUT_IMAGE_URL_MIME_TYPE", properties["LIFE_FOUR_CUT_IMAGE_URL_MIME_TYPE"].toString())
 
-        buildConfigField("String", "PHOTO_SIGNATURE_URL", properties["PHOTO_SIGNATURE_URL"].toString())
-        buildConfigField("String", "PHOTO_SIGNATURE_IMAGE_URL", properties["PHOTO_SIGNATURE_IMAGE_URL"].toString())
-        buildConfigField("String", "PHOTO_SIGNATURE_IMAGE_URL_MIME_TYPE", properties["PHOTO_SIGNATURE_IMAGE_URL_MIME_TYPE"].toString())
+        buildConfigField("String", "PHOTO_SIGNATURE_URL_1", properties["PHOTO_SIGNATURE_URL_1"].toString())
+        buildConfigField("String", "PHOTO_SIGNATURE_IMAGE_URL_1", properties["PHOTO_SIGNATURE_IMAGE_URL_1"].toString())
+        buildConfigField("String", "PHOTO_SIGNATURE_IMAGE_URL_MIME_TYPE_1", properties["PHOTO_SIGNATURE_IMAGE_URL_MIME_TYPE_1"].toString())
+
+        buildConfigField("String", "PHOTO_SIGNATURE_URL_2", properties["PHOTO_SIGNATURE_URL_2"].toString())
+        buildConfigField("String", "PHOTO_SIGNATURE_IMAGE_URL_2", properties["PHOTO_SIGNATURE_IMAGE_URL_2"].toString())
+        buildConfigField("String", "PHOTO_SIGNATURE_IMAGE_URL_MIME_TYPE_2", properties["PHOTO_SIGNATURE_IMAGE_URL_MIME_TYPE_2"].toString())
 
         buildConfigField("String", "HARU_FILM_URL", properties["HARU_FILM_URL"].toString())
         buildConfigField("String", "HARU_FILM_IMAGE_URL", properties["HARU_FILM_IMAGE_URL"].toString())

feature/photo-upload/impl/src/main/java/com/neki/android/feature/photo_upload/impl/qrscan/QRScanViewModel.kt

@@ -157,7 +157,8 @@ internal class QRScanViewModel @Inject constructor(
     private fun isSupportedBrand(url: String): Boolean {
         return url.contains(BuildConfig.PHOTOISM_URL) ||
             url.contains(BuildConfig.LIFE_FOUR_CUT_URL) ||
-            url.contains(BuildConfig.PHOTO_SIGNATURE_URL) ||
+            url.contains(BuildConfig.PHOTO_SIGNATURE_URL_1) ||
+            url.contains(BuildConfig.PHOTO_SIGNATURE_URL_2) ||
             url.contains(BuildConfig.HARU_FILM_URL) ||
             url.contains(BuildConfig.PHOTO_GRAY_URL) ||
             url.contains(BuildConfig.MONO_MANSION_URL)
@@ -166,6 +167,7 @@ internal class QRScanViewModel @Inject constructor(
     private fun isShouldFirstDownloadBrand(url: String): Boolean {
         return url.contains(BuildConfig.MONO_MANSION_URL) ||
             url.contains(BuildConfig.PHOTO_GRAY_URL) ||
-            url.contains(BuildConfig.PHOTO_SIGNATURE_URL)
+            url.contains(BuildConfig.PHOTO_SIGNATURE_URL_1) ||
+            url.contains(BuildConfig.PHOTO_SIGNATURE_URL_2)
     }
 }

feature/photo-upload/impl/src/main/java/com/neki/android/feature/photo_upload/impl/qrscan/util/PhotoWebViewClient.kt

@@ -35,7 +35,13 @@ class PhotoWebViewClient(
             }
 
             // 포토시그니처
-            url.contains(BuildConfig.PHOTO_SIGNATURE_IMAGE_URL) && url.endsWith(BuildConfig.PHOTO_SIGNATURE_IMAGE_URL_MIME_TYPE) -> {
+            url.contains(BuildConfig.PHOTO_SIGNATURE_IMAGE_URL_1) && url.endsWith(BuildConfig.PHOTO_SIGNATURE_IMAGE_URL_MIME_TYPE_1) -> {
+                Timber.d("포토시그니처 이미지")
+                onImageUrlDetected(url)
+            }
+
+            // 포토시그니처
+            url.contains(BuildConfig.PHOTO_SIGNATURE_IMAGE_URL_2) && url.endsWith(BuildConfig.PHOTO_SIGNATURE_IMAGE_URL_MIME_TYPE_2) -> {
                 Timber.d("포토시그니처 이미지")
                 onImageUrlDetected(url)
             }
@@ -53,7 +59,8 @@ class PhotoWebViewClient(
             }
 
             // 모노맨션
-            url.contains(BuildConfig.MONO_MANSION_IMAGE_URL) && url.endsWith(BuildConfig.MONO_MANSION_IMAGE_URL_MIME_TYPE) -> {
+            url.contains(BuildConfig.MONO_MANSION_IMAGE_URL, ignoreCase = true) &&
+                url.endsWith(BuildConfig.MONO_MANSION_IMAGE_URL_MIME_TYPE, ignoreCase = true) -> {
                 Timber.d("모노맨션 이미지")
                 onImageUrlDetected(url)
             }