From a2e4926273356a0845b9fc394b174b4038b04935 Mon Sep 17 00:00:00 2001 From: mendel Date: Thu, 13 Jul 2023 16:53:48 +0900 Subject: [PATCH 001/159] =?UTF-8?q?feat:=20=EC=95=88=EB=93=9C=EB=A1=9C?= =?UTF-8?q?=EC=9D=B4=EB=93=9C=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/.gitignore | 33 ++++ android/app/.gitignore | 1 + android/app/build.gradle | 44 +++++ android/app/proguard-rules.pro | 21 ++ .../android/ExampleInstrumentedTest.kt | 22 +++ android/app/src/main/AndroidManifest.xml | 26 +++ .../ddangddangddang/android/MainActivity.kt | 11 ++ .../drawable-v24/ic_launcher_foreground.xml | 30 +++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++ .../app/src/main/res/layout/activity_main.xml | 18 ++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../app/src/main/res/values-night/themes.xml | 7 + android/app/src/main/res/values/colors.xml | 5 + android/app/src/main/res/values/strings.xml | 3 + android/app/src/main/res/values/themes.xml | 9 + android/app/src/main/res/xml/backup_rules.xml | 13 ++ .../main/res/xml/data_extraction_rules.xml | 19 ++ .../android/ExampleUnitTest.kt | 16 ++ android/build.gradle | 6 + android/gradle.properties | 23 +++ android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + android/gradlew | 185 ++++++++++++++++++ android/gradlew.bat | 89 +++++++++ android/settings.gradle | 16 ++ 36 files changed, 785 insertions(+) create mode 100644 android/.gitignore create mode 100644 android/app/.gitignore create mode 100644 android/app/build.gradle create mode 100644 android/app/proguard-rules.pro create mode 100644 android/app/src/androidTest/java/com/ddangddangddang/android/ExampleInstrumentedTest.kt create mode 100644 android/app/src/main/AndroidManifest.xml create mode 100644 android/app/src/main/java/com/ddangddangddang/android/MainActivity.kt create mode 100644 android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 android/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 android/app/src/main/res/layout/activity_main.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/mipmap-hdpi/ic_launcher.webp create mode 100644 android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 android/app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 android/app/src/main/res/values-night/themes.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/app/src/main/res/xml/backup_rules.xml create mode 100644 android/app/src/main/res/xml/data_extraction_rules.xml create mode 100644 android/app/src/test/java/com/ddangddangddang/android/ExampleUnitTest.kt create mode 100644 android/build.gradle create mode 100644 android/gradle.properties 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/settings.gradle diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 000000000..347e252ef --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,33 @@ +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Log/OS Files +*.log + +# Android Studio generated files and folders +captures/ +.externalNativeBuild/ +.cxx/ +*.apk +output.json + +# IntelliJ +*.iml +.idea/ +misc.xml +deploymentTargetDropDown.xml +render.experimental.xml + +# Keystore files +*.jks +*.keystore + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Android Profiling +*.hprof diff --git a/android/app/.gitignore b/android/app/.gitignore new file mode 100644 index 000000000..42afabfd2 --- /dev/null +++ b/android/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle new file mode 100644 index 000000000..99248b56d --- /dev/null +++ b/android/app/build.gradle @@ -0,0 +1,44 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'com.ddangddangddang.android' + compileSdk 33 + + defaultConfig { + applicationId "com.ddangddangddang.android" + minSdk 28 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' +} \ No newline at end of file diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro new file mode 100644 index 000000000..481bb4348 --- /dev/null +++ b/android/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/android/app/src/androidTest/java/com/ddangddangddang/android/ExampleInstrumentedTest.kt b/android/app/src/androidTest/java/com/ddangddangddang/android/ExampleInstrumentedTest.kt new file mode 100644 index 000000000..bec464668 --- /dev/null +++ b/android/app/src/androidTest/java/com/ddangddangddang/android/ExampleInstrumentedTest.kt @@ -0,0 +1,22 @@ +package com.ddangddangddang.android + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.ddangddangddang.android", appContext.packageName) + } +} diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 000000000..18de0e8fc --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/java/com/ddangddangddang/android/MainActivity.kt b/android/app/src/main/java/com/ddangddangddang/android/MainActivity.kt new file mode 100644 index 000000000..4810fb97b --- /dev/null +++ b/android/app/src/main/java/com/ddangddangddang/android/MainActivity.kt @@ -0,0 +1,11 @@ +package com.ddangddangddang.android + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity + +class MainActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + } +} diff --git a/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 000000000..2b068d114 --- /dev/null +++ b/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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 000000000..07d5da9cb --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml new file mode 100644 index 000000000..17eab17ba --- /dev/null +++ b/android/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file 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 000000000..6f3b755bf --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file 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 000000000..6f3b755bf --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} zs4%E?srLW`CJh0GCIK@hTkrW7A15Iu%N&?Q^$0+!{Tv&|t^Y@u%!L zglTg&?Q5q#ijZ;&HBQ?FNPp;k3J5!&{^+SGq?AX~SiOM9jJMRpyP?RCr@z38AQyy&WRMaC;n4una$~nJKSp?q|s8F00c9?Q! zY_ovvjTFm+DeQM^LXJ#v0}6HRt3R1%5PT*}W!k8BEM;Jrj8dIceFo2fhzTqaB3KKk zGlCLI)gU25(#u6ch6GeB1k@eHq7l{EHXv0n6xE#ws#ri}08kkCf8hUt{|Ejb`2YW* zvg}0nSSX1m=76s?sZhRY$K=3dpJ+y*eDULGnL2}4>4nvW^7_<~wIM_5fjvwt4h1|g z)g0Z6ZFq9j<~9~b8((~TN{Z?ZQfw|is&Xp~AC61sj;xItKyCHdI|tCMC_LbXF>~vR z=w6V3^H=W4CbAgR4#xw}ETTwu2guW~=Crl@SMXv85jQ=%y!s^?m4PI0My7MWICO;- z175jm%&PcPWh8QdOU(#8bp4!N7ET-+)N}N2zk2)8ch|4Q&lPFNQgT-thu053`r*h3 z_8dI@G;`zn;lH$zX3RzIk`E8~`J=BBdR}qD%n@vVG1834)!pS1Y?zVkJGtsa(sB~y zNfMYKsOJb%5J(0ivK8d+l2D2y&5X!cg3BG!AJ}910|_${nF}sC1QF^nLIhzXk-Y#x z0)&1iK!O;Og0Ky!;`b~v%b$`S4E&fB)1NB4v@8wr( z&+NX4e^&o)ecb=)dd~C!{(1e6t?&9j{l8%U*k4)?`(L3;Qjw z#w7FS+U(94MaJKS!J9O8^$)36_J8;thW#2$y9i{bB{?M{QS_inZIJ!jwqAbfXYVd$ zQ5fC$6Nc9hFi8m^;oI-%C#BS|c8vy+@{jx6hFcf^_;2VRgkoN(0h!_VSGmgNPRsxI z8$rTo0LaYq-H5i&gtj81=&xU?H-Y2==G@uQV7E`@+2E9XQW@{&j`?EOktk|Ho{HU>ZqDzvgjwBmdex z&uZNd2C1h{{}2k6Ys9$*nFP3;K%u!MhW`uZy7Sn`1M1zs@Es&;z*Z>Gsh@-3Fe6pE zQD2@cqF((NrRevgvLsvM_8;;iNyJ5nyPyy?e!kvKjGj`6diRFBEe49Oa7wwkJFV7Z z$YT&DWloYu-H?3<0BKn9L&JYDT-SK~*6c5pi18P26$JESKRYj{T7Zk6KiRJcbvOO*{P56Q6s8msbeI3>|j>K9}Q9UBeq*inXKemCm`-<5|-$ZyN4u$(3 z&HcvqehFD%5Yrmykg-^d`=BSa8(i=>ZoC77^mWY{evp(km@aHqhUECBz76YiR+VYK zY_avFC~V3$=`6C4JhfHAQ@DZtUOwH`L;oYX6zK0-uI^?hS$ALfq}A7evR;ohJHij} zHSZdW?EKv9U1s4oD*<(0oQ*;MaQ6@cvGL zuHCPgm_NhVsgp^sfr*ia^Db}swo1?O(_Q2)y+S$CBm+g=9wCOUPbz(x)_GbaKa@A7 zuI&!ynLiZRT#V%_y_-D`0Z5lT*auoe{(U5NylTzFSJW()W-#F6*&A`LNO1bV#Y;QJ zSbLBnp|B^dtK|KIWC|No>JjWBWE@n7O)x{&^E(WMeMvp57#qA8m* zeTow*U@_86B#Fm*rxyYu5PRWaWHx8y> z*qmHEp(AMDl0v)ij(AY8fnH=~ZwwjVAbu*m5;xPfidh@ov6d8g zfJsi&!QyK53Es%sC39ts;54V68koALD4b|%tNHW0bIkZAJKa=W&FomJSEDT>W1xIX z1x%Z>AvNIsSPLcn3RTcHXb@KB?cuM)=x6fcIx>&(GxqZ8w3p#jJ(GVgc*`c0HG}dv zIop&Qim!K1NFwic%07KcjWgHBPUkq7f~lj;TPqVGTiT#cUeim>;nY`>h@a*S{qQex zQ`z62WK|Mj)Y{tfF{;T4P;c8$Q|KU?Joh zIkA^z%X7z|r>4aTh@|StTi!-r1D!g=zb#3d#{{&K3CqE$Iz-UH<%37c zRfkO`&uM%#AD3PHv`g5t0e^O%nVL0d{Xlx^EjEC3#skF@`zl-7PF^0oxW)1!C!JxR zWvuAHH?)61FKA1QeT*_sY7;_Id#!GmV4n`MO{~sv}VLSK` zXRw=Y=Clz*00B(5y^K;gCZMAzjT5+c3IC=)l(9VIDdatpxj3y89WwI|bH&$!ZEvp` zPR!T@#!(|KfI-w?!&+7$N3F6>tD{YO4Qg$d_`nNEdfVCha9vaPn0jI0`)`@*72hq! zpU5ND^P*RoEkbD5o#az(-g=Y)L>HH>Oc%}$ zT3Rs_ih0;4+Lv4Y;@Iv(;fUbQ=i-G(#>vghec~*j(I#r|5mqFiJBpzi&hzEcD{u$< zRsm0BVYn=pT;0>R(itW|*D&;O%bOc7et9ACaH#J>z3A1A~6fdP>pmbM%xzm4>|;c_?B+%sl;Qs2{t!60$^u zH1t@9^6>;?!FuusnISi$f5CL&;z?EqJN$FBuWDA#D5`cy_UvCFIVvf{c?4N0teh;d zET$7aVbj08KTQS!x?Nd1Is8q8qFzs}a=!@nJ;7FSfCY^T@D-gpw`w<6e#X3+;O}1h z$%I!M)0bg|EKUA04Qjn@+x{Rj8vt6Wn!R|3A92z}^$KfF5(#CWr4y#~re1CN4i4w0 z#GsypBR{xA3Er7sgAi(|}1-W?s~n$7?K|9WL8kpVfw-;#b9 z+mn;=ep!162U5R>_t}fOt~tE?s#m( zO-S$7>Ay6*hHdZ)7_oU915WYYCIX;hFI-U2EWYX!pllONr@Q--2o~`!isi6vTPLJ4@(|o=%NHYjo0_S&q*UQIROw@*N-By@PaQ&;YxFZ0aR zX&}LeOEz);#m~Hwm^VAY8DK}b$F4bo{jMN?d!lxKPhNklzr^Cd`0f4oJr^z=I|l`* zm8AHm*fPV`0=lF3Pnnp}&J0N1X@}-D94YvmUabFrLGSnTz7Mu^21F#O5tN#CuY9Vh zUZBH=ez%h*wkf0hBtXJh1SN3d+IF{gzT7lp)j}n?03lt;XSQRAh7qd&v;RwTYDuQ# zbI2*r<>?x-G0@hM{;%{VBD7nLKt~D`T~-HAt5;h%i0_=Ifs=yHma5dhJ+QMG?Ux(a z|E?1CMy1!~oA`FP!k~iG=t&5#>bVdz=peT8HMB6Y)#7PpETtNryT^+Rv3vpJaF^zP z{H}0-LyV9Fu21ID%wO9f1IKlFr1p4c{o-?03vyB-tr5duk^&L$;m_|f$vs`^Sl{j2 z95}oY{LlY+=ZS%J+tZoXCd0*sSU7w^gjovXn+g7uyra5{cU49@yHf#Z^Jl-$9cIfo z+AJuxH$VLb=#+uBbVmUjnx zxb1pZ@-O9=AIk4@S)m6fJ2?{HrNYwwnL3a45muuNjr;6$O`bGEM0T4A2_S$t=86*- zcO+0mywg*j#A4mU}enR_!cGmIYQ;qwfchWtFEXL)AK%*;=j znYne+hS4EMy3S)C*mZ1KI>!+)0V@9!N6H$Y}~MJ{rYuf zz^KljIWvFi-?#?V@LPR&c6Nn{!=XM z>}-h$S76;$H{E{Y%@^zlmOl^efBwa%UU+jJD9UVukQ3ti_kH-?H*RC0?M1W%FCvMB zM_+v6fk$6X2sx)-p~B3&Kl{nscK}pNLM*qjtpaf9>AU{-iPKQZR8yCg!TY}Qg*(;) z)gdvCcB%kppZc$VdvsK@)3l1{&DG!d_6OHOS`y=ITLEVu`unSKA2E%JD*DVX{LJ}K z9l>hMRDqxQh0lnpGHpVYneX}eA3Pt|2v%=q;rt)``R|#bDyB)OXY&vI_@|*}h}G?^ z@aZ4_!7cQPX`!fW_?{oT1NTwHs#l5L-0`E|y@48<3Q^HFf8=Idi zpJYD%1MkII!~|7I^WGo)IF=?{>ACnjJ_WUi39C}!Q{QnheVJqeKKqq5^o5CBde(g9 zvw$X6^jz_^E2$wSw4!q5*RG(C2_^XO$HBn_55vbl44OnTTRwRaePP0vo{K)U1#99& z<>rq7V&V(<&@I%MFoN5zrY}sz=(*-L&}1QQ*a%`u25h{cFj===17eB_uGuzG&byQ< zrm8BJZl4r_E$3k|Wo6FW0-6M7>qac5uFQsQcmkLWGfeH74S3Z_rJ!jgN++!@i=HW8 zkyjI(oPH-+-N#Qc^-mpNO`bc6r=2-<%&Wy5K1vfFJB(L_IkpS6fY^NmuL8qsgj>MD zn~BHH9WM~32_3vd=W&B)k7F9q%stJx+b_L_X-4zr^LVUMCmyCTA3sWtkvsmME?Xiy z?xOSfB=_$oY06~J-HcCq&)qcW{j;uP;?Dm}=hkq?zh&n!;m((-G-u_t|6x399Q;>A zgNpxoJNj{u|MFDH7Rhq@FCAl0dE|ddnl!oh9{Lq?@JDoR6L;C941IK`ISfdE$4S zE0AUQ8+2|Ncl_q5QkSp#AODp~(^mfP&%Au@@|TBQwoP`UU+V{6u8|)6ZA{~uKmQ*M zmrMTDU8S~8Eqi{^v0Ug&5Upcm#y7Z1(RbgZAG8jB$eRwCspQ)>5;U)oGZ&E5aeR*K z8Yt`Y0$G))Yd(Y3KH}tA4`-_QmNke5hU_|nq=xtyjwW(_o?itz>B>WM&^63bNdQ)k@-IgDHW*RW$Xo9#RzrTrCn7L2H{9Amq|qNg@#eZY=|P zCoI?2s+L)zsM%WX(NbVEY^`C>lFjIBYmJ6@DKJ0ZT4&F&WHW!dwa%QzOG!?jY_2(S zDcEzZbz*2Q!43|z))9yOP9X1Xt%DXzwY(3tl-TR=Qb_MbZYRrooh;dYYmS!U_as1(=YVB?Q_A|tNu5Ut&_q3jbfDM zoFxT^uEuH`nX3*sB%K?GuHUkweYReBwnHqh3P)~`+s3+Tj!rDA1e)8vuBv5J*IsxC zkd^~b(aGzArj08{>cnzOuy04C+C`}gb|Yz-1avxeWzev3NzcHbz_&4W@QCr$z3~w=8Ua- z`;vfG1~BP8CyLb=F7t1am~ph_#|O%$khSJ9%Vtcn)YmpgQxF?xM^_Vb+5fnpB^W0I`f%X8gb9#X{Q-yJG0{Z56aWeI&zPxnf5pdJA38bM`cYnS#x)% z`n1tFf$i)W-hGm(f9mde^=X@NcV_lFb=P`4&CI&H=IArijGwdCk&X@uQ$5xmj!~^? z#$ROCI)V-~t%L%GS#wo@U27ddR`4`3)WoB{R-4snfNrfee|kI8^bu#yDgYqOwas9# zmcb`3!kRJ`Cr=_tq)8aMt{aGtUZsqwVlj6DgCGre>AEt&x8H_in!x@uwgExIh|-mA zjdaC(29~CTVSaaF7HPbql&*9Uo8P@f)>LqCXclr}peS7_1BQ28u9PO8Eq1@`l3q9o zkfKCaO2?T?ZyA6loW<#9_c^O=m<&h}CA!ineAD@=(gbq`vyT|tiJ6#^B1$P;;qax` z55k&Q?wEh#87niLo*+n4L@65J(Nz~=Ya%7^(miLb(E>A3B@|Jjl;FU&D>o|9#7PJH z?|ago!o;WC^h=|T7PVBg(DAB}72cyUS zb(f>Bwbr!F1eTCO5fpj<{PqhY5>143p?~5ZA5H40);=@M#MYvrB6gqHbU_!GSY??i z%s=>-ciA4*zOOZHds0a(kWewZ4h(k8h(ua7HX)Au&mY~H8KY6(_cb$_&fA@QjIW-*heP3%$d!m5^AdnT}`12qA^c@!g3DOwZ5WwE2?)-yU z!)Vx#Mtxt?FzFTwK!77sy7)sMzUd->w4^bxtpM2j!b1pjgyk zGKwWGeb4)^zjy{9Es&PU1}gwg?|J#L$KJB7ett9@4M%-nGtIQr0>Fl@8-yh`-+1ed zS6r}(MeSvgSoFmH*_WPu@i?}!AB~2?;i&IxrkNg~cQ9Som98tcq)k^|eeER|Zl77t za-TVUc;DNvzVXJ%w52+#weN?+;i#{f#!Oc&z?81*N>^e~ltRS%ZI@lR{rs()HmqG! zx*}ZrI-EZ}ckJMiy>A^oofwDfC~IH)z8{VHKGT@#E5I(Ll&+MnMCl>~AV7+>Gi%mF zkU1QlKASdR0B80!YhP<$Ywi0?W2Ux45oPfxv9QolWzJPD^weBfvo4SONxP35106sAmh(e+vAs0GboFD@PvNs)jNPvarhW}0YliZEg{Gazv z+JDIpoojRVPr<*C|BTq<`6ga{5q^8^!|0cxe=rZ!zxH3%f5ZO0cQ*Z<^$Yt2{|Ek0 zyT|*F+CO@K;(owBKtGg!S^xj-Z~rga2m6nxKl9J=fBSuNKW_dLKWhJKeg^-Xe`^1? z`TyJj)8E!#>_3Y?uKrwqq3LJ#SGU>AzUO|6`nR^u&3FNN_jGOc zw)Nw`wr3yIKhgcee6IaN=ws>M{6677%)hPwx&HzC(f&u~&)6@b2kNRzBDQAP0*H73 zq%McOmRk{B3i47qRe=DA*$&odrbEJZ*pV9XXa&p@wlW~@Yfs>V{yiTtplMhgM*-Bz zsSnlq&pG;z0OUN%$~$3=g1UF+G*>+17eRbBf3=y79J}KR8owon@$1Z7MIrvvWWH)34nK2SD)GsrJ{l z1Cl#oVo3A8qY3e=aF)qzms~FG#2$LzT=gs&aVMOj>(%{y<&O0cG!nCiESl~x=^dF{ zKvj8F1K8Ng171wwM5Fh4KoQw`_c6#y$(5cAm7e}~nJ#A*fx+c9;y#&W!#VukR)ugk zKp3=+;Ut+IYn%m+r4d*<`L2h%aDnX5}^!5R|H;(34AoVWjRx(msBZvk;rCI*|~ zdOijqI@9Z{Vu!~jvHW{lBa$rnl4+!s_5sfK3bCGk-B%iDe&@-}+%fOKU|(9?V1 zHE8&@4z)Kx!RAvAs z!Wic9=o#(bg?kc-G68-m(jZ`^=XGUXb)}t(%&~sjFnV^sEX%hSy6UKC4iOhgV=BHV z2w`4g7Y=s#Vu2B_?#VQ|hP39@eArgfX>-0S+dd&^mx0*wp}>)x;c4RUgxz%;oNe?& z-7-lJ@Y^2^C;=qJsxx5|xF)*pTGhch2B&kxtn;f!7=gznk}I3}Dh}(CoMXgA5-p&kS202!l?!fT3t|HG*rIP~mS* z$Wjo}jq3}z$Qq!9yrtd3fM0N629ZM?LU$nv@Tv9b7I;D|;0H2dsA~g7Z7zp1| zB)XmrkMgF6OQr|R)HHD^TE{Y#j!~SR?b`Xt3Qs`B+x<hxexYeAjMUWdZ-*n9%(1)Wb(n2U<><7&9dwGJmrob)4%H? zlQ%z+L-^$dFhhH|@u$%97Qz?*Ynh2VG@q|?8vY&L74&fs&_b&3$x&Oyjl~LQDRRap zJU4U*R+(2Dd!G+lh8!V{pT_UJn+^1Qg6$` zqkNm(a#hWyc6SP+p5=C4HL8-m`pO`5o~`-LI?_h5CsH?F_%?nDodmz&pWR20WTpJE z?N|wSzLjMUK8E)a2tI}Lf;+;*M|h3Y(U#>)g1>zk9|Hd}oZAa2 zLYBWBoSW!Ts!RwXr^8h+U*@{9{zqS^iH)Op<;r`Uw~nc}<^$V~_i%$GFjaG?X1@E|M`h)nekvFKt`Dh-f>@|0-`Xoq)o` zx;JmzDfOV9qCx|EVpogEe0LK~tGS?5$$L_i6P$P6wIsCQaP_;d{{N=iV@+8LI}o#( zvo*Ejy=IIn{rdIQh1&q-{EuohpVOjJ^Q3lD*YTp37$^RRgn8ihpdu5{Ct%5-KO!VL zcNB6dUajXI9jkm-P|i3~GB-A(X`P1Oqqb$tcku)UJw0w3GeUijb__#QT4j%64z%EeB7S?jlWwx_7&+EEvB|6N=kV}DwnyAlX=?j`) zmU#!$*^@NIu#n_d7;WoJV@*Fbv9|yJO4;n|BNF2xy(54RyB>t~8lUOUW$&2%Nwi1y zx6JxW88>U2$#qhl^6KUbtmg9}D0o5vYDT7kWJthLGkpGnN4T>{St^_EU>4;DmLF9o zr|LqsA8_MoNLQ=}w?8u!ziSZ@PC#Y<#9uJFo-ozVo6D;<8j^1$c|qAE3ZTE5i~zmE z$BU5lw6l=EWsg^y^;8>r9qH{xfL|~PZYK#md$zZ0?o11gV<*WSW~cgy2GYGQir%wf zt4iW8D+;s*;RGrmd(-T<@2&j(Cb9xhV*l-x`TpK`xq|7p?5R%5*s!69?2c!cC*VY* z2DE^9pvOPLU!1e}wA8S8opcTJ3`NB>hY=JQnL~QFXR4K8A$BqJnoEB$wn-%u@E6Mh zCfMF4kusv3N!(aHC}4)Xs^xoOwXd%e^6pi5|DZo=Q25j+6HlJ^7FodH6y1bMROR^q zGu6)fopS`h%Sw<;ZH%TEPf+#81-#_v+@8nlR0jLcIDKQtLleOC)6yLZgC!D9X3GgS zohwU{v$jl=quD#Go^hB{`@Qw*a%`(^jyT~=q^bWgGzRj;|12J55HWdCWV}EB|K=%N z3Nq-qxJJ`>^|1MNN+q}zTB&ooE3j==AgK@^UW<^oSbeALa2peF)Th6{@sj0KyMNHZ zksk1+MXN2tv+22A%cQOGpS9)77(uP9mh+!5T5ERLvF@b}$+WvXM45Z?-kCa)fb~f1 znVbTD$Gx-0Zxc`0D@YgHakge6SL0H`-vN_x?AP0>iGH0_EE&=v83hMJgaKAI0jJXm zVxVz;X<$v6WW7}fxROO7vr#YLP;;lij5VrX{;>7kK6TtOH&6|Ar^xo>00%+u$C4@# z>!jOt6*3><171+WxoZnKDTzJtDRw+T030;yI}~uV@9fCnei^I*j>Bp&mzP2d=FPb_ zCM*l_+$LDR3B*a!A$g#>xsrZvw0lckxmMg>0aQd7tPyN=t{dgXb;Ie+T8{fZH=gdu zM7Rg9c(kg(Jg0?ARRRl=AONFKrvFj)lTY$KfT%6^6s`mk*ABGhsce*LsoD>K{z_M2 ziPpnu+lw22PfF!CoId^6n*G4H(Ix+#+N{C(da7t1BYMGEaE#PdpOLxsVD5riQXHp@OX;`S`8VnpM~)I920w~<3|mo0 zf8~Az`*?2?H&gZ&*K&bRkV@qzvMlRHXys8*Ze2+1c?5o!^+$&MHxB@4Ee5cke52R! zmn7AZtY6ST%ixgU5)%$%QcwHj7Es-Qu^kLAPwy%7pGBw_4Q9#da^W2$}axNHr03)_nw z5?yuNmXrI5HgS46)c5&}B)Tts49oU92>3xBLLy}FMUW=84DQbVq^;7_e7|(Sdz|&J z73N+M`rc2rt*oSWu#7S{*s~nH6HRHJS1SmzeXk|;CA)FI4bat3<%}nkB%;;?=F>B7ms9QSxv#@+69;@>QaR?REYX4&)=itG>rM{<{A79Rmk)`5ON#GL`*KX%}Ihk3w(RtM-WLt z?f&FLF}4N^yE!(pZ&Yj&Bc`~K0@4_}*0Om?wN|}4WJ>WL;G^H2*QpgEkGA~OET-Km zkwz|5{6dnz1U<2Pe9DNL>3g5FEIvp1jzP&2K#z~j%g6!7B;^zF+o95?fV{3mnB8*RMhCDNp>Am-3e@jNfMj?jHV$MWjk!DDKP zkAz$Y?Sr)!GUOX}qTQ5aMh|wq1uq}~joWyKl=b_LboM#wi{CMuz5x6BKlA-qy++cM01D3b7`uD z#l6M4pI;JCypO8JZ6?U&wNxR!{4oB_ zlV!x9+-&Qy6{%MQ{~yoZGkKiTSC`YS_j22~G;xUV855g2&C(zm^V!(wpcm@zn{%!g z4}JGo(sGZ1O~to-}le

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml new file mode 100644 index 000000000..75ab1bc58 --- /dev/null +++ b/android/app/src/main/res/values-night/themes.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file 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 000000000..c8524cd96 --- /dev/null +++ b/android/app/src/main/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #FF000000 + #FFFFFFFF + \ No newline at end of file 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 000000000..c7e1d6ba6 --- /dev/null +++ b/android/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + DdangDdangDdang + \ No newline at end of file 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 000000000..1d6580a8d --- /dev/null +++ b/android/app/src/main/res/values/themes.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file From e24054916f2a79b4b1dfa49089e1fe56cd3be375 Mon Sep 17 00:00:00 2001 From: mendel Date: Sat, 15 Jul 2023 17:20:37 +0900 Subject: [PATCH 012/159] =?UTF-8?q?feat:=20=ED=94=84=EB=9E=98=EA=B7=B8?= =?UTF-8?q?=EB=A8=BC=ED=8A=B8=20=EC=9D=B4=EB=8F=99=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/feature/home/HomeFragment.kt | 7 +++ .../android/feature/main/FragmentType.kt | 8 ++++ .../android/feature/main/MainActivity.kt | 47 ++++++++++++++++-- .../feature/main/MainBindingAdapter.kt | 12 +++++ .../android/feature/main/MainViewModel.kt | 35 +++++++++++++- .../feature/message/MessageFragment.kt | 7 +++ .../android/feature/mypage/MyPageFragment.kt | 7 +++ .../android/feature/search/SearchFragment.kt | 7 +++ .../app/src/main/res/layout/activity_main.xml | 48 ++++++++++++++----- .../app/src/main/res/layout/fragment_home.xml | 17 +++++++ .../src/main/res/layout/fragment_message.xml | 17 +++++++ .../src/main/res/layout/fragment_my_page.xml | 17 +++++++ .../src/main/res/layout/fragment_search.xml | 17 +++++++ .../main/res/menu/menu_bottom_navigation.xml | 4 +- android/app/src/main/res/values/strings.xml | 2 +- 15 files changed, 232 insertions(+), 20 deletions(-) create mode 100644 android/app/src/main/java/com/ddangddangddang/android/feature/home/HomeFragment.kt create mode 100644 android/app/src/main/java/com/ddangddangddang/android/feature/main/FragmentType.kt create mode 100644 android/app/src/main/java/com/ddangddangddang/android/feature/main/MainBindingAdapter.kt create mode 100644 android/app/src/main/java/com/ddangddangddang/android/feature/message/MessageFragment.kt create mode 100644 android/app/src/main/java/com/ddangddangddang/android/feature/mypage/MyPageFragment.kt create mode 100644 android/app/src/main/java/com/ddangddangddang/android/feature/search/SearchFragment.kt create mode 100644 android/app/src/main/res/layout/fragment_home.xml create mode 100644 android/app/src/main/res/layout/fragment_message.xml create mode 100644 android/app/src/main/res/layout/fragment_my_page.xml create mode 100644 android/app/src/main/res/layout/fragment_search.xml diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/home/HomeFragment.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/home/HomeFragment.kt new file mode 100644 index 000000000..896ce0829 --- /dev/null +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/home/HomeFragment.kt @@ -0,0 +1,7 @@ +package com.ddangddangddang.android.feature.home + +import com.ddangddangddang.android.R +import com.ddangddangddang.android.databinding.FragmentHomeBinding +import com.ddangddangddang.android.util.binding.BindingFragment + +class HomeFragment : BindingFragment(R.layout.fragment_home) diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/main/FragmentType.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/main/FragmentType.kt new file mode 100644 index 000000000..122e1e31e --- /dev/null +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/main/FragmentType.kt @@ -0,0 +1,8 @@ +package com.ddangddangddang.android.feature.main + +enum class FragmentType(val tag: String) { + HOME("fragment_home_tag"), + SEARCH("fragment_search_tag"), + MESSAGE("fragment_message_tag"), + MY_PAGE("fragment_my_page_tag"), +} diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/main/MainActivity.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/main/MainActivity.kt index 7861d758d..db08b92f9 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/main/MainActivity.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/main/MainActivity.kt @@ -1,12 +1,53 @@ package com.ddangddangddang.android.feature.main import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity +import androidx.activity.viewModels +import androidx.fragment.app.Fragment +import androidx.fragment.app.commit import com.ddangddangddang.android.R +import com.ddangddangddang.android.databinding.ActivityMainBinding +import com.ddangddangddang.android.feature.common.viewModelFactory +import com.ddangddangddang.android.feature.home.HomeFragment +import com.ddangddangddang.android.feature.message.MessageFragment +import com.ddangddangddang.android.feature.mypage.MyPageFragment +import com.ddangddangddang.android.feature.search.SearchFragment +import com.ddangddangddang.android.util.binding.BindingActivity -class MainActivity : AppCompatActivity() { +class MainActivity : BindingActivity(R.layout.activity_main) { + private val viewModel by viewModels { viewModelFactory } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) + binding.viewModel = viewModel + + setupViewModel() + } + + fun setupViewModel() { + viewModel.currentFragmentType.observe(this) { + changeFragment(it) + } + } + + private fun changeFragment(type: FragmentType) { + supportFragmentManager.commit { + setReorderingAllowed(true) + + supportFragmentManager.fragments.forEach(::hide) + + supportFragmentManager.findFragmentByTag(type.tag)?.let { + show(it) + } ?: createFragment(type).run { + add(R.id.fcv_container, this, type.tag) + } + } + } + + private fun createFragment(type: FragmentType): Fragment { + return when (type) { + FragmentType.HOME -> HomeFragment() + FragmentType.SEARCH -> SearchFragment() + FragmentType.MESSAGE -> MessageFragment() + FragmentType.MY_PAGE -> MyPageFragment() + } } } diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/main/MainBindingAdapter.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/main/MainBindingAdapter.kt new file mode 100644 index 000000000..f1a108d98 --- /dev/null +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/main/MainBindingAdapter.kt @@ -0,0 +1,12 @@ +package com.ddangddangddang.android.feature.main + +import androidx.databinding.BindingAdapter +import com.google.android.material.bottomnavigation.BottomNavigationView +import com.google.android.material.navigation.NavigationBarView + +@BindingAdapter("onNavigationItemSelected") +fun BottomNavigationView.bindOnNavigationItemSelectedListener( + listener: NavigationBarView.OnItemSelectedListener, +) { + this.setOnItemSelectedListener(listener) +} diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/main/MainViewModel.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/main/MainViewModel.kt index 6d9b454ba..d5ac8e0fe 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/main/MainViewModel.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/main/MainViewModel.kt @@ -1,5 +1,38 @@ package com.ddangddangddang.android.feature.main +import android.view.MenuItem +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel +import com.ddangddangddang.android.R -class MainViewModel : ViewModel() +class MainViewModel : ViewModel() { + private val _currentFragmentType: MutableLiveData = + MutableLiveData(FragmentType.HOME) + val currentFragmentType: LiveData + get() = _currentFragmentType + + fun setCurrentFragment(item: MenuItem): Boolean { + val menuItemId = item.itemId + val pageType = getPageType(menuItemId) + changeCurrentFragmentType(pageType) + + return true + } + + private fun getPageType(menuItemId: Int): FragmentType { + return when (menuItemId) { + R.id.menu_item_home -> FragmentType.HOME + R.id.menu_item_search -> FragmentType.SEARCH + R.id.menu_item_message -> FragmentType.MESSAGE + R.id.menu_item_my_page -> FragmentType.MY_PAGE + else -> throw IllegalArgumentException("Not found menu item") + } + } + + private fun changeCurrentFragmentType(fragmentType: FragmentType) { + if (currentFragmentType.value == fragmentType) return + + _currentFragmentType.value = fragmentType + } +} diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/message/MessageFragment.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/message/MessageFragment.kt new file mode 100644 index 000000000..a7c50e08f --- /dev/null +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/message/MessageFragment.kt @@ -0,0 +1,7 @@ +package com.ddangddangddang.android.feature.message + +import com.ddangddangddang.android.R +import com.ddangddangddang.android.databinding.FragmentMessageBinding +import com.ddangddangddang.android.util.binding.BindingFragment + +class MessageFragment : BindingFragment(R.layout.fragment_message) diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/mypage/MyPageFragment.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/mypage/MyPageFragment.kt new file mode 100644 index 000000000..a5ae29a7f --- /dev/null +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/mypage/MyPageFragment.kt @@ -0,0 +1,7 @@ +package com.ddangddangddang.android.feature.mypage + +import com.ddangddangddang.android.R +import com.ddangddangddang.android.databinding.FragmentMyPageBinding +import com.ddangddangddang.android.util.binding.BindingFragment + +class MyPageFragment : BindingFragment(R.layout.fragment_my_page) diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/search/SearchFragment.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/search/SearchFragment.kt new file mode 100644 index 000000000..e999ec006 --- /dev/null +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/search/SearchFragment.kt @@ -0,0 +1,7 @@ +package com.ddangddangddang.android.feature.search + +import com.ddangddangddang.android.R +import com.ddangddangddang.android.databinding.FragmentSearchBinding +import com.ddangddangddang.android.util.binding.BindingFragment + +class SearchFragment : BindingFragment(R.layout.fragment_search) diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml index d0190c7be..fa23a129b 100644 --- a/android/app/src/main/res/layout/activity_main.xml +++ b/android/app/src/main/res/layout/activity_main.xml @@ -1,16 +1,38 @@ - + xmlns:tools="http://schemas.android.com/tools"> - - \ No newline at end of file + + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/layout/fragment_home.xml b/android/app/src/main/res/layout/fragment_home.xml new file mode 100644 index 000000000..03c18d2f2 --- /dev/null +++ b/android/app/src/main/res/layout/fragment_home.xml @@ -0,0 +1,17 @@ + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/layout/fragment_message.xml b/android/app/src/main/res/layout/fragment_message.xml new file mode 100644 index 000000000..e15be5f80 --- /dev/null +++ b/android/app/src/main/res/layout/fragment_message.xml @@ -0,0 +1,17 @@ + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/layout/fragment_my_page.xml b/android/app/src/main/res/layout/fragment_my_page.xml new file mode 100644 index 000000000..06cf05ecf --- /dev/null +++ b/android/app/src/main/res/layout/fragment_my_page.xml @@ -0,0 +1,17 @@ + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/layout/fragment_search.xml b/android/app/src/main/res/layout/fragment_search.xml new file mode 100644 index 000000000..2d38ad217 --- /dev/null +++ b/android/app/src/main/res/layout/fragment_search.xml @@ -0,0 +1,17 @@ + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/menu/menu_bottom_navigation.xml b/android/app/src/main/res/menu/menu_bottom_navigation.xml index 5db3bdffe..70faedf5c 100644 --- a/android/app/src/main/res/menu/menu_bottom_navigation.xml +++ b/android/app/src/main/res/menu/menu_bottom_navigation.xml @@ -1,9 +1,9 @@

+ android:title="@string/bottom_navigation_home" /> DdangDdangDdang - 메인 + 홈 검색 쪽지 마이페이지 From 398d6db5ef1216afe5294c1bd378e6a88a1d7ea5 Mon Sep 17 00:00:00 2001 From: Song Hyemin Date: Tue, 18 Jul 2023 12:12:52 +0900 Subject: [PATCH 013/159] =?UTF-8?q?feat:=20#17=20=EA=B2=BD=EB=A7=A4=20?= =?UTF-8?q?=EC=83=81=ED=92=88=20=EB=93=B1=EB=A1=9D=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EA=B7=B8=EB=A6=AC=EA=B3=A0=20MVVM=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EC=84=A4=EA=B3=84=20(#33)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Feat: MVVM 구조 생성 * Feat: 레이아웃 작성 * refactor: 중복 함수 호출 삭제 * refactor: 런처 액티비티 수정 * refactor: 들여쓰기 추가 * refactor: string name 수정 --- android/app/src/main/AndroidManifest.xml | 5 +- .../feature/common/ViewModelFactory.kt | 2 + .../register/RegisterAuctionActivity.kt | 17 ++ .../register/RegisterAuctionViewModel.kt | 5 + .../drawable/bg_stroke_gray_radius_1dp.xml | 8 + .../main/res/drawable/ic_edittext_cursor.xml | 5 + .../res/layout/activity_register_auction.xml | 273 ++++++++++++++++++ android/app/src/main/res/values/strings.xml | 12 +- 8 files changed, 325 insertions(+), 2 deletions(-) create mode 100644 android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionActivity.kt create mode 100644 android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionViewModel.kt create mode 100644 android/app/src/main/res/drawable/bg_stroke_gray_radius_1dp.xml create mode 100644 android/app/src/main/res/drawable/ic_edittext_cursor.xml create mode 100644 android/app/src/main/res/layout/activity_register_auction.xml diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index c5494cfb5..7ec14d258 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -22,6 +22,9 @@ android:supportsRtl="true" android:theme="@style/Theme.DdangDdangDdang" tools:targetApi="31"> + @@ -33,4 +36,4 @@ - \ No newline at end of file + diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/common/ViewModelFactory.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/common/ViewModelFactory.kt index a204d9b10..fcf82f3e2 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/common/ViewModelFactory.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/common/ViewModelFactory.kt @@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.CreationExtras import com.ddangddangddang.android.feature.main.MainViewModel +import com.ddangddangddang.android.feature.register.RegisterAuctionViewModel @Suppress("UNCHECKED_CAST") val viewModelFactory = object : ViewModelProvider.Factory { @@ -12,6 +13,7 @@ val viewModelFactory = object : ViewModelProvider.Factory { // 레포지토리 싱글톤 객체 얻어옴 when { isAssignableFrom(MainViewModel::class.java) -> MainViewModel() + isAssignableFrom(RegisterAuctionViewModel::class.java) -> RegisterAuctionViewModel() // 여기에 뷰모델 추가 로직 작성하면 됨 else -> throw IllegalArgumentException("Unknown ViewModel class: ${modelClass.name}") diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionActivity.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionActivity.kt new file mode 100644 index 000000000..c046500ca --- /dev/null +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionActivity.kt @@ -0,0 +1,17 @@ +package com.ddangddangddang.android.feature.register + +import android.os.Bundle +import androidx.activity.viewModels +import com.ddangddangddang.android.R +import com.ddangddangddang.android.databinding.ActivityRegisterAuctionBinding +import com.ddangddangddang.android.feature.common.viewModelFactory +import com.ddangddangddang.android.util.binding.BindingActivity + +class RegisterAuctionActivity : BindingActivity(R.layout.activity_register_auction) { + private val viewModel by viewModels { viewModelFactory } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding.viewModel = viewModel + } +} diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionViewModel.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionViewModel.kt new file mode 100644 index 000000000..7c5a35acf --- /dev/null +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionViewModel.kt @@ -0,0 +1,5 @@ +package com.ddangddangddang.android.feature.register + +import androidx.lifecycle.ViewModel + +class RegisterAuctionViewModel : ViewModel() diff --git a/android/app/src/main/res/drawable/bg_stroke_gray_radius_1dp.xml b/android/app/src/main/res/drawable/bg_stroke_gray_radius_1dp.xml new file mode 100644 index 000000000..3b84fc1e3 --- /dev/null +++ b/android/app/src/main/res/drawable/bg_stroke_gray_radius_1dp.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/android/app/src/main/res/drawable/ic_edittext_cursor.xml b/android/app/src/main/res/drawable/ic_edittext_cursor.xml new file mode 100644 index 000000000..168b9a1b4 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_edittext_cursor.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android/app/src/main/res/layout/activity_register_auction.xml b/android/app/src/main/res/layout/activity_register_auction.xml new file mode 100644 index 000000000..96cbaf781 --- /dev/null +++ b/android/app/src/main/res/layout/activity_register_auction.xml @@ -0,0 +1,273 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file + From 10967b7abc06e8f8bc7408f43234bc46bee7d9e2 Mon Sep 17 00:00:00 2001 From: hyemdooly Date: Wed, 16 Aug 2023 16:15:34 +0900 Subject: [PATCH 077/159] =?UTF-8?q?deploy:=20=EC=8B=9C=EB=A7=A8=ED=8B=B1?= =?UTF-8?q?=20=EB=B2=84=EC=A0=80=EB=8B=9D=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index c3eebd5bc..112640ed6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -18,8 +18,9 @@ android { applicationId "com.ddangddangddang.android" minSdk 28 targetSdk 33 - versionCode 1 - versionName "1.0" + + versionCode 2 + versionName "2.0.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" From 2db47c96b08b67f695ecbbd91b01a7b64dda2bda Mon Sep 17 00:00:00 2001 From: hyemdooly Date: Wed, 16 Aug 2023 17:54:02 +0900 Subject: [PATCH 078/159] =?UTF-8?q?deploy:=20=EB=82=9C=EB=8F=85=ED=99=94?= =?UTF-8?q?=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle | 16 +++++++++--- android/app/glide.pro | 14 ++++++++++ android/app/proguard-rules.pro | 26 ++++++++++++++++++- android/app/retrofit2.pro | 46 +++++++++++++++++++++++++++++++++ android/data/build.gradle | 8 +++++- android/data/proguard-rules.pro | 2 +- 6 files changed, 106 insertions(+), 6 deletions(-) create mode 100644 android/app/glide.pro create mode 100644 android/app/retrofit2.pro diff --git a/android/app/build.gradle b/android/app/build.gradle index 112640ed6..a46260841 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -31,8 +31,18 @@ android { buildTypes { release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), + 'proguard-rules.pro', + 'glide.pro', + 'retrofit2.pro' + } + debug { + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), + 'proguard-rules.pro', + 'glide.pro', + 'retrofit2.pro' } } compileOptions { @@ -86,5 +96,5 @@ dependencies { implementation 'com.google.firebase:firebase-crashlytics-ktx' // 카카오 로그인 - implementation 'com.kakao.sdk:v2-user:2.15.0' + implementation 'com.kakao.sdk:v2-user:2.11.1' } diff --git a/android/app/glide.pro b/android/app/glide.pro new file mode 100644 index 000000000..272578ad6 --- /dev/null +++ b/android/app/glide.pro @@ -0,0 +1,14 @@ +-keep public class * implements com.bumptech.glide.module.GlideModule +-keep class * extends com.bumptech.glide.module.AppGlideModule { + (...); +} +-keep public enum com.bumptech.glide.load.ImageHeaderParser$** { + **[] $VALUES; + public *; +} +-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder { + *** rewind(); +} + +# Uncomment for DexGuard only +#-keepresourcexmlelements manifest/application/meta-data@value=GlideModule diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro index 481bb4348..9f43bd5dc 100644 --- a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -18,4 +18,28 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile +-keep interface com.ddangddangddang.data.* { *; } +-keep class com.ddangddangddang.data.model.** { *; } +-keep class com.ddangddangddang.data.remote.** { *; } + +-keep interface com.ddangddangddang.android.* { *; } +# Kakao SDK +-keep interface com.kakao.sdk.**.*Api +-keep class com.kakao.sdk.**.model.* { ; } +-keep class * extends com.google.gson.TypeAdapter +# https://github.com/square/okhttp/pull/6792 +-dontwarn org.bouncycastle.jsse.** +-dontwarn org.conscrypt.* +-dontwarn org.openjsse.** +# firebase-crashlytics +-keepattributes SourceFile,LineNumberTable # Keep file names and line numbers. +-keep public class * extends java.lang.Exception # Optional: Keep custom exceptions. +# firebase-analytics +-keep public class com.google.firebase.analytics.FirebaseAnalytics { + public *; +} +-keep public class com.google.android.gms.measurement.AppMeasurement { + public *; +} + diff --git a/android/app/retrofit2.pro b/android/app/retrofit2.pro new file mode 100644 index 000000000..e5e473b80 --- /dev/null +++ b/android/app/retrofit2.pro @@ -0,0 +1,46 @@ +# Retrofit does reflection on generic parameters. InnerClasses is required to use Signature and +# EnclosingMethod is required to use InnerClasses. +-keepattributes Signature, InnerClasses, EnclosingMethod + +# Retrofit does reflection on method and parameter annotations. +-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations + +# Keep annotation default values (e.g., retrofit2.http.Field.encoded). +-keepattributes AnnotationDefault + +# Retain service method parameters when optimizing. +-keepclassmembers,allowshrinking,allowobfuscation interface * { + @retrofit2.http.* ; +} + +# Ignore JSR 305 annotations for embedding nullability information. +-dontwarn javax.annotation.** + +# Guarded by a NoClassDefFoundError try/catch and only used when on the classpath. +-dontwarn kotlin.Unit + +# Top-level functions that can only be used by Kotlin. +-dontwarn retrofit2.KotlinExtensions +-dontwarn retrofit2.KotlinExtensions$* +#-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement + +# With R8 full mode, it sees no subtypes of Retrofit interfaces since they are created with a Proxy +# and replaces all potential values with null. Explicitly keeping the interfaces prevents this. +-if interface * { @retrofit2.http.* ; } +-keep,allowobfuscation interface <1> + +# Keep inherited services. +-if interface * { @retrofit2.http.* ; } +-keep,allowobfuscation interface * extends <1> + +# With R8 full mode generic signatures are stripped for classes that are not +# kept. Suspend functions are wrapped in continuations where the type argument +# is used. +-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation + +# R8 full mode strips generic signatures from return types if not kept. +-if interface * { @retrofit2.http.* public *** *(...); } +-keep,allowoptimization,allowshrinking,allowobfuscation class <3> + +# With R8 full mode generic signatures are stripped for classes that are not kept. +-keep,allowobfuscation,allowshrinking class retrofit2.Response diff --git a/android/data/build.gradle b/android/data/build.gradle index 1ba757e88..7cf008adb 100644 --- a/android/data/build.gradle +++ b/android/data/build.gradle @@ -28,7 +28,13 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), + 'proguard-rules.pro' + } + debug { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), + 'proguard-rules.pro' } } compileOptions { diff --git a/android/data/proguard-rules.pro b/android/data/proguard-rules.pro index 481bb4348..f1b424510 100644 --- a/android/data/proguard-rules.pro +++ b/android/data/proguard-rules.pro @@ -18,4 +18,4 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile From 6d22401926e1962340b128f5773ad82a3146b232 Mon Sep 17 00:00:00 2001 From: ippnsj <49394114+ippnsj@users.noreply.github.com> Date: Wed, 16 Aug 2023 18:00:50 +0900 Subject: [PATCH 079/159] =?UTF-8?q?feat:=20#309=20=EC=84=9C=EB=B2=84?= =?UTF-8?q?=EB=A1=9C=EB=B6=80=ED=84=B0=20=EA=B0=80=EC=A0=B8=EC=98=A8=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20=EC=A0=95=EB=B3=B4=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=EC=97=90=20=EB=9D=84=EC=9B=8C=EC=A3=BC=EB=8A=94=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20(#312)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/feature/common/BindingAdapter.kt | 15 ++++++++------- .../android/feature/mypage/MyPageViewModel.kt | 8 +------- .../android/model/ProfileModel.kt | 2 +- .../main/res/drawable/img_default_profile.png | Bin 0 -> 7807 bytes android/app/src/main/res/layout/view_profile.xml | 1 + .../data/model/response/ProfileResponse.kt | 2 +- 6 files changed, 12 insertions(+), 16 deletions(-) create mode 100644 android/app/src/main/res/drawable/img_default_profile.png diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/common/BindingAdapter.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/common/BindingAdapter.kt index e62b3bd97..2d279287f 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/common/BindingAdapter.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/common/BindingAdapter.kt @@ -1,5 +1,6 @@ package com.ddangddangddang.android.feature.common +import android.graphics.drawable.Drawable import android.net.Uri import android.view.View import android.widget.ImageView @@ -9,13 +10,13 @@ import androidx.databinding.BindingAdapter import com.bumptech.glide.Glide import com.google.android.material.chip.Chip -@BindingAdapter("imageUrl") -fun ImageView.setImageUrl(url: String?) { - url?.let { - Glide.with(context) - .load(it) - .into(this) - } +@BindingAdapter("imageUrl", "placeholder", requireAll = false) +fun ImageView.setImageUrl(url: String?, placeholder: Drawable? = null) { + Glide.with(context) + .load(url) + .placeholder(placeholder) + .error(placeholder) + .into(this) } @BindingAdapter("imageUri") diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/mypage/MyPageViewModel.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/mypage/MyPageViewModel.kt index 7d4a64f28..883d75e31 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/mypage/MyPageViewModel.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/mypage/MyPageViewModel.kt @@ -16,13 +16,7 @@ class MyPageViewModel( private val authRepository: AuthRepository, private val userRepository: UserRepository, ) : ViewModel() { - private val _profile: MutableLiveData = MutableLiveData( - ProfileModel( - "글로", - "https://img.freepik.com/free-photo/cute-ai-generated-cartoon-bunny_23-2150288870.jpg?q=10&h=200", - 9.8, - ), - ) + private val _profile: MutableLiveData = MutableLiveData() val profile: LiveData get() = _profile diff --git a/android/app/src/main/java/com/ddangddangddang/android/model/ProfileModel.kt b/android/app/src/main/java/com/ddangddangddang/android/model/ProfileModel.kt index 85c01f7b1..ce14c8105 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/model/ProfileModel.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/model/ProfileModel.kt @@ -2,6 +2,6 @@ package com.ddangddangddang.android.model data class ProfileModel( val name: String, - val profileImage: String, + val profileImage: String?, val reliability: Double, ) diff --git a/android/app/src/main/res/drawable/img_default_profile.png b/android/app/src/main/res/drawable/img_default_profile.png new file mode 100644 index 0000000000000000000000000000000000000000..92f1275e1d1c39250eac3410238573cd9a877037 GIT binary patch literal 7807 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 wcgMh=yx Date: Thu, 17 Aug 2023 16:33:41 +0900 Subject: [PATCH 080/159] =?UTF-8?q?refactor:=20#325=20=EC=9E=85=EC=B0=B0?= =?UTF-8?q?=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC=20=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A7=81=20(#326)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 판매자 입찰 불가 에러 처리 추가 * refactor: 첫 입찰자의 시작금액을 시작금액이상으로 가능하게 수정 * refactor: 내 경매면 경매 하단 버튼 상세 문구 수정 --- .../detail/AuctionDetailBottomButtonStatus.kt | 13 +++++++--- .../feature/detail/AuctionDetailViewModel.kt | 7 +++++- .../feature/detail/bid/AuctionBidDialog.kt | 9 ++++++- .../feature/detail/bid/AuctionBidViewModel.kt | 24 ++++++++++++++----- .../detail/bid/SubmitBidFailureResponse.kt | 3 ++- android/app/src/main/res/values/strings.xml | 6 +++-- 6 files changed, 48 insertions(+), 14 deletions(-) diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailBottomButtonStatus.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailBottomButtonStatus.kt index e3c3e071f..4922cb72f 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailBottomButtonStatus.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailBottomButtonStatus.kt @@ -15,18 +15,22 @@ enum class AuctionDetailBottomButtonStatus( FinishAuction(R.string.detail_auction_finish, false), EnterAuctionChatRoom(R.string.detail_auction_chat_room_entrance, true), + + MyAuction(R.string.detail_auction_my_auction, false), ; companion object { fun find( auctionDetailModel: AuctionDetailModel, ): AuctionDetailBottomButtonStatus { + val isOwner = auctionDetailModel.isOwner val auctionStatus = auctionDetailModel.auctionDetailStatusModel val chatStatus = auctionDetailModel.chatAuctionDetailModel return when { canEnterMessageRoom(chatStatus) -> EnterAuctionChatRoom - canBidAuction(auctionStatus) -> BidAuction + canBidAuction(auctionStatus, isOwner) -> BidAuction + isOwner -> MyAuction else -> FinishAuction } } @@ -35,8 +39,11 @@ enum class AuctionDetailBottomButtonStatus( return chatStatus.isChatParticipant } - private fun canBidAuction(auctionStatus: AuctionDetailStatusModel): Boolean { - return (auctionStatus == AuctionDetailStatusModel.ONGOING || auctionStatus == AuctionDetailStatusModel.UNBIDDEN) + private fun canBidAuction( + auctionStatus: AuctionDetailStatusModel, + isOwner: Boolean, + ): Boolean { + return (auctionStatus == AuctionDetailStatusModel.ONGOING || auctionStatus == AuctionDetailStatusModel.UNBIDDEN) && isOwner.not() } } } diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailViewModel.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailViewModel.kt index ce66e38b6..8333f2f5b 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailViewModel.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailViewModel.kt @@ -34,6 +34,7 @@ class AuctionDetailViewModel( val minBidPrice: Int get() { val auction = auctionDetailModel.value ?: return 0 + if (auction.auctioneerCount == 0) return auction.lastBidPrice return auction.lastBidPrice + auction.bidUnit } @@ -59,6 +60,7 @@ class AuctionDetailViewModel( AuctionDetailBottomButtonStatus.BidAuction -> popupAuctionBidEvent() AuctionDetailBottomButtonStatus.EnterAuctionChatRoom -> enterChatRoomEvent() AuctionDetailBottomButtonStatus.FinishAuction -> {} + AuctionDetailBottomButtonStatus.MyAuction -> {} } } } @@ -106,7 +108,10 @@ class AuctionDetailViewModel( _auctionDetailModel.value?.let { viewModelScope.launch { when (auctionRepository.deleteAuction(it.id)) { - is ApiResponse.Success -> _event.value = AuctionDetailEvent.NotifyAuctionDeletionComplete + is ApiResponse.Success -> + _event.value = + AuctionDetailEvent.NotifyAuctionDeletionComplete + is ApiResponse.Failure -> {} is ApiResponse.NetworkError -> {} is ApiResponse.Unexpected -> {} diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidDialog.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidDialog.kt index 8c1bbf311..b72599243 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidDialog.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidDialog.kt @@ -84,10 +84,17 @@ class AuctionBidDialog : DialogFragment() { when (event) { is AuctionBidViewModel.AuctionBidEvent.Cancel -> exit() is AuctionBidViewModel.AuctionBidEvent.SubmitSuccess -> submitSuccess(event.price) - is AuctionBidViewModel.AuctionBidEvent.SubmitFailureEvent -> handleSubmitFailureEvent(event) + is AuctionBidViewModel.AuctionBidEvent.UnderPrice -> notifyUnderPriceSubmitFailed() + is AuctionBidViewModel.AuctionBidEvent.SubmitFailureEvent -> handleSubmitFailureEvent( + event, + ) } } + private fun notifyUnderPriceSubmitFailed() { + showMessage(getString(R.string.detail_auction_bid_dialog_toast_under_price)) + } + private fun submitSuccess(price: Int) { showMessage(getString(R.string.detail_auction_bid_dialog_success, price)) exit() diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidViewModel.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidViewModel.kt index d9a5eee17..99d73285b 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidViewModel.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidViewModel.kt @@ -47,8 +47,8 @@ class AuctionBidViewModel( } fun submit(auctionId: Long, minBidPrice: Int) { - val bidPrice = bidPrice.value ?: return - if (isBidAmountUnderMinimum(bidPrice, minBidPrice)) return + val bidPrice = bidPrice.value ?: return setUnderPriceEvent() + if (isBidAmountUnderMinimum(bidPrice, minBidPrice)) return setUnderPriceEvent() viewModelScope.launch { when (val response = repository.submitAuctionBid(auctionId, bidPrice)) { is ApiResponse.Success -> _event.value = AuctionBidEvent.SubmitSuccess(bidPrice) @@ -78,32 +78,44 @@ class AuctionBidViewModel( _event.value = AuctionBidEvent.SubmitFailureEvent.Deleted } - SubmitBidFailureResponse.UNDER_PRICE -> { - _event.value = AuctionBidEvent.SubmitFailureEvent.UnderPrice + SubmitBidFailureResponse.EXIST_HIGHER_BIDDER -> { + _event.value = AuctionBidEvent.SubmitFailureEvent.ExistHigherBidder } SubmitBidFailureResponse.ALREADY_HIGHEST_BIDDER -> { _event.value = AuctionBidEvent.SubmitFailureEvent.AlreadyHighestBidder } + SubmitBidFailureResponse.SELLER_CAN_NOT_BID -> { + _event.value = AuctionBidEvent.SubmitFailureEvent.SellerCanNotBid + } + SubmitBidFailureResponse.ELSE -> { _event.value = AuctionBidEvent.SubmitFailureEvent.Unknown } } } + private fun setUnderPriceEvent() { + _event.value = AuctionBidEvent.UnderPrice + } + sealed class AuctionBidEvent { object Cancel : AuctionBidEvent() + object UnderPrice : AuctionBidEvent() data class SubmitSuccess(val price: Int) : AuctionBidEvent() sealed class SubmitFailureEvent(@StringRes val messageId: Int) : AuctionBidEvent() { object Finish : SubmitFailureEvent(R.string.detail_auction_bid_dialog_failure_finish) object Deleted : SubmitFailureEvent(R.string.detail_auction_bid_dialog_failure_deleted) - object UnderPrice : - SubmitFailureEvent(R.string.detail_auction_bid_dialog_failure_under_price) + object ExistHigherBidder : + SubmitFailureEvent(R.string.detail_auction_bid_dialog_failure_already_exist_higher_bidder) object AlreadyHighestBidder : SubmitFailureEvent(R.string.detail_auction_bid_dialog_failure_already_highest_bidder) + object SellerCanNotBid : + SubmitFailureEvent(R.string.detail_auction_bid_dialog_failure_seller_can_not_bid) + object Unknown : SubmitFailureEvent(R.string.detail_auction_bid_dialog_failure_else) } } diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/SubmitBidFailureResponse.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/SubmitBidFailureResponse.kt index 5a1d71dc4..352e9d450 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/SubmitBidFailureResponse.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/SubmitBidFailureResponse.kt @@ -3,8 +3,9 @@ package com.ddangddangddang.android.feature.detail.bid enum class SubmitBidFailureResponse(private val message: String) { FINISH("이미 종료된 경매입니다"), DELETED("삭제된 경매입니다"), - UNDER_PRICE("가능 입찰액보다 낮은 금액을 입력했습니다"), + EXIST_HIGHER_BIDDER("가능 입찰액보다 낮은 금액을 입력했습니다"), ALREADY_HIGHEST_BIDDER("이미 최고 입찰자입니다"), + SELLER_CAN_NOT_BID("판매자는 입찰할 수 없습니다"), ELSE("기타"), ; diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index c7998ea86..831631f13 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -44,6 +44,7 @@ 경매 마감 쪽지방 생성 쪽지방 입장 + 내꺼 입찰금지 %s > %s %s %,d원 시작가 %,d원 @@ -52,7 +53,6 @@ %d명 경매 참여중 존재하지 않는 경매입니다. - 입찰하기 %,d 원 @@ -60,10 +60,12 @@ 취소 입찰 %,d원에 입찰 성공! + 더 높은 금액을 제시해주세요 이미 종료된 경매입니다 삭제된 경매입니다 - 더 높은 금액을 제시해주세요 + 더 높은 입찰자가 등장했습니다 이미 최고 입찰자입니다 + 판매자는 입찰할 수 없습니다 잠시 후에 다시 시도해주세요 정말로 이 경매를 삭제하시겠습니까? 삭제가 완료되었습니다. From 78f04e97914ba76128814a6d43c441e9e48f39bd Mon Sep 17 00:00:00 2001 From: Mendel <67176829+rhthrhrl0@users.noreply.github.com> Date: Thu, 17 Aug 2023 17:47:13 +0900 Subject: [PATCH 081/159] =?UTF-8?q?fix:=20#327=20=ED=86=A0=ED=81=B0=20?= =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EA=B0=B1=EC=8B=A0=20=EC=8B=9C=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=20=EC=95=88=20=EB=8B=AB=EA=B3=A0=20=EB=8B=A4=EC=9D=8C?= =?UTF-8?q?=20=EC=9A=94=EC=B2=AD=EC=9D=84=20=EB=B3=B4=EB=82=B4=EB=8D=98=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20(#328)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ddangddangddang/data/remote/AuctionRetrofit.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/android/data/src/main/java/com/ddangddangddang/data/remote/AuctionRetrofit.kt b/android/data/src/main/java/com/ddangddangddang/data/remote/AuctionRetrofit.kt index ae8b09a60..eea757997 100644 --- a/android/data/src/main/java/com/ddangddangddang/data/remote/AuctionRetrofit.kt +++ b/android/data/src/main/java/com/ddangddangddang/data/remote/AuctionRetrofit.kt @@ -61,6 +61,7 @@ class AuctionRetrofit private constructor(retrofit: Retrofit) { val response = chain.proceed(tokenAddedRequest) if (response.code == 401) { + response.close() refreshTokenRequest(authRepository) val refreshedTokenAddedRequest = From 4583c19d90e1f087b1526e4ce01c94e9c4c0a14d Mon Sep 17 00:00:00 2001 From: mendel Date: Thu, 17 Aug 2023 17:52:17 +0900 Subject: [PATCH 082/159] =?UTF-8?q?fix:=20=EC=9E=85=EC=B0=B0=20=EA=B8=88?= =?UTF-8?q?=EC=95=A1=20=EC=9E=85=EB=A0=A5=20=EC=B5=9C=EB=8C=93=EA=B0=92=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/feature/detail/bid/AuctionBidViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidViewModel.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidViewModel.kt index 99d73285b..1db1f87e9 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidViewModel.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidViewModel.kt @@ -123,6 +123,6 @@ class AuctionBidViewModel( companion object { const val SUFFIX_INPUT_PRICE = " 원" private const val ZERO = 0 - private const val MAX_PRICE = Int.MAX_VALUE + private const val MAX_PRICE = 2100000000 } } From 2be39ad6174076bd1b74d852d13e32d039681e55 Mon Sep 17 00:00:00 2001 From: mendel Date: Thu, 17 Aug 2023 18:02:20 +0900 Subject: [PATCH 083/159] =?UTF-8?q?fix:=20=EA=B2=BD=EB=A7=A4=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EC=97=AC=EB=9F=AC=EB=B2=88=20=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/feature/register/RegisterAuctionViewModel.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionViewModel.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionViewModel.kt index a851f2db3..2501c54d1 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionViewModel.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionViewModel.kt @@ -60,6 +60,8 @@ class RegisterAuctionViewModel(private val repository: AuctionRepository) : View val event: LiveData get() = _event + private var isLoading: Boolean = false + fun setClosingDate(year: Int, month: Int, dayOfMonth: Int) { _closingTime.value = LocalDateTime.of( @@ -76,9 +78,11 @@ class RegisterAuctionViewModel(private val repository: AuctionRepository) : View } fun submitAuction(context: Context) { + if (isLoading) return val isValidInputs = judgeValidInputs() if (!isValidInputs) return + isLoading = true viewModelScope.launch { val files = images.value?.mapNotNull { it.uri.toAdjustImageFile(context) } ?: emptyList() @@ -91,6 +95,7 @@ class RegisterAuctionViewModel(private val repository: AuctionRepository) : View is ApiResponse.NetworkError -> {} is ApiResponse.Unexpected -> {} } + isLoading = false } } From 4c244a080a344799e7a67e58f3b63d5e82967ea0 Mon Sep 17 00:00:00 2001 From: mendel Date: Thu, 17 Aug 2023 18:22:21 +0900 Subject: [PATCH 084/159] =?UTF-8?q?feat:=20=EA=B2=BD=EB=A7=A4=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EC=8B=A4=ED=8C=A8=20=EC=8B=9C=20=EC=8A=A4=EB=82=B5?= =?UTF-8?q?=EB=B0=94=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EB=85=B8=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/register/RegisterAuctionActivity.kt | 11 +++++++++++ .../feature/register/RegisterAuctionViewModel.kt | 13 ++++++++++++- .../android/util/view/SnackbarFactory.kt | 12 ++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionActivity.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionActivity.kt index 118560203..109e330be 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionActivity.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionActivity.kt @@ -105,6 +105,10 @@ class RegisterAuctionActivity : backActivity() } + is RegisterAuctionViewModel.RegisterAuctionEvent.SubmitError -> { + showErrorSubmitMessage(event.message) + } + is RegisterAuctionViewModel.RegisterAuctionEvent.SubmitResult -> { navigationToDetail(event.id) finish() @@ -180,6 +184,13 @@ class RegisterAuctionActivity : ) } + private fun showErrorSubmitMessage(message: String) { + binding.root.showSnackbar( + message, + getString(R.string.all_snackbar_default_action), + ) + } + private fun backActivity() { finish() } diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionViewModel.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionViewModel.kt index 2501c54d1..11cbe349f 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionViewModel.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/register/RegisterAuctionViewModel.kt @@ -18,6 +18,7 @@ import com.ddangddangddang.data.model.request.RegisterAuctionRequest import com.ddangddangddang.data.remote.ApiResponse import com.ddangddangddang.data.repository.AuctionRepository import kotlinx.coroutines.launch +import org.json.JSONObject import java.io.ByteArrayOutputStream import java.io.File import java.io.FileOutputStream @@ -91,7 +92,16 @@ class RegisterAuctionViewModel(private val repository: AuctionRepository) : View _event.value = RegisterAuctionEvent.SubmitResult(response.body.id) } - is ApiResponse.Failure -> {} + is ApiResponse.Failure -> { + if (response.responseCode == 400) { + response.error?.let { + val jsonObject = JSONObject(it) + val message = jsonObject.getString("message") + _event.value = RegisterAuctionEvent.SubmitError(message) + } + } + } + is ApiResponse.NetworkError -> {} is ApiResponse.Unexpected -> {} } @@ -240,6 +250,7 @@ class RegisterAuctionViewModel(private val repository: AuctionRepository) : View sealed class RegisterAuctionEvent { object Exit : RegisterAuctionEvent() + data class SubmitError(val message: String) : RegisterAuctionEvent() class ClosingTimePicker(val dateTime: LocalDateTime) : RegisterAuctionEvent() class SubmitResult(val id: Long) : RegisterAuctionEvent() sealed class InputErrorEvent : RegisterAuctionEvent() { diff --git a/android/app/src/main/java/com/ddangddangddang/android/util/view/SnackbarFactory.kt b/android/app/src/main/java/com/ddangddangddang/android/util/view/SnackbarFactory.kt index d127806cb..4891aaa4d 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/util/view/SnackbarFactory.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/util/view/SnackbarFactory.kt @@ -18,3 +18,15 @@ fun View.showSnackbar( } .show() } + +fun View.showSnackbar( + message: String, + actionMessage: String, + action: () -> Unit = {}, +) { + Snackbar.make(this, message, Snackbar.LENGTH_SHORT) + .setAction(actionMessage) { + action() + } + .show() +} From fba82d8425202773169e6fba5f6df0cbba63917b Mon Sep 17 00:00:00 2001 From: mendel Date: Thu, 17 Aug 2023 18:34:39 +0900 Subject: [PATCH 085/159] =?UTF-8?q?feat:=20=EA=B2=BD=EB=A7=A4=20=EC=9E=85?= =?UTF-8?q?=EC=B0=B0=20=EC=8B=9C=20=EC=9D=BC=EC=A0=95=20=EB=8B=A8=EC=9C=84?= =?UTF-8?q?=EB=A5=BC=20=EB=B2=97=EC=96=B4=EB=82=A0=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EC=84=9C=EB=B2=84=EC=97=90=EC=84=9C=20=EB=B0=9B=EB=8A=94=20?= =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=EB=A5=BC=20=EC=B6=9C=EB=A0=A5?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/feature/detail/bid/AuctionBidDialog.kt | 4 ++++ .../android/feature/detail/bid/AuctionBidViewModel.kt | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidDialog.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidDialog.kt index b72599243..0423e06bc 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidDialog.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidDialog.kt @@ -84,6 +84,10 @@ class AuctionBidDialog : DialogFragment() { when (event) { is AuctionBidViewModel.AuctionBidEvent.Cancel -> exit() is AuctionBidViewModel.AuctionBidEvent.SubmitSuccess -> submitSuccess(event.price) + is AuctionBidViewModel.AuctionBidEvent.SubmitFailureCustomEvent -> { + showMessage(event.message) + exit() + } is AuctionBidViewModel.AuctionBidEvent.UnderPrice -> notifyUnderPriceSubmitFailed() is AuctionBidViewModel.AuctionBidEvent.SubmitFailureEvent -> handleSubmitFailureEvent( event, diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidViewModel.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidViewModel.kt index 1db1f87e9..74bd01824 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidViewModel.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/bid/AuctionBidViewModel.kt @@ -55,7 +55,12 @@ class AuctionBidViewModel( is ApiResponse.Failure -> { val jsonObject = JSONObject(response.error) val message = jsonObject.getString("message") - handleSubmitBidFailure(SubmitBidFailureResponse.find(message)) + val errorType = SubmitBidFailureResponse.find(message) + if (errorType == SubmitBidFailureResponse.ELSE) { + _event.value = AuctionBidEvent.SubmitFailureCustomEvent(message) + } else { + handleSubmitBidFailure(errorType) + } } is ApiResponse.NetworkError -> {} @@ -104,6 +109,7 @@ class AuctionBidViewModel( object Cancel : AuctionBidEvent() object UnderPrice : AuctionBidEvent() data class SubmitSuccess(val price: Int) : AuctionBidEvent() + data class SubmitFailureCustomEvent(val message: String) : AuctionBidEvent() sealed class SubmitFailureEvent(@StringRes val messageId: Int) : AuctionBidEvent() { object Finish : SubmitFailureEvent(R.string.detail_auction_bid_dialog_failure_finish) object Deleted : SubmitFailureEvent(R.string.detail_auction_bid_dialog_failure_deleted) From 05c90bb7bc1d1054634999e2383efee38fdbf039 Mon Sep 17 00:00:00 2001 From: mendel Date: Thu, 17 Aug 2023 18:43:16 +0900 Subject: [PATCH 086/159] =?UTF-8?q?design:=20=EB=A7=88=EA=B0=90=EA=B8=B0?= =?UTF-8?q?=ED=95=9C=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EB=B7=B0=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=EB=A5=BC=20=EC=8B=9C=EC=9E=91=20=EA=B0=80=EA=B2=A9=20?= =?UTF-8?q?=EC=98=86=EC=9C=BC=EB=A1=9C=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/main/res/layout/activity_auction_detail.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/app/src/main/res/layout/activity_auction_detail.xml b/android/app/src/main/res/layout/activity_auction_detail.xml index 242475bc9..2eaa80449 100644 --- a/android/app/src/main/res/layout/activity_auction_detail.xml +++ b/android/app/src/main/res/layout/activity_auction_detail.xml @@ -196,9 +196,8 @@ android:textColor="@color/red_100" android:textSize="@dimen/textsize_sub_header" android:textStyle="bold" - app:layout_constraintBottom_toBottomOf="@id/tv_last_bid_price" app:layout_constraintEnd_toEndOf="@id/gl_end" - app:layout_constraintTop_toTopOf="@id/tv_last_bid_price" + app:layout_constraintTop_toTopOf="@id/tv_start_price" tools:text="마감까지 1시간 35분" /> Date: Thu, 17 Aug 2023 18:49:34 +0900 Subject: [PATCH 087/159] =?UTF-8?q?design:=20=ED=94=84=EB=A1=9C=ED=95=84?= =?UTF-8?q?=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B7=B0=EC=97=90=20=EB=94=94?= =?UTF-8?q?=ED=8F=B4=ED=8A=B8=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/main/res/layout/activity_auction_detail.xml | 1 + android/app/src/main/res/layout/activity_message_room.xml | 1 + android/app/src/main/res/layout/item_message_room.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/android/app/src/main/res/layout/activity_auction_detail.xml b/android/app/src/main/res/layout/activity_auction_detail.xml index 2eaa80449..0982753ec 100644 --- a/android/app/src/main/res/layout/activity_auction_detail.xml +++ b/android/app/src/main/res/layout/activity_auction_detail.xml @@ -296,6 +296,7 @@ Date: Thu, 17 Aug 2023 20:23:35 +0900 Subject: [PATCH 088/159] =?UTF-8?q?fix:=20=EA=B2=BD=EB=A7=A4=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=EA=B0=80=20=ED=95=9C=20?= =?UTF-8?q?=EB=B2=88=EC=97=90=20=EC=97=AC=EB=9F=AC=EA=B0=9C=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ddangddangddang/android/feature/home/HomeFragment.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/home/HomeFragment.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/home/HomeFragment.kt index 9fca0be01..f0cba1e79 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/home/HomeFragment.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/home/HomeFragment.kt @@ -1,5 +1,6 @@ package com.ddangddangddang.android.feature.home +import android.content.Intent import android.os.Bundle import android.view.View import androidx.fragment.app.viewModels @@ -64,6 +65,7 @@ class HomeFragment : BindingFragment(R.layout.fragment_home private fun navigateToAuctionDetail(auctionId: Long) { val intent = AuctionDetailActivity.getIntent(requireContext(), auctionId) + intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP startActivity(intent) } From 15dd51daf4bc0abfb6b58c5810a6d44dd3f6376c Mon Sep 17 00:00:00 2001 From: mendel Date: Thu, 17 Aug 2023 20:34:27 +0900 Subject: [PATCH 089/159] =?UTF-8?q?design:=20=EA=B2=BD=EB=A7=A4=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=ED=99=94=EB=A9=B4=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=20=ED=94=84=EB=A1=9C=ED=95=84=20=EC=99=B8=EA=B3=BD?= =?UTF-8?q?=EC=9D=84=20=EB=91=A5=EA=B8=80=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/activity_auction_detail.xml | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/android/app/src/main/res/layout/activity_auction_detail.xml b/android/app/src/main/res/layout/activity_auction_detail.xml index 0982753ec..7d8dbaa07 100644 --- a/android/app/src/main/res/layout/activity_auction_detail.xml +++ b/android/app/src/main/res/layout/activity_auction_detail.xml @@ -293,17 +293,25 @@ app:layout_constraintStart_toStartOf="@id/gl_begin" app:layout_constraintTop_toBottomOf="@id/rv_direct_exchange_regions" /> - + app:layout_constraintTop_toBottomOf="@id/tv_seller_info"> + + + From a34425b78fa202d5c7cc1dd0aa674c76c4c8d112 Mon Sep 17 00:00:00 2001 From: mendel Date: Thu, 17 Aug 2023 21:02:37 +0900 Subject: [PATCH 090/159] =?UTF-8?q?feat:=20=ED=99=9C=EC=84=B1=ED=99=94?= =?UTF-8?q?=EB=90=9C=20=EC=AA=BD=EC=A7=80=EB=B0=A9=EC=9D=B4=20=EC=97=86?= =?UTF-8?q?=EC=9C=BC=EB=A9=B4=20=EC=AA=BD=EC=A7=80=EB=B0=A9=20=ED=94=84?= =?UTF-8?q?=EB=9E=98=EA=B7=B8=EB=A8=BC=ED=8A=B8=EC=97=90=20=EB=B3=B4?= =?UTF-8?q?=EC=97=AC=EC=A4=84=20=EB=AC=B8=EA=B5=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/message/MessageFragment.kt | 1 + .../src/main/res/layout/fragment_message.xml | 24 ++++++++++++++++++- android/app/src/main/res/values/strings.xml | 9 +++---- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/message/MessageFragment.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/message/MessageFragment.kt index dba8ff9b2..a0acec049 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/message/MessageFragment.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/message/MessageFragment.kt @@ -21,6 +21,7 @@ class MessageFragment : BindingFragment(R.layout.fragmen super.onViewCreated(view, savedInstanceState) setupViewModel() setupMessageRoomsRecyclerView() + binding.viewModel = viewModel if (viewModel.messageRooms.value == null) viewModel.loadMessageRooms() } diff --git a/android/app/src/main/res/layout/fragment_message.xml b/android/app/src/main/res/layout/fragment_message.xml index c8bebeb5c..cd4e7f333 100644 --- a/android/app/src/main/res/layout/fragment_message.xml +++ b/android/app/src/main/res/layout/fragment_message.xml @@ -3,6 +3,13 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> + + + + + + tools:listitem="@layout/item_message_room" /> + + diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 831631f13..dd06a0cc5 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -101,9 +101,10 @@ 카카오 로그인 버튼 로그인에 실패했습니다 - + 상대방 프로필입니다 + 쪽지방이 존재하지 않습니다 경매 상품 이미지입니다 @@ -115,15 +116,15 @@ 채팅방 정보를 불러오는데 문제가 생겼습니다\n잠시후에 다시 시도해주세요 쪽지방이 생성됐습니다. %,d원 - + 마이페이지 개인정보처리방침 로그아웃 탈퇴하기 성공적으로 로그아웃 되었습니다 - 로그아웃에 실패했습니다 - + 로그아웃에 실패했습니다 + 신고하기 신고 내용 From 0107cb2d387e997e9e652a79d9694c6e1cad3364 Mon Sep 17 00:00:00 2001 From: ippnsj Date: Thu, 17 Aug 2023 21:38:56 +0900 Subject: [PATCH 091/159] =?UTF-8?q?fix:=20=EA=B2=BD=EB=A7=A4=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=EC=99=80=20=EC=AA=BD=EC=A7=80=EB=B0=A9=EC=9D=B4=20?= =?UTF-8?q?=EB=AC=B4=ED=95=9C=ED=9E=88=20=EC=A4=91=EC=B2=A9=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/feature/detail/AuctionDetailActivity.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailActivity.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailActivity.kt index b32e84ed8..2ccbe5aed 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailActivity.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailActivity.kt @@ -61,7 +61,9 @@ class AuctionDetailActivity : } private fun navigateToMessageRoom(roomId: Long) { - startActivity(MessageRoomActivity.getIntent(this, roomId)) + val intent = MessageRoomActivity.getIntent(this, roomId) + intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP + Intent.FLAG_ACTIVITY_NEW_TASK + startActivity(intent) } private fun navigateToReport(auctionId: Long) { From 5878c23ccb7a70207592a12543f01a4d91863270 Mon Sep 17 00:00:00 2001 From: ippnsj Date: Thu, 31 Aug 2023 14:02:21 +0900 Subject: [PATCH 092/159] =?UTF-8?q?refactor:=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle | 4 ++-- android/data/build.gradle | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index a46260841..2bee75e2e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -19,8 +19,8 @@ android { minSdk 28 targetSdk 33 - versionCode 2 - versionName "2.0.0" + versionCode 3 + versionName "2.1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/android/data/build.gradle b/android/data/build.gradle index 7cf008adb..7adbf9a36 100644 --- a/android/data/build.gradle +++ b/android/data/build.gradle @@ -16,9 +16,6 @@ android { minSdk 28 targetSdk 33 - versionCode = 2 - versionName = "2.0.0" - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" From 5ccb2df18c30bab0118db92b0d4c727841c469d0 Mon Sep 17 00:00:00 2001 From: Mendel <67176829+rhthrhrl0@users.noreply.github.com> Date: Thu, 7 Sep 2023 16:35:00 +0900 Subject: [PATCH 093/159] =?UTF-8?q?feat:=20#339=20=EC=83=81=EC=84=B8=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EB=A1=9C?= =?UTF-8?q?=EB=94=A9=20=ED=99=94=EB=A9=B4=20=EC=B6=94=EA=B0=80=20(#348)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: lottie 애니메이션 라이브러리 추가 * feat: LoadingDialog 및 애니메이션 리소스 추가 * feat: LoadingDialog를 경매 상세 화면에 적용 * refactor: AuctionDetailFormatter 로직 개선 리팩토링 * refactor: LoadingDialog 생성자 수정 * rename: default_loading으로 이름 수정 * refactor: 상세 페이지 상품 정보 불러오기 전 xml 기본 값 수정 * feat: LoadingDialog 배경 흐림 제거 및 사이즈 키움 * feat: 로딩 라이브데이터를 애니메이션을 동반하는 것과 아닌 것으로 나눔 * refactor: activity_auction_detail.xml 의 최상위 뷰그룹의 visiblity 속성에 gone 할당 --- android/app/build.gradle | 3 + .../feature/detail/AuctionDetailActivity.kt | 6 + .../feature/detail/AuctionDetailFormatter.kt | 38 +- .../feature/detail/AuctionDetailViewModel.kt | 15 + .../android/util/view/LoadingDialog.kt | 50 + .../res/layout/activity_auction_detail.xml | 14 +- .../main/res/layout/view_loading_dialog.xml | 22 + .../app/src/main/res/raw/default_loading.json | 1296 +++++++++++++++++ android/app/src/main/res/values/strings.xml | 1 + 9 files changed, 1429 insertions(+), 16 deletions(-) create mode 100644 android/app/src/main/java/com/ddangddangddang/android/util/view/LoadingDialog.kt create mode 100644 android/app/src/main/res/layout/view_loading_dialog.xml create mode 100644 android/app/src/main/res/raw/default_loading.json diff --git a/android/app/build.gradle b/android/app/build.gradle index 2bee75e2e..913d16027 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -97,4 +97,7 @@ dependencies { // 카카오 로그인 implementation 'com.kakao.sdk:v2-user:2.11.1' + + // lottie 애니메이션 + implementation 'com.airbnb.android:lottie:6.1.0' } diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailActivity.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailActivity.kt index 2ccbe5aed..724a34b53 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailActivity.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailActivity.kt @@ -15,6 +15,7 @@ import com.ddangddangddang.android.feature.report.ReportActivity import com.ddangddangddang.android.model.RegionModel import com.ddangddangddang.android.util.binding.BindingActivity import com.ddangddangddang.android.util.view.Toaster +import com.ddangddangddang.android.util.view.observeLoadingWithDialog import com.ddangddangddang.android.util.view.showDialog import com.google.android.material.tabs.TabLayoutMediator @@ -32,6 +33,11 @@ class AuctionDetailActivity : } private fun setupViewModel() { + observeLoadingWithDialog( + this, + viewModel.isLoadingWithAnimation, + binding.clAuctionDetailContainer, + ) viewModel.event.observe(this) { event -> handleEvent(event) } diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailFormatter.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailFormatter.kt index 3d519cfbd..391616268 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailFormatter.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailFormatter.kt @@ -1,36 +1,54 @@ package com.ddangddangddang.android.feature.detail import android.content.Context +import com.ddangddangddang.android.R import com.ddangddangddang.android.model.AuctionDetailModel -import java.text.DecimalFormat import java.time.LocalDateTime import java.time.format.DateTimeFormatter object AuctionDetailFormatter { private const val emptyContent = "" - fun formatClosingTime(dateTime: LocalDateTime): String { + fun formatClosingTime(dateTime: LocalDateTime?): String { + if (dateTime == null) return emptyContent val formatter = DateTimeFormatter.ofPattern("'~ 'yyyy.MM.dd a hh:mm") return dateTime.format(formatter) } - fun formatAuctionDetailStatus(auctionDetailModel: AuctionDetailModel): String { + fun formatCategoryText(context: Context, mainCategory: String?, subCategory: String?): String { + if (mainCategory.isNullOrBlank() || subCategory.isNullOrBlank()) return emptyContent + return context.getString(R.string.detail_auction_category, mainCategory, subCategory) + } + + fun formatAuctionStatusColor(context: Context, colorId: Int): Int { + if (colorId == 0) return context.getColor(R.color.white) + return context.getColor(colorId) + } + + fun formatAuctionDetailStatus( + context: Context, + auctionDetailModel: AuctionDetailModel?, + ): String { + if (auctionDetailModel == null) return emptyContent val priceStatus = auctionDetailModel.auctionDetailStatusModel.priceStatus - val progressStatus = auctionDetailModel.auctionDetailStatusModel.progressStatus val lastBidPrice = auctionDetailModel.lastBidPrice - val formatter = DecimalFormat("#,###") - return if (priceStatus == "입찰전") { + return if (priceStatus == context.getString(R.string.all_auction_unbidden)) { priceStatus } else { - "$priceStatus ${formatter.format(lastBidPrice)}원" + context.getString(R.string.detail_auction_price_status, priceStatus, lastBidPrice) } } + fun formatClosingRemainDateText(context: Context, remainTime: String?): String { + if (remainTime == null) return emptyContent + if (remainTime.isEmpty()) return context.getString(R.string.detail_auction_remain_time_finish) + return context.getString(R.string.detail_auction_remain_time, remainTime) + } + fun getAuctionBottomButtonText( context: Context, bottomButtonStatus: AuctionDetailBottomButtonStatus?, ): String { - return bottomButtonStatus?.let { - context.getString(it.text) - } ?: emptyContent + if (bottomButtonStatus == null) return emptyContent + return context.getString(bottomButtonStatus.text) } } diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailViewModel.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailViewModel.kt index 8333f2f5b..724734782 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailViewModel.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailViewModel.kt @@ -22,6 +22,12 @@ class AuctionDetailViewModel( val event: LiveData get() = _event + private val _isLoadingWithAnimation: MutableLiveData = MutableLiveData() + val isLoadingWithAnimation: LiveData + get() = _isLoadingWithAnimation + + private var isLoadingWithoutAnimation: Boolean = false + private val _auctionDetailModel: MutableLiveData = MutableLiveData() val auctionDetailModel: LiveData get() = _auctionDetailModel @@ -39,6 +45,8 @@ class AuctionDetailViewModel( } fun loadAuctionDetail(auctionId: Long) { + if (_isLoadingWithAnimation.value == true) return + _isLoadingWithAnimation.value = true viewModelScope.launch { when (val response = auctionRepository.getAuctionDetail(auctionId)) { is ApiResponse.Success -> _auctionDetailModel.value = response.body.toPresentation() @@ -51,6 +59,7 @@ class AuctionDetailViewModel( is ApiResponse.NetworkError -> {} is ApiResponse.Unexpected -> {} } + _isLoadingWithAnimation.value = false } } @@ -73,6 +82,8 @@ class AuctionDetailViewModel( private fun enterChatRoomEvent() { _auctionDetailModel.value?.let { + if (isLoadingWithoutAnimation) return@let + isLoadingWithoutAnimation = true viewModelScope.launch { val request = GetChatRoomIdRequest(it.id) when (val response = chatRepository.getChatRoomId(request)) { @@ -84,6 +95,7 @@ class AuctionDetailViewModel( is ApiResponse.NetworkError -> {} is ApiResponse.Unexpected -> {} } + isLoadingWithoutAnimation = false } } } @@ -106,6 +118,8 @@ class AuctionDetailViewModel( fun deleteAuction() { _auctionDetailModel.value?.let { + if (isLoadingWithoutAnimation) return@let + isLoadingWithoutAnimation = true viewModelScope.launch { when (auctionRepository.deleteAuction(it.id)) { is ApiResponse.Success -> @@ -116,6 +130,7 @@ class AuctionDetailViewModel( is ApiResponse.NetworkError -> {} is ApiResponse.Unexpected -> {} } + isLoadingWithoutAnimation = false } } } diff --git a/android/app/src/main/java/com/ddangddangddang/android/util/view/LoadingDialog.kt b/android/app/src/main/java/com/ddangddangddang/android/util/view/LoadingDialog.kt new file mode 100644 index 000000000..4f3c23550 --- /dev/null +++ b/android/app/src/main/java/com/ddangddangddang/android/util/view/LoadingDialog.kt @@ -0,0 +1,50 @@ +package com.ddangddangddang.android.util.view + +import android.app.Dialog +import android.content.Context +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import android.view.View +import android.view.ViewGroup +import android.view.Window +import android.view.WindowManager +import androidx.annotation.RawRes +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.LiveData +import com.ddangddangddang.android.R +import com.ddangddangddang.android.databinding.ViewLoadingDialogBinding + +class LoadingDialog(context: Context, @RawRes rawResId: Int) : Dialog(context) { + private val binding: ViewLoadingDialogBinding = ViewLoadingDialogBinding.inflate(layoutInflater) + + init { + window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window?.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) // dialog의 dim 처리 배경 제거 + requestWindowFeature(Window.FEATURE_NO_TITLE) + setContentView(binding.root) + setCancelable(false) + binding.lavLoading.setAnimation(rawResId) + } +} + +fun Context.observeLoadingWithDialog( + lifecycleOwner: LifecycleOwner, + loadingLiveData: LiveData, + containerViewGroup: ViewGroup? = null, + @RawRes loadingAnimationResId: Int = R.raw.default_loading, + onLoadingStarted: () -> Unit = {}, + onLoadingFinished: () -> Unit = {}, +) { + val loadingDialog = LoadingDialog(this, loadingAnimationResId) + loadingLiveData.observe(lifecycleOwner) { isLoading -> + if (isLoading) { + loadingDialog.show() + containerViewGroup?.visibility = View.GONE + onLoadingStarted() + } else { + containerViewGroup?.visibility = View.VISIBLE + loadingDialog.dismiss() + onLoadingFinished() + } + } +} diff --git a/android/app/src/main/res/layout/activity_auction_detail.xml b/android/app/src/main/res/layout/activity_auction_detail.xml index 7d8dbaa07..ef60001f3 100644 --- a/android/app/src/main/res/layout/activity_auction_detail.xml +++ b/android/app/src/main/res/layout/activity_auction_detail.xml @@ -15,8 +15,10 @@ + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/raw/default_loading.json b/android/app/src/main/res/raw/default_loading.json new file mode 100644 index 000000000..cdbb7939c --- /dev/null +++ b/android/app/src/main/res/raw/default_loading.json @@ -0,0 +1,1296 @@ +{ + "nm": "newScene", + "ddd": 0, + "h": 160, + "w": 280, + "meta": { + "g": "@lottiefiles/toolkit-js 0.26.1" + }, + "layers": [ + { + "ty": 4, + "nm": "形状图层 5", + "sr": 1, + "st": 0, + "op": 40, + "ip": 0, + "hd": false, + "ddd": 0, + "bm": 0, + "hasMask": false, + "ao": 0, + "ks": { + "a": { + "a": 0, + "k": [ + -76.375, + -2.875, + 0 + ] + }, + "s": { + "a": 1, + "k": [ + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 100, + 100, + 100 + ], + "t": 8 + }, + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 200, + 200, + 100 + ], + "t": 24 + }, + { + "s": [ + 100, + 100, + 100 + ], + "t": 40 + } + ] + }, + "sk": { + "a": 0, + "k": 0 + }, + "p": { + "a": 0, + "k": [ + 187.875, + 77.125, + 0 + ] + }, + "r": { + "a": 0, + "k": 0 + }, + "sa": { + "a": 0, + "k": 0 + }, + "o": { + "a": 1, + "k": [ + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 100 + ], + "t": 8 + }, + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 30 + ], + "t": 24 + }, + { + "s": [ + 100 + ], + "t": 40 + } + ] + } + }, + "ef": [], + "shapes": [ + { + "ty": "gr", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Group", + "nm": "椭圆 1", + "np": 3, + "it": [ + { + "ty": "el", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Shape - Ellipse", + "nm": "椭圆路径 1", + "d": 1, + "p": { + "a": 0, + "k": [ + 0, + 0 + ] + }, + "s": { + "a": 0, + "k": [ + 18, + 18 + ] + } + }, + { + "ty": "st", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Graphic - Stroke", + "nm": "描边 1", + "lc": 1, + "lj": 1, + "ml": 4, + "o": { + "a": 0, + "k": 100 + }, + "w": { + "a": 0, + "k": 0 + }, + "c": { + "a": 0, + "k": [ + 1, + 1, + 1 + ] + } + }, + { + "ty": "fl", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Graphic - Fill", + "nm": "填充 1", + "c": { + "a": 0, + "k": [ + 1, + 0.8902, + 0.5608 + ] + }, + "r": 2, + "o": { + "a": 0, + "k": 100 + } + }, + { + "ty": "tr", + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "p": { + "a": 0, + "k": [ + -76.482, + -3.482 + ], + "ix": 2 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + } + } + ] + } + ], + "ind": 1 + }, + { + "ty": 4, + "nm": "形状图层 4", + "sr": 1, + "st": 0, + "op": 40, + "ip": 0, + "hd": false, + "ddd": 0, + "bm": 0, + "hasMask": false, + "ao": 0, + "ks": { + "a": { + "a": 0, + "k": [ + -76.375, + -2.875, + 0 + ] + }, + "s": { + "a": 1, + "k": [ + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 100, + 100, + 100 + ], + "t": 6 + }, + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 200, + 200, + 100 + ], + "t": 22 + }, + { + "s": [ + 100, + 100, + 100 + ], + "t": 36 + } + ] + }, + "sk": { + "a": 0, + "k": 0 + }, + "p": { + "a": 0, + "k": [ + 162.125, + 76.625, + 0 + ] + }, + "r": { + "a": 0, + "k": 0 + }, + "sa": { + "a": 0, + "k": 0 + }, + "o": { + "a": 1, + "k": [ + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 100 + ], + "t": 6 + }, + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 30 + ], + "t": 22 + }, + { + "s": [ + 100 + ], + "t": 36 + } + ] + } + }, + "ef": [], + "shapes": [ + { + "ty": "gr", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Group", + "nm": "椭圆 1", + "np": 3, + "it": [ + { + "ty": "el", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Shape - Ellipse", + "nm": "椭圆路径 1", + "d": 1, + "p": { + "a": 0, + "k": [ + 0, + 0 + ] + }, + "s": { + "a": 0, + "k": [ + 18, + 18 + ] + } + }, + { + "ty": "st", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Graphic - Stroke", + "nm": "描边 1", + "lc": 1, + "lj": 1, + "ml": 4, + "o": { + "a": 0, + "k": 100 + }, + "w": { + "a": 0, + "k": 0 + }, + "c": { + "a": 0, + "k": [ + 1, + 1, + 1 + ] + } + }, + { + "ty": "fl", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Graphic - Fill", + "nm": "填充 1", + "c": { + "a": 0, + "k": [ + 0.6784, + 0.8275, + 0.6078 + ] + }, + "r": 2, + "o": { + "a": 0, + "k": 100 + } + }, + { + "ty": "tr", + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "p": { + "a": 0, + "k": [ + -76.482, + -3.482 + ], + "ix": 2 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + } + } + ] + } + ], + "ind": 2 + }, + { + "ty": 4, + "nm": "形状图层 3", + "sr": 1, + "st": 0, + "op": 40, + "ip": 0, + "hd": false, + "ddd": 0, + "bm": 0, + "hasMask": false, + "ao": 0, + "ks": { + "a": { + "a": 0, + "k": [ + -76.375, + -2.875, + 0 + ] + }, + "s": { + "a": 1, + "k": [ + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 100, + 100, + 100 + ], + "t": 4 + }, + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 200, + 200, + 100 + ], + "t": 20 + }, + { + "s": [ + 100, + 100, + 100 + ], + "t": 32 + } + ] + }, + "sk": { + "a": 0, + "k": 0 + }, + "p": { + "a": 0, + "k": [ + 135.625, + 76.625, + 0 + ] + }, + "r": { + "a": 0, + "k": 0 + }, + "sa": { + "a": 0, + "k": 0 + }, + "o": { + "a": 1, + "k": [ + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 100 + ], + "t": 4 + }, + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 30 + ], + "t": 20 + }, + { + "s": [ + 100 + ], + "t": 32 + } + ] + } + }, + "ef": [], + "shapes": [ + { + "ty": "gr", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Group", + "nm": "椭圆 1", + "np": 3, + "it": [ + { + "ty": "el", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Shape - Ellipse", + "nm": "椭圆路径 1", + "d": 1, + "p": { + "a": 0, + "k": [ + 0, + 0 + ] + }, + "s": { + "a": 0, + "k": [ + 18, + 18 + ] + } + }, + { + "ty": "st", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Graphic - Stroke", + "nm": "描边 1", + "lc": 1, + "lj": 1, + "ml": 4, + "o": { + "a": 0, + "k": 100 + }, + "w": { + "a": 0, + "k": 0 + }, + "c": { + "a": 0, + "k": [ + 1, + 1, + 1 + ] + } + }, + { + "ty": "fl", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Graphic - Fill", + "nm": "填充 1", + "c": { + "a": 0, + "k": [ + 0.9961, + 0.8039, + 0.8039 + ] + }, + "r": 2, + "o": { + "a": 0, + "k": 100 + } + }, + { + "ty": "tr", + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "p": { + "a": 0, + "k": [ + -76.482, + -3.482 + ], + "ix": 2 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + } + } + ] + } + ], + "ind": 3 + }, + { + "ty": 4, + "nm": "形状图层 2", + "sr": 1, + "st": 0, + "op": 40, + "ip": 0, + "hd": false, + "ddd": 0, + "bm": 0, + "hasMask": false, + "ao": 0, + "ks": { + "a": { + "a": 0, + "k": [ + -76.625, + -3.125, + 0 + ] + }, + "s": { + "a": 1, + "k": [ + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 100, + 100, + 100 + ], + "t": 2 + }, + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 200, + 200, + 100 + ], + "t": 16 + }, + { + "s": [ + 100, + 100, + 100 + ], + "t": 28 + } + ] + }, + "sk": { + "a": 0, + "k": 0 + }, + "p": { + "a": 0, + "k": [ + 109.375, + 76.625, + 0 + ] + }, + "r": { + "a": 0, + "k": 0 + }, + "sa": { + "a": 0, + "k": 0 + }, + "o": { + "a": 1, + "k": [ + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 100 + ], + "t": 2 + }, + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 30 + ], + "t": 16 + }, + { + "s": [ + 100 + ], + "t": 28 + } + ] + } + }, + "ef": [], + "shapes": [ + { + "ty": "gr", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Group", + "nm": "椭圆 1", + "np": 3, + "it": [ + { + "ty": "el", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Shape - Ellipse", + "nm": "椭圆路径 1", + "d": 1, + "p": { + "a": 0, + "k": [ + 0, + 0 + ] + }, + "s": { + "a": 0, + "k": [ + 18, + 18 + ] + } + }, + { + "ty": "st", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Graphic - Stroke", + "nm": "描边 1", + "lc": 1, + "lj": 1, + "ml": 4, + "o": { + "a": 0, + "k": 100 + }, + "w": { + "a": 0, + "k": 0 + }, + "c": { + "a": 0, + "k": [ + 1, + 1, + 1 + ] + } + }, + { + "ty": "fl", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Graphic - Fill", + "nm": "填充 1", + "c": { + "a": 0, + "k": [ + 0.9882, + 0.4118, + 0.4118 + ] + }, + "r": 2, + "o": { + "a": 0, + "k": 100 + } + }, + { + "ty": "tr", + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "p": { + "a": 0, + "k": [ + -76.482, + -3.482 + ], + "ix": 2 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + } + } + ] + } + ], + "ind": 4 + }, + { + "ty": 4, + "nm": "形状图层 1", + "sr": 1, + "st": 0, + "op": 40, + "ip": 0, + "hd": false, + "ddd": 0, + "bm": 0, + "hasMask": false, + "ao": 0, + "ks": { + "a": { + "a": 0, + "k": [ + -76.625, + -3.375, + 0 + ] + }, + "s": { + "a": 1, + "k": [ + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 100, + 100, + 100 + ], + "t": 0 + }, + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 200, + 200, + 100 + ], + "t": 12 + }, + { + "s": [ + 100, + 100, + 100 + ], + "t": 24 + } + ] + }, + "sk": { + "a": 0, + "k": 0 + }, + "p": { + "a": 0, + "k": [ + 82.625, + 76.625, + 0 + ] + }, + "r": { + "a": 0, + "k": 0 + }, + "sa": { + "a": 0, + "k": 0 + }, + "o": { + "a": 1, + "k": [ + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 100 + ], + "t": 0 + }, + { + "o": { + "x": 0.333, + "y": 0 + }, + "i": { + "x": 0.833, + "y": 0.833 + }, + "s": [ + 30 + ], + "t": 12 + }, + { + "s": [ + 100 + ], + "t": 24 + } + ] + } + }, + "ef": [], + "shapes": [ + { + "ty": "gr", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Group", + "nm": "椭圆 1", + "np": 3, + "it": [ + { + "ty": "el", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Shape - Ellipse", + "nm": "椭圆路径 1", + "d": 1, + "p": { + "a": 0, + "k": [ + 0, + 0 + ] + }, + "s": { + "a": 0, + "k": [ + 18, + 18 + ] + } + }, + { + "ty": "st", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Graphic - Stroke", + "nm": "描边 1", + "lc": 1, + "lj": 1, + "ml": 4, + "o": { + "a": 0, + "k": 100 + }, + "w": { + "a": 0, + "k": 0 + }, + "c": { + "a": 0, + "k": [ + 1, + 1, + 1 + ] + } + }, + { + "ty": "fl", + "bm": 0, + "hd": false, + "mn": "ADBE Vector Graphic - Fill", + "nm": "填充 1", + "c": { + "a": 0, + "k": [ + 0.949, + 0.0196, + 0.0196 + ] + }, + "r": 2, + "o": { + "a": 0, + "k": 100 + } + }, + { + "ty": "tr", + "a": { + "a": 0, + "k": [ + 0, + 0 + ], + "ix": 1 + }, + "s": { + "a": 0, + "k": [ + 100, + 100 + ], + "ix": 3 + }, + "sk": { + "a": 0, + "k": 0, + "ix": 4 + }, + "p": { + "a": 0, + "k": [ + -76.482, + -3.482 + ], + "ix": 2 + }, + "r": { + "a": 0, + "k": 0, + "ix": 6 + }, + "sa": { + "a": 0, + "k": 0, + "ix": 5 + }, + "o": { + "a": 0, + "k": 100, + "ix": 7 + } + } + ] + } + ], + "ind": 5 + } + ], + "v": "4.5.4", + "fr": 24, + "op": 40, + "ip": 0, + "assets": [] +} \ No newline at end of file diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index dd06a0cc5..2bd584e98 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -10,6 +10,7 @@ 현재가 시작가 낙찰가 + 입찰전 경매중 낙찰 완료 경매 유찰 From 67228688f434dc8ce09950a52cf2efb26d5a013d Mon Sep 17 00:00:00 2001 From: Song Hyemin Date: Sat, 9 Sep 2023 15:00:28 +0900 Subject: [PATCH 094/159] =?UTF-8?q?feat:=20#335=20=EA=B2=80=EC=83=89=20UI?= =?UTF-8?q?=20=EC=9E=91=EC=84=B1=20=EB=B0=8F=20=EA=B5=AC=EC=A1=B0=20?= =?UTF-8?q?=EC=84=A4=EA=B3=84=20(#345)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/main/AndroidManifest.xml | 3 +- .../feature/common/ViewModelFactory.kt | 2 + .../android/feature/home/HomeFragment.kt | 4 +- .../android/feature/search/SearchFragment.kt | 94 +++++++++++++++- .../android/feature/search/SearchViewModel.kt | 30 +++++ .../main/res/drawable/bg_gray_radius_24dp.xml | 7 ++ .../main/res/drawable/bg_red_radius_24dp.xml | 7 ++ .../drawable/bg_white_black_radius_24dp.xml | 2 +- .../src/main/res/layout/fragment_search.xml | 106 +++++++++++++++++- .../res/layout/item_detail_direct_region.xml | 2 +- .../main/res/menu/menu_bottom_navigation.xml | 3 +- android/app/src/main/res/values/strings.xml | 7 ++ 12 files changed, 254 insertions(+), 13 deletions(-) create mode 100644 android/app/src/main/java/com/ddangddangddang/android/feature/search/SearchViewModel.kt create mode 100644 android/app/src/main/res/drawable/bg_gray_radius_24dp.xml create mode 100644 android/app/src/main/res/drawable/bg_red_radius_24dp.xml diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 8aa6d559f..10bb20739 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -54,7 +54,8 @@ android:exported="false" /> + android:exported="false" + android:windowSoftInputMode="adjustPan" /> diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/common/ViewModelFactory.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/common/ViewModelFactory.kt index 83d46d19f..4e7aad8ea 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/common/ViewModelFactory.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/common/ViewModelFactory.kt @@ -15,6 +15,7 @@ import com.ddangddangddang.android.feature.register.RegisterAuctionViewModel import com.ddangddangddang.android.feature.register.category.SelectCategoryViewModel import com.ddangddangddang.android.feature.register.region.SelectRegionsViewModel import com.ddangddangddang.android.feature.report.ReportViewModel +import com.ddangddangddang.android.feature.search.SearchViewModel import com.ddangddangddang.android.feature.splash.SplashViewModel import com.ddangddangddang.android.global.DdangDdangDdang import com.ddangddangddang.data.repository.AuctionRepositoryImpl @@ -70,6 +71,7 @@ val viewModelFactory = object : ViewModelProvider.Factory { ) isAssignableFrom(ReportViewModel::class.java) -> ReportViewModel(auctionRepository) + isAssignableFrom(SearchViewModel::class.java) -> SearchViewModel() else -> throw IllegalArgumentException("Unknown ViewModel class: ${modelClass.name}") } } as T diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/home/HomeFragment.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/home/HomeFragment.kt index f0cba1e79..215589caa 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/home/HomeFragment.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/home/HomeFragment.kt @@ -77,7 +77,9 @@ class HomeFragment : BindingFragment(R.layout.fragment_home private fun setupAuctionRecyclerView() { with(binding.rvAuction) { adapter = auctionAdapter - addItemDecoration(AuctionSpaceItemDecoration(spanCount = 2, space = 20)) + + val space = resources.getDimensionPixelSize(R.dimen.margin_side_layout) + addItemDecoration(AuctionSpaceItemDecoration(spanCount = 2, space = space)) addOnScrollListener(auctionScrollListener) } } diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/search/SearchFragment.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/search/SearchFragment.kt index e999ec006..f2f685d6b 100644 --- a/android/app/src/main/java/com/ddangddangddang/android/feature/search/SearchFragment.kt +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/search/SearchFragment.kt @@ -1,7 +1,99 @@ package com.ddangddangddang.android.feature.search +import android.content.Context +import android.content.Intent +import android.os.Bundle +import android.view.View +import android.view.inputmethod.EditorInfo +import android.view.inputmethod.InputMethodManager +import androidx.fragment.app.viewModels import com.ddangddangddang.android.R import com.ddangddangddang.android.databinding.FragmentSearchBinding +import com.ddangddangddang.android.feature.common.viewModelFactory +import com.ddangddangddang.android.feature.detail.AuctionDetailActivity +import com.ddangddangddang.android.feature.home.AuctionAdapter +import com.ddangddangddang.android.feature.home.AuctionSpaceItemDecoration +import com.ddangddangddang.android.model.AuctionHomeModel import com.ddangddangddang.android.util.binding.BindingFragment -class SearchFragment : BindingFragment(R.layout.fragment_search) +class SearchFragment : BindingFragment(R.layout.fragment_search) { + private val viewModel: SearchViewModel by viewModels { viewModelFactory } + private val auctionAdapter = AuctionAdapter { auctionId -> + navigateToAuctionDetail(auctionId) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + setupAuctionRecyclerView() + setupKeyboard() + setupViewModel() + } + + private fun setupAuctionRecyclerView() { + binding.rvSearchAuctions.adapter = auctionAdapter + binding.rvSearchAuctions.addItemDecoration( + AuctionSpaceItemDecoration( + 2, + resources.getDimensionPixelSize(R.dimen.margin_side_layout), + ), + ) + } + + private fun setupKeyboard() { + binding.etSearchKeyword.setOnEditorActionListener { _, actionId, _ -> + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + viewModel.submitKeyword() + return@setOnEditorActionListener true + } + return@setOnEditorActionListener false + } + } + + private fun setupViewModel() { + binding.viewModel = viewModel + viewModel.event.observe(viewLifecycleOwner) { event -> + when (event) { + is SearchViewModel.SearchEvent.KeywordSubmit -> changeAuctions(event.auctions) + } + } + } + + private fun changeAuctions(auctions: List) { + hideKeyboard() + hideNoticeInputKeyword() + auctionAdapter.submitList(auctions) + + if (auctions.isEmpty()) { + showNoticeNoAuctions() + return + } + showAuctions() + } + + private fun hideKeyboard() { + val imm = activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + imm.hideSoftInputFromWindow(binding.etSearchKeyword.windowToken, 0) + } + + private fun hideNoticeInputKeyword() { + if (binding.tvNoticeInputKeyword.visibility == View.VISIBLE) { + binding.tvNoticeInputKeyword.visibility = View.INVISIBLE + } + } + + private fun showNoticeNoAuctions() { + binding.tvNoticeNoAuctions.visibility = View.VISIBLE + binding.rvSearchAuctions.visibility = View.INVISIBLE + } + + private fun showAuctions() { + binding.tvNoticeNoAuctions.visibility = View.INVISIBLE + binding.rvSearchAuctions.visibility = View.VISIBLE + } + + private fun navigateToAuctionDetail(auctionId: Long) { + val intent = AuctionDetailActivity.getIntent(requireContext(), auctionId) + intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP + startActivity(intent) + } +} diff --git a/android/app/src/main/java/com/ddangddangddang/android/feature/search/SearchViewModel.kt b/android/app/src/main/java/com/ddangddangddang/android/feature/search/SearchViewModel.kt new file mode 100644 index 000000000..a96196411 --- /dev/null +++ b/android/app/src/main/java/com/ddangddangddang/android/feature/search/SearchViewModel.kt @@ -0,0 +1,30 @@ +package com.ddangddangddang.android.feature.search + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import com.ddangddangddang.android.model.AuctionHomeModel +import com.ddangddangddang.android.model.AuctionHomeStatusModel +import com.ddangddangddang.android.util.livedata.SingleLiveEvent + +class SearchViewModel : ViewModel() { + private val _event: SingleLiveEvent = SingleLiveEvent() + val event: LiveData + get() = _event + + val keyword: MutableLiveData = MutableLiveData("") + + fun submitKeyword() { + // repository에서 검색 결과 List를 가져오는 코드 + val dummy = listOf( + AuctionHomeModel(0, "ihi", "", 1000, AuctionHomeStatusModel.UNBIDDEN, 0), + AuctionHomeModel(1, "ihi", "", 1000, AuctionHomeStatusModel.UNBIDDEN, 0), + AuctionHomeModel(2, "ihi", "", 1000, AuctionHomeStatusModel.SUCCESS, 0), + ) + _event.value = SearchEvent.KeywordSubmit(dummy) + } + + sealed class SearchEvent { + data class KeywordSubmit(val auctions: List) : SearchEvent() + } +} diff --git a/android/app/src/main/res/drawable/bg_gray_radius_24dp.xml b/android/app/src/main/res/drawable/bg_gray_radius_24dp.xml new file mode 100644 index 000000000..c33b03a42 --- /dev/null +++ b/android/app/src/main/res/drawable/bg_gray_radius_24dp.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/android/app/src/main/res/drawable/bg_red_radius_24dp.xml b/android/app/src/main/res/drawable/bg_red_radius_24dp.xml new file mode 100644 index 000000000..00b48c363 --- /dev/null +++ b/android/app/src/main/res/drawable/bg_red_radius_24dp.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/android/app/src/main/res/drawable/bg_white_black_radius_24dp.xml b/android/app/src/main/res/drawable/bg_white_black_radius_24dp.xml index 476115ab5..7974b7580 100644 --- a/android/app/src/main/res/drawable/bg_white_black_radius_24dp.xml +++ b/android/app/src/main/res/drawable/bg_white_black_radius_24dp.xml @@ -6,4 +6,4 @@ android:radius="24dp" /> - \ No newline at end of file + diff --git a/android/app/src/main/res/layout/fragment_search.xml b/android/app/src/main/res/layout/fragment_search.xml index 2d38ad217..4438e0188 100644 --- a/android/app/src/main/res/layout/fragment_search.xml +++ b/android/app/src/main/res/layout/fragment_search.xml @@ -1,17 +1,111 @@ - + + + + + + - + android:layout_height="?attr/actionBarSize" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + - + + +