diff --git a/README.md b/README.md index 046395a8..614c7356 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ git clone git@github.com:Daily-DAYO/DAYO_Android.git ## Application Version - minSdkVersion : 26
-- targetSdkVersion : 35 +- targetSdkVersion : 36 ## Git Convention - Create issue
diff --git a/app/build.gradle b/app/build.gradle index 39887ae3..1f932d1f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id 'com.android.application' id 'kotlin-android' @@ -5,7 +7,6 @@ plugins { id 'dagger.hilt.android.plugin' id 'com.google.gms.google-services' id 'com.google.firebase.crashlytics' - id 'io.sentry.android.gradle' } Properties properties = new Properties() @@ -14,16 +15,11 @@ def NATIVE_APP_KEY = properties.getProperty('NATIVE_APP_KEY') def ADS_APPLICATION_ID = properties.getProperty('ADS_APPLICATION_ID') def keystorePropertiesFile = rootProject.file("app/keystore-release.properties") -sentry { - setIncludeProguardMapping(true) - setAutoUploadProguardMapping(true) - setUploadNativeSymbols(false) - setIncludeNativeSources(false) - setAutoUpload(true) -} - kotlin { jvmToolchain(17) + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } } android { @@ -87,12 +83,6 @@ android { buildConfigField("String", "BASE_URL", properties['BASE_URL_PROD']) } } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - buildFeatures { - dataBinding true - } namespace 'com.daily.dayo' } @@ -102,26 +92,22 @@ dependencies { implementation project(':domain') implementation project(':data') - def sentry_version = "8.24.0" - def glide_version = "4.15.1" + def glide_version = "5.0.5" // Hilt - implementation "com.google.dagger:hilt-android:2.44" - kapt "com.google.dagger:hilt-android-compiler:2.44" + implementation "com.google.dagger:hilt-android:2.57.2" + kapt "com.google.dagger:hilt-android-compiler:2.57.2" // Kakao sdk implementation "com.kakao.sdk:v2-user:2.9.0" // Glide implementation "com.github.bumptech.glide:glide:$glide_version" - kapt "com.github.bumptech.glide:compiler:$glide_version" // Sentry - implementation platform("io.sentry:sentry-bom:$sentry_version") - implementation('io.sentry:sentry-android') - implementation('io.sentry:sentry-android-fragment') implementation 'org.slf4j:slf4j-nop:2.0.17' // Firebase - implementation 'com.google.firebase:firebase-crashlytics-ktx' - implementation 'com.google.firebase:firebase-analytics-ktx' + implementation platform('com.google.firebase:firebase-bom:34.6.0') + implementation "com.google.firebase:firebase-crashlytics" + implementation "com.google.firebase:firebase-analytics" // Google Ads - implementation 'com.google.android.gms:play-services-ads:23.6.0' + implementation 'com.google.android.gms:play-services-ads:24.7.0' } \ No newline at end of file diff --git a/app/src/androidTest/java/com/daily/dayo/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/daily/dayo/ExampleInstrumentedTest.kt index e3089098..86a5e52a 100644 --- a/app/src/androidTest/java/com/daily/dayo/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/daily/dayo/ExampleInstrumentedTest.kt @@ -1,24 +1,10 @@ package com.daily.dayo -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - /** * 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.daily.dayo", appContext.packageName) - } + } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 53ea5df4..0976f302 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,13 +20,6 @@ android:supportsRtl="true" android:theme="@style/Theme.DAYO" android:enableOnBackInvokedCallback="true"> - - - - - - diff --git a/app/src/main/java/com/daily/dayo/DayoApplication.kt b/app/src/main/java/com/daily/dayo/DayoApplication.kt index af69ceb1..93c7caee 100644 --- a/app/src/main/java/com/daily/dayo/DayoApplication.kt +++ b/app/src/main/java/com/daily/dayo/DayoApplication.kt @@ -3,9 +3,9 @@ package com.daily.dayo import android.app.Application import com.bumptech.glide.Glide import com.google.android.gms.ads.MobileAds +import com.google.firebase.Firebase import com.google.firebase.analytics.FirebaseAnalytics -import com.google.firebase.analytics.ktx.analytics -import com.google.firebase.ktx.Firebase +import com.google.firebase.analytics.analytics import com.kakao.sdk.common.KakaoSdk import dagger.hilt.android.HiltAndroidApp diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml deleted file mode 100644 index 9230367c..00000000 --- a/app/src/main/res/xml/network_security_config.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/test/java/com/daily/dayo/ExampleUnitTest.kt b/app/src/test/java/com/daily/dayo/ExampleUnitTest.kt index 8378a036..0d342bd2 100644 --- a/app/src/test/java/com/daily/dayo/ExampleUnitTest.kt +++ b/app/src/test/java/com/daily/dayo/ExampleUnitTest.kt @@ -1,8 +1,5 @@ package com.daily.dayo -import org.junit.Test - -import org.junit.Assert.* /** * Example local unit test, which will execute on the development machine (host). @@ -10,8 +7,4 @@ import org.junit.Assert.* * See [testing documentation](http://d.android.com/tools/testing). */ class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index a0e6994a..7bc1e6d0 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,11 @@ buildscript { ext { javaInjectVersion = '1' - kotlin_version = '1.8.20' - compose_version = '1.4.6' - nav_version = '2.6.0' - paging_version = "3.2.0" - targetSdkVersion = 35 - compileSdkVersion = 35 + kotlin_version = '2.2.21' + nav_version = '2.9.6' + paging_version = "3.3.6" + targetSdkVersion = 36 + compileSdkVersion = 36 minSdkVersion = 26 } repositories { @@ -15,13 +14,13 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' + classpath 'com.android.tools.build:gradle:8.13.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version") - classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44' - classpath 'com.google.gms:google-services:4.3.15' - classpath 'io.sentry:sentry-android-gradle-plugin:4.13.0' - classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.9" + classpath 'com.google.dagger:hilt-android-gradle-plugin:2.57.2' + classpath 'com.google.gms:google-services:4.4.4' + classpath "com.google.firebase:firebase-crashlytics-gradle:3.0.6" + classpath "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.2.21" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/data/build.gradle b/data/build.gradle index e481800b..4d69cb1a 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id 'com.android.library' id 'org.jetbrains.kotlin.android' @@ -7,6 +9,9 @@ plugins { kotlin { jvmToolchain(17) + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } } Properties properties = new Properties() @@ -49,46 +54,41 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } } dependencies { // multiModule implementation project(':domain') - implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.9.0' + implementation 'androidx.core:core-ktx:1.17.0' + implementation 'androidx.appcompat:appcompat:1.7.1' + implementation 'com.google.android.material:material:1.13.0' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0' // Hilt - implementation "com.google.dagger:hilt-android:2.44" - kapt "com.google.dagger:hilt-android-compiler:2.44" - kapt 'androidx.hilt:hilt-compiler:1.0.0' + implementation "com.google.dagger:hilt-android:2.57.2" + kapt "com.google.dagger:hilt-android-compiler:2.57.2" + kapt 'androidx.hilt:hilt-compiler:1.3.0' // retrofit2 - implementation group: 'com.squareup.retrofit2', name: 'retrofit', version: '2.9.0' - implementation group: 'com.squareup.retrofit2', name: 'converter-gson', version: '2.9.0' - implementation group: 'com.squareup.retrofit2', name: 'converter-scalars', version: '2.9.0' + implementation group: 'com.squareup.retrofit2', name: 'retrofit', version: '3.0.0' + implementation group: 'com.squareup.retrofit2', name: 'converter-gson', version: '3.0.0' + implementation group: 'com.squareup.retrofit2', name: 'converter-scalars', version: '3.0.0' // JSON을 직렬화 - implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.13.2' // 직렬화된 JSON을 객체로 역직렬화 // OKHttp - implementation "com.squareup.okhttp3:okhttp:4.9.2" - implementation "com.squareup.okhttp3:okhttp-urlconnection:4.9.2" + implementation "com.squareup.okhttp3:okhttp:5.3.0" + implementation "com.squareup.okhttp3:okhttp-urlconnection:5.3.0" // Use for HttpLoggingInterceptor - implementation "com.squareup.okhttp3:logging-interceptor:4.9.2" + implementation "com.squareup.okhttp3:logging-interceptor:5.3.0" // Preference - implementation 'androidx.preference:preference-ktx:1.1.1' + implementation 'androidx.preference:preference-ktx:1.2.1' // paging implementation "androidx.paging:paging-runtime-ktx:$paging_version" - // optional - Jetpack Compose integration - implementation "androidx.paging:paging-compose:3.2.0" } \ No newline at end of file diff --git a/data/src/test/java/daily/dayo/data/ExampleUnitTest.kt b/data/src/test/java/daily/dayo/data/ExampleUnitTest.kt index 9d6dc57e..32bc686c 100644 --- a/data/src/test/java/daily/dayo/data/ExampleUnitTest.kt +++ b/data/src/test/java/daily/dayo/data/ExampleUnitTest.kt @@ -1,8 +1,5 @@ package daily.dayo.data -import org.junit.Test - -import org.junit.Assert.* /** * Example local unit test, which will execute on the development machine (host). @@ -10,8 +7,4 @@ import org.junit.Assert.* * See [testing documentation](http://d.android.com/tools/testing). */ class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } } \ No newline at end of file diff --git a/domain/build.gradle b/domain/build.gradle index 7d10b703..7a484ba9 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -2,11 +2,15 @@ plugins { id 'kotlin' } +kotlin { + jvmToolchain(17) +} + dependencies { // Dependency Injection implementation "javax.inject:javax.inject:$javaInjectVersion" // OKHttp - implementation "com.squareup.okhttp3:okhttp:4.9.2" + implementation "com.squareup.okhttp3:okhttp:5.3.0" // alternatively - without Android dependencies for tests implementation "androidx.paging:paging-common-ktx:$paging_version" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d08dfb78..de0b5493 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Nov 02 16:51:40 KST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/presentation/build.gradle b/presentation/build.gradle index 73d2042e..35dff526 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id 'com.android.library' id 'org.jetbrains.kotlin.android' @@ -5,6 +7,7 @@ plugins { id 'dagger.hilt.android.plugin' id 'androidx.navigation.safeargs.kotlin' } +apply plugin: "org.jetbrains.kotlin.plugin.compose" Properties properties = new Properties() properties.load(project.rootProject.file('local.properties').newDataInputStream()) @@ -16,6 +19,9 @@ kapt { kotlin { jvmToolchain(17) + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } } android { @@ -35,8 +41,10 @@ android { } buildFeatures { - // AGP 9.0부터 buildConfig가 사라짐에 따라 8.0에서의 임시방편 - buildConfig = true + buildConfig = true // AGP 8.x 대응용 + dataBinding = true + viewBinding = true + compose = true } buildTypes { @@ -62,53 +70,37 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - composeOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - kotlinCompilerExtensionVersion = "$compose_version" - } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } - buildFeatures { - dataBinding true - viewBinding true - compose true - } } dependencies { // multiModule implementation project(':domain') - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.9.0' + implementation 'androidx.appcompat:appcompat:1.7.1' + implementation 'com.google.android.material:material:1.13.0' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0' // Compose - Dependency composeBom = platform('androidx.compose:compose-bom:2025.05.00') + Dependency composeBom = platform('androidx.compose:compose-bom:2025.11.00') implementation composeBom testImplementation composeBom androidTestImplementation composeBom - implementation "androidx.compose.material:material:1.5.4" implementation 'androidx.legacy:legacy-support-v4:1.0.0' - def nav_version = "2.8.3" - def lifecycle_version = "2.6.1" - def splashscreen_version = "1.0.0" - def lottie_version = "6.1.0" - def glide_version = "4.15.1" - def landscapist_glide_version = "2.2.5" - def fragment_version = "1.6.1" + def nav_version = rootProject.ext.nav_version + def lifecycle_version = "2.9.4" + def splashscreen_version = "1.2.0" + def lottie_version = "6.7.1" + def glide_version = "5.0.5" + def landscapist_glide_version = "2.6.1" + def fragment_version = "1.8.9" def activity_version = "1.7.2" - def emoji_version = "1.0.0-alpha03" + def emoji_version = "1.6.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.10.1' - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.core:core-ktx:1.17.0' + implementation 'androidx.constraintlayout:constraintlayout:2.2.1' // Java language implementation implementation("androidx.fragment:fragment:$fragment_version") // Kotlin @@ -121,6 +113,7 @@ dependencies { // Jetpack Compose // Material implementation("androidx.compose.material3:material3") + implementation("androidx.compose.material:material") implementation("androidx.compose.material:material-icons-extended") // Android Studio Preview support implementation("androidx.compose.ui:ui-tooling-preview") @@ -129,7 +122,7 @@ dependencies { androidTestImplementation("androidx.compose.ui:ui-test-junit4") debugImplementation("androidx.compose.ui:ui-test-manifest") // Optional - Integration with activities - implementation("androidx.activity:activity-compose:1.10.1") + implementation("androidx.activity:activity-compose:1.11.0") // Optional - Integration with LiveData implementation("androidx.compose.runtime:runtime-livedata") // Optional - Integration with RxJava @@ -150,17 +143,14 @@ dependencies { androidTestImplementation "androidx.navigation:navigation-testing:$nav_version" // Jetpack Compose Integration implementation "androidx.navigation:navigation-compose:$nav_version" - implementation "androidx.hilt:hilt-navigation-compose:1.2.0" + implementation "androidx.hilt:hilt-navigation-compose:1.3.0" // ViewPager2 - implementation "androidx.viewpager2:viewpager2:1.0.0" + implementation "androidx.viewpager2:viewpager2:1.1.0" // Google Flexbox-Layout implementation 'com.google.android.flexbox:flexbox:3.0.0' - // Google Material Design - implementation 'com.google.android.material:material:1.9.0' - // ViewModel implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version") // ViewModel utilities for Compose @@ -171,55 +161,53 @@ dependencies { implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version") // Saved state module for ViewModel implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version") - // Annotation processor - kapt("androidx.lifecycle:lifecycle-compiler:$lifecycle_version") // optional - helpers for implementing LifecycleOwner in a Service implementation("androidx.lifecycle:lifecycle-service:$lifecycle_version") // retrofit2 - implementation group: 'com.squareup.retrofit2', name: 'retrofit', version: '2.9.0' - implementation group: 'com.squareup.retrofit2', name: 'converter-gson', version: '2.9.0' - implementation group: 'com.squareup.retrofit2', name: 'converter-scalars', version: '2.9.0' + implementation group: 'com.squareup.retrofit2', name: 'retrofit', version: '3.0.0' + implementation group: 'com.squareup.retrofit2', name: 'converter-gson', version: '3.0.0' + implementation group: 'com.squareup.retrofit2', name: 'converter-scalars', version: '3.0.0' // JSON을 직렬화 - implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.13.2' // 직렬화된 JSON을 객체로 역직렬화 // OKHttp - implementation "com.squareup.okhttp3:okhttp:4.9.2" - implementation "com.squareup.okhttp3:okhttp-urlconnection:4.9.2" + implementation "com.squareup.okhttp3:okhttp:5.3.0" + implementation "com.squareup.okhttp3:okhttp-urlconnection:5.3.0" // Use for HttpLoggingInterceptor - implementation "com.squareup.okhttp3:logging-interceptor:4.9.2" + implementation "com.squareup.okhttp3:logging-interceptor:5.3.0" // Hilt - implementation "com.google.dagger:hilt-android:2.44" - kapt "com.google.dagger:hilt-android-compiler:2.44" - kapt 'androidx.hilt:hilt-compiler:1.0.0' + implementation "com.google.dagger:hilt-android:2.57.2" + kapt "com.google.dagger:hilt-android-compiler:2.57.2" + kapt 'androidx.hilt:hilt-compiler:1.3.0' // Coroutines - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.2' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2' // Kakao sdk implementation "com.kakao.sdk:v2-user:2.9.0" // Glide implementation "com.github.bumptech.glide:glide:$glide_version" - kapt "com.github.bumptech.glide:compiler:$glide_version" - kapt "android.arch.lifecycle:compiler:1.1.1" // Glide-For-Compose implementation "com.github.skydoves:landscapist-glide:$landscapist_glide_version" // Coil - implementation "io.coil-kt:coil-compose:2.5.0" + implementation "io.coil-kt:coil-compose:2.7.0" // Preference - implementation 'androidx.preference:preference-ktx:1.1.1' + implementation 'androidx.preference:preference-ktx:1.2.1' // Firebase - implementation platform('com.google.firebase:firebase-bom:32.2.3') - implementation 'com.google.firebase:firebase-messaging-ktx' + implementation platform('com.google.firebase:firebase-bom:34.6.0') + implementation "com.google.firebase:firebase-crashlytics" + implementation "com.google.firebase:firebase-analytics" + implementation "com.google.firebase:firebase-messaging" // 버전 올리면 java.lang.NoSuchFieldError: No instance field mDelegate of type Landroid/database/sqlite/SQLiteStatement; in class Landroidx/sqlite/db/framewo 에러 남 - implementation 'androidx.work:work-runtime-ktx:2.7.1' + implementation 'androidx.work:work-runtime-ktx:2.11.0' // Splash Screen implementation "androidx.core:core-splashscreen:$splashscreen_version" @@ -233,7 +221,7 @@ dependencies { // paging implementation "androidx.paging:paging-runtime-ktx:$paging_version" // optional - Jetpack Compose integration - implementation "androidx.paging:paging-compose:3.2.0" + implementation "androidx.paging:paging-compose:$paging_version" // emoji implementation "androidx.emoji2:emoji2:$emoji_version" @@ -242,22 +230,13 @@ dependencies { // Google In-App Update implementation 'com.google.android.play:app-update-ktx:2.1.0' - testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - testImplementation 'org.mockito:mockito-core:2.25.0' + testImplementation 'org.mockito:mockito-core:5.20.0' testImplementation 'androidx.arch.core:core-testing:2.2.0' - testImplementation "com.google.truth:truth:1.1" - // For Robolectric tests. - testImplementation("com.google.dagger:hilt-android-testing:2.44") - // For instrumented tests. - androidTestImplementation("com.google.dagger:hilt-android-testing:2.44") - // ...with Kotlin. - kaptTest("com.google.dagger:hilt-android-compiler:2.44") - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2" + testImplementation "com.google.truth:truth:1.4.5" + testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2" // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12' // Google Ads - implementation 'com.google.android.gms:play-services-ads:23.6.0' + implementation 'com.google.android.gms:play-services-ads:24.7.0' } \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/activity/MainActivity.kt b/presentation/src/main/java/daily/dayo/presentation/activity/MainActivity.kt index 0c90dcb1..8ab937c2 100644 --- a/presentation/src/main/java/daily/dayo/presentation/activity/MainActivity.kt +++ b/presentation/src/main/java/daily/dayo/presentation/activity/MainActivity.kt @@ -35,7 +35,6 @@ class MainActivity : AppCompatActivity() { private var rewardedAd: RewardedAd? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setSystemBackClickListener() checkCurrentNotification() getNotificationData() askNotificationPermission() @@ -81,24 +80,6 @@ class MainActivity : AppCompatActivity() { } } - private fun setSystemBackClickListener() { - this.onBackPressedDispatcher.addCallback( - this, - object : OnBackPressedCallback(true) { - override fun handleOnBackPressed() { - val navHostFragment = - supportFragmentManager.findFragmentById(R.id.nav_host_fragment) - val backStackEntryCount = - navHostFragment?.childFragmentManager?.backStackEntryCount - - if (backStackEntryCount == 0) { - this@MainActivity.finish() - } - } - } - ) - } - private fun checkCurrentNotification() { if (!NotificationManagerCompat.from(this).areNotificationsEnabled()) { Toast.makeText( diff --git a/presentation/src/main/java/daily/dayo/presentation/adapter/FeedCommentAdapter.kt b/presentation/src/main/java/daily/dayo/presentation/adapter/FeedCommentAdapter.kt deleted file mode 100644 index 4f7a23ca..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/adapter/FeedCommentAdapter.kt +++ /dev/null @@ -1,73 +0,0 @@ -package daily.dayo.presentation.adapter - -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.navigation.Navigation -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.ListAdapter -import androidx.recyclerview.widget.RecyclerView -import daily.dayo.domain.model.Comment -import daily.dayo.presentation.R -import daily.dayo.presentation.common.extension.navigateSafe -import daily.dayo.presentation.common.setOnDebounceClickListener -import daily.dayo.presentation.databinding.ItemFeedPostCommentBinding -import daily.dayo.presentation.fragment.feed.FeedFragmentDirections - -class FeedCommentAdapter : ListAdapter( - diffCallback -) { - companion object { - private val diffCallback = object : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: Comment, newItem: Comment) = - oldItem.commentId == newItem.commentId - - override fun areContentsTheSame(oldItem: Comment, newItem: Comment): Boolean = - oldItem == newItem - } - } - - interface OnItemClickListener { - fun onItemClick(v: View, comment: Comment, position: Int) - } - - private var listener: OnItemClickListener? = null - fun setOnItemClickListener(listener: OnItemClickListener) { - this.listener = listener - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FeedCommentViewHolder = - FeedCommentViewHolder(ItemFeedPostCommentBinding.inflate(LayoutInflater.from(parent.context), parent, false)) - - override fun onBindViewHolder(holder: FeedCommentViewHolder, position: Int) { - holder.bind(getItem(position)) - } - - override fun submitList(comments: MutableList?) { - super.submitList(comments) - } - - inner class FeedCommentViewHolder(private val binding: ItemFeedPostCommentBinding) : RecyclerView.ViewHolder(binding.root) { - fun bind(comment: Comment) { - binding.comment = comment - setOnNicknameClickListener(comment.memberId) - - val pos = adapterPosition - if (pos != RecyclerView.NO_POSITION) { - itemView.setOnDebounceClickListener { - listener?.onItemClick(itemView, comment, pos) - } - } - } - - private fun setOnNicknameClickListener(commentMemberId: String) { - binding.tvFeedPostCommentUserNickname.setOnDebounceClickListener { - Navigation.findNavController(it).navigateSafe( - currentDestinationId = R.id.FeedFragment, - action = R.id.action_feedFragment_to_profileFragment, - args = FeedFragmentDirections.actionFeedFragmentToProfileFragment(memberId = commentMemberId).arguments - ) - } - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/adapter/FollowFragmentPagerStateAdapter.kt b/presentation/src/main/java/daily/dayo/presentation/adapter/FollowFragmentPagerStateAdapter.kt deleted file mode 100644 index eb256f3c..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/adapter/FollowFragmentPagerStateAdapter.kt +++ /dev/null @@ -1,29 +0,0 @@ -package daily.dayo.presentation.adapter - -import androidx.annotation.NonNull -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentManager -import androidx.lifecycle.Lifecycle -import androidx.viewpager2.adapter.FragmentStateAdapter - -class FollowFragmentPagerStateAdapter (@NonNull fragmentManager: FragmentManager, @NonNull lifecycle: Lifecycle) : FragmentStateAdapter(fragmentManager, lifecycle) { - var fragments : ArrayList = ArrayList() - - override fun getItemCount(): Int { - return fragments.size - } - - override fun createFragment(position: Int): Fragment { - return fragments[position] - } - - fun addFragment(fragment: Fragment){ - fragments.add(fragment) - notifyItemInserted(fragments.size - 1) - } - - fun removeFragment(){ - fragments.removeLast() - notifyItemRemoved(fragments.size) - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/adapter/HomeFragmentPagerStateAdapter.kt b/presentation/src/main/java/daily/dayo/presentation/adapter/HomeFragmentPagerStateAdapter.kt deleted file mode 100644 index e313d6bf..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/adapter/HomeFragmentPagerStateAdapter.kt +++ /dev/null @@ -1,39 +0,0 @@ -package daily.dayo.presentation.adapter - -import android.os.Handler -import androidx.annotation.NonNull -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentManager -import androidx.lifecycle.Lifecycle -import androidx.viewpager2.adapter.FragmentStateAdapter - -class HomeFragmentPagerStateAdapter(@NonNull fragmentManager: FragmentManager, @NonNull lifecycle: Lifecycle) : FragmentStateAdapter(fragmentManager, lifecycle) { - var fragments : ArrayList = ArrayList() - - override fun getItemCount(): Int { - return fragments.size - } - - override fun createFragment(position: Int): Fragment { - return fragments[position] - } - - fun addFragment(fragment: Fragment){ - fragments.add(fragment) - notifyItemInserted(fragments.size - 1) - } - - fun removeFragment(){ - fragments.removeLast() - notifyItemRemoved(fragments.size) - } - - fun refreshFragment(index: Int, fragment: Fragment) { - fragments[index] = fragment - Handler().post(object: Runnable { - override fun run() { - notifyDataSetChanged() - } - }) - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/adapter/PostCommentAdapter.kt b/presentation/src/main/java/daily/dayo/presentation/adapter/PostCommentAdapter.kt deleted file mode 100644 index c0dad62b..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/adapter/PostCommentAdapter.kt +++ /dev/null @@ -1,134 +0,0 @@ -package daily.dayo.presentation.adapter - -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.navigation.Navigation -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.ListAdapter -import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.RequestManager -import com.google.android.material.snackbar.Snackbar -import daily.dayo.domain.model.Comment -import daily.dayo.domain.model.User -import daily.dayo.presentation.BR -import daily.dayo.presentation.R -import daily.dayo.presentation.common.GlideLoadUtil.loadImageViewProfile -import daily.dayo.presentation.common.TimeChangerUtil.timeChange -import daily.dayo.presentation.common.extension.navigateSafe -import daily.dayo.presentation.common.setOnDebounceClickListener -import daily.dayo.presentation.databinding.ItemPostCommentBinding -import daily.dayo.presentation.fragment.post.PostFragmentDirections - -class PostCommentAdapter(private val requestManager: RequestManager, private val userInfo: User) : - ListAdapter( - diffCallback - ) { - companion object { - private val diffCallback = object : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: Comment, newItem: Comment) = - oldItem.commentId == newItem.commentId - - override fun areContentsTheSame(oldItem: Comment, newItem: Comment): Boolean = - oldItem == newItem - } - } - - interface OnItemClickListener { - fun onItemClick(v: View, comment: Comment, position: Int) - fun DeletePostCommentClick(comment: Comment, position: Int) - } - - private var listener: OnItemClickListener? = null - fun setOnItemClickListener(listener: OnItemClickListener) { - this.listener = listener - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PostCommentViewHolder = - PostCommentViewHolder( - ItemPostCommentBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - ) - - override fun onBindViewHolder(holder: PostCommentViewHolder, position: Int) { - holder.bind(getItem(position)) - } - - override fun submitList(list: MutableList?) { - super.submitList(list?.let { ArrayList(it) }) - } - - inner class PostCommentViewHolder(private val binding: ItemPostCommentBinding) : - RecyclerView.ViewHolder(binding.root) { - fun bind(comment: Comment) { - val currentUserNickname = userInfo.nickname.toString() - if (comment.nickname == currentUserNickname) { - binding.layoutPostCommentDelete.visibility = View.VISIBLE - } else { - binding.layoutPostCommentDelete.visibility = View.INVISIBLE - } - - with(binding) { - layoutPostCommentDelete.setOnDebounceClickListener { - Snackbar.make(it, "삭제버튼 클릭", Snackbar.LENGTH_SHORT).show() - } - loadImageViewProfile( - requestManager = requestManager, - width = imgPostCommentUserProfile.width, - height = imgPostCommentUserProfile.height, - imgName = comment.profileImg, - imgView = imgPostCommentUserProfile - ) - } - - val pos = adapterPosition - if (pos != RecyclerView.NO_POSITION) { - itemView.setOnDebounceClickListener { - listener?.onItemClick(itemView, comment, pos) - } - binding.layoutPostCommentDelete.setOnDebounceClickListener { - listener?.DeletePostCommentClick(comment, pos) - } - } - - setOnProfileClickListener(comment.memberId) - setBindingSetVariable(comment) - } - - private fun setOnProfileClickListener(commentMemberId: String) { - binding.imgPostCommentUserProfile.setOnDebounceClickListener { - Navigation.findNavController(it) - .navigateSafe( - currentDestinationId = R.id.PostFragment, - action = R.id.action_postFragment_to_profileFragment, - args = PostFragmentDirections.actionPostFragmentToProfileFragment(memberId = commentMemberId).arguments - ) - } - binding.tvPostCommentUserNickname.setOnDebounceClickListener { - Navigation.findNavController(it) - .navigateSafe( - currentDestinationId = R.id.PostFragment, - action = R.id.action_postFragment_to_profileFragment, - args = PostFragmentDirections.actionPostFragmentToProfileFragment(memberId = commentMemberId).arguments - ) - } - } - - private fun setBindingSetVariable(comment: Comment) { - with(binding) { - setVariable(BR.comment, comment) - setVariable( - BR.commentCreateTime, - timeChange( - context = binding.tvPostCommentWriteTime.context, - time = comment.createTime - ) - ) - executePendingBindings() - } - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/adapter/PostImageSliderAdapter.kt b/presentation/src/main/java/daily/dayo/presentation/adapter/PostImageSliderAdapter.kt deleted file mode 100644 index 6d398fa0..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/adapter/PostImageSliderAdapter.kt +++ /dev/null @@ -1,107 +0,0 @@ -package daily.dayo.presentation.adapter - -import android.animation.Animator -import android.view.GestureDetector -import android.view.LayoutInflater -import android.view.MotionEvent -import android.view.View -import android.view.ViewGroup -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.ListAdapter -import androidx.recyclerview.widget.RecyclerView -import com.airbnb.lottie.LottieAnimationView -import com.bumptech.glide.RequestManager -import daily.dayo.presentation.R -import daily.dayo.presentation.common.GlideLoadUtil.loadImageView -import daily.dayo.presentation.databinding.ItemPostImageSliderBinding -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch - -class PostImageSliderAdapter( - private val requestManager: RequestManager -) : ListAdapter( - diffCallback -) { - companion object { - private val diffCallback = object : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: String, newItem: String) = - oldItem == newItem - - override fun areContentsTheSame(oldItem: String, newItem: String): Boolean = - oldItem.hashCode() == newItem.hashCode() - } - } - - interface OnItemClickListener { - fun postImageDoubleTap(lottieAnimationView: LottieAnimationView) - } - - private var clickListener: OnItemClickListener? = null - fun setOnItemClickListener(listener: OnItemClickListener) { - this.clickListener = listener - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PostImageViewHolder { - return PostImageViewHolder( - ItemPostImageSliderBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - ) - } - - override fun onBindViewHolder(holder: PostImageViewHolder, position: Int) { - holder.bindSliderImage(getItem(position)) - - val gestureDetector = GestureDetector( - holder.itemView.context, - object : GestureDetector.SimpleOnGestureListener() { - override fun onDoubleTap(e: MotionEvent): Boolean { - clickListener?.postImageDoubleTap(holder.itemView.findViewById(R.id.lottie_post_heart)) - return super.onDoubleTap(e) - } - }) - holder.itemView.setOnTouchListener { v, event -> - gestureDetector.onTouchEvent(event) - true - } - } - - override fun submitList(list: List?) { - super.submitList(list?.let { ArrayList(it) }) - } - - inner class PostImageViewHolder(private val binding: ItemPostImageSliderBinding) : - RecyclerView.ViewHolder(binding.root) { - fun bindSliderImage(imageURL: String?) { - val layoutParams = ViewGroup.MarginLayoutParams( - ViewGroup.MarginLayoutParams.MATCH_PARENT, - ViewGroup.MarginLayoutParams.MATCH_PARENT - ) - CoroutineScope(Dispatchers.Main).launch { - loadImageView( - requestManager = requestManager, - width = layoutParams.width, - height = layoutParams.width, - imgName = imageURL ?: "", - imgView = binding.imgSlider, - placeholderLottie = binding.lottiePostImage - ) - } - binding.lottiePostHeart.let { bigLikeLottie -> - bigLikeLottie.addAnimatorListener(object : Animator.AnimatorListener { - override fun onAnimationStart(animation: Animator) {} - override fun onAnimationEnd(animation: Animator) { - bigLikeLottie.visibility = View.GONE - } - - override fun onAnimationCancel(animation: Animator) {} - override fun onAnimationRepeat(animation: Animator) {} - }) - } - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/adapter/ProfileBookmarkPostListAdapter.kt b/presentation/src/main/java/daily/dayo/presentation/adapter/ProfileBookmarkPostListAdapter.kt deleted file mode 100644 index fb7e2afb..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/adapter/ProfileBookmarkPostListAdapter.kt +++ /dev/null @@ -1,99 +0,0 @@ -package daily.dayo.presentation.adapter - -import android.util.Log -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.RequestManager -import daily.dayo.presentation.common.GlideLoadUtil.loadImageView -import daily.dayo.presentation.common.setOnDebounceClickListener -import daily.dayo.presentation.databinding.ItemProfilePostBinding -import daily.dayo.domain.model.BookmarkPost -import kotlinx.coroutines.* - -class ProfileBookmarkPostListAdapter( - private val requestManager: RequestManager, -) : PagingDataAdapter( - diffCallback -) { - - companion object { - private val diffCallback = object : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: BookmarkPost, newItem: BookmarkPost) = - oldItem.postId == newItem.postId - - override fun areContentsTheSame(oldItem: BookmarkPost, newItem: BookmarkPost): Boolean = - oldItem == newItem - } - } - - override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int - ): ProfileBookmarkPostListViewHolder { - return ProfileBookmarkPostListViewHolder( - ItemProfilePostBinding.inflate(LayoutInflater.from(parent.context), parent, false) - ) - } - - override fun onBindViewHolder(holder: ProfileBookmarkPostListViewHolder, position: Int) { - holder.bind(getItem(position)) - } - - interface OnItemClickListener { - fun onItemClick(v: View, bookmarkPost: BookmarkPost, pos: Int) - } - - private var listener: OnItemClickListener? = null - fun setOnItemClickListener(listener: OnItemClickListener) { - this.listener = listener - } - - inner class ProfileBookmarkPostListViewHolder(private val binding: ItemProfilePostBinding) : - RecyclerView.ViewHolder(binding.root) { - - fun bind(bookmarkPost: BookmarkPost?) { - val layoutParams = ViewGroup.MarginLayoutParams( - ViewGroup.MarginLayoutParams.WRAP_CONTENT, - ViewGroup.MarginLayoutParams.WRAP_CONTENT - ) - - with(binding.layoutProfilePostShimmer) { - startShimmer() - visibility = View.VISIBLE - } - binding.imgProfilePost.visibility = View.INVISIBLE - - CoroutineScope(Dispatchers.Main).launch { - loadImageView( - requestManager = requestManager, - width = layoutParams.width, - height = layoutParams.width, - imgName = bookmarkPost?.thumbnailImage ?: "", - imgView = binding.imgProfilePost - ) - }.invokeOnCompletion { throwable -> - when (throwable) { - is CancellationException -> Log.e("Image Loading", "CANCELLED") - null -> { - binding.layoutProfilePostShimmer.stopShimmer() - binding.layoutProfilePostShimmer.visibility = View.GONE - binding.imgProfilePost.visibility = View.VISIBLE - } - } - } - - val pos = adapterPosition - if (pos != RecyclerView.NO_POSITION) { - itemView.setOnDebounceClickListener { - if (bookmarkPost != null) { - listener?.onItemClick(itemView, bookmarkPost, pos) - } - } - } - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/adapter/ProfileFolderListAdapter.kt b/presentation/src/main/java/daily/dayo/presentation/adapter/ProfileFolderListAdapter.kt deleted file mode 100644 index 2e7b8526..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/adapter/ProfileFolderListAdapter.kt +++ /dev/null @@ -1,87 +0,0 @@ -package daily.dayo.presentation.adapter - -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.recyclerview.widget.AsyncListDiffer -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.RequestManager -import daily.dayo.presentation.common.GlideLoadUtil.loadImageView -import daily.dayo.presentation.common.setOnDebounceClickListener -import daily.dayo.presentation.databinding.ItemProfileFolderBinding -import daily.dayo.domain.model.Folder -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch - -class ProfileFolderListAdapter( - private val requestManager: RequestManager -) : RecyclerView.Adapter() { - - companion object { - private val diffCallback = object : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: Folder, newItem: Folder) = - oldItem.folderId == newItem.folderId - - override fun areContentsTheSame(oldItem: Folder, newItem: Folder): Boolean = - oldItem == newItem - } - } - - private val differ = AsyncListDiffer(this, diffCallback) - fun submitList(list: List) = differ.submitList(list) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ProfileFolderListViewHolder { - return ProfileFolderListViewHolder( - ItemProfileFolderBinding.inflate(LayoutInflater.from(parent.context), parent, false) - ) - } - - override fun onBindViewHolder(holder: ProfileFolderListViewHolder, position: Int) { - val item = differ.currentList[position] - holder.bind(item) - } - - override fun getItemCount(): Int { - return differ.currentList.size - } - - interface OnItemClickListener { - fun onItemClick(v: View, folder: Folder, pos: Int) - } - - private var listener: OnItemClickListener? = null - fun setOnItemClickListener(listener: OnItemClickListener) { - this.listener = listener - } - - inner class ProfileFolderListViewHolder(private val binding: ItemProfileFolderBinding) : - RecyclerView.ViewHolder(binding.root) { - - fun bind(folder: Folder) { - val layoutParams = ViewGroup.MarginLayoutParams( - ViewGroup.MarginLayoutParams.WRAP_CONTENT, - ViewGroup.MarginLayoutParams.WRAP_CONTENT - ) - - binding.folder = folder - CoroutineScope(Dispatchers.Main).launch { - loadImageView( - requestManager = requestManager, - width = layoutParams.width, - 163, - imgName = folder.thumbnailImage, - imgView = binding.btnProfileFolderItem - ) - } - val pos = adapterPosition - if (pos != RecyclerView.NO_POSITION) { - itemView.setOnDebounceClickListener { - listener?.onItemClick(itemView, folder, pos) - } - } - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/adapter/ProfileFragmentPagerStateAdapter.kt b/presentation/src/main/java/daily/dayo/presentation/adapter/ProfileFragmentPagerStateAdapter.kt deleted file mode 100644 index 924bd7b9..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/adapter/ProfileFragmentPagerStateAdapter.kt +++ /dev/null @@ -1,39 +0,0 @@ -package daily.dayo.presentation.adapter - -import android.os.Handler -import androidx.annotation.NonNull -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentManager -import androidx.lifecycle.Lifecycle -import androidx.viewpager2.adapter.FragmentStateAdapter - -class ProfileFragmentPagerStateAdapter(@NonNull fragmentManager: FragmentManager, @NonNull lifecycle: Lifecycle) : FragmentStateAdapter(fragmentManager, lifecycle) { - var fragments : ArrayList = ArrayList() - - override fun getItemCount(): Int { - return fragments.size - } - - override fun createFragment(position: Int): Fragment { - return fragments[position] - } - - fun addFragment(fragment: Fragment){ - fragments.add(fragment) - notifyItemInserted(fragments.size - 1) - } - - fun removeFragment(){ - fragments.removeLast() - notifyItemRemoved(fragments.size) - } - - fun refreshFragment(index: Int, fragment: Fragment) { - fragments[index] = fragment - Handler().post(object: Runnable { - override fun run() { - notifyDataSetChanged() - } - }) - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/adapter/ProfileLikePostListAdapter.kt b/presentation/src/main/java/daily/dayo/presentation/adapter/ProfileLikePostListAdapter.kt deleted file mode 100644 index 32c30c1a..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/adapter/ProfileLikePostListAdapter.kt +++ /dev/null @@ -1,101 +0,0 @@ -package daily.dayo.presentation.adapter - -import android.util.Log -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.RequestManager -import daily.dayo.presentation.common.GlideLoadUtil.loadImageView -import daily.dayo.presentation.common.setOnDebounceClickListener -import daily.dayo.presentation.databinding.ItemProfilePostBinding -import daily.dayo.domain.model.LikePost -import kotlinx.coroutines.* - -class ProfileLikePostListAdapter( - private val requestManager: RequestManager -) : - PagingDataAdapter( - diffCallback - ) { - - companion object { - private val diffCallback = object : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: LikePost, newItem: LikePost) = - oldItem.postId == newItem.postId - - override fun areContentsTheSame(oldItem: LikePost, newItem: LikePost): Boolean = - oldItem == newItem - - override fun getChangePayload(oldItem: LikePost, newItem: LikePost): Any? { - return if (oldItem.postId != newItem.postId || oldItem.thumbnailImage != newItem.thumbnailImage) true else null - } - } - } - - override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int - ): ProfileLikePostListViewHolder { - return ProfileLikePostListViewHolder( - ItemProfilePostBinding.inflate(LayoutInflater.from(parent.context), parent, false) - ) - } - - override fun onBindViewHolder(holder: ProfileLikePostListViewHolder, position: Int) { - holder.bind(getItem(position)) - } - - interface OnItemClickListener { - fun onItemClick(v: View, likePost: LikePost, pos: Int) - } - - private var listener: OnItemClickListener? = null - fun setOnItemClickListener(listener: OnItemClickListener) { - this.listener = listener - } - - inner class ProfileLikePostListViewHolder(private val binding: ItemProfilePostBinding) : - RecyclerView.ViewHolder(binding.root) { - - fun bind(likePost: LikePost?) { - if (likePost == null) return - val layoutParams = ViewGroup.MarginLayoutParams( - ViewGroup.MarginLayoutParams.MATCH_PARENT, - ViewGroup.MarginLayoutParams.MATCH_PARENT - ) - - binding.layoutProfilePostShimmer.startShimmer() - binding.layoutProfilePostShimmer.visibility = View.VISIBLE - binding.imgProfilePost.visibility = View.INVISIBLE - - CoroutineScope(Dispatchers.Main).launch { - loadImageView( - requestManager = requestManager, - width = layoutParams.width, - height = layoutParams.width, - imgName = likePost.thumbnailImage, - imgView = binding.imgProfilePost - ) - }.invokeOnCompletion { throwable -> - when (throwable) { - is CancellationException -> Log.e("Image Loading", "CANCELLED") - null -> { - binding.layoutProfilePostShimmer.stopShimmer() - binding.layoutProfilePostShimmer.visibility = View.GONE - binding.imgProfilePost.visibility = View.VISIBLE - } - } - } - - val pos = adapterPosition - if (pos != RecyclerView.NO_POSITION) { - itemView.setOnDebounceClickListener { - listener?.onItemClick(itemView, likePost, pos) - } - } - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/adapter/SearchKeywordRecentAdapter.kt b/presentation/src/main/java/daily/dayo/presentation/adapter/SearchKeywordRecentAdapter.kt deleted file mode 100644 index d0b7d67d..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/adapter/SearchKeywordRecentAdapter.kt +++ /dev/null @@ -1,65 +0,0 @@ -package daily.dayo.presentation.adapter - -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.ListAdapter -import androidx.recyclerview.widget.RecyclerView -import daily.dayo.presentation.common.setOnDebounceClickListener -import daily.dayo.presentation.databinding.ItemSearchKeywordRecentBinding - -class SearchKeywordRecentAdapter : ListAdapter ( - diffCallback -) { - companion object { - private val diffCallback = object : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: String, newItem: String) = - oldItem == newItem - - override fun areContentsTheSame(oldItem: String, newItem: String): Boolean = - oldItem.hashCode() == newItem.hashCode() - } - } - - interface OnItemClickListener{ - fun onItemClick(v: View, keyword: String, pos : Int) - fun deleteSearchKeywordRecentClick(keyword: String, pos: Int) - } - private var listener: OnItemClickListener?= null - fun setOnItemClickListener(listener: OnItemClickListener) { - this.listener = listener - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SearchKeywordRecentViewHolder { - return SearchKeywordRecentViewHolder(ItemSearchKeywordRecentBinding.inflate(LayoutInflater.from(parent.context), parent, false)) - } - - override fun onBindViewHolder(holder: SearchKeywordRecentViewHolder, position: Int) { - holder.bindKeyword(getItem(position)) - } - - override fun submitList(list: MutableList?) { - super.submitList(list?.let { ArrayList(it) }) - } - - inner class SearchKeywordRecentViewHolder(private val binding: ItemSearchKeywordRecentBinding) : RecyclerView.ViewHolder(binding.root) { - fun bindKeyword(keyword: String?) { - binding.tvSearchRecentKeywordItem.text = keyword - - val pos = adapterPosition - if(pos!= RecyclerView.NO_POSITION) { - itemView.setOnDebounceClickListener { - if (keyword != null) { - listener?.onItemClick(itemView, keyword, pos) - } - } - binding.btnSearchRecentKeywordItemDelete.setOnDebounceClickListener{ - if (keyword != null) { - listener?.deleteSearchKeywordRecentClick(keyword, pos) - } - } - } - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/adapter/SearchTagResultPostAdapter.kt b/presentation/src/main/java/daily/dayo/presentation/adapter/SearchTagResultPostAdapter.kt deleted file mode 100644 index 923bcb33..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/adapter/SearchTagResultPostAdapter.kt +++ /dev/null @@ -1,94 +0,0 @@ -package daily.dayo.presentation.adapter - -import android.util.Log -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.paging.PagingDataAdapter -import androidx.recyclerview.widget.AsyncListDiffer -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.RequestManager -import daily.dayo.domain.model.Search -import daily.dayo.presentation.common.GlideLoadUtil.HOME_POST_THUMBNAIL_SIZE -import daily.dayo.presentation.common.GlideLoadUtil.loadImageView -import daily.dayo.presentation.common.setOnDebounceClickListener -import daily.dayo.presentation.databinding.ItemSearchResultPostBinding -import kotlinx.coroutines.CancellationException -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch - -class SearchTagResultPostAdapter(private val requestManager: RequestManager) : - PagingDataAdapter(diffCallback) { - companion object { - private val diffCallback = object : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: Search, newItem: Search) = - oldItem.postId == newItem.postId - - override fun areContentsTheSame(oldItem: Search, newItem: Search) = - oldItem == newItem - } - } - - interface OnItemClickListener { - fun onItemClick(v: View, postContent: Search, pos: Int) - } - - private var listener: OnItemClickListener? = null - fun setOnItemClickListener(listener: OnItemClickListener) { - this.listener = listener - } - - override fun onCreateViewHolder( - parent: ViewGroup, - viewType: Int, - ): SearchTagResultPostViewHolder = SearchTagResultPostViewHolder( - ItemSearchResultPostBinding.inflate(LayoutInflater.from(parent.context), parent, false) - ) - - override fun onBindViewHolder(holder: SearchTagResultPostViewHolder, position: Int) { - holder.bind(getItem(position)) - } - - private val differ = AsyncListDiffer(this, diffCallback) - fun submitList(list: MutableList?) = differ.submitList(list?.let { ArrayList(it) }) - - - inner class SearchTagResultPostViewHolder(private val binding: ItemSearchResultPostBinding) : - RecyclerView.ViewHolder(binding.root) { - fun bind(postContent: Search?) { - binding.layoutSearchResultPostContentsShimmer.startShimmer() - binding.layoutSearchResultPostContentsShimmer.visibility = View.VISIBLE - binding.imgSearchResultPost.visibility = View.INVISIBLE - - CoroutineScope(Dispatchers.Main).launch { - loadImageView( - requestManager = requestManager, - width = HOME_POST_THUMBNAIL_SIZE, - height = HOME_POST_THUMBNAIL_SIZE, - imgName = postContent?.thumbnailImage ?: "", - imgView = binding.imgSearchResultPost - ) - }.invokeOnCompletion { throwable -> - when (throwable) { - is CancellationException -> Log.e("Image Loading", "CANCELLED") - null -> { - binding.layoutSearchResultPostContentsShimmer.stopShimmer() - binding.layoutSearchResultPostContentsShimmer.visibility = View.GONE - binding.imgSearchResultPost.visibility = View.VISIBLE - } - } - } - - val pos = adapterPosition - if (pos != RecyclerView.NO_POSITION) { - itemView.setOnDebounceClickListener { - if (postContent != null) { - listener?.onItemClick(itemView, postContent, pos) - } - } - } - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/AutoClearedValue.kt b/presentation/src/main/java/daily/dayo/presentation/common/AutoClearedValue.kt deleted file mode 100644 index 39a17d24..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/AutoClearedValue.kt +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2021 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package daily.dayo.presentation.common - -import androidx.fragment.app.Fragment -import androidx.lifecycle.DefaultLifecycleObserver -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.lifecycleScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlin.properties.ReadWriteProperty -import kotlin.reflect.KProperty - -/** - * A lazy property that gets cleaned up when the fragment's view is destroyed. - * - * Accessing this variable while the fragment's view is destroyed will throw NPE. - */ -class AutoClearedValue(val fragment: Fragment, var onDestroy: ((T) -> Unit)?=null) : ReadWriteProperty { - private var _value: T? = null - - init { - fragment.lifecycleScope.launch(Dispatchers.Main.immediate) { - fragment.viewLifecycleOwnerLiveData.observe(fragment) { viewLifecycleOwner -> - viewLifecycleOwner?.lifecycle?.addObserver(object: DefaultLifecycleObserver { - override fun onDestroy(owner: LifecycleOwner) { - _value?.let { - onDestroy?.invoke(it) - } - _value = null - } - }) - } - } - } - - override fun getValue(thisRef: Fragment, property: KProperty<*>): T { - return _value ?: throw IllegalStateException( - "Accessing the AutoClearedValue after it has been nulled out" - ) - } - - override fun setValue(thisRef: Fragment, property: KProperty<*>, value: T) { - _value = value - } -} - -/** - * Creates an [AutoClearedValue] associated with this fragment. - */ -fun Fragment.autoCleared(onDestroy : ((T) -> Unit)?=null) = - daily.dayo.presentation.common.AutoClearedValue(this, onDestroy) diff --git a/presentation/src/main/java/daily/dayo/presentation/common/BindingAdapter.kt b/presentation/src/main/java/daily/dayo/presentation/common/BindingAdapter.kt deleted file mode 100644 index 9e307fa4..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/BindingAdapter.kt +++ /dev/null @@ -1,34 +0,0 @@ -package daily.dayo.presentation.common - -import android.graphics.Typeface -import android.text.Spannable -import android.text.SpannableStringBuilder -import androidx.appcompat.widget.AppCompatTextView -import androidx.core.text.bold -import androidx.databinding.BindingAdapter - -object BindingAdapter { - @BindingAdapter("main", "secondText") - @JvmStatic - fun setBoldString(view: AppCompatTextView, maintext: String, sequence: String) { - view.text = getBoldText(maintext, sequence) - } - @BindingAdapter("main", "secondTextInteger") - @JvmStatic - fun setBoldStringInteger(view: AppCompatTextView, maintext: String, sequence: Int) { - val str = SpannableStringBuilder() - .append("$maintext ") - .bold { append(sequence.toString()) } - view.text = str - } - - @JvmStatic - fun getBoldText(text: String, name: String): SpannableStringBuilder { - val str = SpannableStringBuilder(text) - val textPosition = text.indexOf(name) - str.setSpan(android.text.style.StyleSpan(Typeface.BOLD), - textPosition, textPosition + name.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) - return str - } - -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/ButtonActivation.kt b/presentation/src/main/java/daily/dayo/presentation/common/ButtonActivation.kt deleted file mode 100644 index 44293413..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/ButtonActivation.kt +++ /dev/null @@ -1,36 +0,0 @@ -package daily.dayo.presentation.common - -import android.content.Context -import android.widget.TextView -import androidx.appcompat.widget.AppCompatButton -import androidx.core.content.ContextCompat -import daily.dayo.presentation.R - -object ButtonActivation { - fun setSignupButtonActive(context: Context, button: AppCompatButton) { - button.isEnabled = true - button.background = ContextCompat.getDrawable(context, R.drawable.button_default_signup_next_button_active) - } - fun setSignupButtonInactive(context: Context, button: AppCompatButton) { - button.isEnabled = false - button.background = ContextCompat.getDrawable(context, R.drawable.button_default_signup_next_button_inactive) - } - - fun setTextViewButtonActive(context: Context, textView: TextView) { - textView.isEnabled = true - textView.setTextColor(ContextCompat.getColor(context, R.color.primary_green_23C882)) - } - fun setTextViewButtonInactive(context: Context, textView: TextView) { - textView.isEnabled = false - textView.setTextColor(ContextCompat.getColor(context, R.color.gray_4_C5CAD2)) - } - - fun setTextViewConfirmButtonActive(context: Context, textView: TextView) { - textView.isEnabled = true - textView.setTextColor(ContextCompat.getColor(context, R.color.gray_1_313131)) - } - fun setTextViewConfirmButtonInactive(context: Context, textView: TextView) { - textView.isEnabled = false - textView.setTextColor(ContextCompat.getColor(context, R.color.gray_4_C5CAD2)) - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/ConvertDP.kt b/presentation/src/main/java/daily/dayo/presentation/common/ConvertDP.kt deleted file mode 100644 index 92b84dbe..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/ConvertDP.kt +++ /dev/null @@ -1,20 +0,0 @@ -package daily.dayo.presentation.common - -import android.content.res.Resources -import android.util.TypedValue -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.unit.Dp - -val Int.dp: Int - get() { - val metrics = Resources.getSystem().displayMetrics - return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), metrics) - .toInt() - } - -val Float.dp: Int - get() = (this * Resources.getSystem().displayMetrics.density + 0.5f).toInt() - -@Composable -fun Dp.toSp() = with(LocalDensity.current) { this@toSp.toSp() } \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/ConvertPx.kt b/presentation/src/main/java/daily/dayo/presentation/common/ConvertPx.kt deleted file mode 100644 index ade01ec6..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/ConvertPx.kt +++ /dev/null @@ -1,10 +0,0 @@ -package daily.dayo.presentation.common - -import android.content.res.Resources - - -val Int.Px: Int - get() { - val density = Resources.getSystem().displayMetrics.density - return (this * density).toInt() - } \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/CountPlaceUtil.kt b/presentation/src/main/java/daily/dayo/presentation/common/CountPlaceUtil.kt deleted file mode 100644 index 064195b4..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/CountPlaceUtil.kt +++ /dev/null @@ -1,10 +0,0 @@ -package daily.dayo.presentation.common - -fun convertCountPlace(count: Int): String { - return when(count){ - in 0 until 1000 -> count.toString() - in 1000 until 10000 -> (count / 1000).toString() + "K" - in 10000 until Int.MAX_VALUE -> (count / 10000).toString() + "M" - else -> "0" - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/CustomDividerDecoration.kt b/presentation/src/main/java/daily/dayo/presentation/common/CustomDividerDecoration.kt deleted file mode 100644 index d3c68f03..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/CustomDividerDecoration.kt +++ /dev/null @@ -1,34 +0,0 @@ -package daily.dayo.presentation.common - -import android.graphics.Canvas -import android.graphics.Paint -import androidx.annotation.ColorInt -import androidx.recyclerview.widget.RecyclerView - -class CustomDividerDecoration( - private val height: Float, - private val padding: Float, - @ColorInt - private val color: Int -) : RecyclerView.ItemDecoration() { - private val paint = Paint() - - init { - paint.color = color - } - - override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { - val left = parent.paddingStart + padding - val right = parent.width - parent.paddingEnd - padding - - for (i in 0 until parent.childCount) { - val child = parent.getChildAt(i) - val params = child.layoutParams as RecyclerView.LayoutParams - - val top = (child.bottom + params.bottomMargin).toFloat() - val bottom = top + height - - c.drawRect(left, top, right, bottom, paint) - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/GlideLoadUtil.kt b/presentation/src/main/java/daily/dayo/presentation/common/GlideLoadUtil.kt deleted file mode 100644 index 9850a339..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/GlideLoadUtil.kt +++ /dev/null @@ -1,260 +0,0 @@ -package daily.dayo.presentation.common - -import android.content.Context -import android.graphics.Bitmap -import android.graphics.drawable.Drawable -import android.view.View -import android.widget.ImageView -import com.airbnb.lottie.LottieAnimationView -import com.bumptech.glide.Glide -import com.bumptech.glide.Priority -import com.bumptech.glide.RequestManager -import com.bumptech.glide.load.DataSource -import com.bumptech.glide.load.engine.DiskCacheStrategy -import com.bumptech.glide.load.engine.GlideException -import com.bumptech.glide.request.RequestListener -import com.bumptech.glide.request.RequestOptions -import com.bumptech.glide.request.target.Target -import daily.dayo.presentation.BuildConfig -import daily.dayo.presentation.R - -object GlideLoadUtil { - private const val BASE_URL_IMG = "${BuildConfig.BASE_URL}/images/" - const val HOME_POST_THUMBNAIL_SIZE = 500 - const val HOME_USER_THUMBNAIL_SIZE = 40 - - fun loadImageView( - requestManager: RequestManager, - width: Int, - height: Int, - imgName: String, - imgView: ImageView, - placeholderImg: Int? = null, - errorImg: Int? = null, - placeholderLottie: LottieAnimationView? = null - ) { - requestManager - .load("$BASE_URL_IMG${imgName}") - .override(width, height) - .listener(object : RequestListener { - override fun onLoadFailed( - e: GlideException?, - model: Any?, - target: Target?, - isFirstResource: Boolean - ): Boolean { - return false - } - - override fun onResourceReady( - resource: Drawable?, - model: Any?, - target: Target?, - dataSource: DataSource?, - isFirstResource: Boolean - ): Boolean { - placeholderLottie?.let { lottieView -> - lottieView.visibility = View.GONE - } - return false - } - }) - .thumbnail(0.1f) - .placeholder(placeholderImg ?: R.color.gray_3_9FA5AE) - .error(errorImg ?: R.drawable.ic_dayo_circle_grayscale) - .priority(Priority.HIGH) - .centerCrop() - .into(imgView) - } - - fun loadImageView( - requestManager: RequestManager, - width: Int, - height: Int, - img: Bitmap, - imgView: ImageView, - placeholderImg: Int? = null, - errorImg: Int? = null, - placeholderLottie: LottieAnimationView? = null - ) { - requestManager.load(img) - .override(width, height) - .listener(object : RequestListener { - override fun onLoadFailed( - e: GlideException?, - model: Any?, - target: Target?, - isFirstResource: Boolean - ): Boolean { - return false - } - - override fun onResourceReady( - resource: Drawable?, - model: Any?, - target: Target?, - dataSource: DataSource?, - isFirstResource: Boolean - ): Boolean { - placeholderLottie?.let { lottieView -> - lottieView.visibility = View.GONE - } - return false - } - }) - .thumbnail(0.1f) - .placeholder(placeholderImg ?: R.color.gray_3_9FA5AE) - .error(errorImg ?: R.drawable.ic_dayo_circle_grayscale) - .priority(Priority.HIGH) - .centerCrop() - .into(imgView) - } - - fun loadImageViewProfile( - requestManager: RequestManager, - width: Int, - height: Int, - imgName: String, - imgView: ImageView, - placeholderImg: Int? = null, - errorImg: Int? = null - ) { - val requestOption = - if (placeholderImg != null && errorImg != null) { - RequestOptions() - .placeholder(placeholderImg) - .error(errorImg) - } else if (placeholderImg != null) { - RequestOptions().placeholder(placeholderImg) - } else if (errorImg != null) { - RequestOptions().error(errorImg) - } else { - RequestOptions() - } - - requestManager - .load("$BASE_URL_IMG${imgName}") - .override(width, height) - .apply(requestOption) - .centerCrop() - .into(imgView) - } - - fun loadImageViewProfile( - requestManager: RequestManager, - width: Int, - height: Int, - img: Bitmap, - imgView: ImageView, - placeholderImg: Int? = null, - errorImg: Int? = null - ) { - val requestOption = - if (placeholderImg != null && errorImg != null) { - RequestOptions() - .placeholder(placeholderImg) - .error(errorImg) - } else if (placeholderImg != null) { - RequestOptions().placeholder(placeholderImg) - } else if (errorImg != null) { - RequestOptions().error(errorImg) - } else { - RequestOptions() - } - - requestManager.load(img) - .override(width, height) - .apply(requestOption) - .centerCrop() - .into(imgView) - } - - fun loadImageBackground( - context: Context, - width: Int, - height: Int, - imgName: String, - placeholderImg: Int? = null, - errorImg: Int? = null - ): Bitmap { - val requestOption = - if (placeholderImg != null && errorImg != null) { - RequestOptions() - .placeholder(placeholderImg) - .error(errorImg) - } else if (placeholderImg != null) { - RequestOptions().placeholder(placeholderImg) - } else if (errorImg != null) { - RequestOptions().error(errorImg) - } else { - RequestOptions() - } - - return Glide.with(context) - .asBitmap() - .override(width, height) - .load("$BASE_URL_IMG${imgName}") - .apply(requestOption) - .priority(Priority.HIGH) - .submit() - .get() - } - - fun loadImageBackground( - requestManager: RequestManager, - width: Int, - height: Int, - imgName: String, - placeholderImg: Int? = null, - errorImg: Int? = null - ): Bitmap { - return requestManager.asBitmap() - .override(width, height) - .placeholder(placeholderImg ?: R.color.gray_3_9FA5AE) - .error(errorImg ?: R.drawable.ic_dayo_circle_grayscale) - .load("$BASE_URL_IMG${imgName}") - .priority(Priority.HIGH) - .submit() - .get() - } - - fun loadImageBackgroundProfile( - requestManager: RequestManager, - width: Int, - height: Int, - imgName: String, - placeholderImg: Int? = null, - errorImg: Int? = null - ): Bitmap { - val requestOption = - if (placeholderImg != null && errorImg != null) { - RequestOptions() - .placeholder(placeholderImg) - .error(errorImg) - } else if (placeholderImg != null) { - RequestOptions().placeholder(placeholderImg) - } else if (errorImg != null) { - RequestOptions().error(errorImg) - } else { - RequestOptions() - } - - return requestManager.asBitmap() - .override(width, height) - .load("$BASE_URL_IMG${imgName}") - .apply(requestOption) - .submit() - .get() - } - - fun loadImagePreload(requestManager: RequestManager, width: Int, height: Int, imgName: String) { - requestManager.asBitmap() - .load("$BASE_URL_IMG${imgName}") - .diskCacheStrategy(DiskCacheStrategy.RESOURCE) - .preload(width, height) - } - - fun cancelImageLoad(requestManager: RequestManager, clearImageView: ImageView) { - requestManager.clear(clearImageView) - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/GlideModule.kt b/presentation/src/main/java/daily/dayo/presentation/common/GlideModule.kt deleted file mode 100644 index 9a50eb2b..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/GlideModule.kt +++ /dev/null @@ -1,9 +0,0 @@ -package daily.dayo.presentation.common - -import com.bumptech.glide.annotation.GlideModule -import com.bumptech.glide.module.AppGlideModule - -@GlideModule -class GlideModule : AppGlideModule() { - -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/GridSpacingItemDecoration.kt b/presentation/src/main/java/daily/dayo/presentation/common/GridSpacingItemDecoration.kt deleted file mode 100644 index 1f833de8..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/GridSpacingItemDecoration.kt +++ /dev/null @@ -1,20 +0,0 @@ -package daily.dayo.presentation.common - -import android.graphics.Rect -import android.view.View -import androidx.recyclerview.widget.RecyclerView - -class GridSpacingItemDecoration(private val spanCount: Int, private val topSpacing: Int, private val horizontalSpacing: Int): RecyclerView.ItemDecoration() { - override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { - super.getItemOffsets(outRect, view, parent, state) - - val position = parent.getChildAdapterPosition(view) - - if(position % 2 == 0) { outRect.right = horizontalSpacing } - else { outRect.left = horizontalSpacing } - - if(position >= spanCount) { - outRect.top = topSpacing - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/HideKeyBoardUtil.kt b/presentation/src/main/java/daily/dayo/presentation/common/HideKeyBoardUtil.kt deleted file mode 100644 index f2ff84cf..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/HideKeyBoardUtil.kt +++ /dev/null @@ -1,26 +0,0 @@ -package daily.dayo.presentation.common - -import android.annotation.SuppressLint -import android.app.Activity -import android.content.Context -import android.view.View -import android.view.inputmethod.InputMethodManager -import android.widget.EditText - -object HideKeyBoardUtil { - fun hide(context: Context, editText: EditText) { - editText.clearFocus() - val inputMethodManager = - context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager - inputMethodManager.hideSoftInputFromWindow(editText.windowToken, 0) - } - - @SuppressLint("ClickableViewAccessibility") - fun hideTouchDisplay(activity: Activity, view : View) { - view.setOnTouchListener { _, _ -> - val inputMethodManager : InputMethodManager = activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager - inputMethodManager.hideSoftInputFromWindow(activity.currentFocus?.windowToken, 0) - true - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/ItemTouchHelperCallback.kt b/presentation/src/main/java/daily/dayo/presentation/common/ItemTouchHelperCallback.kt deleted file mode 100644 index 03ddacf2..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/ItemTouchHelperCallback.kt +++ /dev/null @@ -1,38 +0,0 @@ -package daily.dayo.presentation.common - -import androidx.recyclerview.widget.ItemTouchHelper -import androidx.recyclerview.widget.RecyclerView - -class ItemTouchHelperCallback( - private val itemMoveListener: OnItemMoveListener -) : ItemTouchHelper.Callback() { - - interface OnItemMoveListener { - fun onItemMoved(fromPosition: Int, toPosition: Int) - } - - - override fun getMovementFlags( - recyclerView: RecyclerView, - viewHolder: RecyclerView.ViewHolder - ): Int { - val dragFlags = ItemTouchHelper.UP or ItemTouchHelper.DOWN - val swipeFlags = ItemTouchHelper.START or ItemTouchHelper.END - return makeMovementFlags(dragFlags, swipeFlags) - } - - override fun onMove( - recyclerView: RecyclerView, - viewHolder: RecyclerView.ViewHolder, - target: RecyclerView.ViewHolder - ): Boolean { - itemMoveListener.onItemMoved(viewHolder.adapterPosition, target.adapterPosition) - return true - } - - - override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { - } - - override fun isLongPressDragEnabled(): Boolean = false -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/KeyboardVisibilityUtils.kt b/presentation/src/main/java/daily/dayo/presentation/common/KeyboardVisibilityUtils.kt deleted file mode 100644 index 6094995a..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/KeyboardVisibilityUtils.kt +++ /dev/null @@ -1,46 +0,0 @@ -package daily.dayo.presentation.common - -import android.graphics.Rect -import android.view.ViewTreeObserver -import android.view.Window - -class KeyboardVisibilityUtils( - private val window: Window, - private val onShowKeyboard: ((keyboardHeight: Int) -> Unit)? = null, - private val onHideKeyboard: (() -> Unit)? = null -) { - - private val MIN_KEYBOARD_HEIGHT_PX = 150 - - private val windowVisibleDisplayFrame = Rect() - private var lastVisibleDecorViewHeight: Int = 0 - - - private val onGlobalLayoutListener = ViewTreeObserver.OnGlobalLayoutListener { - window.decorView.getWindowVisibleDisplayFrame(windowVisibleDisplayFrame) - val visibleDecorViewHeight = windowVisibleDisplayFrame.height() - - // Decide whether keyboard is visible from changing decor view height. - if (lastVisibleDecorViewHeight != 0) { - if (lastVisibleDecorViewHeight > visibleDecorViewHeight + MIN_KEYBOARD_HEIGHT_PX) { - // Calculate current keyboard height (this includes also navigation bar height when in fullscreen mode). - val currentKeyboardHeight = window.decorView.height - windowVisibleDisplayFrame.bottom - // Notify listener about keyboard being shown. - onShowKeyboard?.invoke(currentKeyboardHeight) - } else if (lastVisibleDecorViewHeight + MIN_KEYBOARD_HEIGHT_PX < visibleDecorViewHeight) { - // Notify listener about keyboard being hidden. - onHideKeyboard?.invoke() - } - } - // Save current decor view height for the next call. - lastVisibleDecorViewHeight = visibleDecorViewHeight - } - - init { - window.decorView.viewTreeObserver.addOnGlobalLayoutListener(onGlobalLayoutListener) - } - - fun detachKeyboardListeners() { - window.decorView.viewTreeObserver.removeOnGlobalLayoutListener(onGlobalLayoutListener) - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/ListLiveData.kt b/presentation/src/main/java/daily/dayo/presentation/common/ListLiveData.kt deleted file mode 100644 index 438dedba..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/ListLiveData.kt +++ /dev/null @@ -1,66 +0,0 @@ -package daily.dayo.presentation.common - -import androidx.lifecycle.MutableLiveData - -class ListLiveData : MutableLiveData>() { - init { - value = ArrayList() - } - - fun add(item: T, notify: Boolean) { - val items: ArrayList? = value - items!!.add(item) - if (notify) { - value = items - } - } - - fun addAll(list: List, notify: Boolean) { - val items: ArrayList? = value - items!!.addAll(list) - if (notify) { - value = items - } - } - - fun clear(notify: Boolean) { - val items: ArrayList? = value - items!!.clear() - if (notify) { - value = items - } - } - - fun size(): Int { - return value?.size ?: 0 - } - - fun replaceAll(list: List, notify: Boolean) { - val items: ArrayList = arrayListOf() - items.addAll(list) - if (notify) { - value = items - } - } - - fun removeAt(pos: Int, notify: Boolean) { - val items: ArrayList? = value - items!!.removeAt(pos) - if (notify) { - value = items - } - } - - fun remove(item: T, notify: Boolean) { - val items: ArrayList? = value - items!!.remove(item) - if (notify) { - value = items - } - } - - fun notifyChange() { - val items: ArrayList? = value - value = items - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/Permissions.kt b/presentation/src/main/java/daily/dayo/presentation/common/Permissions.kt deleted file mode 100644 index 667c9027..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/Permissions.kt +++ /dev/null @@ -1,29 +0,0 @@ -package daily.dayo.presentation.common - -import android.Manifest -import android.os.Build - -val PERMISSIONS_CAMERA = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - arrayOf( - Manifest.permission.CAMERA, - Manifest.permission.READ_MEDIA_IMAGES, - Manifest.permission.READ_MEDIA_VIDEO - ) -} else { - arrayOf( - Manifest.permission.CAMERA, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - ) -} -val PERMISSIONS_GALLERY = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - arrayOf( - Manifest.permission.READ_MEDIA_IMAGES, - Manifest.permission.READ_MEDIA_VIDEO - ) -} else { - arrayOf( - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - ) -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/RadioGridGroup.kt b/presentation/src/main/java/daily/dayo/presentation/common/RadioGridGroup.kt deleted file mode 100644 index c5744e77..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/RadioGridGroup.kt +++ /dev/null @@ -1,193 +0,0 @@ -package daily.dayo.presentation.common - -import android.content.Context -import android.util.AttributeSet -import android.view.View -import android.view.ViewGroup -import android.view.accessibility.AccessibilityEvent -import android.view.accessibility.AccessibilityNodeInfo -import android.widget.CompoundButton -import android.widget.GridLayout -import androidx.appcompat.widget.AppCompatRadioButton -import java.util.concurrent.atomic.AtomicInteger - -/** - * This class is used to create a multiple-exclusion scope for a set of radio - * buttons. Checking one radio button that belongs to a radio group unchecks - * any previously checked radio button within the same group. - * - * Adapted from https://gist.github.com/saiaspire/a73135cfee1110a64cb0ab3451b6ca33. - * - * Intially, all of the radio buttons are unchecked. While it is not possible - * to uncheck a particular radio button, the radio group can be cleared to - * remove the checked state. - * - * - * The selection is identified by the unique id of the radio button as defined - * in the XML layout file. - * - * - * See - * [GridLayout.LayoutParams][android.widget.GridLayout.LayoutParams] - * for layout attributes. - * - * @see AppCompatRadioButton - */ -class RadioGridGroup : GridLayout { - var checkedCheckableImageButtonId = NOTHING_CHECKED - private var childOnCheckedChangeListener: CompoundButton.OnCheckedChangeListener? = null - private var protectFromCheckedChange = false - private var onCheckedChangeListener: OnCheckedChangeListener? = null - private var passThroughListener: PassThroughHierarchyChangeListener? = null - - constructor(context: Context?) : super(context) { - init() - } - - constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) { - init() - } - - private fun init() { - childOnCheckedChangeListener = CheckedStateTracker() - passThroughListener = PassThroughHierarchyChangeListener() - super.setOnHierarchyChangeListener(passThroughListener) - } - - override fun setOnHierarchyChangeListener(listener: OnHierarchyChangeListener) { - passThroughListener?.mOnHierarchyChangeListener = listener - } - - override fun onFinishInflate() { - super.onFinishInflate() - if (checkedCheckableImageButtonId != NOTHING_CHECKED) { - protectFromCheckedChange = true - setCheckedStateForView(checkedCheckableImageButtonId, true) - protectFromCheckedChange = false - setCheckedId(checkedCheckableImageButtonId) - } - } - - override fun addView(child: View, index: Int, params: ViewGroup.LayoutParams) { - if (child is AppCompatRadioButton) { - val button = child - if (button.isChecked) { - protectFromCheckedChange = true - if (checkedCheckableImageButtonId != NOTHING_CHECKED) { - setCheckedStateForView(checkedCheckableImageButtonId, false) - } - protectFromCheckedChange = false - setCheckedId(button.id) - } - } - super.addView(child, index, params) - } - - fun check(id: Int) { - if (id != NOTHING_CHECKED && id == checkedCheckableImageButtonId) { - return - } - if (checkedCheckableImageButtonId != NOTHING_CHECKED) { - setCheckedStateForView(checkedCheckableImageButtonId, false) - } - if (id != NOTHING_CHECKED) { - setCheckedStateForView(id, true) - } - setCheckedId(id) - } - - private fun setCheckedId(id: Int) { - checkedCheckableImageButtonId = id - if (onCheckedChangeListener != null) { - onCheckedChangeListener?.onCheckedChanged(this, checkedCheckableImageButtonId) - } - } - - private fun setCheckedStateForView(viewId: Int, checked: Boolean) { - val checkedView = findViewById(viewId) - if (checkedView != null && checkedView is AppCompatRadioButton) { - checkedView.isChecked = checked - } - } - - fun clearCheck() { - check(NOTHING_CHECKED) - } - - fun setOnCheckedChangeListener(listener: OnCheckedChangeListener?) { - onCheckedChangeListener = listener - } - - override fun onInitializeAccessibilityEvent(event: AccessibilityEvent) { - super.onInitializeAccessibilityEvent(event) - event.className = RadioGridGroup::class.java.name - } - - override fun onInitializeAccessibilityNodeInfo(info: AccessibilityNodeInfo) { - super.onInitializeAccessibilityNodeInfo(info) - info.className = RadioGridGroup::class.java.name - } - - interface OnCheckedChangeListener { - fun onCheckedChanged(group: RadioGridGroup?, checkedId: Int) - } - - private inner class CheckedStateTracker : CompoundButton.OnCheckedChangeListener { - override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) { - if (protectFromCheckedChange) { - return - } - protectFromCheckedChange = true - if (checkedCheckableImageButtonId != NOTHING_CHECKED) { - setCheckedStateForView(checkedCheckableImageButtonId, false) - } - protectFromCheckedChange = false - val id = buttonView.id - setCheckedId(id) - } - } - - private inner class PassThroughHierarchyChangeListener : OnHierarchyChangeListener { - var mOnHierarchyChangeListener: OnHierarchyChangeListener? = null - override fun onChildViewAdded(parent: View, child: View) { - if (parent === this@RadioGridGroup && child is AppCompatRadioButton) { - var id = child.getId() - // generates an id if it's missing - if (id == NO_ID) { - id = generateViewId() - child.setId(id) - } - child.setOnCheckedChangeListener( - childOnCheckedChangeListener - ) - } - mOnHierarchyChangeListener?.onChildViewAdded(parent, child) - } - - override fun onChildViewRemoved(parent: View, child: View) { - if (parent === this@RadioGridGroup && child is AppCompatRadioButton) { - child.setOnCheckedChangeListener(null) - } - mOnHierarchyChangeListener?.onChildViewRemoved(parent, child) - } - } - - companion object { - const val NOTHING_CHECKED = -1 - private const val TRANSPARENT_COLOR = 0x00FFFFFF - - private val nextGeneratedId = AtomicInteger(1) - fun generateViewId(): Int { - while (true) { - val result = nextGeneratedId.get() - - // aapt-generated IDs have the high byte nonzero; clamp to the range under that. - var newValue = result + 1 - if (newValue > TRANSPARENT_COLOR) newValue = 1 // Roll over to 1, not 0. - if (nextGeneratedId.compareAndSet(result, newValue)) { - return result - } - } - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/SetTextInputLayout.kt b/presentation/src/main/java/daily/dayo/presentation/common/SetTextInputLayout.kt deleted file mode 100644 index 1129bdc8..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/SetTextInputLayout.kt +++ /dev/null @@ -1,52 +0,0 @@ -package daily.dayo.presentation.common - -import android.content.Context -import androidx.core.content.ContextCompat -import daily.dayo.presentation.R -import com.google.android.material.textfield.TextInputEditText -import com.google.android.material.textfield.TextInputLayout - -object SetTextInputLayout { - fun setEditTextTheme(context: Context, textInputLayout: TextInputLayout, editText: TextInputEditText, isEditTextEmpty: Boolean) { - if(isEditTextEmpty) { - textInputLayout.defaultHintTextColor = context.resources.getColorStateList(R.color.gray_4_C5CAD2, context.theme) - if(!textInputLayout.isErrorEnabled) { - editText.backgroundTintList = context.resources.getColorStateList(R.color.gray_5_E8EAEE, context.theme) - } - } else { - textInputLayout.defaultHintTextColor = context.resources.getColorStateList(R.color.gray_3_9FA5AE, context.theme) - if(!textInputLayout.isErrorEnabled) { - editText.backgroundTintList = context.resources.getColorStateList(R.color.primary_green_23C882, context.theme) - } - } - } - - fun setEditTextErrorTheme(context: Context, textInputLayout: TextInputLayout, editText: TextInputEditText, errorMessage: String?, pass: Boolean) { - with(textInputLayout) { - error = errorMessage - errorIconDrawable = null - if(pass) { - isErrorEnabled = false - editText.backgroundTintList = context.resources.getColorStateList(R.color.primary_green_23C882, context.theme) - } else { - isErrorEnabled = true - editText.backgroundTintList = context.resources.getColorStateList(R.color.red_FF4545, context.theme) - } - } - } - - fun setEditTextErrorThemeWithIcon(context: Context, textInputLayout: TextInputLayout, editText: TextInputEditText, errorMessage: String?, pass: Boolean) { - with(textInputLayout) { - error = errorMessage - if(pass) { - isErrorEnabled = false - editText.backgroundTintList = context.resources.getColorStateList(R.color.primary_green_23C882, context.theme) - endIconDrawable = ContextCompat.getDrawable(context, R.drawable.ic_check_ok_sign) - } else { - isErrorEnabled = true - editText.backgroundTintList = context.resources.getColorStateList(R.color.red_FF4545, context.theme) - endIconDrawable = null - } - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/common/dialog/DefaultDialog.kt b/presentation/src/main/java/daily/dayo/presentation/common/dialog/DefaultDialog.kt index 74505543..0a865a93 100644 --- a/presentation/src/main/java/daily/dayo/presentation/common/dialog/DefaultDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/common/dialog/DefaultDialog.kt @@ -12,7 +12,7 @@ import android.view.View import android.view.Window import android.view.WindowManager import daily.dayo.presentation.R -import daily.dayo.presentation.common.setOnDebounceClickListener +import daily.dayo.presentation.common.extension.setOnDebounceClickListener import daily.dayo.presentation.databinding.DialogDefaltExplanationConfirmBinding import daily.dayo.presentation.databinding.DialogDefaultAlertBinding import daily.dayo.presentation.databinding.DialogDefaultConfirmBinding diff --git a/presentation/src/main/java/daily/dayo/presentation/common/extension/NavControllerExtension.kt b/presentation/src/main/java/daily/dayo/presentation/common/extension/NavControllerExtension.kt deleted file mode 100644 index 5d5fea42..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/common/extension/NavControllerExtension.kt +++ /dev/null @@ -1,34 +0,0 @@ -package daily.dayo.presentation.common.extension - -import android.annotation.SuppressLint -import android.os.Bundle -import android.util.Log -import androidx.annotation.IdRes -import androidx.navigation.NavController -import androidx.navigation.NavDirections - -@SuppressLint("UnsafeNavigation") -fun NavController.navigateSafe(@IdRes currentDestinationId: Int, @IdRes action: Int, args: Bundle? = null): Boolean { - return try { - if (currentDestination?.id == currentDestinationId) { - navigate(action, args) - } - true - } catch (t: Throwable) { - Log.e("NAVIGATION_SAFE_TAG", "navigation error for action $action") - false - } -} - -@SuppressLint("UnsafeNavigation") -fun NavController.navigateSafe(@IdRes currentDestinationId: Int, action: NavDirections): Boolean { - return try { - if (currentDestination?.id == currentDestinationId) { - navigate(action) - } - true - } catch (t: Throwable) { - Log.e("NAVIGATION_SAFE_TAG", "navigation error for action $action") - false - } -} diff --git a/presentation/src/main/java/daily/dayo/presentation/common/ViewExtension.kt b/presentation/src/main/java/daily/dayo/presentation/common/extension/XMLView.kt similarity index 91% rename from presentation/src/main/java/daily/dayo/presentation/common/ViewExtension.kt rename to presentation/src/main/java/daily/dayo/presentation/common/extension/XMLView.kt index f78c8c09..795b3938 100644 --- a/presentation/src/main/java/daily/dayo/presentation/common/ViewExtension.kt +++ b/presentation/src/main/java/daily/dayo/presentation/common/extension/XMLView.kt @@ -1,4 +1,4 @@ -package daily.dayo.presentation.common +package daily.dayo.presentation.common.extension import android.view.View diff --git a/presentation/src/main/java/daily/dayo/presentation/fragment/mypage/profile/ProfileEditImageOptionFragment.kt b/presentation/src/main/java/daily/dayo/presentation/fragment/mypage/profile/ProfileEditImageOptionFragment.kt deleted file mode 100644 index f2c453cc..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/fragment/mypage/profile/ProfileEditImageOptionFragment.kt +++ /dev/null @@ -1,220 +0,0 @@ -package daily.dayo.presentation.fragment.mypage.profile - -import android.Manifest -import android.app.Activity -import android.content.Intent -import android.graphics.Color -import android.graphics.drawable.ColorDrawable -import android.net.Uri -import android.os.Build -import android.os.Bundle -import android.provider.MediaStore -import android.view.* -import android.widget.Toast -import androidx.activity.result.contract.ActivityResultContracts -import androidx.annotation.RequiresApi -import androidx.core.content.FileProvider -import androidx.fragment.app.DialogFragment -import androidx.navigation.fragment.findNavController -import daily.dayo.presentation.BuildConfig -import daily.dayo.presentation.R -import daily.dayo.presentation.common.dialog.DefaultDialogConfigure -import daily.dayo.presentation.common.autoCleared -import daily.dayo.presentation.common.image.ImageUploadUtil.extension -import daily.dayo.presentation.common.image.ImageUploadUtil.isPermitExtension -import daily.dayo.presentation.common.setOnDebounceClickListener -import daily.dayo.presentation.databinding.FragmentProfileEditImageOptionBinding -import java.io.File -import java.io.IOException -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale -import java.util.Objects - -class ProfileEditImageOptionFragment : DialogFragment() { - private var binding by autoCleared() - private lateinit var currentTakenPhotoPath: String - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - isCancelable = true - } - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentProfileEditImageOptionBinding.inflate(inflater, container, false) - - dialog?.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE) - dialog?.window?.setGravity(Gravity.BOTTOM) - return binding.root - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - setImageSelectGalleryClickListener() - setImageTakePhotoClickListener() - setImageResetClickListener() - } - - override fun onResume() { - super.onResume() - resizeOptionDialogFragment() - } - - private fun resizeOptionDialogFragment() { - val params: ViewGroup.LayoutParams? = dialog?.window?.attributes - val deviceWidth = DefaultDialogConfigure.getDeviceWidthSize(requireContext()) - params?.width = (deviceWidth * 0.9).toInt() - dialog?.window?.attributes = params as WindowManager.LayoutParams - } - - private fun setImageResetClickListener() { - binding.layoutMyProfileEditImageOptionReset.setOnDebounceClickListener { - setMyProfileImage("resetMyProfileImage", "") - } - } - - private fun setImageSelectGalleryClickListener() { - binding.layoutMyProfileEditImageOptionSelectGallery.setOnDebounceClickListener { - requestOpenGallery.launch( - PERMISSIONS_GALLERY - ) - } - } - - private val requestOpenGallery = - registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { permissions -> - permissions.entries.forEach { - if (it.value == false) { - return@registerForActivityResult - } - } - openGallery() - } - - private fun openGallery() { - // ACTION PICK 사용시, intent type에서 설정한 종류의 데이터를 MediaStore에서 불러와서 목록으로 나열 후 선택할 수 있는 앱 실행 - val intent = Intent(Intent.ACTION_PICK) - intent.type = MediaStore.Images.Media.CONTENT_TYPE - requestActivity.launch(intent) - } - - @RequiresApi(Build.VERSION_CODES.O) - val requestActivity = - registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { activityResult -> - if (activityResult.resultCode == Activity.RESULT_OK) { - val data: Intent? = activityResult.data - // 호출된 갤러리에서 이미지 선택시, data의 data속성으로 해당 이미지의 Uri 전달 - val uri = data?.data!! - // 이미지 파일과 함께, 파일 확장자도 같이 저장 - if (uri.extension(requireActivity().applicationContext.contentResolver).isPermitExtension) { - setMyProfileImage(uri.toString(), uri.extension(requireActivity().applicationContext.contentResolver)) - } else { - Toast.makeText( - requireContext(), - getString(R.string.write_post_upload_alert_message_image_fail_file_extension), - Toast.LENGTH_SHORT - ).show() - findNavController().popBackStack() - } - } else { - findNavController().popBackStack() - } - } - - private fun setImageTakePhotoClickListener() { - binding.layoutMyProfileEditImageOptionCamera.setOnDebounceClickListener { - requestOpenCamera.launch( - PERMISSIONS_CAMERA - ) - } - } - - private val requestOpenCamera = - registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { permissions -> - permissions.entries.forEach { - if (it.value == false) { - return@registerForActivityResult - } - } - openCamera() - } - - private fun openCamera() { - val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE) - if (intent.resolveActivity(requireContext().packageManager) != null) { - var photoFile: File? = null - val tmpDir: File? = requireContext().cacheDir - val timeStamp: String = - SimpleDateFormat("yyyy-MM-d-HH-mm-ss", Locale.KOREA).format(Date()) - val photoFileName = "Capture_${timeStamp}_" - try { - val tmpPhoto = File.createTempFile(photoFileName, ".jpg", tmpDir) - currentTakenPhotoPath = tmpPhoto.absolutePath - photoFile = tmpPhoto - } catch (e: IOException) { - e.printStackTrace() - } - if (photoFile != null) { - val photoURI = FileProvider.getUriForFile( - Objects.requireNonNull(requireContext().applicationContext), - BuildConfig.LIBRARY_PACKAGE_NAME + ".fileprovider", - photoFile - ) - intent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI) - requestTakePhotoActivity.launch(intent) - } - } - } - - @RequiresApi(Build.VERSION_CODES.O) - val requestTakePhotoActivity = - registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { activityResult -> - if (activityResult.resultCode == Activity.RESULT_OK) { - val photoFile = File(currentTakenPhotoPath) - setMyProfileImage(Uri.fromFile(photoFile).toString(), "jpg") - } - } - - private fun setMyProfileImage(ImageString: String, fileExtension: String) { - findNavController().previousBackStackEntry?.savedStateHandle?.set( - "userProfileImageString", - ImageString - ) - findNavController().previousBackStackEntry?.savedStateHandle?.set( - "fileExtension", - fileExtension - ) - findNavController().popBackStack() - } - - companion object { - val PERMISSIONS_CAMERA = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - arrayOf( - Manifest.permission.CAMERA, - Manifest.permission.READ_MEDIA_IMAGES, - Manifest.permission.READ_MEDIA_VIDEO - ) - } else { - arrayOf( - Manifest.permission.CAMERA, - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - ) - } - val PERMISSIONS_GALLERY = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - arrayOf( - Manifest.permission.READ_MEDIA_IMAGES, - Manifest.permission.READ_MEDIA_VIDEO - ) - } else { - arrayOf( - Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.WRITE_EXTERNAL_STORAGE - ) - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/fragment/mypage/profile/ProfileOptionFragment.kt b/presentation/src/main/java/daily/dayo/presentation/fragment/mypage/profile/ProfileOptionFragment.kt deleted file mode 100644 index 8d91c3e2..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/fragment/mypage/profile/ProfileOptionFragment.kt +++ /dev/null @@ -1,130 +0,0 @@ -package daily.dayo.presentation.fragment.mypage.profile - -import android.graphics.Color -import android.graphics.drawable.ColorDrawable -import android.os.Bundle -import android.view.Gravity -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.view.Window -import android.view.WindowManager -import android.widget.Toast -import androidx.fragment.app.DialogFragment -import androidx.fragment.app.viewModels -import androidx.navigation.fragment.findNavController -import androidx.navigation.fragment.navArgs -import dagger.hilt.android.AndroidEntryPoint -import daily.dayo.presentation.R -import daily.dayo.presentation.common.autoCleared -import daily.dayo.presentation.common.dialog.DefaultDialogConfigure -import daily.dayo.presentation.common.dialog.DefaultDialogExplanationConfirm -import daily.dayo.presentation.common.extension.navigateSafe -import daily.dayo.presentation.common.setOnDebounceClickListener -import daily.dayo.presentation.databinding.FragmentProfileOptionBinding -import daily.dayo.presentation.viewmodel.ProfileViewModel - -@AndroidEntryPoint -class ProfileOptionFragment : DialogFragment() { - private val profileViewModel by viewModels() - private var binding by autoCleared() - private val args by navArgs() - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - isCancelable = true - } - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentProfileOptionBinding.inflate(inflater, container, false) - - dialog?.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE) - dialog?.window?.setGravity(Gravity.BOTTOM) - - binding.isMine = args.isMine - - // My Profile - setOptionFolderSettingClickListener() - setOptionProfileEditClickListener() - setOptionSettingClickListener() - - // Other Profile - setOptionReportUserClickListener() - setBlockUserClickListener() - - return binding.root - } - - override fun onResume() { - super.onResume() - resizePostOptionDialogFragment() - } - - private fun resizePostOptionDialogFragment() { - val params: ViewGroup.LayoutParams? = dialog?.window?.attributes - val deviceWidth = DefaultDialogConfigure.getDeviceWidthSize(requireContext()) - params?.width = (deviceWidth * 0.9).toInt() - dialog?.window?.attributes = params as WindowManager.LayoutParams - } - - private fun setOptionFolderSettingClickListener() { - binding.layoutProfileOptionFolderSetting.setOnDebounceClickListener { - } - } - - private fun setOptionProfileEditClickListener() { - binding.layoutProfileOptionEditProfile.setOnDebounceClickListener { - findNavController().navigateSafe( - currentDestinationId = R.id.ProfileOptionFragment, - action = R.id.action_profileOptionFragment_to_profileEditFragment - ) - } - } - - private fun setOptionSettingClickListener() { - binding.layoutProfileOptionSetting.setOnDebounceClickListener { - } - } - - private fun setBlockUserClickListener() { - binding.layoutOtherProfileOptionBlockUser.setOnDebounceClickListener { - val blockAlertDialog = DefaultDialogExplanationConfirm.createDialog(requireContext(), - R.string.other_profile_block_message, - R.string.other_profile_block_explanation_message, - true, - true, - R.string.confirm, - R.string.cancel, - { blockUser() }, - { dismiss() }) - - if (!blockAlertDialog.isShowing) { - blockAlertDialog.show() - DefaultDialogConfigure.dialogResize( - requireContext(), - blockAlertDialog, - 0.7f, - 0.23f - ) - } - } - } - - private fun blockUser() { - } - - private fun setOptionReportUserClickListener() { - binding.layoutOtherProfileOptionReportUser.setOnDebounceClickListener { - findNavController().navigateSafe( - currentDestinationId = R.id.ProfileOptionFragment, - action = R.id.action_profileOptionFragment_to_reportUserFragment, - args = ProfileOptionFragmentDirections.actionProfileOptionFragmentToReportUserFragment( - memberId = args.memberId - ).arguments - ) - } - } -} diff --git a/presentation/src/main/java/daily/dayo/presentation/fragment/post/PostOptionFragment.kt b/presentation/src/main/java/daily/dayo/presentation/fragment/post/PostOptionFragment.kt deleted file mode 100644 index 9e2df393..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/fragment/post/PostOptionFragment.kt +++ /dev/null @@ -1,125 +0,0 @@ -package daily.dayo.presentation.fragment.post - -import android.graphics.Color -import android.graphics.drawable.ColorDrawable -import android.os.Bundle -import android.view.Gravity -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.view.Window -import android.view.WindowManager -import android.widget.Toast -import androidx.fragment.app.DialogFragment -import androidx.fragment.app.viewModels -import androidx.navigation.fragment.findNavController -import androidx.navigation.fragment.navArgs -import dagger.hilt.android.AndroidEntryPoint -import daily.dayo.presentation.R -import daily.dayo.presentation.common.autoCleared -import daily.dayo.presentation.common.dialog.DefaultDialogConfigure -import daily.dayo.presentation.common.dialog.DefaultDialogExplanationConfirm -import daily.dayo.presentation.common.extension.navigateSafe -import daily.dayo.presentation.common.setOnDebounceClickListener -import daily.dayo.presentation.databinding.FragmentPostOptionBinding -import daily.dayo.presentation.viewmodel.PostViewModel - -@AndroidEntryPoint -class PostOptionFragment : DialogFragment() { - private val postViewModel by viewModels() - private var binding by autoCleared() - private val args by navArgs() - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - isCancelable = true - } - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentPostOptionBinding.inflate(inflater, container, false) - dialog?.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE) - dialog?.window?.setGravity(Gravity.BOTTOM) - setBlockUserClickListener() - setReportUserClickListener() - setReportPostClickListener() - - return binding.root - } - - override fun onResume() { - super.onResume() - resizePostOptionDialogFragment() - } - - private fun resizePostOptionDialogFragment() { - val params: ViewGroup.LayoutParams? = dialog?.window?.attributes - val deviceWidth = DefaultDialogConfigure.getDeviceWidthSize(requireContext()) - params?.width = (deviceWidth * 0.9).toInt() - dialog?.window?.attributes = params as WindowManager.LayoutParams - } - - private fun setBlockUserClickListener() { - binding.layoutPostOptionBlockUser.setOnDebounceClickListener { - val blockAlertDialog = DefaultDialogExplanationConfirm.createDialog(requireContext(), - R.string.post_block_message, - R.string.post_block_explanation_message, - true, - true, - R.string.confirm, - R.string.cancel, - { blockUser() }, - { dismiss() }) - - if (!blockAlertDialog.isShowing) { - blockAlertDialog.show() - DefaultDialogConfigure.dialogResize( - requireContext(), - blockAlertDialog, - 0.7f, - 0.23f - ) - } - } - } - - private fun blockUser() { - postViewModel.requestBlockMember(args.memberId) - postViewModel.blockSuccess.observe(viewLifecycleOwner) { - if (it.getContentIfNotHandled() == true) { - Toast.makeText( - requireContext(), - R.string.post_block_success_message, - Toast.LENGTH_SHORT - ).show() - findNavController().navigateUp() - } - } - } - - private fun setReportUserClickListener() { - binding.layoutPostOptionReportUser.setOnDebounceClickListener { - findNavController().navigateSafe( - currentDestinationId = R.id.PostOptionFragment, - action = R.id.action_postOptionFragment_to_reportUserFragment, - args = PostOptionFragmentDirections.actionPostOptionFragmentToReportUserFragment( - memberId = args.memberId - ).arguments - ) - } - } - - private fun setReportPostClickListener() { - binding.layoutPostOptionReportPost.setOnDebounceClickListener { - findNavController().navigateSafe( - currentDestinationId = R.id.PostOptionFragment, - action = R.id.action_postOptionFragment_to_reportPostFragment, - args = PostOptionFragmentDirections.actionPostOptionFragmentToReportPostFragment( - postId = args.postId - ).arguments - ) - } - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/fragment/search/SearchFragment.kt b/presentation/src/main/java/daily/dayo/presentation/fragment/search/SearchFragment.kt deleted file mode 100644 index 3e53c0ab..00000000 --- a/presentation/src/main/java/daily/dayo/presentation/fragment/search/SearchFragment.kt +++ /dev/null @@ -1,141 +0,0 @@ -package daily.dayo.presentation.fragment.search - -import android.os.Bundle -import android.text.Editable -import android.text.TextWatcher -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.view.inputmethod.EditorInfo -import androidx.fragment.app.Fragment -import androidx.fragment.app.activityViewModels -import androidx.navigation.fragment.findNavController -import dagger.hilt.android.AndroidEntryPoint -import daily.dayo.presentation.R -import daily.dayo.presentation.adapter.SearchKeywordRecentAdapter -import daily.dayo.presentation.common.HideKeyBoardUtil -import daily.dayo.presentation.common.ReplaceUnicode -import daily.dayo.presentation.common.autoCleared -import daily.dayo.presentation.common.extension.navigateSafe -import daily.dayo.presentation.common.setOnDebounceClickListener -import daily.dayo.presentation.databinding.FragmentSearchBinding -import daily.dayo.presentation.viewmodel.SearchViewModel - -@AndroidEntryPoint -class SearchFragment : Fragment() { - private var binding by autoCleared { onDestroyBindingView() } - private val searchViewModel by activityViewModels() - private var searchKeywordRecentAdapter: SearchKeywordRecentAdapter? = null - private lateinit var searchKeywordRecentList: ArrayList - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle?, - ): View? { - binding = FragmentSearchBinding.inflate(inflater, container, false) - return binding.root - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - setBackButtonClickListener() - setSearchKeywordRecentListAdapter() - setSearchEditTextListener() - initSearchKeywordRecentList() - setSearchKeywordRecentClickListener() - setSearchKeywordInputDone() - setSearchKeywordInputRemoveClickListener() - HideKeyBoardUtil.hideTouchDisplay(requireActivity(), view) - } - - private fun onDestroyBindingView() { - searchKeywordRecentAdapter = null - binding.rvSearchRecentKeyword.adapter = null - } - - private fun setBackButtonClickListener() { - binding.btnSearchBack.setOnDebounceClickListener { - findNavController().navigateUp() - } - } - - private fun setSearchKeywordRecentListAdapter() { - searchKeywordRecentAdapter = SearchKeywordRecentAdapter() - binding.rvSearchRecentKeyword.adapter = searchKeywordRecentAdapter - } - - private fun setSearchEditTextListener() { - binding.tvSearchKeywordInput.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {} - override fun afterTextChanged(s: Editable?) { - with(binding.btnSearchRemoveEtInput) { - visibility = if (!s.isNullOrBlank()) { - View.VISIBLE - } else { - View.GONE - } - } - } - }) - } - - private fun setSearchKeywordInputDone() { - binding.tvSearchKeywordInput.setOnEditorActionListener { _, actionId, _ -> - when (actionId) { - EditorInfo.IME_ACTION_SEARCH -> { - HideKeyBoardUtil.hide(requireContext(), binding.tvSearchKeywordInput) - binding.tvSearchKeywordInput.setText(ReplaceUnicode.replaceBlankText(binding.tvSearchKeywordInput.text.toString())) - if (ReplaceUnicode.replaceBlankText(binding.tvSearchKeywordInput.text.toString()).isNotBlank()) { - searchKeyword(ReplaceUnicode.replaceBlankText(binding.tvSearchKeywordInput.text.toString())) - } - true - } - - else -> false - } - } - } - - private fun setSearchKeywordInputRemoveClickListener() { - binding.btnSearchRemoveEtInput.setOnDebounceClickListener { - binding.tvSearchKeywordInput.setText("") - } - } - - private fun initSearchKeywordRecentList() { -// searchKeywordRecentList = searchViewModel.getSearchKeywordRecent() - searchKeywordRecentAdapter?.submitList(searchKeywordRecentList) - } - - private fun setSearchKeywordRecentClickListener() { - searchKeywordRecentAdapter?.setOnItemClickListener(object : - SearchKeywordRecentAdapter.OnItemClickListener { - override fun onItemClick(v: View, keyword: String, pos: Int) { - searchKeyword(keyword) - } - - override fun deleteSearchKeywordRecentClick(keyword: String, pos: Int) { -// searchViewModel.searchHistory.value?.data?.get(pos)?.let { -// searchViewModel.deleteSearchKeywordRecent(it.history, it.searchHistoryType) -// } -// searchKeywordRecentList = searchViewModel.getSearchKeywordRecent() - searchKeywordRecentAdapter?.submitList(searchKeywordRecentList) - } - }) - - binding.tvSearchAllDelete.setOnDebounceClickListener { -// searchViewModel.clearSearchKeywordRecent() -// searchKeywordRecentList = searchViewModel.getSearchKeywordRecent() - searchKeywordRecentAdapter?.submitList(searchKeywordRecentList) - } - } - - private fun searchKeyword(keyword: String) { - searchViewModel.searchKeyword = keyword - findNavController().navigateSafe( - currentDestinationId = R.id.SearchFragment, - action = R.id.action_searchFragment_to_searchResultFragment - ) - } -} \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/account/SetProfileSetupView.kt b/presentation/src/main/java/daily/dayo/presentation/screen/account/SetProfileSetupView.kt index c4e92d34..b68f105c 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/account/SetProfileSetupView.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/account/SetProfileSetupView.kt @@ -52,7 +52,7 @@ fun SetProfileSetupView( requestIsNicknameDuplicate: (String) -> Unit = {}, profileImg: Bitmap? = null, ) { - val placeholderResId = remember { R.drawable.ic_profile_default_user_profile } + val placeholderResId = remember { R.drawable.ic_profile_default } val interactionSource = remember { MutableInteractionSource() } val profileImageClickModifier = remember { Modifier diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/account/SignInScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/account/SignInScreen.kt index 67ce53a8..8ea3a2a2 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/account/SignInScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/account/SignInScreen.kt @@ -170,7 +170,7 @@ private fun SignInScreen( Column { FilledRoundedCornerButton( onClick = { onClickKakaoLoginButton(context, requestSignInKakao) }, - label = stringResource(id = R.string.login_select_method_kakao), + label = stringResource(id = R.string.sign_in_select_method_kakao), modifier = Modifier .fillMaxWidth() .height(44.dp) @@ -187,7 +187,7 @@ private fun SignInScreen( FilledRoundedCornerButton( onClick = { navigateToSignInEmail() }, - label = stringResource(id = R.string.login_select_method_email), + label = stringResource(id = R.string.sign_in_select_method_email), modifier = Modifier .fillMaxWidth() .height(44.dp) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/account/SignUpEmailScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/account/SignUpEmailScreen.kt index 3ddb414b..3d2cf2f2 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/account/SignUpEmailScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/account/SignUpEmailScreen.kt @@ -593,7 +593,7 @@ fun SignUpEmailScaffold( } }, iconContentDescription = stringResource(R.string.close_sign), - iconPainter = painterResource(id = R.drawable.ic_x_sign), + iconPainter = painterResource(id = R.drawable.ic_x), ) } }, diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/account/WithdrawScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/account/WithdrawScreen.kt index 336f6c5b..bdc121c0 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/account/WithdrawScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/account/WithdrawScreen.kt @@ -314,7 +314,7 @@ private fun WithdrawReasonItem( Spacer(modifier = Modifier.weight(1f)) Icon( - painter = painterResource(id = R.drawable.ic_next), + painter = painterResource(id = R.drawable.ic_chevron_r_3), contentDescription = stringResource(id = reason.content.reasonTextResId), tint = Gray4_C5CAD2 ) @@ -708,7 +708,7 @@ fun WithdrawConfirmCheckItems( .wrapContentHeight() ) { Icon( - painter = painterResource(id = R.drawable.ic_check_mark), + painter = painterResource(id = R.drawable.ic_check), contentDescription = null, tint = Primary_23C882, ) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/bookmark/BookmarkScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/bookmark/BookmarkScreen.kt index cadbaa02..57079a5f 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/bookmark/BookmarkScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/bookmark/BookmarkScreen.kt @@ -148,7 +148,7 @@ private fun BookmarkTopNavigation( ) ) { Icon( - painter = painterResource(id = R.drawable.ic_back_sign), + painter = painterResource(id = R.drawable.ic_arrow_left_2), contentDescription = "back sign", tint = Gray1_50545B ) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderCreateScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderCreateScreen.kt index 6112b590..2a407133 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderCreateScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderCreateScreen.kt @@ -160,7 +160,7 @@ private fun FolderCreateTopNavigation( leftIcon = { IconButton(onClick = onBackClick) { Icon( - painter = painterResource(id = R.drawable.ic_back_sign), + painter = painterResource(id = R.drawable.ic_arrow_left_2), contentDescription = stringResource(id = R.string.back_sign), tint = Dark ) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderEditScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderEditScreen.kt index dc20598e..38f48e3f 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderEditScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderEditScreen.kt @@ -179,7 +179,7 @@ private fun FolderEditTopNavigation( leftIcon = { IconButton(onClick = onBackClick) { Icon( - painter = painterResource(id = R.drawable.ic_back_sign), + painter = painterResource(id = R.drawable.ic_arrow_left_2), contentDescription = stringResource(id = R.string.back_sign), tint = Dark ) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderScreen.kt index ae737c46..82fe5de5 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderScreen.kt @@ -241,7 +241,7 @@ private fun FolderScreen( leftIcon = { IconButton(onClick = onBackClick) { Icon( - painter = painterResource(id = R.drawable.ic_back_sign), + painter = painterResource(id = R.drawable.ic_arrow_left_2), contentDescription = stringResource(id = R.string.back_sign), tint = Dark ) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/FollowScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/mypage/FollowScreen.kt index 23ac7635..0d176f58 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/FollowScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/mypage/FollowScreen.kt @@ -146,7 +146,7 @@ private fun FollowScreen( ) ) { Icon( - painter = painterResource(id = R.drawable.ic_back_sign), + painter = painterResource(id = R.drawable.ic_arrow_left_2), contentDescription = stringResource(id = R.string.back_sign), tint = Gray1_50545B ) @@ -338,7 +338,7 @@ private fun FollowUserInfo( label = stringResource(id = R.string.follow_already), icon = { Icon( - painter = painterResource(id = R.drawable.ic_check_sign_gray), + painter = painterResource(id = R.drawable.ic_check_2_gray), contentDescription = stringResource(R.string.follow_already_icon_description), modifier = Modifier.size(20.dp) ) @@ -350,7 +350,7 @@ private fun FollowUserInfo( label = stringResource(id = R.string.follow_yet), icon = { Icon( - painter = painterResource(id = R.drawable.ic_plus_sign_green), + painter = painterResource(id = R.drawable.ic_plus_green), contentDescription = stringResource(R.string.follow_yet_icon_description), modifier = Modifier.size(20.dp) ) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageEditScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageEditScreen.kt index 790f1c49..3d4a51e3 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageEditScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageEditScreen.kt @@ -255,7 +255,7 @@ private fun MyPageEditScreen( .padding(vertical = 32.dp), horizontalAlignment = Alignment.CenterHorizontally ) { - val placeholderResId = remember { R.drawable.ic_profile_default_user_profile } + val placeholderResId = remember { R.drawable.ic_profile_default } BadgeRoundImageView( context = LocalContext.current, imageUrl = modifiedProfileImage, @@ -345,7 +345,7 @@ private fun MyPageEditTopNavigation( leftIcon = { IconButton(onClick = onBackClick) { Icon( - painter = painterResource(id = R.drawable.ic_back_sign), + painter = painterResource(id = R.drawable.ic_arrow_left_2), contentDescription = "back", tint = Gray1_50545B ) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/notification/NotificationScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/notification/NotificationScreen.kt index d90c2e2d..c73703b9 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/notification/NotificationScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/notification/NotificationScreen.kt @@ -367,7 +367,7 @@ fun NotificationView( imageDescription = "notification thumbnail", imageSize = Size.ORIGINAL, roundSize = 14.dp, - placeholderResId = R.drawable.ic_profile_default_user_profile, + placeholderResId = R.drawable.ic_profile_default, ) Spacer( modifier = Modifier diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/post/PostLikeUsersScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/post/PostLikeUsersScreen.kt index 3e60073b..db9ebe48 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/post/PostLikeUsersScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/post/PostLikeUsersScreen.kt @@ -33,7 +33,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview @@ -54,6 +53,7 @@ import daily.dayo.presentation.theme.Dark import daily.dayo.presentation.theme.DayoTheme import daily.dayo.presentation.theme.Gray2_767B83 import daily.dayo.presentation.theme.Primary_23C882 +import daily.dayo.presentation.theme.White_FFFFFF import daily.dayo.presentation.view.DayoOutlinedButton import daily.dayo.presentation.view.FilledButton import daily.dayo.presentation.view.TopNavigation @@ -131,7 +131,7 @@ private fun PostLikeUsersScreen( .indication(interactionSource = remember { MutableInteractionSource() }, indication = null) ) { Icon( - painter = painterResource(id = R.drawable.ic_back_sign), + painter = painterResource(id = R.drawable.ic_arrow_left_2), contentDescription = "back sign", tint = Dark ) @@ -198,7 +198,7 @@ private fun LikeUserItem( onFollowClick: (LikeUser) -> Unit ) { Surface( - color = colorResource(id = R.color.white_FFFFFF), + color = White_FFFFFF, modifier = Modifier .fillMaxWidth() .padding(bottom = 20.dp) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/post/PostScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/post/PostScreen.kt index a6225d2e..f2b4350c 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/post/PostScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/post/PostScreen.kt @@ -295,7 +295,7 @@ private fun PostScreen( leftIcon = { IconButton(onClick = onBackClick) { Icon( - painter = painterResource(id = R.drawable.ic_x_sign), + painter = painterResource(id = R.drawable.ic_x), contentDescription = stringResource(id = R.string.back_sign), tint = Dark ) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/profile/ProfileScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/profile/ProfileScreen.kt index e72175f6..68e87283 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/profile/ProfileScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/profile/ProfileScreen.kt @@ -246,7 +246,7 @@ private fun UserFollowButton( modifier = Modifier.fillMaxWidth(), icon = { Icon( - painter = painterResource(id = R.drawable.ic_check_sign_gray), + painter = painterResource(id = R.drawable.ic_check_2_gray), contentDescription = stringResource(R.string.follow_already_icon_description), modifier = Modifier.size(20.dp) ) @@ -259,7 +259,7 @@ private fun UserFollowButton( modifier = Modifier.fillMaxWidth(), icon = { Icon( - painter = painterResource(id = R.drawable.ic_plus_sign_green), + painter = painterResource(id = R.drawable.ic_plus_green), contentDescription = stringResource(R.string.follow_yet_icon_description), modifier = Modifier.size(20.dp) ) @@ -408,7 +408,7 @@ private fun ProfileTopNavigation( leftIcon = { IconButton(onClick = onBackClick) { Icon( - painter = painterResource(id = R.drawable.ic_x_sign), + painter = painterResource(id = R.drawable.ic_x), contentDescription = stringResource(id = R.string.back_sign), tint = Dark ) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchPostHashtagScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchPostHashtagScreen.kt index aa64311f..3db82539 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchPostHashtagScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchPostHashtagScreen.kt @@ -71,7 +71,7 @@ fun SearchPostHashtagScreen( .indication(interactionSource = remember { MutableInteractionSource() }, indication = null) ) { Icon( - painter = painterResource(id = R.drawable.ic_back_sign), + painter = painterResource(id = R.drawable.ic_arrow_left_2), contentDescription = "back sign", tint = Gray1_50545B ) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt index 6dc82102..0f73c605 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchResultScreen.kt @@ -55,7 +55,6 @@ import androidx.compose.ui.graphics.Color.Companion.White import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource @@ -83,7 +82,6 @@ import daily.dayo.presentation.BuildConfig import daily.dayo.presentation.R import daily.dayo.presentation.common.Event import daily.dayo.presentation.common.extension.clickableSingle -import daily.dayo.presentation.common.toSp import daily.dayo.presentation.theme.DayoTheme import daily.dayo.presentation.theme.Gray1_50545B import daily.dayo.presentation.theme.Gray2_767B83 @@ -243,11 +241,7 @@ fun SearchResultScreen( text = { Text( text = title, - style = TextStyle( - fontSize = 14.dp.toSp(), - fontFamily = FontFamily(Font(R.font.pretendard_medium)), - fontWeight = FontWeight(500) - ) + style = DayoTheme.typography.b6 ) }, selected = pagerState.currentPage == index, @@ -357,7 +351,7 @@ fun SearchResultEmpty() { @Preview fun SearchResultsCount(resultCount: Int = 0) { Surface( - color = colorResource(id = R.color.white_FFFFFF), + color = White_FFFFFF, modifier = Modifier .fillMaxWidth() .height(44.dp), @@ -496,7 +490,7 @@ fun SearchResultUserView( onClickProfile: (String) -> Unit ) { Surface( - color = colorResource(id = R.color.white_FFFFFF), + color = White_FFFFFF, modifier = Modifier.fillMaxWidth() ) { Row( @@ -623,8 +617,8 @@ private fun SearchResultUserFollowLayout( } }, iconContentDescription = "follow button", - iconPainter = if (isFollowButton) painterResource(R.drawable.ic_plus_sign_green) - else painterResource(R.drawable.ic_check_sign_gray), + iconPainter = if (isFollowButton) painterResource(R.drawable.ic_plus_green) + else painterResource(R.drawable.ic_check_2_gray), iconButtonModifier = Modifier .width(85.dp) .height(36.dp) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchScreen.kt index 0d78b2dd..87ae007d 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/search/SearchScreen.kt @@ -42,14 +42,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.Font -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.style.TextAlign @@ -63,10 +58,13 @@ import daily.dayo.domain.model.SearchHistoryType import daily.dayo.presentation.R import daily.dayo.presentation.common.ReplaceUnicode.trimBlankText import daily.dayo.presentation.common.extension.clickableSingle -import daily.dayo.presentation.common.toSp +import daily.dayo.presentation.theme.Dark import daily.dayo.presentation.theme.DayoTheme +import daily.dayo.presentation.theme.Gray2_767B83 import daily.dayo.presentation.theme.Gray3_9FA5AE import daily.dayo.presentation.theme.Gray4_C5CAD2 +import daily.dayo.presentation.theme.Gray7_F6F6F7 +import daily.dayo.presentation.theme.White_FFFFFF import daily.dayo.presentation.view.NoRippleIconButton import daily.dayo.presentation.viewmodel.SearchViewModel import kotlinx.coroutines.launch @@ -148,7 +146,7 @@ fun SearchActionbarLayout( onSearchClick: (String) -> Unit ) { Surface( - color = colorResource(id = R.color.white_FFFFFF), + color = White_FFFFFF, modifier = modifier .height(IntrinsicSize.Min) .fillMaxWidth() @@ -172,10 +170,7 @@ fun SearchActionbarLayout( .fillMaxHeight() .weight(1F) .padding(vertical = 4.dp) - .background( - colorResource(id = R.color.gray_7_F6F6F7), - RoundedCornerShape(8.dp) - ), + .background(Gray7_F6F6F7, RoundedCornerShape(8.dp)), contentAlignment = Alignment.CenterStart ) { BasicTextField( @@ -187,23 +182,12 @@ fun SearchActionbarLayout( .wrapContentHeight(align = Alignment.CenterVertically) .fillMaxWidth() .defaultMinSize(minWidth = 1.dp, minHeight = 1.dp), - textStyle = TextStyle( - fontSize = 16.dp.toSp(), - fontFamily = FontFamily(Font(R.font.pretendard_medium)), - fontWeight = FontWeight(500), - color = colorResource(id = R.color.gray_1_313131), - ), + textStyle = DayoTheme.typography.b6.copy(color = Dark), decorationBox = { innerTextField -> if (textFieldValue.text.isEmpty()) { Text( text = stringResource(id = R.string.hint_search_keyword_input), - style = TextStyle( - fontSize = 14.dp.toSp(), - lineHeight = 20.dp.toSp(), - fontFamily = FontFamily(Font(R.font.pretendard_medium)), - fontWeight = FontWeight(500), - color = colorResource(id = R.color.gray_3_9FA5AE), - ) + style = DayoTheme.typography.b6.copy(color = Gray3_9FA5AE) ) } innerTextField() @@ -221,7 +205,7 @@ fun SearchActionbarLayout( NoRippleIconButton( onClick = { textFieldValue = TextFieldValue() }, iconContentDescription = "Input Clear Button", - iconPainter = painterResource(id = R.drawable.ic_x_sign_circle_gray), + iconPainter = painterResource(id = R.drawable.ic_x_with_circle_2), iconTintColor = Color.Unspecified, iconButtonModifier = Modifier .align(Alignment.CenterEnd) @@ -236,7 +220,7 @@ fun SearchActionbarLayout( @Preview private fun SearchHistoryGuideLayout() { Surface( - color = colorResource(id = R.color.white_FFFFFF), + color = White_FFFFFF, modifier = Modifier .fillMaxWidth() .wrapContentHeight() @@ -244,13 +228,7 @@ private fun SearchHistoryGuideLayout() { ) { Text( text = "최근 검색", - style = TextStyle( - fontSize = 14.dp.toSp(), - lineHeight = 20.dp.toSp(), - fontFamily = FontFamily(Font(R.font.pretendard_medium)), - fontWeight = FontWeight(500), - color = colorResource(id = R.color.gray_2_767B83), - ), + style = DayoTheme.typography.b6.copy(color = Gray2_767B83), modifier = Modifier .padding(start = 2.dp, top = 8.dp, bottom = 8.dp) ) @@ -260,7 +238,7 @@ private fun SearchHistoryGuideLayout() { @Composable private fun SetClearSearchHistoryLayout(onHistoryClearClick: () -> Unit) { Surface( - color = colorResource(id = R.color.white_FFFFFF), + color = White_FFFFFF, modifier = Modifier .fillMaxWidth() .wrapContentHeight() @@ -272,22 +250,16 @@ private fun SetClearSearchHistoryLayout(onHistoryClearClick: () -> Unit) { .background(DayoTheme.colorScheme.background) .padding(horizontal = 12.dp, vertical = 4.dp), colors = ButtonDefaults.buttonColors( - containerColor = colorResource(id = R.color.white_FFFFFF), - contentColor = colorResource(id = R.color.gray_2_767B83), + containerColor = White_FFFFFF, + contentColor = Gray2_767B83, ), shape = RoundedCornerShape(100.dp), - border = BorderStroke(1.dp, colorResource(id = R.color.gray_2_767B83)), + border = BorderStroke(1.dp, Gray2_767B83), onClick = { onHistoryClearClick() } ) { Text( text = stringResource(id = R.string.search_history_clear), - style = TextStyle( - fontSize = 12.dp.toSp(), - lineHeight = 18.dp.toSp(), - fontFamily = FontFamily(Font(R.font.pretendard_medium)), - fontWeight = FontWeight(500), - color = colorResource(id = R.color.gray_2_767B83), - ), + style = DayoTheme.typography.caption4.copy(color = Gray2_767B83), textAlign = TextAlign.Center, modifier = Modifier.padding(horizontal = 8.dp, vertical = 0.dp) ) @@ -372,7 +344,7 @@ private fun SearchHistoryLayout( searchHistoryDetail: SearchHistoryDetail ) { Surface( - color = colorResource(id = R.color.white_FFFFFF), + color = White_FFFFFF, modifier = Modifier .fillMaxWidth() .wrapContentHeight() @@ -419,12 +391,7 @@ private fun PreviewSearchHistoryLayout() { private fun SearchHistoryDetailLayout(searchedText: String) { Text( text = searchedText, - style = TextStyle( - fontSize = 16.dp.toSp(), - fontFamily = FontFamily(Font(R.font.pretendard_medium)), - fontWeight = FontWeight(500), - color = colorResource(id = R.color.gray_1_313131), - ), + style = DayoTheme.typography.b4.copy(color = Dark), modifier = Modifier .wrapContentSize() .padding(start = 8.dp) @@ -443,6 +410,6 @@ private fun SearchHistoryDeleteButton( } }, iconContentDescription = "History Delete Button", - iconPainter = painterResource(id = R.drawable.ic_x_sign) + iconPainter = painterResource(id = R.drawable.ic_x) ) } \ No newline at end of file diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/settings/BlockedUsersScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/settings/BlockedUsersScreen.kt index b4861f2e..3869a205 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/settings/BlockedUsersScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/settings/BlockedUsersScreen.kt @@ -228,7 +228,7 @@ fun BlockedUser( imageDescription = "User Profile Image", imageSize = Size(36, 36), roundSize = 18.dp, - placeholderResId = R.drawable.ic_profile_default_user_profile, + placeholderResId = R.drawable.ic_profile_default, ) Spacer(modifier = Modifier.width(12.dp)) Text( diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/settings/SettingNotificationScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/settings/SettingNotificationScreen.kt index db329631..8d2d4b5e 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/settings/SettingNotificationScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/settings/SettingNotificationScreen.kt @@ -45,8 +45,8 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.google.firebase.ktx.Firebase -import com.google.firebase.messaging.ktx.messaging +import com.google.firebase.Firebase +import com.google.firebase.messaging.messaging import daily.dayo.presentation.R import daily.dayo.presentation.theme.Dark import daily.dayo.presentation.theme.DayoTheme diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/settings/SettingsScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/settings/SettingsScreen.kt index 37e9a64b..808893d5 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/settings/SettingsScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/settings/SettingsScreen.kt @@ -176,7 +176,7 @@ private fun SettingsScreen( ) ) { Icon( - painter = painterResource(id = R.drawable.ic_back_sign), + painter = painterResource(id = R.drawable.ic_arrow_left_2), contentDescription = stringResource(id = R.string.back_sign), tint = Gray1_50545B ) @@ -342,7 +342,7 @@ private fun SettingMenu( ) Icon( - painter = painterResource(id = R.drawable.ic_next), + painter = painterResource(id = R.drawable.ic_chevron_r_3), contentDescription = stringResource(id = titleId), tint = Gray4_C5CAD2 ) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/write/WriteFolderScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/write/WriteFolderScreen.kt index 37fbd925..ab809b72 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/write/WriteFolderScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/write/WriteFolderScreen.kt @@ -25,7 +25,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue -import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -292,7 +291,7 @@ fun WriteFolderItemLayout( .background(Primary_23C882.copy(alpha = 0.6f)) ) { Image( - painter = painterResource(id = R.drawable.ic_check_mark), + painter = painterResource(id = R.drawable.ic_check), contentDescription = "Selected", contentScale = ContentScale.Crop, colorFilter = ColorFilter.tint(White_FFFFFF), diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/write/WriteScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/write/WriteScreen.kt index 9e8e7950..16f45968 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/write/WriteScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/write/WriteScreen.kt @@ -474,7 +474,7 @@ fun WriteUploadImages( if (images.size == WRITE_POST_IMAGE_MIN_SIZE) return@itemsIndexed Image( - painter = painterResource(id = R.drawable.ic_img_delete), + painter = painterResource(id = R.drawable.ic_x_with_circle), contentDescription = "delete image", modifier = Modifier .align(Alignment.TopEnd) @@ -650,7 +650,7 @@ fun WriteCategoryLayout( Spacer(modifier = Modifier.weight(1f)) Image( modifier = Modifier.fillMaxHeight(), - painter = painterResource(id = R.drawable.ic_arrow_category_green), + painter = painterResource(id = R.drawable.ic_chevron_r_primary_green), contentDescription = stringResource(R.string.write_post_select_category_title) ) } @@ -720,7 +720,7 @@ fun WriteTagLayout( modifier = Modifier .fillMaxHeight() .padding(start = 2.dp), - painter = painterResource(id = R.drawable.ic_arrow_tag_gray), + painter = painterResource(id = R.drawable.ic_chevron_r_gray), contentDescription = stringResource(R.string.write_post_select_tag_title) ) } @@ -786,7 +786,7 @@ fun WriteFolderLayout( modifier = Modifier .fillMaxHeight() .padding(start = 2.dp), - painter = painterResource(id = R.drawable.ic_arrow_tag_gray), + painter = painterResource(id = R.drawable.ic_chevron_r_gray), contentDescription = stringResource(R.string.write_post_select_folder_title) ) } diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/write/WriteTagScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/write/WriteTagScreen.kt index 449364c3..ed026313 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/write/WriteTagScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/write/WriteTagScreen.kt @@ -261,7 +261,7 @@ fun WriteTags( .fillMaxSize() .clickable { onRemoveTagClick(tagText) } .padding(4.dp), - imageVector = ImageVector.vectorResource(id = R.drawable.ic_x_sign), + imageVector = ImageVector.vectorResource(id = R.drawable.ic_x), contentDescription = "Remove $tagText", tint = Gray4_C5CAD2, ) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/Checkbox.kt b/presentation/src/main/java/daily/dayo/presentation/view/Checkbox.kt index e62d2fbd..c511452f 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/Checkbox.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/Checkbox.kt @@ -32,7 +32,7 @@ fun DayoCheckbox( modifier = modifier ) { Icon( - painter = painterResource(id = R.drawable.ic_check_ok_sign), + painter = painterResource(id = R.drawable.ic_check_with_circle), tint = if (checked) Color.Unspecified else White_FFFFFF.copy(0.4f), modifier = modifier .border( diff --git a/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt b/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt index b0ac12e9..98766de6 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/Comment.kt @@ -323,7 +323,7 @@ fun getAnnotatedCommentContent(content: String, mentionList: List): @Composable fun CommentMentionSearchView(userResults: LazyPagingItems, onClickFollowUser: (SearchUser) -> Unit) { - val placeholder = AppCompatResources.getDrawable(LocalContext.current, R.drawable.ic_profile_default_user_profile) + val placeholder = AppCompatResources.getDrawable(LocalContext.current, R.drawable.ic_profile_default) LazyColumn( modifier = Modifier .background(DayoTheme.colorScheme.background) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/RoundImageView.kt b/presentation/src/main/java/daily/dayo/presentation/view/RoundImageView.kt index 26a3eaa5..72c87843 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/RoundImageView.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/RoundImageView.kt @@ -66,7 +66,7 @@ fun BadgeRoundImageView( ) Icon( - painter = painterResource(id = R.drawable.ic_camera_button), + painter = painterResource(id = R.drawable.ic_camera_with_circle), contentDescription = "set image", modifier = Modifier .align(Alignment.BottomEnd) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/TopNavigation.kt b/presentation/src/main/java/daily/dayo/presentation/view/TopNavigation.kt index 25ad39c0..00b4c24d 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/TopNavigation.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/TopNavigation.kt @@ -85,7 +85,7 @@ fun PreviewTopNavigation() { rightIcon = { IconButton(onClick = { /* do something */ }) { Icon( - painter = painterResource(id = R.drawable.ic_option), + painter = painterResource(id = R.drawable.ic_option_vertical), contentDescription = "Option" ) } diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt index 041ed2c1..6e5ec11e 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt @@ -67,7 +67,7 @@ fun BottomSheetDialog( checkedColor: Color = Primary_23C882, title: String = "", titleButtonAction: () -> Unit = {}, - rightIcon: ImageVector = ImageVector.vectorResource(id = R.drawable.ic_check_mark), + rightIcon: ImageVector = ImageVector.vectorResource(id = R.drawable.ic_check), checkedButtonIndex: Int = -1, closeButtonAction: (() -> Unit)? = null ) { @@ -108,7 +108,7 @@ fun BottomSheetDialog( .wrapContentSize() ) { Icon( - imageVector = ImageVector.vectorResource(id = R.drawable.ic_x_sign), + imageVector = ImageVector.vectorResource(id = R.drawable.ic_x), modifier = Modifier .padding(12.dp) .wrapContentSize() diff --git a/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt b/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt index 91b30945..51ce7ca5 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/dialog/CommentBottomSheetDialog.kt @@ -275,7 +275,7 @@ private fun CommentBottomSheetDialogTitle(clearComment: () -> Unit, onClickClose onClickClose() }, iconContentDescription = "close", - iconPainter = painterResource(id = R.drawable.ic_x_sign), + iconPainter = painterResource(id = R.drawable.ic_x), iconButtonModifier = Modifier.align(Alignment.CenterEnd) ) } diff --git a/presentation/src/main/res/anim/translate_bottom_up.xml b/presentation/src/main/res/anim/translate_bottom_up.xml deleted file mode 100644 index a15fe738..00000000 --- a/presentation/src/main/res/anim/translate_bottom_up.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/presentation/src/main/res/anim/translate_from_left_in.xml b/presentation/src/main/res/anim/translate_from_left_in.xml deleted file mode 100644 index 1321bb90..00000000 --- a/presentation/src/main/res/anim/translate_from_left_in.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/presentation/src/main/res/anim/translate_from_right_in.xml b/presentation/src/main/res/anim/translate_from_right_in.xml deleted file mode 100644 index 64ca4483..00000000 --- a/presentation/src/main/res/anim/translate_from_right_in.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/presentation/src/main/res/anim/translate_nothing.xml b/presentation/src/main/res/anim/translate_nothing.xml deleted file mode 100644 index 6bea4f3c..00000000 --- a/presentation/src/main/res/anim/translate_nothing.xml +++ /dev/null @@ -1,6 +0,0 @@ - - \ No newline at end of file diff --git a/presentation/src/main/res/anim/translate_to_left_out.xml b/presentation/src/main/res/anim/translate_to_left_out.xml deleted file mode 100644 index c520a16c..00000000 --- a/presentation/src/main/res/anim/translate_to_left_out.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/presentation/src/main/res/anim/translate_to_right_out.xml b/presentation/src/main/res/anim/translate_to_right_out.xml deleted file mode 100644 index 1e357bd1..00000000 --- a/presentation/src/main/res/anim/translate_to_right_out.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/presentation/src/main/res/anim/translate_top_down.xml b/presentation/src/main/res/anim/translate_top_down.xml deleted file mode 100644 index efe842c2..00000000 --- a/presentation/src/main/res/anim/translate_top_down.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/background_cursor_color_gray_1.xml b/presentation/src/main/res/drawable/background_cursor_color_gray_1.xml deleted file mode 100644 index 62fac92c..00000000 --- a/presentation/src/main/res/drawable/background_cursor_color_gray_1.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/background_profile_round_bottom_corner.xml b/presentation/src/main/res/drawable/background_profile_round_bottom_corner.xml deleted file mode 100644 index 48803671..00000000 --- a/presentation/src/main/res/drawable/background_profile_round_bottom_corner.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/background_white_radius_10.xml b/presentation/src/main/res/drawable/background_white_radius_10.xml index 7148fe8c..be35809f 100644 --- a/presentation/src/main/res/drawable/background_white_radius_10.xml +++ b/presentation/src/main/res/drawable/background_white_radius_10.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/presentation/src/main/res/drawable/background_white_radius_32.xml b/presentation/src/main/res/drawable/background_white_radius_32.xml deleted file mode 100644 index c0ab5df9..00000000 --- a/presentation/src/main/res/drawable/background_white_radius_32.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/button_default_green.xml b/presentation/src/main/res/drawable/button_default_green.xml deleted file mode 100644 index 72926215..00000000 --- a/presentation/src/main/res/drawable/button_default_green.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/button_default_signup_next_button_active.xml b/presentation/src/main/res/drawable/button_default_signup_next_button_active.xml deleted file mode 100644 index b0b00e0a..00000000 --- a/presentation/src/main/res/drawable/button_default_signup_next_button_active.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/button_default_signup_next_button_inactive.xml b/presentation/src/main/res/drawable/button_default_signup_next_button_inactive.xml deleted file mode 100644 index 696fe02e..00000000 --- a/presentation/src/main/res/drawable/button_default_signup_next_button_inactive.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/button_default_white.xml b/presentation/src/main/res/drawable/button_default_white.xml deleted file mode 100644 index 1f98ba3a..00000000 --- a/presentation/src/main/res/drawable/button_default_white.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/button_follow_green.xml b/presentation/src/main/res/drawable/button_follow_green.xml deleted file mode 100644 index 52e85304..00000000 --- a/presentation/src/main/res/drawable/button_follow_green.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/button_follow_white.xml b/presentation/src/main/res/drawable/button_follow_white.xml deleted file mode 100644 index 6d398f2f..00000000 --- a/presentation/src/main/res/drawable/button_follow_white.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/button_list_gray.xml b/presentation/src/main/res/drawable/button_list_gray.xml deleted file mode 100644 index b9ec3584..00000000 --- a/presentation/src/main/res/drawable/button_list_gray.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/button_login_email.xml b/presentation/src/main/res/drawable/button_login_email.xml deleted file mode 100644 index bd9ef2cf..00000000 --- a/presentation/src/main/res/drawable/button_login_email.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - diff --git a/presentation/src/main/res/drawable/button_login_kakao.xml b/presentation/src/main/res/drawable/button_login_kakao.xml deleted file mode 100644 index 7195ad0b..00000000 --- a/presentation/src/main/res/drawable/button_login_kakao.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - diff --git a/presentation/src/main/res/drawable/button_profile_edit_circle.xml b/presentation/src/main/res/drawable/button_profile_edit_circle.xml deleted file mode 100644 index bb9a13b2..00000000 --- a/presentation/src/main/res/drawable/button_profile_edit_circle.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/button_profile_folder_default_gray.xml b/presentation/src/main/res/drawable/button_profile_folder_default_gray.xml deleted file mode 100644 index 1a89e738..00000000 --- a/presentation/src/main/res/drawable/button_profile_folder_default_gray.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/button_write_post_tag.xml b/presentation/src/main/res/drawable/button_write_post_tag.xml deleted file mode 100644 index bed4c395..00000000 --- a/presentation/src/main/res/drawable/button_write_post_tag.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/dialog_alert_default.xml b/presentation/src/main/res/drawable/dialog_alert_default.xml index f06cf26f..f1013807 100644 --- a/presentation/src/main/res/drawable/dialog_alert_default.xml +++ b/presentation/src/main/res/drawable/dialog_alert_default.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/presentation/src/main/res/drawable/dialog_bottom_sheet_default.xml b/presentation/src/main/res/drawable/dialog_bottom_sheet_default.xml index 58b9b85d..c3b32566 100644 --- a/presentation/src/main/res/drawable/dialog_bottom_sheet_default.xml +++ b/presentation/src/main/res/drawable/dialog_bottom_sheet_default.xml @@ -1,7 +1,7 @@ - + diff --git a/presentation/src/main/res/drawable/dialog_confirm_default.xml b/presentation/src/main/res/drawable/dialog_confirm_default.xml index f06cf26f..f1013807 100644 --- a/presentation/src/main/res/drawable/dialog_confirm_default.xml +++ b/presentation/src/main/res/drawable/dialog_confirm_default.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/presentation/src/main/res/drawable/dialog_option_default.xml b/presentation/src/main/res/drawable/dialog_option_default.xml deleted file mode 100644 index dad10a5d..00000000 --- a/presentation/src/main/res/drawable/dialog_option_default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/dialog_option_default_bottom.xml b/presentation/src/main/res/drawable/dialog_option_default_bottom.xml deleted file mode 100644 index 51abb3e6..00000000 --- a/presentation/src/main/res/drawable/dialog_option_default_bottom.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/dialog_option_default_mid.xml b/presentation/src/main/res/drawable/dialog_option_default_mid.xml deleted file mode 100644 index 4e00308d..00000000 --- a/presentation/src/main/res/drawable/dialog_option_default_mid.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/dialog_option_default_top.xml b/presentation/src/main/res/drawable/dialog_option_default_top.xml deleted file mode 100644 index 8992d813..00000000 --- a/presentation/src/main/res/drawable/dialog_option_default_top.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/edittext_background_follow_search.xml b/presentation/src/main/res/drawable/edittext_background_follow_search.xml deleted file mode 100644 index 355fdfa3..00000000 --- a/presentation/src/main/res/drawable/edittext_background_follow_search.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/edittext_background_post_comment_write.xml b/presentation/src/main/res/drawable/edittext_background_post_comment_write.xml deleted file mode 100644 index b676e5db..00000000 --- a/presentation/src/main/res/drawable/edittext_background_post_comment_write.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/edittext_background_remove_padding.xml b/presentation/src/main/res/drawable/edittext_background_remove_padding.xml deleted file mode 100644 index e5e484a1..00000000 --- a/presentation/src/main/res/drawable/edittext_background_remove_padding.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/edittext_default_white.xml b/presentation/src/main/res/drawable/edittext_default_white.xml deleted file mode 100644 index e07b5a84..00000000 --- a/presentation/src/main/res/drawable/edittext_default_white.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_back_sign.xml b/presentation/src/main/res/drawable/ic_arrow_left_2.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_back_sign.xml rename to presentation/src/main/res/drawable/ic_arrow_left_2.xml diff --git a/presentation/src/main/res/drawable/ic_back_sign_white.xml b/presentation/src/main/res/drawable/ic_back_sign_white.xml deleted file mode 100644 index 7d9bce7d..00000000 --- a/presentation/src/main/res/drawable/ic_back_sign_white.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/presentation/src/main/res/drawable/ic_background_post_ranking_number.xml b/presentation/src/main/res/drawable/ic_background_post_ranking_number.xml deleted file mode 100644 index 676f51c1..00000000 --- a/presentation/src/main/res/drawable/ic_background_post_ranking_number.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/presentation/src/main/res/drawable/ic_camera_button.xml b/presentation/src/main/res/drawable/ic_camera_with_circle.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_camera_button.xml rename to presentation/src/main/res/drawable/ic_camera_with_circle.xml diff --git a/presentation/src/main/res/drawable/ic_category.xml b/presentation/src/main/res/drawable/ic_category.xml deleted file mode 100644 index 66247fe1..00000000 --- a/presentation/src/main/res/drawable/ic_category.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/presentation/src/main/res/drawable/ic_change_order.xml b/presentation/src/main/res/drawable/ic_change_order.xml deleted file mode 100644 index 77a81893..00000000 --- a/presentation/src/main/res/drawable/ic_change_order.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_change_order_option.xml b/presentation/src/main/res/drawable/ic_change_order_option.xml deleted file mode 100644 index 238adfe9..00000000 --- a/presentation/src/main/res/drawable/ic_change_order_option.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_check_mark.xml b/presentation/src/main/res/drawable/ic_check.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_check_mark.xml rename to presentation/src/main/res/drawable/ic_check.xml diff --git a/presentation/src/main/res/drawable/ic_check_sign_gray.xml b/presentation/src/main/res/drawable/ic_check_2_gray.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_check_sign_gray.xml rename to presentation/src/main/res/drawable/ic_check_2_gray.xml diff --git a/presentation/src/main/res/drawable/ic_check_ok_sign.xml b/presentation/src/main/res/drawable/ic_check_with_circle.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_check_ok_sign.xml rename to presentation/src/main/res/drawable/ic_check_with_circle.xml diff --git a/presentation/src/main/res/drawable/ic_check_x_sign.xml b/presentation/src/main/res/drawable/ic_check_x_sign.xml deleted file mode 100644 index 0b8345cd..00000000 --- a/presentation/src/main/res/drawable/ic_check_x_sign.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - diff --git a/presentation/src/main/res/drawable/ic_next.xml b/presentation/src/main/res/drawable/ic_chevron_r_3.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_next.xml rename to presentation/src/main/res/drawable/ic_chevron_r_3.xml diff --git a/presentation/src/main/res/drawable/ic_arrow_tag_gray.xml b/presentation/src/main/res/drawable/ic_chevron_r_gray.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_arrow_tag_gray.xml rename to presentation/src/main/res/drawable/ic_chevron_r_gray.xml diff --git a/presentation/src/main/res/drawable/ic_arrow_category_green.xml b/presentation/src/main/res/drawable/ic_chevron_r_primary_green.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_arrow_category_green.xml rename to presentation/src/main/res/drawable/ic_chevron_r_primary_green.xml diff --git a/presentation/src/main/res/drawable/ic_dayo_circle.xml b/presentation/src/main/res/drawable/ic_dayo_circle.xml deleted file mode 100644 index 9cce23a5..00000000 --- a/presentation/src/main/res/drawable/ic_dayo_circle.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/presentation/src/main/res/drawable/ic_dayo_circle_grayscale.xml b/presentation/src/main/res/drawable/ic_dayo_circle_grayscale.xml deleted file mode 100644 index e87dd2ee..00000000 --- a/presentation/src/main/res/drawable/ic_dayo_circle_grayscale.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/presentation/src/main/res/drawable/ic_dayo_loading.xml b/presentation/src/main/res/drawable/ic_dayo_loading.xml deleted file mode 100644 index 5a40f48c..00000000 --- a/presentation/src/main/res/drawable/ic_dayo_loading.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/presentation/src/main/res/drawable/ic_dayo_logo_splash.png b/presentation/src/main/res/drawable/ic_dayo_logo_splash.png deleted file mode 100644 index a98ad473..00000000 Binary files a/presentation/src/main/res/drawable/ic_dayo_logo_splash.png and /dev/null differ diff --git a/presentation/src/main/res/drawable/ic_splash.xml b/presentation/src/main/res/drawable/ic_dayo_logo_splash.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_splash.xml rename to presentation/src/main/res/drawable/ic_dayo_logo_splash.xml diff --git a/presentation/src/main/res/drawable/ic_dayo_logo_text.xml b/presentation/src/main/res/drawable/ic_dayo_logo_text.xml deleted file mode 100644 index 8f405408..00000000 --- a/presentation/src/main/res/drawable/ic_dayo_logo_text.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_dayo_logo_text_vertical.xml b/presentation/src/main/res/drawable/ic_dayo_logo_text_vertical.xml deleted file mode 100644 index 4f550039..00000000 --- a/presentation/src/main/res/drawable/ic_dayo_logo_text_vertical.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_folder_post_empty.xml b/presentation/src/main/res/drawable/ic_folder_post_empty.xml deleted file mode 100644 index 706bc726..00000000 --- a/presentation/src/main/res/drawable/ic_folder_post_empty.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_folder_private.xml b/presentation/src/main/res/drawable/ic_folder_private.xml deleted file mode 100644 index 5d4d8591..00000000 --- a/presentation/src/main/res/drawable/ic_folder_private.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_folder_thumbnail_empty.xml b/presentation/src/main/res/drawable/ic_folder_thumbnail_empty.xml deleted file mode 100644 index 389776d4..00000000 --- a/presentation/src/main/res/drawable/ic_folder_thumbnail_empty.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_home_gray_1.xml b/presentation/src/main/res/drawable/ic_home_gray_1.xml deleted file mode 100644 index 333f0745..00000000 --- a/presentation/src/main/res/drawable/ic_home_gray_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/presentation/src/main/res/drawable/ic_img_delete_gray_5.xml b/presentation/src/main/res/drawable/ic_img_delete_gray_5.xml deleted file mode 100644 index 984b5000..00000000 --- a/presentation/src/main/res/drawable/ic_img_delete_gray_5.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - diff --git a/presentation/src/main/res/drawable/ic_indicator_active.xml b/presentation/src/main/res/drawable/ic_indicator_active.xml deleted file mode 100644 index 5f1dcbbe..00000000 --- a/presentation/src/main/res/drawable/ic_indicator_active.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/presentation/src/main/res/drawable/ic_indicator_inactive.xml b/presentation/src/main/res/drawable/ic_indicator_inactive.xml deleted file mode 100644 index 796ce428..00000000 --- a/presentation/src/main/res/drawable/ic_indicator_inactive.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/presentation/src/main/res/drawable/ic_indicator_inactive_gray.xml b/presentation/src/main/res/drawable/ic_indicator_inactive_gray.xml deleted file mode 100644 index 660e7d70..00000000 --- a/presentation/src/main/res/drawable/ic_indicator_inactive_gray.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/presentation/src/main/res/drawable/ic_menu_edit.xml b/presentation/src/main/res/drawable/ic_menu_edit.xml deleted file mode 100644 index 698d9181..00000000 --- a/presentation/src/main/res/drawable/ic_menu_edit.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_notification_gray_1.xml b/presentation/src/main/res/drawable/ic_notification_gray_1.xml deleted file mode 100644 index ab327696..00000000 --- a/presentation/src/main/res/drawable/ic_notification_gray_1.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - diff --git a/presentation/src/main/res/drawable/ic_option_horizontal_white.xml b/presentation/src/main/res/drawable/ic_option_horizontal_white.xml deleted file mode 100644 index 2ec008c4..00000000 --- a/presentation/src/main/res/drawable/ic_option_horizontal_white.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_option.xml b/presentation/src/main/res/drawable/ic_option_vertical.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_option.xml rename to presentation/src/main/res/drawable/ic_option_vertical.xml diff --git a/presentation/src/main/res/drawable/ic_plus_sign_green.xml b/presentation/src/main/res/drawable/ic_plus_green.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_plus_sign_green.xml rename to presentation/src/main/res/drawable/ic_plus_green.xml diff --git a/presentation/src/main/res/drawable/ic_plus_sign.xml b/presentation/src/main/res/drawable/ic_plus_sign.xml deleted file mode 100644 index 84549b36..00000000 --- a/presentation/src/main/res/drawable/ic_plus_sign.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - diff --git a/presentation/src/main/res/drawable/ic_profile_default_user_profile.xml b/presentation/src/main/res/drawable/ic_profile_default.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_profile_default_user_profile.xml rename to presentation/src/main/res/drawable/ic_profile_default.xml diff --git a/presentation/src/main/res/drawable/ic_profile_default_small.xml b/presentation/src/main/res/drawable/ic_profile_default_small.xml deleted file mode 100644 index 4ffaef31..00000000 --- a/presentation/src/main/res/drawable/ic_profile_default_small.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/presentation/src/main/res/drawable/ic_profile_edit.xml b/presentation/src/main/res/drawable/ic_profile_edit.xml deleted file mode 100644 index 0a4959a8..00000000 --- a/presentation/src/main/res/drawable/ic_profile_edit.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_profile_empty.xml b/presentation/src/main/res/drawable/ic_profile_empty.xml deleted file mode 100644 index d8b37fa8..00000000 --- a/presentation/src/main/res/drawable/ic_profile_empty.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_profile_folder_post_count.xml b/presentation/src/main/res/drawable/ic_profile_folder_post_count.xml deleted file mode 100644 index 4b1ee853..00000000 --- a/presentation/src/main/res/drawable/ic_profile_folder_post_count.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_remove_edittext.xml b/presentation/src/main/res/drawable/ic_remove_edittext.xml deleted file mode 100644 index df709a47..00000000 --- a/presentation/src/main/res/drawable/ic_remove_edittext.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - diff --git a/presentation/src/main/res/drawable/ic_right_sign_light_gray.xml b/presentation/src/main/res/drawable/ic_right_sign_light_gray.xml deleted file mode 100644 index 485628cd..00000000 --- a/presentation/src/main/res/drawable/ic_right_sign_light_gray.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/presentation/src/main/res/drawable/ic_search_recent_keyword_delete.xml b/presentation/src/main/res/drawable/ic_search_recent_keyword_delete.xml deleted file mode 100644 index 852425b9..00000000 --- a/presentation/src/main/res/drawable/ic_search_recent_keyword_delete.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_search_result_empty.xml b/presentation/src/main/res/drawable/ic_search_result_empty.xml deleted file mode 100644 index 498fd2b8..00000000 --- a/presentation/src/main/res/drawable/ic_search_result_empty.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - diff --git a/presentation/src/main/res/drawable/ic_search_white.xml b/presentation/src/main/res/drawable/ic_search_white.xml deleted file mode 100644 index ac13c4e8..00000000 --- a/presentation/src/main/res/drawable/ic_search_white.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/presentation/src/main/res/drawable/ic_share.xml b/presentation/src/main/res/drawable/ic_share.xml deleted file mode 100644 index 57b46b92..00000000 --- a/presentation/src/main/res/drawable/ic_share.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/presentation/src/main/res/drawable/ic_swipe_top_bar.xml b/presentation/src/main/res/drawable/ic_swipe_top_bar.xml deleted file mode 100644 index 2e9b7b7a..00000000 --- a/presentation/src/main/res/drawable/ic_swipe_top_bar.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/presentation/src/main/res/drawable/ic_tag_list_empty.xml b/presentation/src/main/res/drawable/ic_tag_list_empty.xml deleted file mode 100644 index 77249237..00000000 --- a/presentation/src/main/res/drawable/ic_tag_list_empty.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/presentation/src/main/res/drawable/ic_tag_small.xml b/presentation/src/main/res/drawable/ic_tag_small.xml deleted file mode 100644 index 6b74f9dc..00000000 --- a/presentation/src/main/res/drawable/ic_tag_small.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - diff --git a/presentation/src/main/res/drawable/ic_unread.xml b/presentation/src/main/res/drawable/ic_unread.xml deleted file mode 100644 index 27a3b3d8..00000000 --- a/presentation/src/main/res/drawable/ic_unread.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/presentation/src/main/res/drawable/ic_upload_picture.xml b/presentation/src/main/res/drawable/ic_upload_picture.xml deleted file mode 100644 index dae776db..00000000 --- a/presentation/src/main/res/drawable/ic_upload_picture.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/presentation/src/main/res/drawable/ic_user_profile_image_empty.xml b/presentation/src/main/res/drawable/ic_user_profile_image_empty.xml deleted file mode 100644 index 16401c42..00000000 --- a/presentation/src/main/res/drawable/ic_user_profile_image_empty.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/presentation/src/main/res/drawable/ic_x_sign.xml b/presentation/src/main/res/drawable/ic_x.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_x_sign.xml rename to presentation/src/main/res/drawable/ic_x.xml diff --git a/presentation/src/main/res/drawable/ic_img_delete.xml b/presentation/src/main/res/drawable/ic_x_with_circle.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_img_delete.xml rename to presentation/src/main/res/drawable/ic_x_with_circle.xml diff --git a/presentation/src/main/res/drawable/ic_x_sign_circle_gray.xml b/presentation/src/main/res/drawable/ic_x_with_circle_2.xml similarity index 100% rename from presentation/src/main/res/drawable/ic_x_sign_circle_gray.xml rename to presentation/src/main/res/drawable/ic_x_with_circle_2.xml diff --git a/presentation/src/main/res/drawable/selector_bookmark.xml b/presentation/src/main/res/drawable/selector_bookmark.xml deleted file mode 100644 index 14e67f94..00000000 --- a/presentation/src/main/res/drawable/selector_bookmark.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_bottom_navigation_color.xml b/presentation/src/main/res/drawable/selector_bottom_navigation_color.xml deleted file mode 100644 index 55d73ba0..00000000 --- a/presentation/src/main/res/drawable/selector_bottom_navigation_color.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_button_default_green.xml b/presentation/src/main/res/drawable/selector_button_default_green.xml deleted file mode 100644 index aeb1e25a..00000000 --- a/presentation/src/main/res/drawable/selector_button_default_green.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_button_follow.xml b/presentation/src/main/res/drawable/selector_button_follow.xml deleted file mode 100644 index 21f5656b..00000000 --- a/presentation/src/main/res/drawable/selector_button_follow.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_button_follow_text.xml b/presentation/src/main/res/drawable/selector_button_follow_text.xml deleted file mode 100644 index e3326011..00000000 --- a/presentation/src/main/res/drawable/selector_button_follow_text.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_button_home_post_category.xml b/presentation/src/main/res/drawable/selector_button_home_post_category.xml deleted file mode 100644 index 1591dd08..00000000 --- a/presentation/src/main/res/drawable/selector_button_home_post_category.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_button_home_post_category_text.xml b/presentation/src/main/res/drawable/selector_button_home_post_category_text.xml deleted file mode 100644 index 375fa4d0..00000000 --- a/presentation/src/main/res/drawable/selector_button_home_post_category_text.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_button_post_like.xml b/presentation/src/main/res/drawable/selector_button_post_like.xml deleted file mode 100644 index 890700e7..00000000 --- a/presentation/src/main/res/drawable/selector_button_post_like.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_button_post_like_outlined.xml b/presentation/src/main/res/drawable/selector_button_post_like_outlined.xml deleted file mode 100644 index edab61d7..00000000 --- a/presentation/src/main/res/drawable/selector_button_post_like_outlined.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_button_search_recommend_keyword.xml b/presentation/src/main/res/drawable/selector_button_search_recommend_keyword.xml deleted file mode 100644 index 356a7035..00000000 --- a/presentation/src/main/res/drawable/selector_button_search_recommend_keyword.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_button_write.xml b/presentation/src/main/res/drawable/selector_button_write.xml deleted file mode 100644 index 23971979..00000000 --- a/presentation/src/main/res/drawable/selector_button_write.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_button_write_option_private.xml b/presentation/src/main/res/drawable/selector_button_write_option_private.xml deleted file mode 100644 index 63569dbf..00000000 --- a/presentation/src/main/res/drawable/selector_button_write_option_private.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_button_write_option_private_text.xml b/presentation/src/main/res/drawable/selector_button_write_option_private_text.xml deleted file mode 100644 index 3a9d0685..00000000 --- a/presentation/src/main/res/drawable/selector_button_write_option_private_text.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_button_write_post_category.xml b/presentation/src/main/res/drawable/selector_button_write_post_category.xml deleted file mode 100644 index 1591dd08..00000000 --- a/presentation/src/main/res/drawable/selector_button_write_post_category.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_button_write_post_category_text.xml b/presentation/src/main/res/drawable/selector_button_write_post_category_text.xml deleted file mode 100644 index 375fa4d0..00000000 --- a/presentation/src/main/res/drawable/selector_button_write_post_category_text.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_dialog_confirm_default_button.xml b/presentation/src/main/res/drawable/selector_dialog_confirm_default_button.xml index d8598d55..16a71d6d 100644 --- a/presentation/src/main/res/drawable/selector_dialog_confirm_default_button.xml +++ b/presentation/src/main/res/drawable/selector_dialog_confirm_default_button.xml @@ -2,14 +2,14 @@ - + - + diff --git a/presentation/src/main/res/drawable/selector_dialog_confirm_default_button_left.xml b/presentation/src/main/res/drawable/selector_dialog_confirm_default_button_left.xml index 6ff36356..8248823a 100644 --- a/presentation/src/main/res/drawable/selector_dialog_confirm_default_button_left.xml +++ b/presentation/src/main/res/drawable/selector_dialog_confirm_default_button_left.xml @@ -2,13 +2,13 @@ - + - + diff --git a/presentation/src/main/res/drawable/selector_dialog_confirm_default_button_right.xml b/presentation/src/main/res/drawable/selector_dialog_confirm_default_button_right.xml index 1394875a..d6351cd5 100644 --- a/presentation/src/main/res/drawable/selector_dialog_confirm_default_button_right.xml +++ b/presentation/src/main/res/drawable/selector_dialog_confirm_default_button_right.xml @@ -2,13 +2,13 @@ - + - + diff --git a/presentation/src/main/res/drawable/selector_edittext_background_stroke.xml b/presentation/src/main/res/drawable/selector_edittext_background_stroke.xml deleted file mode 100644 index faa740bf..00000000 --- a/presentation/src/main/res/drawable/selector_edittext_background_stroke.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_edittext_report.xml b/presentation/src/main/res/drawable/selector_edittext_report.xml deleted file mode 100644 index 67aeee58..00000000 --- a/presentation/src/main/res/drawable/selector_edittext_report.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_edittext_withdraw.xml b/presentation/src/main/res/drawable/selector_edittext_withdraw.xml deleted file mode 100644 index 67aeee58..00000000 --- a/presentation/src/main/res/drawable/selector_edittext_withdraw.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_edittext_write_tag.xml b/presentation/src/main/res/drawable/selector_edittext_write_tag.xml deleted file mode 100644 index 8b141884..00000000 --- a/presentation/src/main/res/drawable/selector_edittext_write_tag.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_menu_icon_feed.xml b/presentation/src/main/res/drawable/selector_menu_icon_feed.xml deleted file mode 100644 index 12f431ae..00000000 --- a/presentation/src/main/res/drawable/selector_menu_icon_feed.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_menu_icon_home.xml b/presentation/src/main/res/drawable/selector_menu_icon_home.xml deleted file mode 100644 index a5f9b092..00000000 --- a/presentation/src/main/res/drawable/selector_menu_icon_home.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_menu_icon_my_profile.xml b/presentation/src/main/res/drawable/selector_menu_icon_my_profile.xml deleted file mode 100644 index e999c56c..00000000 --- a/presentation/src/main/res/drawable/selector_menu_icon_my_profile.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_menu_icon_notification.xml b/presentation/src/main/res/drawable/selector_menu_icon_notification.xml deleted file mode 100644 index acad923c..00000000 --- a/presentation/src/main/res/drawable/selector_menu_icon_notification.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_menu_icon_write.xml b/presentation/src/main/res/drawable/selector_menu_icon_write.xml deleted file mode 100644 index f0f5d875..00000000 --- a/presentation/src/main/res/drawable/selector_menu_icon_write.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_radiobutton_report.xml b/presentation/src/main/res/drawable/selector_radiobutton_report.xml deleted file mode 100644 index f66d7f34..00000000 --- a/presentation/src/main/res/drawable/selector_radiobutton_report.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_radiobutton_report_text.xml b/presentation/src/main/res/drawable/selector_radiobutton_report_text.xml deleted file mode 100644 index 3fa42b2c..00000000 --- a/presentation/src/main/res/drawable/selector_radiobutton_report_text.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_radiobutton_withdraw.xml b/presentation/src/main/res/drawable/selector_radiobutton_withdraw.xml deleted file mode 100644 index f66d7f34..00000000 --- a/presentation/src/main/res/drawable/selector_radiobutton_withdraw.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_radiobutton_withdraw_text.xml b/presentation/src/main/res/drawable/selector_radiobutton_withdraw_text.xml deleted file mode 100644 index 3fa42b2c..00000000 --- a/presentation/src/main/res/drawable/selector_radiobutton_withdraw_text.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_switch_default_track.xml b/presentation/src/main/res/drawable/selector_switch_default_track.xml deleted file mode 100644 index 746ad570..00000000 --- a/presentation/src/main/res/drawable/selector_switch_default_track.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_tab_follow_count_text.xml b/presentation/src/main/res/drawable/selector_tab_follow_count_text.xml deleted file mode 100644 index 4f10d81c..00000000 --- a/presentation/src/main/res/drawable/selector_tab_follow_count_text.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/selector_tab_follow_text.xml b/presentation/src/main/res/drawable/selector_tab_follow_text.xml deleted file mode 100644 index 1043f5c7..00000000 --- a/presentation/src/main/res/drawable/selector_tab_follow_text.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/shape_switch_default_thumb.xml b/presentation/src/main/res/drawable/shape_switch_default_thumb.xml deleted file mode 100644 index 2b313e68..00000000 --- a/presentation/src/main/res/drawable/shape_switch_default_thumb.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/tab_indicator.xml b/presentation/src/main/res/drawable/tab_indicator.xml deleted file mode 100644 index 1dba7a0a..00000000 --- a/presentation/src/main/res/drawable/tab_indicator.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/drawable/tab_indicator_home_filter.xml b/presentation/src/main/res/drawable/tab_indicator_home_filter.xml deleted file mode 100644 index 2c28d02b..00000000 --- a/presentation/src/main/res/drawable/tab_indicator_home_filter.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/font/font.xml b/presentation/src/main/res/font/font.xml deleted file mode 100644 index 11141671..00000000 --- a/presentation/src/main/res/font/font.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/activity_main.xml b/presentation/src/main/res/layout/activity_main.xml deleted file mode 100644 index 8cb1f790..00000000 --- a/presentation/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/dialog_defalt_explanation_confirm.xml b/presentation/src/main/res/layout/dialog_defalt_explanation_confirm.xml index 086b51ad..2d43c603 100644 --- a/presentation/src/main/res/layout/dialog_defalt_explanation_confirm.xml +++ b/presentation/src/main/res/layout/dialog_defalt_explanation_confirm.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="15dp" - android:textColor="@color/gray_1_313131" + android:textColor="#FF313131" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@id/tv_default_dialog_explanation" app:layout_constraintStart_toStartOf="parent" @@ -31,7 +31,7 @@ android:id="@+id/tv_default_dialog_explanation" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/gray_4_C5CAD2" + android:textColor="#FFC5CAD2" android:textSize="11dp" android:gravity="center" app:layout_constraintTop_toBottomOf="@+id/tv_default_dialog_description" @@ -50,7 +50,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" android:layout_marginTop="20dp" - android:background="@color/gray_4_C5CAD2"/> + android:background="#FFC5CAD2"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_folder.xml b/presentation/src/main/res/layout/fragment_folder.xml deleted file mode 100644 index 5ac5c4eb..00000000 --- a/presentation/src/main/res/layout/fragment_folder.xml +++ /dev/null @@ -1,340 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_folder_option.xml b/presentation/src/main/res/layout/fragment_folder_option.xml deleted file mode 100644 index 7e4be099..00000000 --- a/presentation/src/main/res/layout/fragment_folder_option.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_folder_setting.xml b/presentation/src/main/res/layout/fragment_folder_setting.xml deleted file mode 100644 index 1c2d9bf1..00000000 --- a/presentation/src/main/res/layout/fragment_folder_setting.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_folder_setting_add.xml b/presentation/src/main/res/layout/fragment_folder_setting_add.xml deleted file mode 100644 index c96cfb8f..00000000 --- a/presentation/src/main/res/layout/fragment_folder_setting_add.xml +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_folder_setting_edit_image_option.xml b/presentation/src/main/res/layout/fragment_folder_setting_edit_image_option.xml deleted file mode 100644 index 36b153bc..00000000 --- a/presentation/src/main/res/layout/fragment_folder_setting_edit_image_option.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_follow.xml b/presentation/src/main/res/layout/fragment_follow.xml deleted file mode 100644 index 74ec8a1e..00000000 --- a/presentation/src/main/res/layout/fragment_follow.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_follower_list.xml b/presentation/src/main/res/layout/fragment_follower_list.xml deleted file mode 100644 index c8b0d4ea..00000000 --- a/presentation/src/main/res/layout/fragment_follower_list.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_following_list.xml b/presentation/src/main/res/layout/fragment_following_list.xml deleted file mode 100644 index 8e5cf57e..00000000 --- a/presentation/src/main/res/layout/fragment_following_list.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_home.xml b/presentation/src/main/res/layout/fragment_home.xml deleted file mode 100644 index fbffefde..00000000 --- a/presentation/src/main/res/layout/fragment_home.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_home_dayo_pick_post_list.xml b/presentation/src/main/res/layout/fragment_home_dayo_pick_post_list.xml deleted file mode 100644 index 93f5ea46..00000000 --- a/presentation/src/main/res/layout/fragment_home_dayo_pick_post_list.xml +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_home_new_post_list.xml b/presentation/src/main/res/layout/fragment_home_new_post_list.xml deleted file mode 100644 index fc4e65cf..00000000 --- a/presentation/src/main/res/layout/fragment_home_new_post_list.xml +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_my_page.xml b/presentation/src/main/res/layout/fragment_my_page.xml deleted file mode 100644 index 5c6c7c40..00000000 --- a/presentation/src/main/res/layout/fragment_my_page.xml +++ /dev/null @@ -1,268 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_post_option.xml b/presentation/src/main/res/layout/fragment_post_option.xml deleted file mode 100644 index 37675744..00000000 --- a/presentation/src/main/res/layout/fragment_post_option.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_post_option_mine.xml b/presentation/src/main/res/layout/fragment_post_option_mine.xml deleted file mode 100644 index 64f3f1cd..00000000 --- a/presentation/src/main/res/layout/fragment_post_option_mine.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_profile.xml b/presentation/src/main/res/layout/fragment_profile.xml deleted file mode 100644 index b39f550a..00000000 --- a/presentation/src/main/res/layout/fragment_profile.xml +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_profile_bookmark_post_list.xml b/presentation/src/main/res/layout/fragment_profile_bookmark_post_list.xml deleted file mode 100644 index 21998f1a..00000000 --- a/presentation/src/main/res/layout/fragment_profile_bookmark_post_list.xml +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_profile_edit.xml b/presentation/src/main/res/layout/fragment_profile_edit.xml deleted file mode 100644 index 114a065c..00000000 --- a/presentation/src/main/res/layout/fragment_profile_edit.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_profile_edit_image_option.xml b/presentation/src/main/res/layout/fragment_profile_edit_image_option.xml deleted file mode 100644 index 15a3e3be..00000000 --- a/presentation/src/main/res/layout/fragment_profile_edit_image_option.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_profile_folder_list.xml b/presentation/src/main/res/layout/fragment_profile_folder_list.xml deleted file mode 100644 index 9afa12b7..00000000 --- a/presentation/src/main/res/layout/fragment_profile_folder_list.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_profile_like_post_list.xml b/presentation/src/main/res/layout/fragment_profile_like_post_list.xml deleted file mode 100644 index fbd4bcea..00000000 --- a/presentation/src/main/res/layout/fragment_profile_like_post_list.xml +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_profile_option.xml b/presentation/src/main/res/layout/fragment_profile_option.xml deleted file mode 100644 index 4031b5be..00000000 --- a/presentation/src/main/res/layout/fragment_profile_option.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/presentation/src/main/res/layout/fragment_search.xml b/presentation/src/main/res/layout/fragment_search.xml deleted file mode 100644 index 0be1ec11..00000000 --- a/presentation/src/main/res/layout/fragment_search.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_search_result.xml b/presentation/src/main/res/layout/fragment_search_result.xml deleted file mode 100644 index 14cb6961..00000000 --- a/presentation/src/main/res/layout/fragment_search_result.xml +++ /dev/null @@ -1,354 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_feed_post.xml b/presentation/src/main/res/layout/item_feed_post.xml deleted file mode 100644 index 8c5f70ee..00000000 --- a/presentation/src/main/res/layout/item_feed_post.xml +++ /dev/null @@ -1,297 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_feed_post_comment.xml b/presentation/src/main/res/layout/item_feed_post_comment.xml deleted file mode 100644 index 7677b314..00000000 --- a/presentation/src/main/res/layout/item_feed_post_comment.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_feed_post_image.xml b/presentation/src/main/res/layout/item_feed_post_image.xml deleted file mode 100644 index 37b93711..00000000 --- a/presentation/src/main/res/layout/item_feed_post_image.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_folder_list.xml b/presentation/src/main/res/layout/item_folder_list.xml deleted file mode 100644 index ff6323a7..00000000 --- a/presentation/src/main/res/layout/item_folder_list.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_folder_post.xml b/presentation/src/main/res/layout/item_folder_post.xml deleted file mode 100644 index 1db79d3a..00000000 --- a/presentation/src/main/res/layout/item_folder_post.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - diff --git a/presentation/src/main/res/layout/item_main_post.xml b/presentation/src/main/res/layout/item_main_post.xml deleted file mode 100644 index 5e681a76..00000000 --- a/presentation/src/main/res/layout/item_main_post.xml +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_main_post_shimmer.xml b/presentation/src/main/res/layout/item_main_post_shimmer.xml deleted file mode 100644 index c56e840f..00000000 --- a/presentation/src/main/res/layout/item_main_post_shimmer.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_post_comment.xml b/presentation/src/main/res/layout/item_post_comment.xml deleted file mode 100644 index 0c1feb42..00000000 --- a/presentation/src/main/res/layout/item_post_comment.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_post_image_slider.xml b/presentation/src/main/res/layout/item_post_image_slider.xml deleted file mode 100644 index 41d39b1e..00000000 --- a/presentation/src/main/res/layout/item_post_image_slider.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_post_tag.xml b/presentation/src/main/res/layout/item_post_tag.xml deleted file mode 100644 index 2bbae93f..00000000 --- a/presentation/src/main/res/layout/item_post_tag.xml +++ /dev/null @@ -1,11 +0,0 @@ - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_profile_folder.xml b/presentation/src/main/res/layout/item_profile_folder.xml deleted file mode 100644 index 416101d1..00000000 --- a/presentation/src/main/res/layout/item_profile_folder.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_profile_post.xml b/presentation/src/main/res/layout/item_profile_post.xml deleted file mode 100644 index 4d9ca44a..00000000 --- a/presentation/src/main/res/layout/item_profile_post.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - diff --git a/presentation/src/main/res/layout/item_search_keyword_recent.xml b/presentation/src/main/res/layout/item_search_keyword_recent.xml deleted file mode 100644 index 36677caa..00000000 --- a/presentation/src/main/res/layout/item_search_keyword_recent.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_search_keyword_recommend.xml b/presentation/src/main/res/layout/item_search_keyword_recommend.xml deleted file mode 100644 index ee720bb9..00000000 --- a/presentation/src/main/res/layout/item_search_keyword_recommend.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_search_result_post.xml b/presentation/src/main/res/layout/item_search_result_post.xml deleted file mode 100644 index c697885a..00000000 --- a/presentation/src/main/res/layout/item_search_result_post.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_write_post_tag.xml b/presentation/src/main/res/layout/item_write_post_tag.xml deleted file mode 100644 index 47950b2c..00000000 --- a/presentation/src/main/res/layout/item_write_post_tag.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_write_post_tag_chip.xml b/presentation/src/main/res/layout/item_write_post_tag_chip.xml deleted file mode 100644 index ad879ad4..00000000 --- a/presentation/src/main/res/layout/item_write_post_tag_chip.xml +++ /dev/null @@ -1,15 +0,0 @@ - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_write_post_upload_image.xml b/presentation/src/main/res/layout/item_write_post_upload_image.xml deleted file mode 100644 index c2a2a7a2..00000000 --- a/presentation/src/main/res/layout/item_write_post_upload_image.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/item_write_post_upload_image_menu.xml b/presentation/src/main/res/layout/item_write_post_upload_image_menu.xml deleted file mode 100644 index 7bdce384..00000000 --- a/presentation/src/main/res/layout/item_write_post_upload_image_menu.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/tab_follow.xml b/presentation/src/main/res/layout/tab_follow.xml deleted file mode 100644 index 703c4c04..00000000 --- a/presentation/src/main/res/layout/tab_follow.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/menu/menu_main_bottom.xml b/presentation/src/main/res/menu/menu_main_bottom.xml deleted file mode 100644 index a8ba1f2e..00000000 --- a/presentation/src/main/res/menu/menu_main_bottom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/navigation/nav_graph.xml b/presentation/src/main/res/navigation/nav_graph.xml deleted file mode 100644 index c3d8aaab..00000000 --- a/presentation/src/main/res/navigation/nav_graph.xml +++ /dev/null @@ -1,701 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/raw/like_big.json b/presentation/src/main/res/raw/like_big.json deleted file mode 100644 index 667f6190..00000000 --- a/presentation/src/main/res/raw/like_big.json +++ /dev/null @@ -1,3131 +0,0 @@ -{ - "v": "5.7.13", - "fr": 29.9700012207031, - "ip": 0, - "op": 30.0000012219251, - "w": 1080, - "h": 1080, - "nm": "heart", - "ddd": 0, - "assets": [], - "layers": [ - { - "ddd": 0, - "ind": 1, - "ty": 4, - "nm": "h6 Outlines", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 547.088, - 531.138, - 0 - ], - "ix": 2, - "l": 2 - }, - "a": { - "a": 0, - "k": [ - 247.749, - 211.642, - 0 - ], - "ix": 1, - "l": 2 - }, - "s": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 0, - "s": [ - 0, - 0, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 1, - "s": [ - 6.478, - 6.478, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 2, - "s": [ - 13.829, - 13.829, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 3, - "s": [ - 21.495, - 21.495, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 4, - "s": [ - 29.02, - 29.02, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 5, - "s": [ - 36.049, - 36.049, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 6, - "s": [ - 42.327, - 42.327, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 7, - "s": [ - 47.69, - 47.69, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 8, - "s": [ - 52.055, - 52.055, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 9, - "s": [ - 55.407, - 55.407, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 10, - "s": [ - 57.785, - 57.785, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 11, - "s": [ - 59.271, - 59.271, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 12, - "s": [ - 59.975, - 59.975, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 13, - "s": [ - 60.024, - 60.024, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 14, - "s": [ - 59.551, - 59.551, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 15, - "s": [ - 58.689, - 58.689, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 16, - "s": [ - 57.563, - 57.563, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 17, - "s": [ - 56.286, - 56.286, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 18, - "s": [ - 54.953, - 54.953, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 19, - "s": [ - 53.646, - 53.646, - 100 - ] - }, - { - "t": 20.0000008146167, - "s": [ - 52.424, - 52.424, - 100 - ] - } - ], - "ix": 6, - "l": 2 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 49.325, - 49.324 - ], - [ - 49.324, - -49.325 - ], - [ - 10.799, - 10.8 - ], - [ - 49.325, - -49.325 - ], - [ - -49.324, - -49.324 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - -4.114, - 4.115 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - -49.324, - -49.325 - ], - [ - -10.8, - 10.8 - ], - [ - -49.325, - -49.325 - ], - [ - -49.324, - 49.324 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 4.114, - 4.115 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 49.325, - -49.324 - ] - ], - "v": [ - [ - 198.174, - -162.067 - ], - [ - 19.555, - -162.067 - ], - [ - -19.555, - -162.067 - ], - [ - -198.175, - -162.067 - ], - [ - -198.175, - 16.552 - ], - [ - -178.619, - 36.107 - ], - [ - -7.45, - 207.276 - ], - [ - 7.449, - 207.276 - ], - [ - 178.619, - 36.107 - ], - [ - 198.174, - 16.552 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "Path 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 0.9490196078431372, - 0.28627450980392155, - 0.28627450980392155, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "Fill 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 247.749, - 211.642 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "Transform" - } - ], - "nm": "Group 1", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 0, - "op": 30.0000012219251, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 2, - "ty": 4, - "nm": "Layer 8 Outlines 10", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": -44, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.667, - "y": 1 - }, - "o": { - "x": 0.333, - "y": 0 - }, - "t": 9, - "s": [ - 547, - 394.938, - 0 - ], - "to": [ - 0, - -30.667, - 0 - ], - "ti": [ - 0, - 30.667, - 0 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 547, - 210.938, - 0 - ] - } - ], - "ix": 2, - "l": 2 - }, - "a": { - "a": 0, - "k": [ - 69.466, - 39.451, - 0 - ], - "ix": 1, - "l": 2 - }, - "s": { - "a": 0, - "k": [ - 36.682, - 36.682, - 100 - ], - "ix": 6, - "l": 2 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 111.841, - -3.174 - ], - [ - 27.091, - 82.076 - ] - ], - "c": false - }, - "ix": 2 - }, - "nm": "Path 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 0.9490196078431372, - 0.28627450980392155, - 0.28627450980392155, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 32, - "ix": 5 - }, - "lc": 2, - "lj": 1, - "ml": 4, - "bm": 0, - "nm": "Stroke 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "Transform" - } - ], - "nm": "Shape 1", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "tm", - "s": { - "a": 0, - "k": 0, - "ix": 1 - }, - "e": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] - }, - "t": 9, - "s": [ - 100 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 0 - ] - } - ], - "ix": 2 - }, - "o": { - "a": 0, - "k": 0, - "ix": 3 - }, - "m": 1, - "ix": 2, - "nm": "Trim Paths 2", - "mn": "ADBE Vector Filter - Trim", - "hd": false - } - ], - "ip": 9.00000036657752, - "op": 19.0000007738859, - "st": -1.00000004073083, - "bm": 0 - }, - { - "ddd": 0, - "ind": 3, - "ty": 4, - "nm": "Layer 8 Outlines 9", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 91, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.667, - "y": 1 - }, - "o": { - "x": 0.333, - "y": 0 - }, - "t": 9, - "s": [ - 417, - 403.438, - 0 - ], - "to": [ - -19, - -17.667, - 0 - ], - "ti": [ - 19, - 17.667, - 0 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 303, - 297.438, - 0 - ] - } - ], - "ix": 2, - "l": 2 - }, - "a": { - "a": 0, - "k": [ - 69.466, - 39.451, - 0 - ], - "ix": 1, - "l": 2 - }, - "s": { - "a": 0, - "k": [ - 37.229, - 38.046, - 100 - ], - "ix": 6, - "l": 2 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 111.841, - -3.174 - ], - [ - 27.091, - 82.076 - ] - ], - "c": false - }, - "ix": 2 - }, - "nm": "Path 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 0.9490196078431372, - 0.28627450980392155, - 0.28627450980392155, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 32, - "ix": 5 - }, - "lc": 2, - "lj": 1, - "ml": 4, - "bm": 0, - "nm": "Stroke 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "Transform" - } - ], - "nm": "Shape 1", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "tm", - "s": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] - }, - "t": 9, - "s": [ - 0 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 100 - ] - } - ], - "ix": 1 - }, - "e": { - "a": 0, - "k": 100, - "ix": 2 - }, - "o": { - "a": 0, - "k": 0, - "ix": 3 - }, - "m": 1, - "ix": 2, - "nm": "Trim Paths 1", - "mn": "ADBE Vector Filter - Trim", - "hd": false - } - ], - "ip": 9.00000036657752, - "op": 19.0000007738859, - "st": -1.00000004073083, - "bm": 0 - }, - { - "ddd": 0, - "ind": 4, - "ty": 4, - "nm": "Layer 8 Outlines 11", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 47, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.667, - "y": 1 - }, - "o": { - "x": 0.333, - "y": 0 - }, - "t": 9, - "s": [ - 383, - 533.938, - 0 - ], - "to": [ - -24, - 0, - 0 - ], - "ti": [ - 24, - 0, - 0 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 239, - 533.938, - 0 - ] - } - ], - "ix": 2, - "l": 2 - }, - "a": { - "a": 0, - "k": [ - 69.466, - 39.451, - 0 - ], - "ix": 1, - "l": 2 - }, - "s": { - "a": 0, - "k": [ - 36.682, - 36.682, - 100 - ], - "ix": 6, - "l": 2 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 111.841, - -3.174 - ], - [ - 27.091, - 82.076 - ] - ], - "c": false - }, - "ix": 2 - }, - "nm": "Path 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 0.9490196078431372, - 0.28627450980392155, - 0.28627450980392155, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 32, - "ix": 5 - }, - "lc": 2, - "lj": 1, - "ml": 4, - "bm": 0, - "nm": "Stroke 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "Transform" - } - ], - "nm": "Shape 1", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "tm", - "s": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] - }, - "t": 9, - "s": [ - 0 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 100 - ] - } - ], - "ix": 1 - }, - "e": { - "a": 0, - "k": 100, - "ix": 2 - }, - "o": { - "a": 0, - "k": 0, - "ix": 3 - }, - "m": 1, - "ix": 2, - "nm": "Trim Paths 1", - "mn": "ADBE Vector Filter - Trim", - "hd": false - } - ], - "ip": 9.00000036657752, - "op": 19.0000007738859, - "st": -1.00000004073083, - "bm": 0 - }, - { - "ddd": 0, - "ind": 5, - "ty": 4, - "nm": "Layer 8 Outlines 16", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 45, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.667, - "y": 1 - }, - "o": { - "x": 0.333, - "y": 0 - }, - "t": 9, - "s": [ - 710.5, - 533.938, - 0 - ], - "to": [ - 33, - 0, - 0 - ], - "ti": [ - -33, - 0, - 0 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 908.5, - 533.938, - 0 - ] - } - ], - "ix": 2, - "l": 2 - }, - "a": { - "a": 0, - "k": [ - 69.466, - 39.451, - 0 - ], - "ix": 1, - "l": 2 - }, - "s": { - "a": 0, - "k": [ - 36.682, - 36.682, - 100 - ], - "ix": 6, - "l": 2 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 111.841, - -3.174 - ], - [ - 27.091, - 82.076 - ] - ], - "c": false - }, - "ix": 2 - }, - "nm": "Path 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 0.9490196078431372, - 0.28627450980392155, - 0.28627450980392155, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 32, - "ix": 5 - }, - "lc": 2, - "lj": 1, - "ml": 4, - "bm": 0, - "nm": "Stroke 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "Transform" - } - ], - "nm": "Shape 1", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "tm", - "s": { - "a": 0, - "k": 0, - "ix": 1 - }, - "e": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] - }, - "t": 9, - "s": [ - 100 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 0 - ] - } - ], - "ix": 2 - }, - "o": { - "a": 0, - "k": 0, - "ix": 3 - }, - "m": 1, - "ix": 2, - "nm": "Trim Paths 1", - "mn": "ADBE Vector Filter - Trim", - "hd": false - } - ], - "ip": 9.00000036657752, - "op": 19.0000007738859, - "st": -1.00000004073083, - "bm": 0 - }, - { - "ddd": 0, - "ind": 6, - "ty": 4, - "nm": "Layer 8 Outlines 15", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 134, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.667, - "y": 1 - }, - "o": { - "x": 0.333, - "y": 0 - }, - "t": 9, - "s": [ - 547, - 690.438, - 0 - ], - "to": [ - 0, - 32.333, - 0 - ], - "ti": [ - 0, - -32.333, - 0 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 547, - 884.438, - 0 - ] - } - ], - "ix": 2, - "l": 2 - }, - "a": { - "a": 0, - "k": [ - 69.466, - 39.451, - 0 - ], - "ix": 1, - "l": 2 - }, - "s": { - "a": 0, - "k": [ - 36.682, - 36.682, - 100 - ], - "ix": 6, - "l": 2 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 111.841, - -3.174 - ], - [ - 27.091, - 82.076 - ] - ], - "c": false - }, - "ix": 2 - }, - "nm": "Path 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 0.9490196078431372, - 0.28627450980392155, - 0.28627450980392155, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 32, - "ix": 5 - }, - "lc": 2, - "lj": 1, - "ml": 4, - "bm": 0, - "nm": "Stroke 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "Transform" - } - ], - "nm": "Shape 1", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "tm", - "s": { - "a": 0, - "k": 0, - "ix": 1 - }, - "e": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] - }, - "t": 9, - "s": [ - 100 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 0 - ] - } - ], - "ix": 2 - }, - "o": { - "a": 0, - "k": 0, - "ix": 3 - }, - "m": 1, - "ix": 2, - "nm": "Trim Paths 1", - "mn": "ADBE Vector Filter - Trim", - "hd": false - } - ], - "ip": 9.00000036657752, - "op": 19.0000007738859, - "st": -1.00000004073083, - "bm": 0 - }, - { - "ddd": 0, - "ind": 7, - "ty": 4, - "nm": "Layer 8 Outlines 14", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 182, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.667, - "y": 1 - }, - "o": { - "x": 0.333, - "y": 0 - }, - "t": 9, - "s": [ - 456.5, - 623.438, - 0 - ], - "to": [ - -25, - 28.333, - 0 - ], - "ti": [ - 25, - -28.333, - 0 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 306.5, - 793.438, - 0 - ] - } - ], - "ix": 2, - "l": 2 - }, - "a": { - "a": 0, - "k": [ - 69.466, - 39.451, - 0 - ], - "ix": 1, - "l": 2 - }, - "s": { - "a": 0, - "k": [ - 36.682, - 36.682, - 100 - ], - "ix": 6, - "l": 2 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 111.841, - -3.174 - ], - [ - 27.091, - 82.076 - ] - ], - "c": false - }, - "ix": 2 - }, - "nm": "Path 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 0.9490196078431372, - 0.28627450980392155, - 0.28627450980392155, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 32, - "ix": 5 - }, - "lc": 2, - "lj": 1, - "ml": 4, - "bm": 0, - "nm": "Stroke 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "Transform" - } - ], - "nm": "Shape 1", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "tm", - "s": { - "a": 0, - "k": 0, - "ix": 1 - }, - "e": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] - }, - "t": 9, - "s": [ - 100 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 0 - ] - } - ], - "ix": 2 - }, - "o": { - "a": 0, - "k": 0, - "ix": 3 - }, - "m": 1, - "ix": 2, - "nm": "Trim Paths 1", - "mn": "ADBE Vector Filter - Trim", - "hd": false - } - ], - "ip": 9.00000036657752, - "op": 19.0000007738859, - "st": -1.00000004073083, - "bm": 0 - }, - { - "ddd": 0, - "ind": 8, - "ty": 4, - "nm": "Layer 8 Outlines 13", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 96, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.667, - "y": 1 - }, - "o": { - "x": 0.333, - "y": 0 - }, - "t": 9, - "s": [ - 639, - 624.938, - 0 - ], - "to": [ - 23.667, - 31, - 0 - ], - "ti": [ - -23.667, - -31, - 0 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 781, - 810.938, - 0 - ] - } - ], - "ix": 2, - "l": 2 - }, - "a": { - "a": 0, - "k": [ - 69.466, - 39.451, - 0 - ], - "ix": 1, - "l": 2 - }, - "s": { - "a": 0, - "k": [ - 36.682, - 36.682, - 100 - ], - "ix": 6, - "l": 2 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 111.841, - -3.174 - ], - [ - 27.091, - 82.076 - ] - ], - "c": false - }, - "ix": 2 - }, - "nm": "Path 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 0.9490196078431372, - 0.28627450980392155, - 0.28627450980392155, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 32, - "ix": 5 - }, - "lc": 2, - "lj": 1, - "ml": 4, - "bm": 0, - "nm": "Stroke 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "Transform" - } - ], - "nm": "Shape 1", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "tm", - "s": { - "a": 0, - "k": 0, - "ix": 1 - }, - "e": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] - }, - "t": 9, - "s": [ - 100 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 0 - ] - } - ], - "ix": 2 - }, - "o": { - "a": 0, - "k": 0, - "ix": 3 - }, - "m": 1, - "ix": 2, - "nm": "Trim Paths 1", - "mn": "ADBE Vector Filter - Trim", - "hd": false - } - ], - "ip": 9.00000036657752, - "op": 19.0000007738859, - "st": -1.00000004073083, - "bm": 0 - }, - { - "ddd": 0, - "ind": 9, - "ty": 4, - "nm": "Layer 8 Outlines 12", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 1, - "k": [ - { - "i": { - "x": 0.667, - "y": 1 - }, - "o": { - "x": 0.333, - "y": 0 - }, - "t": 9, - "s": [ - 681.5, - 404.438, - 0 - ], - "to": [ - 19, - -20.667, - 0 - ], - "ti": [ - -19, - 20.667, - 0 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 795.5, - 280.438, - 0 - ] - } - ], - "ix": 2, - "l": 2 - }, - "a": { - "a": 0, - "k": [ - 69.466, - 39.451, - 0 - ], - "ix": 1, - "l": 2 - }, - "s": { - "a": 0, - "k": [ - 36.682, - 36.682, - 100 - ], - "ix": 6, - "l": 2 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - 111.841, - -3.174 - ], - [ - 27.091, - 82.076 - ] - ], - "c": false - }, - "ix": 2 - }, - "nm": "Path 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 0.9490196078431372, - 0.28627450980392155, - 0.28627450980392155, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 32, - "ix": 5 - }, - "lc": 2, - "lj": 1, - "ml": 4, - "bm": 0, - "nm": "Stroke 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "Transform" - } - ], - "nm": "Shape 1", - "np": 3, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "tm", - "s": { - "a": 0, - "k": 0, - "ix": 1 - }, - "e": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.667 - ], - "y": [ - 1 - ] - }, - "o": { - "x": [ - 0.333 - ], - "y": [ - 0 - ] - }, - "t": 9, - "s": [ - 100 - ] - }, - { - "t": 19.0000007738859, - "s": [ - 0 - ] - } - ], - "ix": 2 - }, - "o": { - "a": 0, - "k": 0, - "ix": 3 - }, - "m": 1, - "ix": 2, - "nm": "Trim Paths 1", - "mn": "ADBE Vector Filter - Trim", - "hd": false - } - ], - "ip": 9.00000036657752, - "op": 19.0000007738859, - "st": -1.00000004073083, - "bm": 0 - } - ], - "markers": [] -} \ No newline at end of file diff --git a/presentation/src/main/res/raw/like_small.json b/presentation/src/main/res/raw/like_small.json deleted file mode 100644 index 9ca7b5ea..00000000 --- a/presentation/src/main/res/raw/like_small.json +++ /dev/null @@ -1,1079 +0,0 @@ -{ - "v": "5.11.0", - "fr": 29.9700012207031, - "ip": 0, - "op": 30.0000012219251, - "w": 165, - "h": 165, - "nm": "btn_heart", - "ddd": 0, - "assets": [], - "layers": [ - { - "ddd": 0, - "ind": 1, - "ty": 4, - "nm": "active Outlines", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 82.339, - 84.491, - 0 - ], - "ix": 2, - "l": 2 - }, - "a": { - "a": 0, - "k": [ - 187.612, - 171.978, - 0 - ], - "ix": 1, - "l": 2 - }, - "s": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.167, - 0.167, - 0.167 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 10, - "s": [ - 35, - 35, - 100 - ] - }, - { - "t": 16.0000006516934, - "s": [ - 45.3, - 45.3, - 100 - ] - } - ], - "ix": 6, - "l": 2 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 47.483, - 0 - ], - [ - 0, - -47.936 - ], - [ - -148.125, - -92.84 - ], - [ - -3.106, - 0 - ], - [ - -2.653, - 1.646 - ], - [ - 0, - 38.697 - ], - [ - 47.484, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - -47.483, - 0 - ], - [ - 0, - 38.697 - ], - [ - 2.653, - 1.646 - ], - [ - 3.105, - 0 - ], - [ - 148.125, - -92.84 - ], - [ - 0, - -47.936 - ], - [ - -47.483, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - -85.989, - -156.344 - ], - [ - -171.978, - -69.553 - ], - [ - -8.805, - 153.827 - ], - [ - 0, - 156.344 - ], - [ - 8.805, - 153.827 - ], - [ - 171.978, - -69.553 - ], - [ - 85.989, - -156.344 - ], - [ - 0, - -103.744 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "Path 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 0.952941236309, - 0.301960784314, - 0.478431402468, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 15.634, - "ix": 5 - }, - "lc": 2, - "lj": 2, - "bm": 0, - "nm": "Stroke 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 187.612, - 171.978 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "Transform" - } - ], - "nm": "Group 1", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 47.483, - 0 - ], - [ - 0, - -47.936 - ], - [ - -148.125, - -92.84 - ], - [ - -3.106, - 0 - ], - [ - -2.653, - 1.646 - ], - [ - 0, - 38.697 - ], - [ - 47.484, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - -47.483, - 0 - ], - [ - 0, - 38.697 - ], - [ - 2.653, - 1.646 - ], - [ - 3.105, - 0 - ], - [ - 148.125, - -92.84 - ], - [ - 0, - -47.936 - ], - [ - -47.483, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - -85.989, - -156.344 - ], - [ - -171.978, - -69.553 - ], - [ - -8.805, - 153.827 - ], - [ - 0, - 156.344 - ], - [ - 8.805, - 153.827 - ], - [ - 171.978, - -69.553 - ], - [ - 85.989, - -156.344 - ], - [ - 0, - -103.744 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "Path 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 0.952941236309, - 0.301960784314, - 0.478431402468, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 100, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "Fill 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 187.612, - 171.978 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "Transform" - } - ], - "nm": "Group 2", - "np": 4, - "cix": 2, - "bm": 0, - "ix": 2, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 10.0000004073083, - "op": 30.000001221925, - "st": -3.00000012219251, - "ct": 1, - "bm": 0 - }, - { - "ddd": 0, - "ind": 2, - "ty": 4, - "nm": "inactive Outlines", - "sr": 1, - "ks": { - "o": { - "a": 0, - "k": 100, - "ix": 11 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "p": { - "a": 0, - "k": [ - 82.379, - 84.493, - 0 - ], - "ix": 2, - "l": 2 - }, - "a": { - "a": 0, - "k": [ - 187.612, - 171.978, - 0 - ], - "ix": 1, - "l": 2 - }, - "s": { - "a": 1, - "k": [ - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": -1, - "s": [ - 100, - 100, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 0, - "s": [ - 45.326, - 45.326, - 100 - ] - }, - { - "i": { - "x": [ - 0.667, - 0.667, - 0.667 - ], - "y": [ - 1, - 1, - 1 - ] - }, - "o": { - "x": [ - 0.333, - 0.333, - 0.333 - ], - "y": [ - 0, - 0, - 0 - ] - }, - "t": 6, - "s": [ - 45.326, - 45.326, - 100 - ] - }, - { - "t": 10.0000004073083, - "s": [ - 35, - 35, - 100 - ] - } - ], - "ix": 6, - "l": 2 - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 47.483, - 0 - ], - [ - 0, - -47.936 - ], - [ - -148.125, - -92.84 - ], - [ - -3.106, - 0 - ], - [ - -2.653, - 1.646 - ], - [ - 0, - 38.697 - ], - [ - 47.484, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - -47.483, - 0 - ], - [ - 0, - 38.697 - ], - [ - 2.653, - 1.646 - ], - [ - 3.107, - 0 - ], - [ - 148.125, - -92.84 - ], - [ - 0, - -47.936 - ], - [ - -47.483, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - -85.989, - -156.344 - ], - [ - -171.978, - -69.553 - ], - [ - -8.805, - 153.827 - ], - [ - 0, - 156.344 - ], - [ - 8.805, - 153.827 - ], - [ - 171.978, - -69.553 - ], - [ - 85.989, - -156.344 - ], - [ - 0, - -103.744 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "Path 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "st", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 3 - }, - "o": { - "a": 0, - "k": 100, - "ix": 4 - }, - "w": { - "a": 0, - "k": 15.634, - "ix": 5 - }, - "lc": 2, - "lj": 2, - "bm": 0, - "nm": "Stroke 1", - "mn": "ADBE Vector Graphic - Stroke", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 189.042, - 172.919 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "Transform" - } - ], - "nm": "Group 1", - "np": 2, - "cix": 2, - "bm": 0, - "ix": 1, - "mn": "ADBE Vector Group", - "hd": false - }, - { - "ty": "gr", - "it": [ - { - "ind": 0, - "ty": "sh", - "ix": 1, - "ks": { - "a": 0, - "k": { - "i": [ - [ - 47.483, - 0 - ], - [ - 0, - -47.936 - ], - [ - -148.125, - -92.84 - ], - [ - -3.106, - 0 - ], - [ - -2.653, - 1.646 - ], - [ - 0, - 38.697 - ], - [ - 47.484, - 0 - ], - [ - 0, - 0 - ] - ], - "o": [ - [ - -47.483, - 0 - ], - [ - 0, - 38.697 - ], - [ - 2.653, - 1.646 - ], - [ - 3.107, - 0 - ], - [ - 148.125, - -92.84 - ], - [ - 0, - -47.936 - ], - [ - -47.483, - 0 - ], - [ - 0, - 0 - ] - ], - "v": [ - [ - -85.989, - -156.344 - ], - [ - -171.978, - -69.553 - ], - [ - -8.805, - 153.827 - ], - [ - 0, - 156.344 - ], - [ - 8.805, - 153.827 - ], - [ - 171.978, - -69.553 - ], - [ - 85.989, - -156.344 - ], - [ - 0, - -103.744 - ] - ], - "c": true - }, - "ix": 2 - }, - "nm": "Path 1", - "mn": "ADBE Vector Shape - Group", - "hd": false - }, - { - "ty": "fl", - "c": { - "a": 0, - "k": [ - 1, - 1, - 1, - 1 - ], - "ix": 4 - }, - "o": { - "a": 0, - "k": 30, - "ix": 5 - }, - "r": 1, - "bm": 0, - "nm": "Fill 1", - "mn": "ADBE Vector Graphic - Fill", - "hd": false - }, - { - "ty": "tr", - "p": { - "a": 0, - "k": [ - 187.612, - 171.978 - ], - "ix": 2 - }, - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "nm": "Transform" - } - ], - "nm": "Group 2", - "np": 4, - "cix": 2, - "bm": 0, - "ix": 2, - "mn": "ADBE Vector Group", - "hd": false - } - ], - "ip": 0, - "op": 28.0000011404634, - "st": -1.00000004073083, - "ct": 1, - "bm": 0 - } - ], - "markers": [], - "props": {} -} \ No newline at end of file diff --git a/presentation/src/main/res/raw/lottie_complete_check_green.json b/presentation/src/main/res/raw/lottie_complete_check_green.json deleted file mode 100644 index 33610efa..00000000 --- a/presentation/src/main/res/raw/lottie_complete_check_green.json +++ /dev/null @@ -1 +0,0 @@ -{"v":"4.8.0","meta":{"g":"LottieFiles AE ","a":"","k":"","d":"","tc":""},"fr":30,"ip":0,"op":60,"w":130,"h":130,"nm":"dayo","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[65,65,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-28.75,-5.5],[-11.25,17.5],[29.75,-17]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.137254901961,0.78431372549,0.509803921569,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":20.0000008146167,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":40.0000016292334,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[65,65,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[30.691,0],[0,-30.691],[-30.691,0],[0,30.691]],"o":[[-30.691,0],[0,30.691],[30.691,0],[0,-30.691]],"v":[[0,-55.572],[-55.572,0],[0,55.572],[55.572,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.137254901961,0.78431372549,0.509803921569,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-0.381,0.021],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[91.028,91.028],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":16,"s":[0]},{"t":36.0000014663101,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":40.0000016292334,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/presentation/src/main/res/values-night/themes.xml b/presentation/src/main/res/values-night/themes.xml index 0445ec26..136c45c1 100644 --- a/presentation/src/main/res/values-night/themes.xml +++ b/presentation/src/main/res/values-night/themes.xml @@ -4,20 +4,20 @@ @color/purple_200 @color/purple_700 - @color/black_000000 + #FF000000 @color/teal_200 @color/teal_200 - @color/black_000000 + #FF000000 - @color/white_FFFFFF + #FFFFFFFF true @style/AppBottomSheetDialogTheme @@ -26,38 +26,7 @@ @style/AppModalStyle - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml index 6ee584cc..aa88e1fc 100644 --- a/presentation/src/main/res/values/colors.xml +++ b/presentation/src/main/res/values/colors.xml @@ -5,28 +5,4 @@ #FF3700B3 #FF03DAC5 #FF018786 - - #FF23C882 - #FF8FD9B9 - #FFE6FBF1 - #FFF2FBF7 - - #FFF34D7A - #FF597CF2 - #FFFFEB5A - #FFFF4545 - - #FF000000 - #FFFFFFFF - #4DFFFFFF - #FF313131 - #66313131 - #FF767B83 - #66767B83 - #FF9FA5AE - #4D9FA5AE - #FFC5CAD2 - #FFE8EAEE - #FFF0F1F3 - #FFF6F6F7 \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 99efcf72..29fb3289 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -8,7 +8,6 @@ 글쓰기 알림 MY - 태그 이전 다음 확인 @@ -16,14 +15,9 @@ 제출 저장 취소 - 모두 선택 삭제 이동 - 전체삭제 - 수정 - 닫기 로그인 - 로그인 좋아요 댓글 추가 @@ -37,7 +31,6 @@ 재시도 - %d%s 방금 전 분 전 시간 전 @@ -47,7 +40,6 @@ 카메라 권한을 허용하지 않으면 사진을 등록할 수 없습니다 - 카메라를 통해 사진을 등록하려면 설정에서 카메라 권한을 허용으로 변경해주세요 파일 권한을 허용하지 않으면 사진을 등록할 수 없습니다 갤러리를 통해 사진을 등록하려면 설정에서 파일 권한을 허용으로 변경해주세요 알림 권한을 허용하지 않으면 정상적 사용이 불가능할 수 있습니다 @@ -58,34 +50,17 @@ 한 번 더 누르면 앱이 종료됩니다. - - 인기가 많은 다꾸들을 구경할 수 있어요 - 내 취향의 다꾸러들을 팔로우하고 모아볼 수 있어요 - 내 다꾸들을 폴더를 만들어 분류할 수 있어요 - 내가 열심히 꾸민 다이어리, - 에 공유하러 가볼까요? - 카카오 로그인에 실패했어요 로그인 이메일 - 이메일을 입력해주세요 패스워드 비밀번호를 입력해주세요 비밀번호 찾기 이메일 또는 비밀번호를 잘못 입력했어요 아직 계정이 없으신가요? - - - 아직 계정이 없으신가요? 회원가입하기 - 카카오톡으로 시작하기 - 이메일로 시작하기 - 이메일을 입력해주세요. - 비밀번호를 입력해주세요. - 이메일 주소 또는 비밀번호를 잘못 입력했어요. - 비밀번호를 잊어버렸어요 - 아직 계정이 없으신가요? 회원가입하기 - 가입 시 DAYO의 이용약관 및 개인정보 취급방침에 동의하게 됩니다. + 카카오톡으로 시작하기 + 이메일로 시작하기 개인정보 취급방침 @@ -105,28 +80,6 @@ 필터 - 전체 - 스케줄러 - 스터디 플래너 - 포켓북 - 6공 다이어리 - 모바일 다이어리 - 기타 - ALL - SCHEDULER - STUDY_PLANNER - POCKET_BOOK - SIX_DIARY - GOOD_NOTE - ETC - - - 전체공개 - 팔로잉 - 나만보기 - ALL - FOLLOWING - ONLY_ME 아직 피드에 게시물이 없어요. @@ -148,24 +101,11 @@ 폴더 폴더 선택 - 내용을 작성해주세요. - / 최대 200자 - 올리기 - 태그 추가 - # 키워드를 입력해주세요. - 폴더 설정 - 폴더를 선택해 주세요. - 공개 설정 - 태그 추가 - 기록에 관한 키워드를 추가해보세요. - 태그 어떤 주제의 다꾸인가요? # 태그를 입력하세요 / %d - 태그는 %d개까지 등록 가능해요. - 태그는 %d자 까지만 입력할 수 있어요! 폴더 선택 @@ -181,15 +121,6 @@ 비공개 폴더 내용을 입력해 주세요. - 사진을 추가해 주세요. - 카테고리를 선택해 주세요. - 폴더를 선택해 주세요 - 내용은 200자까지 작성할 수 있어요. - 사진은 5장까지만 선택 가능합니다. - jpg, jpeg, png, webp 형식의 이미지 파일만 업로드 가능합니다. - 사진 가져오기에 실패했습니다. 다시 선택해주세요 - 게시글을 올리고 있어요! 잠시만 기다려주세요. - 게시글을 업로드 할 수 없어요. 다시 시도해주세요. 게시글을 올리고 있어요! 잠시만 기다려주세요. @@ -198,30 +129,15 @@ - 댓글을 남겨주세요 - 게시 - 사용자 차단 - 사용자를 차단할까요? - 사용자를 차단하면\n 서로 게시물을 볼 수 없어요. - 사용자가 차단되었어요. - 사용자 신고 게시물 신고 - 이 게시물 숨기기 이 글을 명이 좋아해요 개의 댓글 더보기 아직 댓글이 없어요 이 게시글에 대해 댓글을 남겨주세요 - 댓글을 삭제할까요? - 댓글이 삭제되었습니다. - 댓글 삭제를 실패하였습니다. 다시 시도해주세요. - 게시물을 숨길까요? - 게시물을 숨기면 다시 피드에서 볼 수 없어요. - 게시물을 숨겼습니다. 게시물 수정 게시물 삭제 - 게시물을 삭제할까요? 남기기 @@ -230,8 +146,6 @@ 게시물 신고 - 신고하기 - 게시글을 신고하시겠어요? 게시글을 신고하는 이유에 대해 알려주세요. 게시물을 신고하는 기타 사유는 무엇인가요? 신고가 접수되었어요. @@ -247,8 +161,6 @@ 댓글 신고 - 신고하기 - 댓글을 신고하시겠어요? 댓글을 신고하는 이유에 대해 알려주세요. 신고가 접수되었어요. @@ -262,8 +174,6 @@ 신고하기 - 신고하기 - 사용자를 신고하시겠어요? 사용자를 신고하는 이유에 대해 알려주세요. 신고 사유를 작성해주세요. (100자 이내) 신고가 접수되었어요. @@ -279,25 +189,13 @@ - 좋아요 - 폴더 추가 폴더 추가 폴더 옵션 폴더 편집 - 폴더 이름 폴더 이름 폴더 소개 - 비공개 폴더 - 공개설정 - 15자 이내로 입력해주세요. - 15자 이내로 입력해주세요. - 20자 이내로 입력해주세요. - 공개 설정 - 전체공개 - 팔로잉 - 나만보기 공개 폴더 비공개 폴더 게시글 작성 @@ -306,16 +204,11 @@ %d개 선택 최신순 오래된순 - 커버 사진 초기화 \'%s\' 폴더를\n 정말 삭제할까요? \'%s\' 폴더를 삭제하면\n폴더 안의 게시글도 함께 삭제돼요. %d개의 게시글을\n정말 삭제할까요? 선택한 게시글이 삭제되면 복구할 수 없어요. 선택한 폴더로 이동 - 폴더 이름을 입력해주세요. - 폴더 이름에는 한글, 영문, 숫자만 사용할 수 있어요. - 폴더를 생성 할 수 없어요. 다시 시도해주세요. - 아직 게시물이 없어요. 게시글 편집 폴더 편집 폴더 삭제 @@ -327,8 +220,6 @@ 팔로우 팔로우 취소 팔로우 하기 - 팔로우를 취소할까요? - 존재하지 않습니다 아직 회원님을 팔로우하는 사람이 없어요 회원님의 다꾸를 더 업로드해 보세요 관심이 가는 사람들을 팔로우해보세요 @@ -336,17 +227,12 @@ 프로필 수정 - 닉네임을 입력해 주세요. - / 10 - 사용할 수 있는 닉네임이에요. 닉네임에는 한글, 영문, 숫자만 사용할 수 있어요. 닉네임을 2글자 이상 입력해주세요. 닉네임은 10글자 이하로 가능해요. 이미 사용중인 닉네임이에요. 앨범에서 선택 프로필 사진 초기화 - 폴더설정 - 프로필 수정 사용자 차단 사용자를 차단할까요? 사용자를 차단하면\n 서로 게시물을 볼 수 없어요. @@ -354,16 +240,11 @@ 사용자가 차단해제되었어요. 차단 해제에 실패했어요. 다시 시도해주세요 사용자 신고 - 로그인 정보 - 환경설정 북마크 편집 개의 북마크 %d개 선택 - 아직 북마크한 게시물이 없어요. - 아직 좋아요한 게시물이 없어요. - 아직 폴더가 없어요. 나의 다이어리 새 폴더 @@ -380,14 +261,6 @@ 관심있는 키워드 또는 사용자를 찾아보세요 - 인증번호 받기 - 인증하기 - 인증번호를 입력해주세요. - 메일로 인증번호가 발송되었어요! - 인증번호 재발송 - 인증번호가 발송되었습니다. - 잘못된 인증번호입니다. 다시 확인해보세요. - 인증 실패 하였습니다. 제한시간을 초과했어요! 인증번호를 다시 받아주세요. @@ -402,12 +275,6 @@ 인증번호 받기 이메일 - 이메일 주소 - email@example.com - 이메일 인증 - 이메일을 입력해주세요. - 올바른 이메일 주소를 입력해주세요. - 이미 사용중인 이메일 주소예요. 인증번호 @@ -426,15 +293,6 @@ 다음 - 비밀번호 - 비밀번호를 입력해주세요. - 영문 소문자와 숫자만 사용할 수 있어요. - 8자리 이상을 입력해주세요 - 16자까지만 입력할 수 있어요. - 비밀번호 확인 - 다시 한번 입력해주세요 - 비밀번호를 확인해주세요. - 비밀번호가 일치하지 않아요. 비밀번호 확인 비밀번호 재입력 @@ -454,8 +312,6 @@ 사진 직접촬영 가입을 진행중 입니다. \n잠시만 기다려 주세요. - %s님,\n가입을 축하드려요! - 가입을 완료할 수 없어요. 다시 시도해주세요. 비밀번호 변경 중입니다. @@ -491,18 +347,10 @@ 변경하기 - 비밀번호 찾기 - 가입할 때 사용한 이메일을 입력해주세요. - 등록된 이메일이 없어요 - 새로운 비밀번호를 \n입력해주세요. - 새로운 비밀번호가\n 설정되었어요. - 로그인하러 가기 환경설정 나의 프로필 이미지 - 계정을 삭제할까요? - 모든 정보가 삭제되며, 복구가 불가능합니다. 메일 주소 복사 완료! 클립보드에 저장된 메일 주소로 문의해 주세요. 비밀번호 변경 @@ -519,7 +367,6 @@ 비밀번호를 정확히 입력해주세요. 현재 비밀번호를\n입력해주세요. 새로운 비밀번호를\n입력해주세요. - 비밀번호 변경 비밀번호가 변경되었어요 @@ -527,7 +374,6 @@ 기기 알림 설정 앱에서 보내는 알림을 받아요. 공지 알림 - 앱에서 보내는 공지사항 알림을 받아요. 반응 알림 REACTION 반응 알림 @@ -538,10 +384,6 @@ 기기의 알림 설정 변경을 위해\n환경설정으로 이동할게요 - 계정 삭제하기 - 정말 계정을 삭제하시겠어요? - 계정을 삭제하는 이유에 대해 알려주세요. 적어주신 내용은 좀 더 나은 서비스를 제공하는데 사용됩니다. - 계정 삭제 계정을 삭제하는 이유가 무엇인가요? 이용이 불편해요 곧 새로운 버전이 업데이트 될거예요 @@ -596,7 +438,4 @@ 문제가 발생했습니다. - - - Hello blank fragment diff --git a/presentation/src/main/res/values/style.xml b/presentation/src/main/res/values/style.xml deleted file mode 100644 index 323af017..00000000 --- a/presentation/src/main/res/values/style.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml index 7795304e..909bc9c7 100644 --- a/presentation/src/main/res/values/themes.xml +++ b/presentation/src/main/res/values/themes.xml @@ -4,20 +4,20 @@ @color/purple_500 @color/purple_700 - @color/white_FFFFFF + #FFFFFFFF @color/teal_200 @color/teal_700 - @color/black_000000 + #FF000000 - @color/white_FFFFFF + #FFFFFFFF true @style/AppBottomSheetDialogTheme @@ -31,37 +31,4 @@ @drawable/dialog_bottom_sheet_default - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/test/java/daily/dayo/presentation/ExampleUnitTest.kt b/presentation/src/test/java/daily/dayo/presentation/ExampleUnitTest.kt index 4f92aaa7..047dd37d 100644 --- a/presentation/src/test/java/daily/dayo/presentation/ExampleUnitTest.kt +++ b/presentation/src/test/java/daily/dayo/presentation/ExampleUnitTest.kt @@ -1,17 +1,4 @@ package daily.dayo.presentation -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } } \ No newline at end of file