diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/.gitignore" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/.gitignore" deleted file mode 100644 index 26d3352..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/.gitignore" +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/.name" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/.name" deleted file mode 100644 index 2e8cda0..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/.name" +++ /dev/null @@ -1 +0,0 @@ -FloClone \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/6th_Android.iml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/6th_Android.iml" deleted file mode 100644 index d6ebd48..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/6th_Android.iml" +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/compiler.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/compiler.xml" deleted file mode 100644 index b589d56..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/compiler.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/deploymentTargetDropDown.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/deploymentTargetDropDown.xml" deleted file mode 100644 index 6b024e2..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/deploymentTargetDropDown.xml" +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/deploymentTargetSelector.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/deploymentTargetSelector.xml" deleted file mode 100644 index f8a9ff1..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/deploymentTargetSelector.xml" +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/gradle.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/gradle.xml" deleted file mode 100644 index 09f5981..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/gradle.xml" +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/kotlinc.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/kotlinc.xml" deleted file mode 100644 index fdf8d99..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/kotlinc.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/migrations.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/migrations.xml" deleted file mode 100644 index 5274e56..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/migrations.xml" +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/misc.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/misc.xml" deleted file mode 100644 index ac801d8..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/misc.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/studiobot.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/studiobot.xml" deleted file mode 100644 index 539e3b8..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/studiobot.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/vcs.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/vcs.xml" deleted file mode 100644 index 62bd7a0..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/vcs.xml" +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275.iml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275.iml" deleted file mode 100644 index d6ebd48..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/.idea/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275.iml" +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.gitignore" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.gitignore" deleted file mode 100644 index aa724b7..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.gitignore" +++ /dev/null @@ -1,15 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store -/build -/captures -.externalNativeBuild -.cxx -local.properties diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/.gitignore" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/.gitignore" deleted file mode 100644 index 26d3352..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/.gitignore" +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/compiler.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/compiler.xml" deleted file mode 100644 index b589d56..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/compiler.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/deploymentTargetDropDown.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/deploymentTargetDropDown.xml" deleted file mode 100644 index 09f1f21..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/deploymentTargetDropDown.xml" +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/deploymentTargetSelector.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/deploymentTargetSelector.xml" deleted file mode 100644 index b268ef3..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/deploymentTargetSelector.xml" +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/gradle.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/gradle.xml" deleted file mode 100644 index 757f88e..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/gradle.xml" +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/kotlinc.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/kotlinc.xml" deleted file mode 100644 index fdf8d99..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/kotlinc.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/migrations.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/migrations.xml" deleted file mode 100644 index f8051a6..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/migrations.xml" +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/misc.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/misc.xml" deleted file mode 100644 index 8978d23..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/misc.xml" +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/vcs.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/vcs.xml" deleted file mode 100644 index 64713b8..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/vcs.xml" +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/workspace.xml" "b/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/workspace.xml" deleted file mode 100644 index 27f435f..0000000 --- "a/\353\217\204\353\246\254_\352\271\200\353\257\274\352\262\275/FloClone/.idea/workspace.xml" +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { - "customColor": "", - "associatedIndex": 3 -} - - - - - - - - - - - - 1715593693410 - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/README.md" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/README.md" deleted file mode 100644 index 1af4f63..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/README.md" +++ /dev/null @@ -1,2 +0,0 @@ -# udemy_android_template_bottomnavi -안드로이드 플로 클론 1주차에 필요한 템플릿입니다. diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.gitignore" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.gitignore" deleted file mode 100644 index 42afabf..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.gitignore" +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.gradle/config.properties" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.gradle/config.properties" deleted file mode 100644 index 5b7e3c0..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.gradle/config.properties" +++ /dev/null @@ -1,2 +0,0 @@ -#Mon May 13 18:51:38 KST 2024 -java.home=C\:\\Users\\wkdal\\AppData\\Local\\Programs\\Android Studio\\jbr diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/.gitignore" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/.gitignore" deleted file mode 100644 index 26d3352..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/.gitignore" +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/gradle.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/gradle.xml" deleted file mode 100644 index 4019936..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/gradle.xml" +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/migrations.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/migrations.xml" deleted file mode 100644 index f8051a6..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/migrations.xml" +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/misc.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/misc.xml" deleted file mode 100644 index 3040d03..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/misc.xml" +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/vcs.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/vcs.xml" deleted file mode 100644 index c2365ab..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/vcs.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/workspace.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/workspace.xml" deleted file mode 100644 index cf46cc8..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/.idea/workspace.xml" +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - { - "associatedIndex": 5 -} - - - - - - - - - 1715593898553 - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/build.gradle" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/build.gradle" deleted file mode 100644 index bbdb347..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/build.gradle" +++ /dev/null @@ -1,48 +0,0 @@ -plugins { - id 'com.android.application' - id 'kotlin-android' -} - -android { - compileSdk 31 - - viewBinding { - enabled true - } - - defaultConfig { - applicationId "com.example.flo" - minSdk 21 - targetSdk 31 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - } -} - -dependencies { - //implementation 'me.relex:circleindicator:2.1.6' //circleindicator - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.4.0' - implementation 'com.google.android.material:material:1.4.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.2' - implementation 'com.google.code.gson:gson:2.8.7' //GSON - testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/local.properties" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/local.properties" deleted file mode 100644 index 442fa12..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/local.properties" +++ /dev/null @@ -1,8 +0,0 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Mon May 13 18:51:38 KST 2024 -sdk.dir=C\:\\Users\\wkdal\\AppData\\Local\\Android\\Sdk diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/proguard-rules.pro" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/proguard-rules.pro" deleted file mode 100644 index 481bb43..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/proguard-rules.pro" +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/androidTest/java/com/example/flo/ExampleInstrumentedTest.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/androidTest/java/com/example/flo/ExampleInstrumentedTest.kt" deleted file mode 100644 index 6dfac89..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/androidTest/java/com/example/flo/ExampleInstrumentedTest.kt" +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.flo - -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.example.flo", appContext.packageName) - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/AndroidManifest.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/AndroidManifest.xml" deleted file mode 100644 index ef1b6e5..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/AndroidManifest.xml" +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/AlbumFragment.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/AlbumFragment.kt" deleted file mode 100644 index 747dce4..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/AlbumFragment.kt" +++ /dev/null @@ -1,38 +0,0 @@ -package com.example.flo - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.Toast -import androidx.fragment.app.Fragment -import com.example.flo.databinding.ActivitySongBinding -import com.example.flo.databinding.FragmentAlbumBinding -import com.google.android.material.tabs.TabLayoutMediator - -class AlbumFragment : Fragment() { - lateinit var binding: FragmentAlbumBinding - - private val information = arrayListOf("수록곡", "상세정보", "영상") - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentAlbumBinding.inflate(inflater, container, false) - - binding.albumBtnBackIv.setOnClickListener { - (context as MainActivity).supportFragmentManager.beginTransaction().replace(R.id.main_frm,HomeFragment()).commitAllowingStateLoss() - } - - val albumAdapter = AlbumVPAdapter(this) - binding.albumContentVp.adapter = albumAdapter - TabLayoutMediator(binding.albumContentTb, binding.albumContentVp) { - tab, position -> - tab.text = information[position] - }.attach() - - return binding.root - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/AlbumVPAdapter.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/AlbumVPAdapter.kt" deleted file mode 100644 index d193c40..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/AlbumVPAdapter.kt" +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.flo - -import androidx.fragment.app.Fragment -import androidx.viewpager2.adapter.FragmentStateAdapter - -class AlbumVPAdapter(fragment:Fragment) : FragmentStateAdapter(fragment){ - override fun getItemCount(): Int = 3 - - override fun createFragment(position: Int): Fragment { - return when(position){ - 0 -> SongFragment() - 1 -> DetailFragment() - else -> VideoFragment() - } - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/BannerFragment.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/BannerFragment.kt" deleted file mode 100644 index acb8067..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/BannerFragment.kt" +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.flo - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.flo.databinding.FragmentBannerBinding - -class BannerFragment(val imgRes : Int): Fragment() { - - lateinit var binding : FragmentBannerBinding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentBannerBinding.inflate(inflater, container, false) - - binding.bannerImageIv.setImageResource(imgRes) - return binding.root - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/BannerVPAdapter.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/BannerVPAdapter.kt" deleted file mode 100644 index ddb9d56..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/BannerVPAdapter.kt" +++ /dev/null @@ -1,19 +0,0 @@ -package com.example.flo - -import androidx.fragment.app.Fragment -import androidx.viewpager2.adapter.FragmentStateAdapter - -class BannerVPAdapter(fragment:Fragment) :FragmentStateAdapter(fragment){ - - private val fragmentlist : ArrayList = ArrayList() - - override fun getItemCount(): Int = fragmentlist.size - - override fun createFragment(position: Int): Fragment = fragmentlist[position] - - - fun addFragment(fragment: Fragment) { - fragmentlist.add(fragment) - notifyItemInserted(fragmentlist.size-1) - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/DetailFragment.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/DetailFragment.kt" deleted file mode 100644 index 75b3d3e..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/DetailFragment.kt" +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.flo - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.flo.databinding.FragmentDetailBinding - -class DetailFragment : Fragment() { - - lateinit var binding : FragmentDetailBinding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentDetailBinding.inflate(inflater,container, false) - return binding.root - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/HomeFragment.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/HomeFragment.kt" deleted file mode 100644 index 6d3ed75..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/HomeFragment.kt" +++ /dev/null @@ -1,39 +0,0 @@ -package com.example.flo - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import androidx.viewpager2.widget.ViewPager2 -import com.example.flo.databinding.FragmentHomeBinding - -class HomeFragment : Fragment() { - - lateinit var binding: FragmentHomeBinding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - binding = FragmentHomeBinding.inflate(inflater, container, false) - - binding.homePannelSecondAlbum1Iv.setOnClickListener { - (context as MainActivity).supportFragmentManager.beginTransaction().replace(R.id.main_frm,AlbumFragment()).commitAllowingStateLoss() - } - val bannerAdapter = BannerVPAdapter(this) - bannerAdapter.addFragment(BannerFragment(R.drawable.img_home_viewpager_exp)) - bannerAdapter.addFragment(BannerFragment(R.drawable.img_home_viewpager_exp2)) - binding.homeBannerVp.adapter = bannerAdapter - binding.homeBannerVp.orientation = ViewPager2.ORIENTATION_HORIZONTAL //좌우 스크롤 가능하게 - - val pannelAdapter = PannelVPAdapter(this) - pannelAdapter.addFragment(PannelFragment(R.drawable.img_first_album_default)) - pannelAdapter.addFragment(PannelFragment(R.drawable.img_album_exp2)) - binding.homePannelVp.adapter = pannelAdapter - binding.homePannelVp.orientation = ViewPager2.ORIENTATION_HORIZONTAL //좌우 스크롤 가능하게 - - return binding.root - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/LockerFragment.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/LockerFragment.kt" deleted file mode 100644 index 1a41129..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/LockerFragment.kt" +++ /dev/null @@ -1,33 +0,0 @@ -package com.example.flo - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.flo.databinding.FragmentLockerBinding -import com.google.android.material.tabs.TabLayoutMediator - -class LockerFragment : Fragment() { - - lateinit var binding: FragmentLockerBinding - - private val information = arrayListOf("저장한 곡", "음악파일") - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentLockerBinding.inflate(inflater, container, false) - - val lockerAdapter = LockerVPAdapter(this) - binding.lockerContentVp.adapter = lockerAdapter - TabLayoutMediator(binding.lockerContentTb, binding.lockerContentVp) { - tab, position -> - tab.text = information[position] - }.attach() - - return binding.root - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/LockerVPAdapter.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/LockerVPAdapter.kt" deleted file mode 100644 index 4e9ef31..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/LockerVPAdapter.kt" +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.flo - -import androidx.fragment.app.Fragment -import androidx.viewpager2.adapter.FragmentStateAdapter -import com.example.flo.databinding.FragmentLockerBinding - -class LockerVPAdapter(fragment:Fragment) : FragmentStateAdapter(fragment){ - override fun getItemCount(): Int = 2 - - override fun createFragment(position: Int): Fragment { - return when(position) { - 0 -> SaveSongFragment() - else -> MusicFileFragment() - } - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/LookFragment.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/LookFragment.kt" deleted file mode 100644 index c1e990d..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/LookFragment.kt" +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.flo - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.flo.databinding.FragmentLookBinding - -class LookFragment : Fragment() { - - lateinit var binding: FragmentLookBinding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentLookBinding.inflate(inflater, container, false) - - return binding.root - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/MainActivity.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/MainActivity.kt" deleted file mode 100644 index c678107..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/MainActivity.kt" +++ /dev/null @@ -1,103 +0,0 @@ -package com.example.flo - -import android.content.Intent -import androidx.appcompat.app.AppCompatActivity -import android.os.Bundle -import android.util.Log -import android.widget.TextView -import com.example.flo.databinding.ActivityMainBinding -import com.google.gson.Gson - -class MainActivity : AppCompatActivity() { - - lateinit var binding: ActivityMainBinding - - private var song: Song = Song() - private var gson: Gson = Gson() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setTheme(R.style.Theme_FLO) - binding = ActivityMainBinding.inflate(layoutInflater) - setContentView(binding.root) - - val song = Song(binding.mainMiniplayerTitleTv.text.toString(), binding.mainMiniplayerSingerTv.text.toString(),0,60,false, "music") - - binding.mainPlayerCl.setOnClickListener{ - //startActivity(Intent(this, SongActivity::class.java)) - val intent = Intent(this, SongActivity::class.java) - intent.putExtra("title", song.title) - intent.putExtra("singer", song.singer) - intent.putExtra("second", song.second) - intent.putExtra("playTime", song.playTime) - intent.putExtra("isPlaying", song.isPlaying) - intent.putExtra("music", song.music) - startActivity(intent) - } - initBottomNavigation() - - Log.d("Song", song.title + song.singer ) - - } - - private fun initBottomNavigation(){ - - supportFragmentManager.beginTransaction() - .replace(R.id.main_frm, HomeFragment()) - .commitAllowingStateLoss() - - binding.mainBnv.setOnItemSelectedListener{ item -> - when (item.itemId) { - - R.id.homeFragment -> { - supportFragmentManager.beginTransaction() - .replace(R.id.main_frm, HomeFragment()) - .commitAllowingStateLoss() - return@setOnItemSelectedListener true - } - - R.id.lookFragment -> { - supportFragmentManager.beginTransaction() - .replace(R.id.main_frm, LookFragment()) - .commitAllowingStateLoss() - return@setOnItemSelectedListener true - } - R.id.searchFragment -> { - supportFragmentManager.beginTransaction() - .replace(R.id.main_frm, SearchFragment()) - .commitAllowingStateLoss() - return@setOnItemSelectedListener true - } - R.id.lockerFragment -> { - supportFragmentManager.beginTransaction() - .replace(R.id.main_frm, LockerFragment()) - .commitAllowingStateLoss() - return@setOnItemSelectedListener true - } - } - false - } - } - - private fun setMiniPlayer(song: Song) { - binding.mainMiniplayerTitleTv.text = song.title - binding.mainMiniplayerSingerTv.text = song.singer - binding.mainProgressSb.progress = (song.second*100000)/song.playTime - } - - override fun onStart() { - super.onStart() - val sharedPreferences = getSharedPreferences("song", MODE_PRIVATE) - val songJson = sharedPreferences.getString("songData", null) - - song = if(songJson == null) { - Song("라일락", "아이유(IU)", 0, 60, false, "music") - } else { - gson.fromJson(songJson, Song::class.java) - } - - setMiniPlayer(song) - - } - -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/MusicFileFragment.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/MusicFileFragment.kt" deleted file mode 100644 index 1063a30..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/MusicFileFragment.kt" +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.flo - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.flo.databinding.FragmentDetailBinding -import com.example.flo.databinding.FragmentMusicFileBinding - -class MusicFileFragment : Fragment() { - - lateinit var binding : FragmentMusicFileBinding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentMusicFileBinding.inflate(inflater,container, false) - return binding.root - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/PannelFragment.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/PannelFragment.kt" deleted file mode 100644 index b20dec2..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/PannelFragment.kt" +++ /dev/null @@ -1,25 +0,0 @@ -package com.example.flo - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.flo.databinding.FragmentPannelBinding - -class PannelFragment(val imgRes : Int): Fragment() { - - lateinit var binding : FragmentPannelBinding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentPannelBinding.inflate(inflater, container, false) - - binding.homePannelBackgroundIv.setImageResource(imgRes) - return binding.root - } - -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/PannelVPAdapter.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/PannelVPAdapter.kt" deleted file mode 100644 index 65f67c0..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/PannelVPAdapter.kt" +++ /dev/null @@ -1,19 +0,0 @@ -package com.example.flo - -import androidx.fragment.app.Fragment -import androidx.viewpager2.adapter.FragmentStateAdapter - -class PannelVPAdapter (fragment: Fragment) : FragmentStateAdapter(fragment){ - - private val fragmentlist : ArrayList = ArrayList() - - override fun getItemCount(): Int = fragmentlist.size - - override fun createFragment(position: Int): Fragment = fragmentlist[position] - - - fun addFragment(fragment: Fragment) { - fragmentlist.add(fragment) - notifyItemInserted(fragmentlist.size-1) - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SaveSongFragment.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SaveSongFragment.kt" deleted file mode 100644 index 899faf8..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SaveSongFragment.kt" +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.flo - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.flo.databinding.FragmentDetailBinding -import com.example.flo.databinding.FragmentSaveSongBinding - -class SaveSongFragment : Fragment() { - - lateinit var binding : FragmentSaveSongBinding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentSaveSongBinding.inflate(inflater,container, false) - return binding.root - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SearchFragment.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SearchFragment.kt" deleted file mode 100644 index 7c87789..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SearchFragment.kt" +++ /dev/null @@ -1,27 +0,0 @@ -package com.example.flo - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.flo.databinding.FragmentSearchBinding - -class SearchFragment : Fragment() { - - lateinit var binding: FragmentSearchBinding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentSearchBinding.inflate(inflater, container, false) - - return binding.root - } -} - -class FragmentSearchBinding { - -} diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/Song.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/Song.kt" deleted file mode 100644 index d234409..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/Song.kt" +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.flo - -data class Song( - val title : String = "", - val singer : String = "", - var second : Int = 0, - var playTime : Int = 0, - var isPlaying : Boolean = false, - var music : String = "" -) diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SongActivity.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SongActivity.kt" deleted file mode 100644 index d51302e..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SongActivity.kt" +++ /dev/null @@ -1,153 +0,0 @@ -package com.example.flo - -import android.media.MediaPlayer -import android.os.Bundle -import android.util.Log -import android.view.View -import androidx.appcompat.app.AppCompatActivity -import com.example.flo.databinding.ActivitySongBinding -import com.google.gson.Gson - -class SongActivity : AppCompatActivity() { - - //전역변수 - lateinit var binding : ActivitySongBinding - lateinit var song : Song - lateinit var timer : Timer - private var mediaPlayer:MediaPlayer? = null - private var gson: Gson = Gson() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - binding = ActivitySongBinding.inflate(layoutInflater) - setContentView(binding.root) - - initSong() - setPlayer(song) - - binding.songBtnDownIv.setOnClickListener{ - finish() - } - binding.songBtnStartIv.setOnClickListener { - setPlayerStatus(false) - } - binding.songBtnPauseIv.setOnClickListener { - setPlayerStatus(true) - } - if (intent.hasExtra("title") && intent.hasExtra("singer")) { - binding.songTxtTitleTv.text = intent.getStringExtra("title") - binding.songTxtSingerTv.text = intent.getStringExtra("singer") - } - } - - override fun onDestroy() { - super.onDestroy() - timer.interrupt() - } - - private fun initSong() { - if (intent.hasExtra("title") && intent.hasExtra("singer")) { - song = Song( - intent.getStringExtra("title")!!, - intent.getStringExtra("singer")!!, - intent.getIntExtra("second", 0), - intent.getIntExtra("playTime", 0), - intent.getBooleanExtra("isPlaying", false), - intent.getStringExtra("music")!! - ) - } - startTimer() - } - - private fun setPlayer(song:Song){ - binding.songTxtTitleTv.text = intent.getStringExtra("title")!! - binding.songTxtSingerTv.text = intent.getStringExtra("singer")!! - binding.songBarWhereTv.text = String.format("%02d:%02d",song.second / 60, song.second % 60) - binding.songBarFullTv.text = String.format("%02d:%02d",song.playTime / 60, song.playTime % 60) - binding.songProgressSb.progress = (song.second *1000 / song.playTime) - var music = resources.getIdentifier(song.music, "raw", this.packageName) - mediaPlayer = MediaPlayer.create(this,music) - - setPlayerStatus(song.isPlaying) - } - - fun setPlayerStatus(isPlaying : Boolean) { - song.isPlaying = isPlaying - timer.isPlaying = isPlaying - - if (isPlaying) { - binding.songBtnStartIv.visibility = View.VISIBLE - binding.songBtnPauseIv.visibility = View.GONE - mediaPlayer?.start() - } - else { - binding.songBtnStartIv.visibility = View.GONE - binding.songBtnPauseIv.visibility = View.VISIBLE - if(mediaPlayer?.isPlaying == true) { - mediaPlayer?.pause() - } - } - } - - private fun startTimer() { - timer = Timer(song.playTime, song.isPlaying) - timer.start() - } - - inner class Timer(private val playTime : Int, var isPlaying : Boolean = true):Thread(){ - - private var second : Int = 0 - private var mills: Float = 0f - - override fun run() { - super.run() - try { - while(true) { - if(second >= playTime) { - break - } - if(isPlaying){ - sleep(50) - mills += 50 - - runOnUiThread { - binding.songProgressSb.progress = ((mills / playTime)*100).toInt() - } - - if (mills % 1000 == 0f) { - runOnUiThread { - binding.songBarWhereTv.text = String.format("%02d:%02d",second / 60, second % 60) - } - second++ - } - } - - } - }catch(e: InterruptedException) { - Log.d("Song", "쓰레드가 죽었습니다. ${e.message}") - } - } - } - - //사용자가 포커스를 잃었을 때 음악이 중지 - override fun onPause() { - super.onPause() - setPlayerStatus(false) - song.second = ((binding.songProgressSb.progress* song.playTime)/100)/1000 - val sharedPreferences = getSharedPreferences("song", MODE_PRIVATE) - val editor = sharedPreferences.edit() //에디터 - val songJson = gson.toJson(song) - editor.putString("songData", songJson) - - editor.apply() - } - - //왜 안 되지? -// override fun onDestroy() { -// super.onDestroy() -// timer.interrupt() -// mediaPlayer?.release() // 미디어 플레이어가 갖고 있던 리소스 해제 -// mediaPlayer = null //미디어 플레이어 해제 -// } - -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SongFragment.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SongFragment.kt" deleted file mode 100644 index 35c21a0..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SongFragment.kt" +++ /dev/null @@ -1,53 +0,0 @@ -package com.example.flo - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.appcompat.app.AppCompatActivity -import androidx.fragment.app.Fragment -import com.example.flo.databinding.FragmentSongBinding - - -class SongFragment : Fragment() { - - lateinit var binding: FragmentSongBinding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentSongBinding.inflate(inflater, container, false) - return binding.root - } -} - -class SongFragment_2 : AppCompatActivity() { - - lateinit var binding2 : FragmentSongBinding - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - binding2 = FragmentSongBinding.inflate(layoutInflater) - setContentView(binding2.root) - binding2.albumFirstOnIv.setOnClickListener { - setMixStatus(false) - } - binding2.albumFirstOffIv.setOnClickListener { - setMixStatus(true) - } - } - - fun setMixStatus(isPlaying: Boolean) { - if (isPlaying) { - binding2.albumFirstOnIv.visibility = View.VISIBLE - binding2.albumFirstOffIv.visibility = View.GONE - } else { - binding2.albumFirstOnIv.visibility = View.GONE - binding2.albumFirstOffIv.visibility = View.VISIBLE - - } - - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SplashActivity.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SplashActivity.kt" deleted file mode 100644 index 56e5bff..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/SplashActivity.kt" +++ /dev/null @@ -1,25 +0,0 @@ -//package com.example.flo -// -//import android.content.Intent -//import android.os.Bundle -//import android.os.Handler -//import android.os.Looper -//import androidx.appcompat.app.AppCompatActivity -//import com.example.flo.databinding.ActivitySplashBinding -// -//class SplashActivity : AppCompatActivity() { -// lateinit var binding : ActivitySplashBinding -// -// override fun onCreate(savedInstanceState: Bundle?) { -// super.onCreate(savedInstanceState) -// -// binding = ActivitySplashBinding.inflate(layoutInflater) -// setContentView(binding.root) -// -// var handler = Handler(Looper.getMainLooper()) -// -// handler.postDelayed({ -// startActivity(Intent(this,MainActivity::class.java)) -// },1000) -// } -//} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/VideoFragment.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/VideoFragment.kt" deleted file mode 100644 index d3f3bfd..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/java/com/example/flo/VideoFragment.kt" +++ /dev/null @@ -1,23 +0,0 @@ -package com.example.flo - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.flo.databinding.FragmentDetailBinding -import com.example.flo.databinding.FragmentVideoBinding - -class VideoFragment : Fragment() { - - lateinit var binding : FragmentVideoBinding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentVideoBinding.inflate(inflater,container, false) - return binding.root - } -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" deleted file mode 100644 index 2b068d1..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btm_color_selector.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btm_color_selector.xml" deleted file mode 100644 index 3ecf8a7..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btm_color_selector.xml" +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_actionbar_instagram.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_actionbar_instagram.png" deleted file mode 100644 index 90bc027..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_actionbar_instagram.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_arrow_black.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_arrow_black.png" deleted file mode 100644 index cc38ca8..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_arrow_black.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_main_arrow_more.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_main_arrow_more.png" deleted file mode 100644 index 59e410c..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_main_arrow_more.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_main_mike.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_main_mike.png" deleted file mode 100644 index 9bddec6..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_main_mike.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_main_setting.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_main_setting.png" deleted file mode 100644 index 7a8d5d6..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_main_setting.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_main_ticket.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_main_ticket.png" deleted file mode 100644 index 52b6d64..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_main_ticket.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplay_mvpause.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplay_mvpause.png" deleted file mode 100644 index 470e046..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplay_mvpause.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplay_mvplay.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplay_mvplay.png" deleted file mode 100644 index d118677..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplay_mvplay.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplay_pause.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplay_pause.png" deleted file mode 100644 index 470e046..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplay_pause.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplayer_go_list.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplayer_go_list.png" deleted file mode 100644 index 1b2d977..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplayer_go_list.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplayer_next.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplayer_next.png" deleted file mode 100644 index 3aedba3..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplayer_next.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplayer_play.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplayer_play.png" deleted file mode 100644 index f619072..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplayer_play.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplayer_previous.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplayer_previous.png" deleted file mode 100644 index d0bf1f6..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_miniplayer_previous.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_panel_play_large.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_panel_play_large.png" deleted file mode 100644 index 4ac7103..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_panel_play_large.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_eq_off.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_eq_off.png" deleted file mode 100644 index f23d9c6..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_eq_off.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_go_list.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_go_list.png" deleted file mode 100644 index 1b2d977..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_go_list.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_more.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_more.png" deleted file mode 100644 index a8ad9e6..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_more.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_play.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_play.png" deleted file mode 100644 index f6c3201..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_play.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_related.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_related.png" deleted file mode 100644 index 9026fe5..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_related.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_setting.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_setting.png" deleted file mode 100644 index 0df8f69..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_setting.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_unlike_off.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_unlike_off.png" deleted file mode 100644 index b539504..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_unlike_off.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_unlike_on.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_unlike_on.png" deleted file mode 100644 index 45a43ca..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_player_unlike_on.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_playlist_select_off.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_playlist_select_off.png" deleted file mode 100644 index 62ef45c..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_playlist_select_off.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_playlist_select_on.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_playlist_select_on.png" deleted file mode 100644 index 2d3b6af..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_playlist_select_on.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_toggle_off.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_toggle_off.png" deleted file mode 100644 index 983360d..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_toggle_off.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_toggle_on.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_toggle_on.png" deleted file mode 100644 index fb609f4..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/btn_toggle_on.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/discovery_banner_aos.jpg" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/discovery_banner_aos.jpg" deleted file mode 100644 index c905515..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/discovery_banner_aos.jpg" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_home_no_select.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_home_no_select.png" deleted file mode 100644 index 69a8ab6..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_home_no_select.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_home_select.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_home_select.png" deleted file mode 100644 index c0ff48e..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_home_select.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_locker_no_select.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_locker_no_select.png" deleted file mode 100644 index a67dec3..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_locker_no_select.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_locker_select.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_locker_select.png" deleted file mode 100644 index 042489f..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_locker_select.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_look_no_select.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_look_no_select.png" deleted file mode 100644 index 6c2f4f0..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_look_no_select.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_look_select.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_look_select.png" deleted file mode 100644 index 3d169e4..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_look_select.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_search_no_select.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_search_no_select.png" deleted file mode 100644 index a77b8c5..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_search_no_select.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_search_select.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_search_select.png" deleted file mode 100644 index d5c8a72..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_bottom_search_select.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_flo_logo.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_flo_logo.png" deleted file mode 100644 index 643224d..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_flo_logo.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_launcher_background.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_launcher_background.xml" deleted file mode 100644 index 07d5da9..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_launcher_background.xml" +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_main_facebook.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_main_facebook.png" deleted file mode 100644 index 83e9732..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_main_facebook.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_main_instagram.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_main_instagram.png" deleted file mode 100644 index 398ce61..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_main_instagram.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_main_twitter.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_main_twitter.png" deleted file mode 100644 index 6ddc68e..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_main_twitter.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_main_youtube.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_main_youtube.png" deleted file mode 100644 index 0c4ec93..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_main_youtube.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_my_like_off.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_my_like_off.png" deleted file mode 100644 index c06e139..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_my_like_off.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_my_like_on.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_my_like_on.png" deleted file mode 100644 index 22577c0..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/ic_my_like_on.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/icon_browse_arrow_right.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/icon_browse_arrow_right.png" deleted file mode 100644 index 71b588b..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/icon_browse_arrow_right.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_album_exp.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_album_exp.png" deleted file mode 100644 index 6e3f38a..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_album_exp.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_album_exp2.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_album_exp2.png" deleted file mode 100644 index 28ea3ee..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_album_exp2.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_album_lp.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_album_lp.png" deleted file mode 100644 index 29fb1b4..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_album_lp.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_first_album_default.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_first_album_default.png" deleted file mode 100644 index 926d34f..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_first_album_default.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_home_viewpager_exp.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_home_viewpager_exp.png" deleted file mode 100644 index da78032..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_home_viewpager_exp.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_home_viewpager_exp2.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_home_viewpager_exp2.png" deleted file mode 100644 index 50fa4be..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_home_viewpager_exp2.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_potcast_exp.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_potcast_exp.png" deleted file mode 100644 index 50a46e0..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_potcast_exp.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_video_exp.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_video_exp.png" deleted file mode 100644 index 7f6b05f..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/img_video_exp.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_down.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_down.png" deleted file mode 100644 index 03a04c5..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_down.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_pause_32.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_pause_32.png" deleted file mode 100644 index 9388aa3..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_pause_32.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_play_32.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_play_32.png" deleted file mode 100644 index b781e4c..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_play_32.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_random_inactive.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_random_inactive.png" deleted file mode 100644 index fe4f880..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_random_inactive.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_repeat_inactive.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_repeat_inactive.png" deleted file mode 100644 index 1e4044d..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_repeat_inactive.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_skip_next_32.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_skip_next_32.png" deleted file mode 100644 index fc02f28..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_skip_next_32.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_skip_previous_32.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_skip_previous_32.png" deleted file mode 100644 index 03ec854..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/nugu_btn_skip_previous_32.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/splash.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/splash.xml" deleted file mode 100644 index ace8a7d..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/splash.xml" +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/textview_background_select_color_radius.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/textview_background_select_color_radius.xml" deleted file mode 100644 index 8aaca4c..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/textview_background_select_color_radius.xml" +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/widget_black_play.png" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/widget_black_play.png" deleted file mode 100644 index 0ec2700..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/drawable/widget_black_play.png" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/activity_main.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/activity_main.xml" deleted file mode 100644 index 55efdfa..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/activity_main.xml" +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/activity_song.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/activity_song.xml" deleted file mode 100644 index 6efd1a3..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/activity_song.xml" +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/activity_splash.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/activity_splash.xml" deleted file mode 100644 index 359e6cd..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/activity_splash.xml" +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_album.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_album.xml" deleted file mode 100644 index ff922d9..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_album.xml" +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_banner.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_banner.xml" deleted file mode 100644 index 37c2ef8..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_banner.xml" +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_detail.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_detail.xml" deleted file mode 100644 index ade280c..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_detail.xml" +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_home.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_home.xml" deleted file mode 100644 index 6f0f253..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_home.xml" +++ /dev/null @@ -1,597 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_locker.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_locker.xml" deleted file mode 100644 index 14b25dd..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_locker.xml" +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_look.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_look.xml" deleted file mode 100644 index 59d1359..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_look.xml" +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_music_file.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_music_file.xml" deleted file mode 100644 index e64250c..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_music_file.xml" +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_pannel.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_pannel.xml" deleted file mode 100644 index 8785ecb..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_pannel.xml" +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_save_song.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_save_song.xml" deleted file mode 100644 index a5feef0..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_save_song.xml" +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_search.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_search.xml" deleted file mode 100644 index 6fbc0a9..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_search.xml" +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_song.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_song.xml" deleted file mode 100644 index 0b16627..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_song.xml" +++ /dev/null @@ -1,525 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_video.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_video.xml" deleted file mode 100644 index 826873d..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/layout/fragment_video.xml" +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/menu/bottom_nav_menu.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/menu/bottom_nav_menu.xml" deleted file mode 100644 index 9a55b1a..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/menu/bottom_nav_menu.xml" +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" deleted file mode 100644 index eca70cf..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" deleted file mode 100644 index eca70cf..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-hdpi/ic_launcher.webp" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-hdpi/ic_launcher.webp" deleted file mode 100644 index c209e78..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-hdpi/ic_launcher.webp" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp" deleted file mode 100644 index b2dfe3d..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-mdpi/ic_launcher.webp" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-mdpi/ic_launcher.webp" deleted file mode 100644 index 4f0f1d6..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-mdpi/ic_launcher.webp" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp" deleted file mode 100644 index 62b611d..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xhdpi/ic_launcher.webp" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xhdpi/ic_launcher.webp" deleted file mode 100644 index 948a307..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xhdpi/ic_launcher.webp" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp" deleted file mode 100644 index 1b9a695..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp" deleted file mode 100644 index 28d4b77..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp" deleted file mode 100644 index 9287f50..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp" deleted file mode 100644 index aa7d642..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp" deleted file mode 100644 index 9126ae3..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/raw/music.mp3" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/raw/music.mp3" deleted file mode 100644 index 3a18441..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/raw/music.mp3" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/values-night/themes.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/values-night/themes.xml" deleted file mode 100644 index f430368..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/values-night/themes.xml" +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/values/colors.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/values/colors.xml" deleted file mode 100644 index 38a8b8e..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/values/colors.xml" +++ /dev/null @@ -1,22 +0,0 @@ - - - #3f3fff - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - - #9cbee2 - #062342 - #424242 - #6bb2ff - - #00ff0000 - #3f3fff - #a8a8a8 - #3f3fff - #a8a8a8 - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/values/strings.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/values/strings.xml" deleted file mode 100644 index 9ac5010..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/values/strings.xml" +++ /dev/null @@ -1,3 +0,0 @@ - - FLO - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/values/themes.xml" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/values/themes.xml" deleted file mode 100644 index d41ee63..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/main/res/values/themes.xml" +++ /dev/null @@ -1,27 +0,0 @@ - - - - - \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/test/java/com/example/flo/ExampleUnitTest.kt" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/test/java/com/example/flo/ExampleUnitTest.kt" deleted file mode 100644 index d39df20..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/app/src/test/java/com/example/flo/ExampleUnitTest.kt" +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.flo - -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 diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/build.gradle" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/build.gradle" deleted file mode 100644 index 8c50564..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/build.gradle" +++ /dev/null @@ -1,18 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath "com.android.tools.build:gradle:7.0.3" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradle.properties" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradle.properties" deleted file mode 100644 index 98bed16..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradle.properties" +++ /dev/null @@ -1,21 +0,0 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app"s APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradle/wrapper/gradle-wrapper.jar" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradle/wrapper/gradle-wrapper.jar" deleted file mode 100644 index 7454180..0000000 Binary files "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradle/wrapper/gradle-wrapper.jar" and /dev/null differ diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradle/wrapper/gradle-wrapper.properties" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradle/wrapper/gradle-wrapper.properties" deleted file mode 100644 index ffed3a2..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradle/wrapper/gradle-wrapper.properties" +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradlew" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradlew" deleted file mode 100644 index 1b6c787..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradlew" +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# 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 -# -# https://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. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradlew.bat" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradlew.bat" deleted file mode 100644 index 107acd3..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/gradlew.bat" +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/local.properties" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/local.properties" deleted file mode 100644 index 20070d3..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/local.properties" +++ /dev/null @@ -1,8 +0,0 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Mon May 13 18:48:16 KST 2024 -sdk.dir=C\:\\Users\\wkdal\\AppData\\Local\\Android\\Sdk diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/settings.gradle" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/settings.gradle" deleted file mode 100644 index 5cb40e4..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/240401cloneCodingFlo/settings.gradle" +++ /dev/null @@ -1,10 +0,0 @@ -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - google() - mavenCentral() - jcenter() // Warning: this repository is going to shut down soon - } -} -rootProject.name = "FLO" -include ':app' diff --git "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/README.md" "b/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/README.md" deleted file mode 100644 index 009d197..0000000 --- "a/\354\234\244\354\212\254_\354\235\264\354\234\244\354\204\234/README.md" +++ /dev/null @@ -1,55 +0,0 @@ -# 6th-Android / 윤슬_이윤서 님의 작업 폴더 - -# 💚 UMC MJU 6th_Android - -[UMC MJU 6th를 위한 깃허브 사용법 및 규칙](https://www.notion.so/UMC-MJU-GITHUB-RULE-49d597d8c58c4089a4c51a519b7d5350?pvs=21) - -
- -## 🌱 Pull Requests Rule - -**Title**: N주차미션_닉네임 (ex. 1주차미션_제이) - -**Reviewers(PR을 리뷰해 줄 팀원)**: 스터디원 (최소)1명 - -**Assignees(PR 담당자)**: 본인 - -**Labels**: mission - -
- -## ✔ Commit Message Convention - -CHORE: 코드 수정, 내부 파일 수정 - -FEAT: 새로운 기능 추가 - -FIX: 버그, 오류 수정 - -DOCS: README 등의 문서 수정 - -REFACTOR: 전면 수정(코드 리펙토링) - -TEST: 테스트 코드 추가 및 수정 - -
- -Copyright © Sojung Park (Bei) All rights reserved. - - -## 🍀 Members -| [![텍스트](https://avatars.githubusercontent.com/u/128218483?v=4)](https://github.com/saojaem) | [![텍스트](https://avatars.githubusercontent.com/u/164713708?v=4)](https://github.com/L3416yst) | [![텍스트](https://avatars.githubusercontent.com/u/150216299?v=4)](https://github.com/thos0412) | [![텍스트](https://avatars.githubusercontent.com/u/111961655?v=4)](https://github.com/starshape7) | -|:---:|:---:|:---:|:---:| -| 해리/박상재 | 윤슬/이윤서 | 주니/임준희 | 우연/추연우 | - -| [![텍스트](https://avatars.githubusercontent.com/u/113087916?v=4)](https://github.com/m01310g) | [![텍스트](https://avatars.githubusercontent.com/u/163288437?v=4)](https://github.com/eunsol1530) | [![텍스트](https://avatars.githubusercontent.com/u/155813460?v=4)](https://github.com/fredleeJH) | -|:---:|:---:|:---:| -| 도리/김민경 | 언스/김은솔 | 프레드/이종훈 | - -
- -## 1. 자신의 브랜치에 프로젝트 업로드하기 - -## 2. Main 브랜치로 PR(Pull Request) 날리기 - -## 3. 스터디원 코드 리뷰해주기 diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/checksums/checksums.lock" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/checksums/checksums.lock" deleted file mode 100644 index 1eb5813..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/checksums/checksums.lock" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/checksums/md5-checksums.bin" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/checksums/md5-checksums.bin" deleted file mode 100644 index a9d7a04..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/checksums/md5-checksums.bin" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/checksums/sha1-checksums.bin" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/checksums/sha1-checksums.bin" deleted file mode 100644 index b2b009f..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/checksums/sha1-checksums.bin" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxCoreLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxCoreLibraryAccessors.class" deleted file mode 100644 index c11906c..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxCoreLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxEspressoLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxEspressoLibraryAccessors.class" deleted file mode 100644 index 665ae41..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxEspressoLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxLibraryAccessors.class" deleted file mode 100644 index 5f57d1f..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxLifecycleLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxLifecycleLibraryAccessors.class" deleted file mode 100644 index ba9c4dc..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxLifecycleLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxLifecycleLivedataLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxLifecycleLivedataLibraryAccessors.class" deleted file mode 100644 index 52e06e7..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxLifecycleLivedataLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxLifecycleViewmodelLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxLifecycleViewmodelLibraryAccessors.class" deleted file mode 100644 index 1d417c9..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxLifecycleViewmodelLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxNavigationFragmentLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxNavigationFragmentLibraryAccessors.class" deleted file mode 100644 index 9567c8e..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxNavigationFragmentLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxNavigationLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxNavigationLibraryAccessors.class" deleted file mode 100644 index 543b5eb..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxNavigationLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxNavigationUiLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxNavigationUiLibraryAccessors.class" deleted file mode 100644 index f69ce49..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$AndroidxNavigationUiLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$BundleAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$BundleAccessors.class" deleted file mode 100644 index 74614a4..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$BundleAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$PluginAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$PluginAccessors.class" deleted file mode 100644 index efba873..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$PluginAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$VersionAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$VersionAccessors.class" deleted file mode 100644 index ca68f50..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs$VersionAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs.class" deleted file mode 100644 index b334e63..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibs.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxCoreLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxCoreLibraryAccessors.class" deleted file mode 100644 index 5c91fc6..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxCoreLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxEspressoLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxEspressoLibraryAccessors.class" deleted file mode 100644 index 14f3aab..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxEspressoLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxLibraryAccessors.class" deleted file mode 100644 index 27c7d75..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxLifecycleLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxLifecycleLibraryAccessors.class" deleted file mode 100644 index 41e2d3b..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxLifecycleLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxLifecycleLivedataLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxLifecycleLivedataLibraryAccessors.class" deleted file mode 100644 index 46a54a1..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxLifecycleLivedataLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxLifecycleViewmodelLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxLifecycleViewmodelLibraryAccessors.class" deleted file mode 100644 index e557b38..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxLifecycleViewmodelLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxNavigationFragmentLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxNavigationFragmentLibraryAccessors.class" deleted file mode 100644 index a663760..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxNavigationFragmentLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxNavigationLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxNavigationLibraryAccessors.class" deleted file mode 100644 index d17b27d..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxNavigationLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxNavigationUiLibraryAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxNavigationUiLibraryAccessors.class" deleted file mode 100644 index 0a94b09..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$AndroidxNavigationUiLibraryAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$BundleAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$BundleAccessors.class" deleted file mode 100644 index 21b1f12..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$BundleAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$PluginAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$PluginAccessors.class" deleted file mode 100644 index 33ff8dc..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$PluginAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$VersionAccessors.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$VersionAccessors.class" deleted file mode 100644 index c81d4fc..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock$VersionAccessors.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.class" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.class" deleted file mode 100644 index e272624..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/classes/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.class" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/sources/org/gradle/accessors/dm/LibrariesForLibs.java" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/sources/org/gradle/accessors/dm/LibrariesForLibs.java" deleted file mode 100644 index ad85a23..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/sources/org/gradle/accessors/dm/LibrariesForLibs.java" +++ /dev/null @@ -1,419 +0,0 @@ -package org.gradle.accessors.dm; - -import org.gradle.api.NonNullApi; -import org.gradle.api.artifacts.MinimalExternalModuleDependency; -import org.gradle.plugin.use.PluginDependency; -import org.gradle.api.artifacts.ExternalModuleDependencyBundle; -import org.gradle.api.artifacts.MutableVersionConstraint; -import org.gradle.api.provider.Provider; -import org.gradle.api.model.ObjectFactory; -import org.gradle.api.provider.ProviderFactory; -import org.gradle.api.internal.catalog.AbstractExternalDependencyFactory; -import org.gradle.api.internal.catalog.DefaultVersionCatalog; -import java.util.Map; -import org.gradle.api.internal.attributes.ImmutableAttributesFactory; -import org.gradle.api.internal.artifacts.dsl.CapabilityNotationParser; -import javax.inject.Inject; - -/** - * A catalog of dependencies accessible via the `libs` extension. - */ -@NonNullApi -public class LibrariesForLibs extends AbstractExternalDependencyFactory { - - private final AbstractExternalDependencyFactory owner = this; - private final AndroidxLibraryAccessors laccForAndroidxLibraryAccessors = new AndroidxLibraryAccessors(owner); - private final VersionAccessors vaccForVersionAccessors = new VersionAccessors(providers, config); - private final BundleAccessors baccForBundleAccessors = new BundleAccessors(objects, providers, config, attributesFactory, capabilityNotationParser); - private final PluginAccessors paccForPluginAccessors = new PluginAccessors(providers, config); - - @Inject - public LibrariesForLibs(DefaultVersionCatalog config, ProviderFactory providers, ObjectFactory objects, ImmutableAttributesFactory attributesFactory, CapabilityNotationParser capabilityNotationParser) { - super(config, providers, objects, attributesFactory, capabilityNotationParser); - } - - /** - * Creates a dependency provider for junit (junit:junit) - * This dependency was declared in catalog libs.versions.toml - */ - public Provider getJunit() { - return create("junit"); - } - - /** - * Creates a dependency provider for material (com.google.android.material:material) - * This dependency was declared in catalog libs.versions.toml - */ - public Provider getMaterial() { - return create("material"); - } - - /** - * Returns the group of libraries at androidx - */ - public AndroidxLibraryAccessors getAndroidx() { - return laccForAndroidxLibraryAccessors; - } - - /** - * Returns the group of versions at versions - */ - public VersionAccessors getVersions() { - return vaccForVersionAccessors; - } - - /** - * Returns the group of bundles at bundles - */ - public BundleAccessors getBundles() { - return baccForBundleAccessors; - } - - /** - * Returns the group of plugins at plugins - */ - public PluginAccessors getPlugins() { - return paccForPluginAccessors; - } - - public static class AndroidxLibraryAccessors extends SubDependencyFactory { - private final AndroidxCoreLibraryAccessors laccForAndroidxCoreLibraryAccessors = new AndroidxCoreLibraryAccessors(owner); - private final AndroidxEspressoLibraryAccessors laccForAndroidxEspressoLibraryAccessors = new AndroidxEspressoLibraryAccessors(owner); - private final AndroidxLifecycleLibraryAccessors laccForAndroidxLifecycleLibraryAccessors = new AndroidxLifecycleLibraryAccessors(owner); - private final AndroidxNavigationLibraryAccessors laccForAndroidxNavigationLibraryAccessors = new AndroidxNavigationLibraryAccessors(owner); - - public AndroidxLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for activity (androidx.activity:activity) - * This dependency was declared in catalog libs.versions.toml - */ - public Provider getActivity() { - return create("androidx.activity"); - } - - /** - * Creates a dependency provider for appcompat (androidx.appcompat:appcompat) - * This dependency was declared in catalog libs.versions.toml - */ - public Provider getAppcompat() { - return create("androidx.appcompat"); - } - - /** - * Creates a dependency provider for constraintlayout (androidx.constraintlayout:constraintlayout) - * This dependency was declared in catalog libs.versions.toml - */ - public Provider getConstraintlayout() { - return create("androidx.constraintlayout"); - } - - /** - * Creates a dependency provider for junit (androidx.test.ext:junit) - * This dependency was declared in catalog libs.versions.toml - */ - public Provider getJunit() { - return create("androidx.junit"); - } - - /** - * Returns the group of libraries at androidx.core - */ - public AndroidxCoreLibraryAccessors getCore() { - return laccForAndroidxCoreLibraryAccessors; - } - - /** - * Returns the group of libraries at androidx.espresso - */ - public AndroidxEspressoLibraryAccessors getEspresso() { - return laccForAndroidxEspressoLibraryAccessors; - } - - /** - * Returns the group of libraries at androidx.lifecycle - */ - public AndroidxLifecycleLibraryAccessors getLifecycle() { - return laccForAndroidxLifecycleLibraryAccessors; - } - - /** - * Returns the group of libraries at androidx.navigation - */ - public AndroidxNavigationLibraryAccessors getNavigation() { - return laccForAndroidxNavigationLibraryAccessors; - } - - } - - public static class AndroidxCoreLibraryAccessors extends SubDependencyFactory { - - public AndroidxCoreLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for ktx (androidx.core:core-ktx) - * This dependency was declared in catalog libs.versions.toml - */ - public Provider getKtx() { - return create("androidx.core.ktx"); - } - - } - - public static class AndroidxEspressoLibraryAccessors extends SubDependencyFactory { - - public AndroidxEspressoLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for core (androidx.test.espresso:espresso-core) - * This dependency was declared in catalog libs.versions.toml - */ - public Provider getCore() { - return create("androidx.espresso.core"); - } - - } - - public static class AndroidxLifecycleLibraryAccessors extends SubDependencyFactory { - private final AndroidxLifecycleLivedataLibraryAccessors laccForAndroidxLifecycleLivedataLibraryAccessors = new AndroidxLifecycleLivedataLibraryAccessors(owner); - private final AndroidxLifecycleViewmodelLibraryAccessors laccForAndroidxLifecycleViewmodelLibraryAccessors = new AndroidxLifecycleViewmodelLibraryAccessors(owner); - - public AndroidxLifecycleLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Returns the group of libraries at androidx.lifecycle.livedata - */ - public AndroidxLifecycleLivedataLibraryAccessors getLivedata() { - return laccForAndroidxLifecycleLivedataLibraryAccessors; - } - - /** - * Returns the group of libraries at androidx.lifecycle.viewmodel - */ - public AndroidxLifecycleViewmodelLibraryAccessors getViewmodel() { - return laccForAndroidxLifecycleViewmodelLibraryAccessors; - } - - } - - public static class AndroidxLifecycleLivedataLibraryAccessors extends SubDependencyFactory { - - public AndroidxLifecycleLivedataLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for ktx (androidx.lifecycle:lifecycle-livedata-ktx) - * This dependency was declared in catalog libs.versions.toml - */ - public Provider getKtx() { - return create("androidx.lifecycle.livedata.ktx"); - } - - } - - public static class AndroidxLifecycleViewmodelLibraryAccessors extends SubDependencyFactory { - - public AndroidxLifecycleViewmodelLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for ktx (androidx.lifecycle:lifecycle-viewmodel-ktx) - * This dependency was declared in catalog libs.versions.toml - */ - public Provider getKtx() { - return create("androidx.lifecycle.viewmodel.ktx"); - } - - } - - public static class AndroidxNavigationLibraryAccessors extends SubDependencyFactory { - private final AndroidxNavigationFragmentLibraryAccessors laccForAndroidxNavigationFragmentLibraryAccessors = new AndroidxNavigationFragmentLibraryAccessors(owner); - private final AndroidxNavigationUiLibraryAccessors laccForAndroidxNavigationUiLibraryAccessors = new AndroidxNavigationUiLibraryAccessors(owner); - - public AndroidxNavigationLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Returns the group of libraries at androidx.navigation.fragment - */ - public AndroidxNavigationFragmentLibraryAccessors getFragment() { - return laccForAndroidxNavigationFragmentLibraryAccessors; - } - - /** - * Returns the group of libraries at androidx.navigation.ui - */ - public AndroidxNavigationUiLibraryAccessors getUi() { - return laccForAndroidxNavigationUiLibraryAccessors; - } - - } - - public static class AndroidxNavigationFragmentLibraryAccessors extends SubDependencyFactory { - - public AndroidxNavigationFragmentLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for ktx (androidx.navigation:navigation-fragment-ktx) - * This dependency was declared in catalog libs.versions.toml - */ - public Provider getKtx() { - return create("androidx.navigation.fragment.ktx"); - } - - } - - public static class AndroidxNavigationUiLibraryAccessors extends SubDependencyFactory { - - public AndroidxNavigationUiLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for ktx (androidx.navigation:navigation-ui-ktx) - * This dependency was declared in catalog libs.versions.toml - */ - public Provider getKtx() { - return create("androidx.navigation.ui.ktx"); - } - - } - - public static class VersionAccessors extends VersionFactory { - - public VersionAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); } - - /** - * Returns the version associated to this alias: activity (1.9.0) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getActivity() { return getVersion("activity"); } - - /** - * Returns the version associated to this alias: agp (8.3.2) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getAgp() { return getVersion("agp"); } - - /** - * Returns the version associated to this alias: appcompat (1.6.1) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getAppcompat() { return getVersion("appcompat"); } - - /** - * Returns the version associated to this alias: constraintlayout (2.1.4) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getConstraintlayout() { return getVersion("constraintlayout"); } - - /** - * Returns the version associated to this alias: coreKtx (1.13.0) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getCoreKtx() { return getVersion("coreKtx"); } - - /** - * Returns the version associated to this alias: espressoCore (3.5.1) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getEspressoCore() { return getVersion("espressoCore"); } - - /** - * Returns the version associated to this alias: junit (4.13.2) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getJunit() { return getVersion("junit"); } - - /** - * Returns the version associated to this alias: junitVersion (1.1.5) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getJunitVersion() { return getVersion("junitVersion"); } - - /** - * Returns the version associated to this alias: kotlin (1.9.0) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getKotlin() { return getVersion("kotlin"); } - - /** - * Returns the version associated to this alias: lifecycleLivedataKtx (2.7.0) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getLifecycleLivedataKtx() { return getVersion("lifecycleLivedataKtx"); } - - /** - * Returns the version associated to this alias: lifecycleViewmodelKtx (2.7.0) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getLifecycleViewmodelKtx() { return getVersion("lifecycleViewmodelKtx"); } - - /** - * Returns the version associated to this alias: material (1.11.0) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getMaterial() { return getVersion("material"); } - - /** - * Returns the version associated to this alias: navigationFragmentKtx (2.7.7) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getNavigationFragmentKtx() { return getVersion("navigationFragmentKtx"); } - - /** - * Returns the version associated to this alias: navigationUiKtx (2.7.7) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getNavigationUiKtx() { return getVersion("navigationUiKtx"); } - - } - - public static class BundleAccessors extends BundleFactory { - - public BundleAccessors(ObjectFactory objects, ProviderFactory providers, DefaultVersionCatalog config, ImmutableAttributesFactory attributesFactory, CapabilityNotationParser capabilityNotationParser) { super(objects, providers, config, attributesFactory, capabilityNotationParser); } - - } - - public static class PluginAccessors extends PluginFactory { - - public PluginAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); } - - /** - * Creates a plugin provider for androidApplication to the plugin id 'com.android.application' - * This plugin was declared in catalog libs.versions.toml - */ - public Provider getAndroidApplication() { return createPlugin("androidApplication"); } - - /** - * Creates a plugin provider for jetbrainsKotlinAndroid to the plugin id 'org.jetbrains.kotlin.android' - * This plugin was declared in catalog libs.versions.toml - */ - public Provider getJetbrainsKotlinAndroid() { return createPlugin("jetbrainsKotlinAndroid"); } - - } - -} diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/sources/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.java" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/sources/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.java" deleted file mode 100644 index 0f5bfa6..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/b6e60771395e9885a9c971ad5ffa795d23e55e76/sources/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.java" +++ /dev/null @@ -1,525 +0,0 @@ -package org.gradle.accessors.dm; - -import org.gradle.api.NonNullApi; -import org.gradle.api.artifacts.MinimalExternalModuleDependency; -import org.gradle.plugin.use.PluginDependency; -import org.gradle.api.artifacts.ExternalModuleDependencyBundle; -import org.gradle.api.artifacts.MutableVersionConstraint; -import org.gradle.api.provider.Provider; -import org.gradle.api.model.ObjectFactory; -import org.gradle.api.provider.ProviderFactory; -import org.gradle.api.internal.catalog.AbstractExternalDependencyFactory; -import org.gradle.api.internal.catalog.DefaultVersionCatalog; -import java.util.Map; -import org.gradle.api.internal.attributes.ImmutableAttributesFactory; -import org.gradle.api.internal.artifacts.dsl.CapabilityNotationParser; -import javax.inject.Inject; - -/** - * A catalog of dependencies accessible via the `libs` extension. - */ -@NonNullApi -public class LibrariesForLibsInPluginsBlock extends AbstractExternalDependencyFactory { - - private final AbstractExternalDependencyFactory owner = this; - private final AndroidxLibraryAccessors laccForAndroidxLibraryAccessors = new AndroidxLibraryAccessors(owner); - private final VersionAccessors vaccForVersionAccessors = new VersionAccessors(providers, config); - private final BundleAccessors baccForBundleAccessors = new BundleAccessors(objects, providers, config, attributesFactory, capabilityNotationParser); - private final PluginAccessors paccForPluginAccessors = new PluginAccessors(providers, config); - - @Inject - public LibrariesForLibsInPluginsBlock(DefaultVersionCatalog config, ProviderFactory providers, ObjectFactory objects, ImmutableAttributesFactory attributesFactory, CapabilityNotationParser capabilityNotationParser) { - super(config, providers, objects, attributesFactory, capabilityNotationParser); - } - - /** - * Creates a dependency provider for junit (junit:junit) - * This dependency was declared in catalog libs.versions.toml - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public Provider getJunit() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return create("junit"); - } - - /** - * Creates a dependency provider for material (com.google.android.material:material) - * This dependency was declared in catalog libs.versions.toml - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public Provider getMaterial() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return create("material"); - } - - /** - * Returns the group of libraries at androidx - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public AndroidxLibraryAccessors getAndroidx() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return laccForAndroidxLibraryAccessors; - } - - /** - * Returns the group of versions at versions - */ - public VersionAccessors getVersions() { - return vaccForVersionAccessors; - } - - /** - * Returns the group of bundles at bundles - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public BundleAccessors getBundles() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return baccForBundleAccessors; - } - - /** - * Returns the group of plugins at plugins - */ - public PluginAccessors getPlugins() { - return paccForPluginAccessors; - } - - /** - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public static class AndroidxLibraryAccessors extends SubDependencyFactory { - private final AndroidxCoreLibraryAccessors laccForAndroidxCoreLibraryAccessors = new AndroidxCoreLibraryAccessors(owner); - private final AndroidxEspressoLibraryAccessors laccForAndroidxEspressoLibraryAccessors = new AndroidxEspressoLibraryAccessors(owner); - private final AndroidxLifecycleLibraryAccessors laccForAndroidxLifecycleLibraryAccessors = new AndroidxLifecycleLibraryAccessors(owner); - private final AndroidxNavigationLibraryAccessors laccForAndroidxNavigationLibraryAccessors = new AndroidxNavigationLibraryAccessors(owner); - - public AndroidxLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for activity (androidx.activity:activity) - * This dependency was declared in catalog libs.versions.toml - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public Provider getActivity() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return create("androidx.activity"); - } - - /** - * Creates a dependency provider for appcompat (androidx.appcompat:appcompat) - * This dependency was declared in catalog libs.versions.toml - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public Provider getAppcompat() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return create("androidx.appcompat"); - } - - /** - * Creates a dependency provider for constraintlayout (androidx.constraintlayout:constraintlayout) - * This dependency was declared in catalog libs.versions.toml - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public Provider getConstraintlayout() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return create("androidx.constraintlayout"); - } - - /** - * Creates a dependency provider for junit (androidx.test.ext:junit) - * This dependency was declared in catalog libs.versions.toml - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public Provider getJunit() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return create("androidx.junit"); - } - - /** - * Returns the group of libraries at androidx.core - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public AndroidxCoreLibraryAccessors getCore() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return laccForAndroidxCoreLibraryAccessors; - } - - /** - * Returns the group of libraries at androidx.espresso - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public AndroidxEspressoLibraryAccessors getEspresso() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return laccForAndroidxEspressoLibraryAccessors; - } - - /** - * Returns the group of libraries at androidx.lifecycle - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public AndroidxLifecycleLibraryAccessors getLifecycle() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return laccForAndroidxLifecycleLibraryAccessors; - } - - /** - * Returns the group of libraries at androidx.navigation - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public AndroidxNavigationLibraryAccessors getNavigation() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return laccForAndroidxNavigationLibraryAccessors; - } - - } - - /** - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public static class AndroidxCoreLibraryAccessors extends SubDependencyFactory { - - public AndroidxCoreLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for ktx (androidx.core:core-ktx) - * This dependency was declared in catalog libs.versions.toml - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public Provider getKtx() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return create("androidx.core.ktx"); - } - - } - - /** - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public static class AndroidxEspressoLibraryAccessors extends SubDependencyFactory { - - public AndroidxEspressoLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for core (androidx.test.espresso:espresso-core) - * This dependency was declared in catalog libs.versions.toml - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public Provider getCore() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return create("androidx.espresso.core"); - } - - } - - /** - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public static class AndroidxLifecycleLibraryAccessors extends SubDependencyFactory { - private final AndroidxLifecycleLivedataLibraryAccessors laccForAndroidxLifecycleLivedataLibraryAccessors = new AndroidxLifecycleLivedataLibraryAccessors(owner); - private final AndroidxLifecycleViewmodelLibraryAccessors laccForAndroidxLifecycleViewmodelLibraryAccessors = new AndroidxLifecycleViewmodelLibraryAccessors(owner); - - public AndroidxLifecycleLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Returns the group of libraries at androidx.lifecycle.livedata - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public AndroidxLifecycleLivedataLibraryAccessors getLivedata() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return laccForAndroidxLifecycleLivedataLibraryAccessors; - } - - /** - * Returns the group of libraries at androidx.lifecycle.viewmodel - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public AndroidxLifecycleViewmodelLibraryAccessors getViewmodel() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return laccForAndroidxLifecycleViewmodelLibraryAccessors; - } - - } - - /** - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public static class AndroidxLifecycleLivedataLibraryAccessors extends SubDependencyFactory { - - public AndroidxLifecycleLivedataLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for ktx (androidx.lifecycle:lifecycle-livedata-ktx) - * This dependency was declared in catalog libs.versions.toml - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public Provider getKtx() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return create("androidx.lifecycle.livedata.ktx"); - } - - } - - /** - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public static class AndroidxLifecycleViewmodelLibraryAccessors extends SubDependencyFactory { - - public AndroidxLifecycleViewmodelLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for ktx (androidx.lifecycle:lifecycle-viewmodel-ktx) - * This dependency was declared in catalog libs.versions.toml - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public Provider getKtx() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return create("androidx.lifecycle.viewmodel.ktx"); - } - - } - - /** - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public static class AndroidxNavigationLibraryAccessors extends SubDependencyFactory { - private final AndroidxNavigationFragmentLibraryAccessors laccForAndroidxNavigationFragmentLibraryAccessors = new AndroidxNavigationFragmentLibraryAccessors(owner); - private final AndroidxNavigationUiLibraryAccessors laccForAndroidxNavigationUiLibraryAccessors = new AndroidxNavigationUiLibraryAccessors(owner); - - public AndroidxNavigationLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Returns the group of libraries at androidx.navigation.fragment - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public AndroidxNavigationFragmentLibraryAccessors getFragment() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return laccForAndroidxNavigationFragmentLibraryAccessors; - } - - /** - * Returns the group of libraries at androidx.navigation.ui - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public AndroidxNavigationUiLibraryAccessors getUi() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return laccForAndroidxNavigationUiLibraryAccessors; - } - - } - - /** - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public static class AndroidxNavigationFragmentLibraryAccessors extends SubDependencyFactory { - - public AndroidxNavigationFragmentLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for ktx (androidx.navigation:navigation-fragment-ktx) - * This dependency was declared in catalog libs.versions.toml - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public Provider getKtx() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return create("androidx.navigation.fragment.ktx"); - } - - } - - /** - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public static class AndroidxNavigationUiLibraryAccessors extends SubDependencyFactory { - - public AndroidxNavigationUiLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); } - - /** - * Creates a dependency provider for ktx (androidx.navigation:navigation-ui-ktx) - * This dependency was declared in catalog libs.versions.toml - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public Provider getKtx() { - org.gradle.internal.deprecation.DeprecationLogger.deprecateBehaviour("Accessing libraries or bundles from version catalogs in the plugins block.").withAdvice("Only use versions or plugins from catalogs in the plugins block.").willBeRemovedInGradle9().withUpgradeGuideSection(8, "kotlin_dsl_deprecated_catalogs_plugins_block").nagUser(); - return create("androidx.navigation.ui.ktx"); - } - - } - - public static class VersionAccessors extends VersionFactory { - - public VersionAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); } - - /** - * Returns the version associated to this alias: activity (1.9.0) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getActivity() { return getVersion("activity"); } - - /** - * Returns the version associated to this alias: agp (8.3.2) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getAgp() { return getVersion("agp"); } - - /** - * Returns the version associated to this alias: appcompat (1.6.1) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getAppcompat() { return getVersion("appcompat"); } - - /** - * Returns the version associated to this alias: constraintlayout (2.1.4) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getConstraintlayout() { return getVersion("constraintlayout"); } - - /** - * Returns the version associated to this alias: coreKtx (1.13.0) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getCoreKtx() { return getVersion("coreKtx"); } - - /** - * Returns the version associated to this alias: espressoCore (3.5.1) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getEspressoCore() { return getVersion("espressoCore"); } - - /** - * Returns the version associated to this alias: junit (4.13.2) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getJunit() { return getVersion("junit"); } - - /** - * Returns the version associated to this alias: junitVersion (1.1.5) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getJunitVersion() { return getVersion("junitVersion"); } - - /** - * Returns the version associated to this alias: kotlin (1.9.0) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getKotlin() { return getVersion("kotlin"); } - - /** - * Returns the version associated to this alias: lifecycleLivedataKtx (2.7.0) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getLifecycleLivedataKtx() { return getVersion("lifecycleLivedataKtx"); } - - /** - * Returns the version associated to this alias: lifecycleViewmodelKtx (2.7.0) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getLifecycleViewmodelKtx() { return getVersion("lifecycleViewmodelKtx"); } - - /** - * Returns the version associated to this alias: material (1.11.0) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getMaterial() { return getVersion("material"); } - - /** - * Returns the version associated to this alias: navigationFragmentKtx (2.7.7) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getNavigationFragmentKtx() { return getVersion("navigationFragmentKtx"); } - - /** - * Returns the version associated to this alias: navigationUiKtx (2.7.7) - * If the version is a rich version and that its not expressible as a - * single version string, then an empty string is returned. - * This version was declared in catalog libs.versions.toml - */ - public Provider getNavigationUiKtx() { return getVersion("navigationUiKtx"); } - - } - - /** - * @deprecated Will be removed in Gradle 9.0. - */ - @Deprecated - public static class BundleAccessors extends BundleFactory { - - public BundleAccessors(ObjectFactory objects, ProviderFactory providers, DefaultVersionCatalog config, ImmutableAttributesFactory attributesFactory, CapabilityNotationParser capabilityNotationParser) { super(objects, providers, config, attributesFactory, capabilityNotationParser); } - - } - - public static class PluginAccessors extends PluginFactory { - - public PluginAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); } - - /** - * Creates a plugin provider for androidApplication to the plugin id 'com.android.application' - * This plugin was declared in catalog libs.versions.toml - */ - public Provider getAndroidApplication() { return createPlugin("androidApplication"); } - - /** - * Creates a plugin provider for jetbrainsKotlinAndroid to the plugin id 'org.jetbrains.kotlin.android' - * This plugin was declared in catalog libs.versions.toml - */ - public Provider getJetbrainsKotlinAndroid() { return createPlugin("jetbrainsKotlinAndroid"); } - - } - -} diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock" deleted file mode 100644 index 3c95ed9..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/executionHistory.bin" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/executionHistory.bin" deleted file mode 100644 index b9a758b..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/executionHistory.bin" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/gc.properties" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/dependencies-accessors/gc.properties" deleted file mode 100644 index e69de29..0000000 diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/executionHistory/executionHistory.bin" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/executionHistory/executionHistory.bin" deleted file mode 100644 index 1b747ba..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/executionHistory/executionHistory.bin" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/executionHistory/executionHistory.lock" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/executionHistory/executionHistory.lock" deleted file mode 100644 index e0b3db8..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/executionHistory/executionHistory.lock" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/fileChanges/last-build.bin" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/fileChanges/last-build.bin" deleted file mode 100644 index f76dd23..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/fileChanges/last-build.bin" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/fileHashes/fileHashes.bin" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/fileHashes/fileHashes.bin" deleted file mode 100644 index f3ba242..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/fileHashes/fileHashes.bin" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/fileHashes/fileHashes.lock" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/fileHashes/fileHashes.lock" deleted file mode 100644 index 2fd8e40..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/fileHashes/fileHashes.lock" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/fileHashes/resourceHashesCache.bin" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/fileHashes/resourceHashesCache.bin" deleted file mode 100644 index b4f5663..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/fileHashes/resourceHashesCache.bin" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/gc.properties" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/8.4/gc.properties" deleted file mode 100644 index e69de29..0000000 diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/buildOutputCleanup/buildOutputCleanup.lock" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/buildOutputCleanup/buildOutputCleanup.lock" deleted file mode 100644 index 9fd3204..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/buildOutputCleanup/buildOutputCleanup.lock" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/buildOutputCleanup/cache.properties" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/buildOutputCleanup/cache.properties" deleted file mode 100644 index eb34edf..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/buildOutputCleanup/cache.properties" +++ /dev/null @@ -1,2 +0,0 @@ -#Tue Apr 30 22:58:51 KST 2024 -gradle.version=8.4 diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/buildOutputCleanup/outputFiles.bin" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/buildOutputCleanup/outputFiles.bin" deleted file mode 100644 index 100e2a1..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/buildOutputCleanup/outputFiles.bin" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/config.properties" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/config.properties" deleted file mode 100644 index d4d95de..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/config.properties" +++ /dev/null @@ -1,2 +0,0 @@ -#Wed May 01 13:47:03 KST 2024 -java.home=C\:\\Users\\wkdal\\AppData\\Local\\Programs\\Android Studio\\jbr diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/file-system.probe" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/file-system.probe" deleted file mode 100644 index d35fc90..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/file-system.probe" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/vcs-1/gc.properties" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.gradle/vcs-1/gc.properties" deleted file mode 100644 index e69de29..0000000 diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/.gitignore" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/.gitignore" deleted file mode 100644 index 26d3352..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/.gitignore" +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/.name" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/.name" deleted file mode 100644 index b3405b3..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/.name" +++ /dev/null @@ -1 +0,0 @@ -My Application \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/compiler.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/compiler.xml" deleted file mode 100644 index b589d56..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/compiler.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/deploymentTargetDropDown.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/deploymentTargetDropDown.xml" deleted file mode 100644 index 0c0c338..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/deploymentTargetDropDown.xml" +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/gradle.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/gradle.xml" deleted file mode 100644 index 0897082..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/gradle.xml" +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/kotlinc.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/kotlinc.xml" deleted file mode 100644 index fdf8d99..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/kotlinc.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/migrations.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/migrations.xml" deleted file mode 100644 index f8051a6..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/migrations.xml" +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/misc.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/misc.xml" deleted file mode 100644 index 8978d23..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/misc.xml" +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/modules.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/modules.xml" deleted file mode 100644 index b047500..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/modules.xml" +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/vcs.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/vcs.xml" deleted file mode 100644 index 6c0b863..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/vcs.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210.iml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210.iml" deleted file mode 100644 index d6ebd48..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/.idea/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210.iml" +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/.gitignore" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/.gitignore" deleted file mode 100644 index 42afabf..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/.gitignore" +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/build.gradle.kts" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/build.gradle.kts" deleted file mode 100644 index e4c6569..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/build.gradle.kts" +++ /dev/null @@ -1,58 +0,0 @@ -plugins { - alias(libs.plugins.androidApplication) - alias(libs.plugins.jetbrainsKotlinAndroid) -} - -android { - namespace = "com.example.myapplication" - compileSdk = 34 - - defaultConfig { - applicationId = "com.example.myapplication" - minSdk = 30 - targetSdk = 34 - versionCode = 1 - versionName = "1.0" - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = "1.8" - } - buildFeatures { - viewBinding = true - } -} - -dependencies { - - implementation(libs.androidx.core.ktx) - implementation(libs.androidx.appcompat) - implementation(libs.material) - implementation(libs.androidx.constraintlayout) - implementation(libs.androidx.lifecycle.livedata.ktx) - implementation(libs.androidx.lifecycle.viewmodel.ktx) - implementation(libs.androidx.navigation.fragment.ktx) - implementation(libs.androidx.navigation.ui.ktx) - implementation(libs.androidx.activity) - testImplementation(libs.junit) - androidTestImplementation(libs.androidx.junit) - androidTestImplementation(libs.androidx.espresso.core) -//인디케이터 애니메이션 오픈소스 - implementation("me.relex:circleindicator:2.1.6") - -} \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/proguard-rules.pro" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/proguard-rules.pro" deleted file mode 100644 index 481bb43..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/proguard-rules.pro" +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt" deleted file mode 100644 index e9283cf..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.kt" +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.myapplication - -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.example.myapplication", appContext.packageName) - } -} \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/AndroidManifest.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/AndroidManifest.xml" deleted file mode 100644 index 4d05616..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/AndroidManifest.xml" +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/AlbumFragment.kt" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/AlbumFragment.kt" deleted file mode 100644 index edf1069..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/AlbumFragment.kt" +++ /dev/null @@ -1,63 +0,0 @@ -package com.example.myapplication - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.myapplication.databinding.FragmentAlbumBinding -import com.google.android.material.tabs.TabLayoutMediator - -class AlbumFragment : Fragment() { - lateinit var binding: FragmentAlbumBinding - private val information = arrayListOf("수록곡", "상세정보", "영상") - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentAlbumBinding.inflate(inflater, container, false) - - binding.albumBeenzinoTv.text = arguments?.getString("title") - binding.albumMusicSingerTv.text = arguments?.getString("singer") - - - binding.albumBackIv.setOnClickListener { - (context as MainActivity).supportFragmentManager.beginTransaction() - .replace(R.id.main_frm, HomeFragment()).commitAllowingStateLoss() - } - val albumAdapter = AlbumVPAdapter(this) - binding.albumContentVp.adapter = albumAdapter - TabLayoutMediator(binding.albumContentTb, binding.albumContentVp){ - tab, position -> - tab.text = information[position] - }.attach() - //taplayoutmediator는 탭과 뷰페이저를 이어줌. - - return binding.root - //넥서스 4여서 안되는거였다니... 이런 - - // binding.musicListTitle1Tv.setOnClickListener { - // // binding.musicListTitle1Tv.setOnClickListener { - // Toast.makeText(activity, "제목1", Toast.LENGTH_SHORT).show() - // } - // - // binding.musicListTitle2Tv.setOnClickListener { - // Toast.makeText(activity, "제목2", Toast.LENGTH_SHORT).show() - // } - // - // binding.musicListTitle3Tv.setOnClickListener { - // Toast.makeText(activity, "제목3", Toast.LENGTH_SHORT).show() - // } - // - // binding.musicListTitle4Tv.setOnClickListener { - // Toast.makeText(activity, "제목4", Toast.LENGTH_SHORT).show() - // } - // - // binding.musicListTitle5Tv.setOnClickListener { - // Toast.makeText(activity, "제목5", Toast.LENGTH_SHORT).show() - // } - } - - -} \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/HomeFragment.kt" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/HomeFragment.kt" deleted file mode 100644 index ab33fac..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/HomeFragment.kt" +++ /dev/null @@ -1,108 +0,0 @@ -package com.example.myapplication - -import android.os.Bundle -import android.os.Handler -import android.os.Looper -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import androidx.viewpager2.widget.ViewPager2 -import com.example.myapplication.databinding.FragmentHomeBinding -import java.util.Timer -import java.util.TimerTask - -class HomeFragment : Fragment() { - - lateinit var binding: FragmentHomeBinding - private val timer = Timer() - private val handler = Handler(Looper.getMainLooper()) - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentHomeBinding.inflate(inflater, container, false) - - binding.homePannelAlbumBeenzinoIv.setOnClickListener { - - val bundle = Bundle() - bundle.putString("title", binding.homePannelTodayMusicTitle1Tv.text.toString()) - bundle.putString("singer", binding.homePannelTodayMusicSinger1Tv.text.toString()) - - - val albumFragment = AlbumFragment() - albumFragment.arguments = bundle - - (context as MainActivity).supportFragmentManager.beginTransaction().replace( - R.id.main_frm, albumFragment).commitAllowingStateLoss() - - } - binding.homePannelAlbumBigbang.setOnClickListener { - - val bundle = Bundle() - bundle.putString("title", binding.homePannelTodayMusicTitle2Tv.text.toString()) - bundle.putString("singer", binding.homePannelTodayMusicSinger2Tv.text.toString()) - - - val albumFragment = AlbumFragment() - albumFragment.arguments = bundle - - (context as MainActivity).supportFragmentManager.beginTransaction().replace( - R.id.main_frm, albumFragment).commitAllowingStateLoss() - - } - - binding.homePannelAlbumChangmo.setOnClickListener { - - val bundle = Bundle() - bundle.putString("title", binding.homePannelTodayMusicTitle3Tv.text.toString()) - bundle.putString("singer", binding.homePannelTodayMusicSinger3Tv.text.toString()) - - - val albumFragment = AlbumFragment() - albumFragment.arguments = bundle - - (context as MainActivity).supportFragmentManager.beginTransaction().replace( - R.id.main_frm, albumFragment).commitAllowingStateLoss() - - } - - val bannerAdapter = BannerVPAdapter(this) - bannerAdapter.addFragment(BannerFragment(R.drawable.img_home_viewpager_exp)) - bannerAdapter.addFragment(BannerFragment(R.drawable.img_home_viewpager_exp2)) - binding.homeBannerVp.adapter = bannerAdapter - binding.homeBannerVp.orientation = ViewPager2.ORIENTATION_HORIZONTAL - - val pannelAdpater = PannelVpAdapter(this) - pannelAdpater.addFragment(PannelFragment(R.drawable.img_first_album_default)) - pannelAdpater.addFragment(PannelFragment(R.drawable.skplanet_musicmate_sc0_2021_03_12_16_59_19)) - pannelAdpater.addFragment(PannelFragment(R.drawable._786635_719636_923)) - - binding.homePannelBackgroundIv.adapter = pannelAdpater - binding.homePannelBackgroundIv.orientation = ViewPager2.ORIENTATION_HORIZONTAL - binding.indicator.setViewPager(binding.homePannelBackgroundIv) - - autoSlide(pannelAdpater) - - - - - return binding.root - } - private fun autoSlide(adapter: PannelVpAdapter) { - timer.scheduleAtFixedRate(object : TimerTask() { - override fun run() { - handler.post { - val nextItem = binding.homePannelBackgroundIv.currentItem + 1 - if (nextItem < adapter.itemCount) { - binding.homePannelBackgroundIv.currentItem = nextItem - } else { - binding.homePannelBackgroundIv.currentItem = 0 // 순환 - } - } - } - }, 3000, 3000) - } -} \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/LockerFragment.kt" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/LockerFragment.kt" deleted file mode 100644 index 27542db..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/LockerFragment.kt" +++ /dev/null @@ -1,33 +0,0 @@ -package com.example.myapplication - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.myapplication.databinding.FragmentLockerBinding -import com.google.android.material.tabs.TabLayoutMediator - -class LockerFragment : Fragment() { - - lateinit var binding: FragmentLockerBinding - private val information = arrayListOf("저장한 곡", "음악파일") - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentLockerBinding.inflate(inflater, container, false) - - val lockerAdapter = LockerVPAdapter(this) - binding.lockerContentVp.adapter = lockerAdapter - TabLayoutMediator(binding.lockerContentTb,binding.lockerContentVp){ - tab, position -> - tab.text = information[position] - - }.attach() - - - return binding.root - } -} \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/MainActivity.kt" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/MainActivity.kt" deleted file mode 100644 index 490362f..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/MainActivity.kt" +++ /dev/null @@ -1,94 +0,0 @@ -package com.example.myapplication - -import android.content.Intent -import androidx.appcompat.app.AppCompatActivity -import android.os.Bundle -import android.util.Log -import android.widget.Toast -import androidx.activity.result.ActivityResultLauncher -import androidx.activity.result.contract.ActivityResultContracts -import com.example.myapplication.databinding.ActivityMainBinding - -class MainActivity : AppCompatActivity() { - lateinit var activityResultLauncher:ActivityResultLauncher - val binding by lazy{ - ActivityMainBinding.inflate(layoutInflater)} - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - binding.mainPlayerCl.setOnClickListener { - startActivity(Intent(this,SongActivity::class.java)) - } - - setContentView(binding.root) - - initBottomNavigation() - - val song = Song( - binding.miniPlayerTitleTv.text.toString(), - binding.miniPlayerSingerTv.text.toString() - ) - - activityResultLauncher = registerForActivityResult( - ActivityResultContracts.StartActivityForResult() - ) { result -> - if (result.resultCode == RESULT_OK) { - val data = result.data - if (data != null) { - val message = data.getStringExtra("message") - Log.d("message", message!!) - Toast.makeText(this, message, Toast.LENGTH_SHORT).show() - } - } - } - - binding.mainPlayerCl.setOnClickListener { - - val intent = Intent(this,SongActivity::class.java) - intent.putExtra("title", song.title) - intent.putExtra("singer",song.singer,) - startActivity(intent) - } - - } - - private fun initBottomNavigation(){ - - supportFragmentManager.beginTransaction() - .replace(R.id.main_frm, HomeFragment()) - .commitAllowingStateLoss() - - binding.mainBnv.setOnItemSelectedListener{ item -> - when (item.itemId) { - - R.id.homeFragment -> { - supportFragmentManager.beginTransaction() - .replace(R.id.main_frm, HomeFragment()) - .commitAllowingStateLoss() - return@setOnItemSelectedListener true - } - - R.id.lookFragment -> { - supportFragmentManager.beginTransaction() - .replace(R.id.main_frm, LookFragment()) - .commitAllowingStateLoss() - return@setOnItemSelectedListener true - } - R.id.searchFragment -> { - supportFragmentManager.beginTransaction() - .replace(R.id.main_frm, SearchFragment()) - .commitAllowingStateLoss() - return@setOnItemSelectedListener true - } - R.id.lockerFragment -> { - supportFragmentManager.beginTransaction() - .replace(R.id.main_frm, LockerFragment()) - .commitAllowingStateLoss() - return@setOnItemSelectedListener true - } - } - false - } - } -} \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SavedAlbumFragment.kt" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SavedAlbumFragment.kt" deleted file mode 100644 index 551311f..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SavedAlbumFragment.kt" +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.myapplication - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.myapplication.databinding.FragmentLockerSavedalbumBinding - -class SavedAlbumFragment: Fragment() { - lateinit var binding: FragmentLockerSavedalbumBinding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentLockerSavedalbumBinding.inflate(inflater, container, false) - - return binding.root - } -} \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SavedSongFragment.kt" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SavedSongFragment.kt" deleted file mode 100644 index 65c2285..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SavedSongFragment.kt" +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.myapplication - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.myapplication.databinding.FragmentLockerSavedsongBinding - -class SavedSongFragment: Fragment() { - lateinit var binding: FragmentLockerSavedsongBinding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - binding = FragmentLockerSavedsongBinding.inflate(inflater,container,false) - - return binding.root - } -} diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/Song.kt" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/Song.kt" deleted file mode 100644 index 980fc9a..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/Song.kt" +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.myapplication - -data class Song ( - val title: String = "", - val singer: String = "") \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SongActivity.kt" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SongActivity.kt" deleted file mode 100644 index 00441c7..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SongActivity.kt" +++ /dev/null @@ -1,70 +0,0 @@ -package com.example.myapplication - -import android.content.Intent -import android.media.AsyncPlayer -import android.media.Image -import android.os.Bundle -import android.view.View -import androidx.activity.enableEdgeToEdge -import androidx.appcompat.app.AppCompatActivity -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -import com.example.myapplication.databinding.ActivitySongBinding - -class SongActivity : AppCompatActivity() { - - val binding by lazy { - ActivitySongBinding.inflate(layoutInflater) - } - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(binding.root) - - var title : String? = null - var singer : String? = null - - if (intent.hasExtra("title") && intent.hasExtra("singer")) { - title = intent.getStringExtra("title") - singer = intent.getStringExtra("singer") - binding.musicTitleTv.text = title - binding.singerNameTv.text = singer - } - - binding.lowerIb.setOnClickListener{ - val intent = Intent(this, MainActivity::class.java) - intent.putExtra("message", title + " _ " + singer) - setResult(RESULT_OK, intent) - finish() - } - - binding.songMiniplayerIv.setOnClickListener{ - setPlayerStatus(false) - } - binding.songPauseIv.setOnClickListener { - setPlayerStatus(true) - } - - - - } - - fun setPlayerStatus(isPlaying : Boolean){ - if(isPlaying){ - binding.songPauseIv.visibility = View.GONE - binding.songMiniplayerIv.visibility = View.VISIBLE - - } - - else{ - binding.songMiniplayerIv.visibility = View.GONE - binding.songPauseIv.visibility = View.VISIBLE - } - } - - override fun onBackPressed() { - val intent = Intent(this, MainActivity::class.java) - intent.putExtra("message", "뒤로가기 버튼 클릭") - setResult(RESULT_OK, intent) - finish() - } -} \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/_786635_719636_923.jpg" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/_786635_719636_923.jpg" deleted file mode 100644 index 31c76a0..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/_786635_719636_923.jpg" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/aquaman.jpeg" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/aquaman.jpeg" deleted file mode 100644 index 58c4548..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/aquaman.jpeg" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/bangbangbang.jpeg" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/bangbangbang.jpeg" deleted file mode 100644 index d7ea32e..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/bangbangbang.jpeg" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/beautiful.jpeg" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/beautiful.jpeg" deleted file mode 100644 index 72ad6b2..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/beautiful.jpeg" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/bibi_album.jpeg" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/bibi_album.jpeg" deleted file mode 100644 index 91a1703..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/bibi_album.jpeg" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/blue_radius.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/blue_radius.xml" deleted file mode 100644 index 9d234ef..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/blue_radius.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btm_color_selector.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btm_color_selector.xml" deleted file mode 100644 index 3ecf8a7..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btm_color_selector.xml" +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_actionbar_instagram.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_actionbar_instagram.png" deleted file mode 100644 index 90bc027..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_actionbar_instagram.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_arrow_black.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_arrow_black.png" deleted file mode 100644 index cc38ca8..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_arrow_black.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_main_arrow_more.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_main_arrow_more.png" deleted file mode 100644 index 59e410c..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_main_arrow_more.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_main_mike.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_main_mike.png" deleted file mode 100644 index 9bddec6..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_main_mike.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_main_setting.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_main_setting.png" deleted file mode 100644 index 7a8d5d6..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_main_setting.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_main_ticket.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_main_ticket.png" deleted file mode 100644 index 52b6d64..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_main_ticket.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplay_mvpause.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplay_mvpause.png" deleted file mode 100644 index 470e046..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplay_mvpause.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplay_mvplay.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplay_mvplay.png" deleted file mode 100644 index d118677..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplay_mvplay.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplay_pause.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplay_pause.png" deleted file mode 100644 index 470e046..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplay_pause.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplayer_go_list.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplayer_go_list.png" deleted file mode 100644 index 1b2d977..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplayer_go_list.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplayer_next.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplayer_next.png" deleted file mode 100644 index 3aedba3..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplayer_next.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplayer_play.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplayer_play.png" deleted file mode 100644 index f619072..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplayer_play.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplayer_previous.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplayer_previous.png" deleted file mode 100644 index d0bf1f6..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_miniplayer_previous.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_panel_play_large.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_panel_play_large.png" deleted file mode 100644 index 4ac7103..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_panel_play_large.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_eq_off.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_eq_off.png" deleted file mode 100644 index f23d9c6..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_eq_off.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_go_list.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_go_list.png" deleted file mode 100644 index 1b2d977..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_go_list.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_more.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_more.png" deleted file mode 100644 index a8ad9e6..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_more.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_play.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_play.png" deleted file mode 100644 index f6c3201..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_play.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_related.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_related.png" deleted file mode 100644 index 9026fe5..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_related.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_setting.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_setting.png" deleted file mode 100644 index 0df8f69..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_setting.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_unlike_off.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_unlike_off.png" deleted file mode 100644 index b539504..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_unlike_off.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_unlike_on.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_unlike_on.png" deleted file mode 100644 index 45a43ca..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_player_unlike_on.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_playlist_select_off.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_playlist_select_off.png" deleted file mode 100644 index 62ef45c..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_playlist_select_off.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_playlist_select_on.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_playlist_select_on.png" deleted file mode 100644 index 2d3b6af..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_playlist_select_on.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_toggle_off.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_toggle_off.png" deleted file mode 100644 index 983360d..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_toggle_off.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_toggle_on.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_toggle_on.png" deleted file mode 100644 index fb609f4..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/btn_toggle_on.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/discovery_banner_aos.jpg" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/discovery_banner_aos.jpg" deleted file mode 100644 index c905515..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/discovery_banner_aos.jpg" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/gray_radius.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/gray_radius.xml" deleted file mode 100644 index f723d9c..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/gray_radius.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_home_no_select.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_home_no_select.png" deleted file mode 100644 index 69a8ab6..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_home_no_select.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_home_select.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_home_select.png" deleted file mode 100644 index c0ff48e..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_home_select.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_locker_no_select.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_locker_no_select.png" deleted file mode 100644 index a67dec3..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_locker_no_select.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_locker_select.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_locker_select.png" deleted file mode 100644 index 042489f..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_locker_select.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_look_no_select.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_look_no_select.png" deleted file mode 100644 index 6c2f4f0..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_look_no_select.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_look_select.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_look_select.png" deleted file mode 100644 index 3d169e4..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_look_select.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_search_no_select.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_search_no_select.png" deleted file mode 100644 index a77b8c5..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_search_no_select.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_search_select.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_search_select.png" deleted file mode 100644 index d5c8a72..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_bottom_search_select.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_dashboard_black_24dp.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_dashboard_black_24dp.xml" deleted file mode 100644 index 46fc8de..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_dashboard_black_24dp.xml" +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_home_black_24dp.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_home_black_24dp.xml" deleted file mode 100644 index f8bb0b5..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_home_black_24dp.xml" +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_launcher_background.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_launcher_background.xml" deleted file mode 100644 index 07d5da9..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_launcher_background.xml" +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_launcher_foreground.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_launcher_foreground.xml" deleted file mode 100644 index 2b068d1..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_launcher_foreground.xml" +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_main_facebook.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_main_facebook.png" deleted file mode 100644 index 83e9732..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_main_facebook.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_main_instagram.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_main_instagram.png" deleted file mode 100644 index 398ce61..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_main_instagram.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_main_twitter.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_main_twitter.png" deleted file mode 100644 index 6ddc68e..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_main_twitter.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_main_youtube.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_main_youtube.png" deleted file mode 100644 index 0c4ec93..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_main_youtube.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_my_like_off.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_my_like_off.png" deleted file mode 100644 index c06e139..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_my_like_off.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_my_like_on.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_my_like_on.png" deleted file mode 100644 index 22577c0..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_my_like_on.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_notifications_black_24dp.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_notifications_black_24dp.xml" deleted file mode 100644 index 78b75c3..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/ic_notifications_black_24dp.xml" +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/icon_browse_arrow_right.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/icon_browse_arrow_right.png" deleted file mode 100644 index 71b588b..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/icon_browse_arrow_right.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_album_exp.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_album_exp.png" deleted file mode 100644 index 6e3f38a..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_album_exp.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_album_exp2.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_album_exp2.png" deleted file mode 100644 index 28ea3ee..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_album_exp2.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_album_lp.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_album_lp.png" deleted file mode 100644 index 29fb1b4..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_album_lp.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_first_album_default.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_first_album_default.png" deleted file mode 100644 index 926d34f..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_first_album_default.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_home_viewpager_exp.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_home_viewpager_exp.png" deleted file mode 100644 index da78032..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_home_viewpager_exp.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_home_viewpager_exp2.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_home_viewpager_exp2.png" deleted file mode 100644 index 50fa4be..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_home_viewpager_exp2.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_potcast_exp.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_potcast_exp.png" deleted file mode 100644 index 50a46e0..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_potcast_exp.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_video_exp.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_video_exp.png" deleted file mode 100644 index 7f6b05f..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/img_video_exp.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_down.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_down.png" deleted file mode 100644 index 03a04c5..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_down.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_pause_32.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_pause_32.png" deleted file mode 100644 index 9388aa3..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_pause_32.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_play_32.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_play_32.png" deleted file mode 100644 index b781e4c..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_play_32.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_random_inactive.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_random_inactive.png" deleted file mode 100644 index fe4f880..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_random_inactive.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_repeat_inactive.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_repeat_inactive.png" deleted file mode 100644 index 1e4044d..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_repeat_inactive.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_skip_next_32.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_skip_next_32.png" deleted file mode 100644 index fc02f28..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_skip_next_32.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_skip_previous_32.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_skip_previous_32.png" deleted file mode 100644 index 03ec854..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/nugu_btn_skip_previous_32.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/skplanet_musicmate_sc0_2021_03_12_16_59_19.jpg" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/skplanet_musicmate_sc0_2021_03_12_16_59_19.jpg" deleted file mode 100644 index 88b3124..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/skplanet_musicmate_sc0_2021_03_12_16_59_19.jpg" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/widget_black_play.png" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/widget_black_play.png" deleted file mode 100644 index 0ec2700..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/drawable/widget_black_play.png" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/activity_main.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/activity_main.xml" deleted file mode 100644 index 1903e08..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/activity_main.xml" +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/activity_song.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/activity_song.xml" deleted file mode 100644 index f449a21..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/activity_song.xml" +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_album.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_album.xml" deleted file mode 100644 index b2595a0..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_album.xml" +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_banner.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_banner.xml" deleted file mode 100644 index ff8b14e..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_banner.xml" +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_detail.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_detail.xml" deleted file mode 100644 index 3a62a57..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_detail.xml" +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_home.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_home.xml" deleted file mode 100644 index ba99ec1..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_home.xml" +++ /dev/null @@ -1,1026 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_locker.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_locker.xml" deleted file mode 100644 index fe8d901..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_locker.xml" +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_locker_savedsong.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_locker_savedsong.xml" deleted file mode 100644 index 77d9ef6..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_locker_savedsong.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_look.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_look.xml" deleted file mode 100644 index 1fa702b..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_look.xml" +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_pannel.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_pannel.xml" deleted file mode 100644 index e2f6f9e..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_pannel.xml" +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_search.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_search.xml" deleted file mode 100644 index 6fbc0a9..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_search.xml" +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_song.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_song.xml" deleted file mode 100644 index eaac2d5..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_song.xml" +++ /dev/null @@ -1,498 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_video.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_video.xml" deleted file mode 100644 index 6247a2b..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_video.xml" +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/menu/bottom_nav_menu.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/menu/bottom_nav_menu.xml" deleted file mode 100644 index 9a55b1a..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/menu/bottom_nav_menu.xml" +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-anydpi/ic_launcher.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-anydpi/ic_launcher.xml" deleted file mode 100644 index 6f3b755..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-anydpi/ic_launcher.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml" deleted file mode 100644 index 6f3b755..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-hdpi/ic_launcher.webp" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-hdpi/ic_launcher.webp" deleted file mode 100644 index c209e78..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-hdpi/ic_launcher.webp" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp" deleted file mode 100644 index b2dfe3d..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-mdpi/ic_launcher.webp" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-mdpi/ic_launcher.webp" deleted file mode 100644 index 4f0f1d6..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-mdpi/ic_launcher.webp" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp" deleted file mode 100644 index 62b611d..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xhdpi/ic_launcher.webp" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xhdpi/ic_launcher.webp" deleted file mode 100644 index 948a307..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xhdpi/ic_launcher.webp" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp" deleted file mode 100644 index 1b9a695..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp" deleted file mode 100644 index 28d4b77..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp" deleted file mode 100644 index 9287f50..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp" deleted file mode 100644 index aa7d642..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp" deleted file mode 100644 index 9126ae3..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/navigation/mobile_navigation.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/navigation/mobile_navigation.xml" deleted file mode 100644 index 9439eda..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/navigation/mobile_navigation.xml" +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values-night/themes.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values-night/themes.xml" deleted file mode 100644 index 54202f5..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values-night/themes.xml" +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values/colors.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values/colors.xml" deleted file mode 100644 index f8c6127..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values/colors.xml" +++ /dev/null @@ -1,10 +0,0 @@ - - - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values/dimens.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values/dimens.xml" deleted file mode 100644 index e00c2dd..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values/dimens.xml" +++ /dev/null @@ -1,5 +0,0 @@ - - - 16dp - 16dp - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values/strings.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values/strings.xml" deleted file mode 100644 index 54372b2..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values/strings.xml" +++ /dev/null @@ -1,23 +0,0 @@ - - My Application - Home - Dashboard - Notifications - - Hello blank fragment - BEENZINO 1st Album \'Aquaman\' - BEENZINO (빈지노) - 2012.07.03 | 정규 | 힙합 - - - Beenzino의 클래식 [2 4 : 2 6] 5주년 기념 리마스터 재발매!\n\n - 2012년 여름에 발매되었던 Beenzino의 첫 솔로 앨범 [2 4 : 2 6]\n - [2 4 : 2 6]는 발매 직후 폭발적인 호응을 이끌어내며 Beenzino의 대표작으로 자리매김하였다.\n\n - [2 4 : 2 6]는 힙합 앨범으로써는 유례없는 성공을 거둠과 동시에 Beenzino를 세상에 널리 알린 작품이 되었으며, 5년이 지난 지금도 이 앨범의 영향력은 현재 진행형이다.\n\n - 심지어 이 앨범의 CD 역시 그 인기가 식지 않아 지금까지도 번번이 품절 사태에 이르렀으니 한국 힙합 역사상 가장 사랑받는 앨범이 되었다고 해도 과언이 아닐 것이다.\n - 이러한 [2 4 : 2 6]가 발매 5주년을 맞이하여 "5th Anniversary Remaster Edition"으로 돌아온다.\n\n - 이번 리마스터 에디션은 세계적인 마스터링 엔지니어 Vlado Meller의 리마스터링을 거쳐 보다 향상된 사운드로 재탄생하였으며, 음반의 구성과 형태는 초판과 거의 동일하게 유지하여\n - 원작의 감흥을 그대로 전한다. - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values/themes.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values/themes.xml" deleted file mode 100644 index 503477b..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/values/themes.xml" +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/xml/backup_rules.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/xml/backup_rules.xml" deleted file mode 100644 index fa0f996..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/xml/backup_rules.xml" +++ /dev/null @@ -1,13 +0,0 @@ - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/xml/data_extraction_rules.xml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/xml/data_extraction_rules.xml" deleted file mode 100644 index 9ee9997..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/xml/data_extraction_rules.xml" +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/test/java/com/example/myapplication/ExampleUnitTest.kt" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/test/java/com/example/myapplication/ExampleUnitTest.kt" deleted file mode 100644 index e500fb8..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/test/java/com/example/myapplication/ExampleUnitTest.kt" +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.myapplication - -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 diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/build.gradle.kts" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/build.gradle.kts" deleted file mode 100644 index a0985ef..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/build.gradle.kts" +++ /dev/null @@ -1,5 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -plugins { - alias(libs.plugins.androidApplication) apply false - alias(libs.plugins.jetbrainsKotlinAndroid) apply false -} \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradle.properties" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradle.properties" deleted file mode 100644 index 20e2a01..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradle.properties" +++ /dev/null @@ -1,23 +0,0 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. For more details, visit -# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradle/libs.versions.toml" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradle/libs.versions.toml" deleted file mode 100644 index 219c586..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradle/libs.versions.toml" +++ /dev/null @@ -1,34 +0,0 @@ -[versions] -agp = "8.3.2" -kotlin = "1.9.0" -coreKtx = "1.13.0" -junit = "4.13.2" -junitVersion = "1.1.5" -espressoCore = "3.5.1" -appcompat = "1.6.1" -material = "1.11.0" -constraintlayout = "2.1.4" -lifecycleLivedataKtx = "2.7.0" -lifecycleViewmodelKtx = "2.7.0" -navigationFragmentKtx = "2.7.7" -navigationUiKtx = "2.7.7" -activity = "1.9.0" - -[libraries] -androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } -junit = { group = "junit", name = "junit", version.ref = "junit" } -androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } -androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } -androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } -material = { group = "com.google.android.material", name = "material", version.ref = "material" } -androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } -androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" } -androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" } -androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigationFragmentKtx" } -androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigationUiKtx" } -androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" } - -[plugins] -androidApplication = { id = "com.android.application", version.ref = "agp" } -jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } - diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradle/wrapper/gradle-wrapper.jar" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradle/wrapper/gradle-wrapper.jar" deleted file mode 100644 index e708b1c..0000000 Binary files "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradle/wrapper/gradle-wrapper.jar" and /dev/null differ diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradle/wrapper/gradle-wrapper.properties" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradle/wrapper/gradle-wrapper.properties" deleted file mode 100644 index be58dc5..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradle/wrapper/gradle-wrapper.properties" +++ /dev/null @@ -1,6 +0,0 @@ -#Sat Apr 06 18:11:03 KST 2024 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradlew" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradlew" deleted file mode 100755 index 4f906e0..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradlew" +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# 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 -# -# https://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. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradlew.bat" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradlew.bat" deleted file mode 100644 index 107acd3..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/gradlew.bat" +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/local.properties" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/local.properties" deleted file mode 100644 index 0ccfb94..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/local.properties" +++ /dev/null @@ -1,8 +0,0 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Wed May 01 13:47:09 KST 2024 -sdk.dir=C\:\\Users\\wkdal\\AppData\\Local\\Android\\Sdk diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/settings.gradle.kts" "b/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/settings.gradle.kts" deleted file mode 100644 index 7e67774..0000000 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/settings.gradle.kts" +++ /dev/null @@ -1,24 +0,0 @@ -pluginManagement { - repositories { - google { - content { - includeGroupByRegex("com\\.android.*") - includeGroupByRegex("com\\.google.*") - includeGroupByRegex("androidx.*") - } - } - mavenCentral() - gradlePluginPortal() - } -} -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - google() - mavenCentral() - } -} - -rootProject.name = "My Application" -include(":app") - \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/checksums/checksums.lock" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/checksums/checksums.lock" index bd348aa..1421a7b 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/checksums/checksums.lock" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/checksums/checksums.lock" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/checksums/md5-checksums.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/checksums/md5-checksums.bin" index f8126be..1e9b32b 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/checksums/md5-checksums.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/checksums/md5-checksums.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/checksums/sha1-checksums.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/checksums/sha1-checksums.bin" index 89aaeee..d90e8e5 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/checksums/sha1-checksums.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/checksums/sha1-checksums.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock" index 2c1afc7..0e9b980 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/dependencies-accessors/executionHistory.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/dependencies-accessors/executionHistory.bin" index 8b5489a..3654de0 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/dependencies-accessors/executionHistory.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/dependencies-accessors/executionHistory.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/executionHistory/executionHistory.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/executionHistory/executionHistory.bin" index 38a9333..63a6975 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/executionHistory/executionHistory.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/executionHistory/executionHistory.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/executionHistory/executionHistory.lock" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/executionHistory/executionHistory.lock" index 64c43b0..06a34ac 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/executionHistory/executionHistory.lock" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/executionHistory/executionHistory.lock" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/fileHashes/fileHashes.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/fileHashes/fileHashes.bin" index aa3910b..be9dd0b 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/fileHashes/fileHashes.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/fileHashes/fileHashes.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/fileHashes/fileHashes.lock" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/fileHashes/fileHashes.lock" index 23e6bcb..91e99b1 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/fileHashes/fileHashes.lock" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/fileHashes/fileHashes.lock" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/fileHashes/resourceHashesCache.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/fileHashes/resourceHashesCache.bin" index be1ffbd..6cb39e3 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/fileHashes/resourceHashesCache.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/8.4/fileHashes/resourceHashesCache.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/buildOutputCleanup/buildOutputCleanup.lock" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/buildOutputCleanup/buildOutputCleanup.lock" index 981b03c..e5d898d 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/buildOutputCleanup/buildOutputCleanup.lock" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/buildOutputCleanup/buildOutputCleanup.lock" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/buildOutputCleanup/outputFiles.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/buildOutputCleanup/outputFiles.bin" index b7ce01a..9d82f18 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/buildOutputCleanup/outputFiles.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/buildOutputCleanup/outputFiles.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/file-system.probe" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/file-system.probe" index ff034a9..73c78a4 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/file-system.probe" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.gradle/file-system.probe" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/deploymentTargetSelector.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/deploymentTargetSelector.xml" deleted file mode 100644 index b268ef3..0000000 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/deploymentTargetSelector.xml" +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/misc.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/misc.xml" index 95b3004..8978d23 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/misc.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/misc.xml" @@ -1,7 +1,3 @@ -<<<<<<< Updated upstream - -======= ->>>>>>> Stashed changes diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/vcs.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/vcs.xml" deleted file mode 100644 index b2bdec2..0000000 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/vcs.xml" +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/workspace.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/workspace.xml" index 9310893..218a711 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/workspace.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/.idea/workspace.xml" @@ -5,11 +5,21 @@ + + + @style/Theme.UMCflo + + @style/Theme.UMCflo + + + @style/Theme.UMCflo + + @style/Theme.UMCflo @@ -30,6 +40,11 @@ @style/Theme.UMCflo + + + @style/Theme.UMCflo + + @style/Theme.UMCflo @@ -55,6 +70,11 @@ @style/Theme.UMCflo + + + @style/Theme.UMCflo + + @style/Theme.UMCflo @@ -85,6 +105,11 @@ @style/Theme.UMCflo + + + @style/Theme.UMCflo + + @@ -110,9 +135,11 @@ @@ -135,9 +162,21 @@ } } + + + + + + + + + + + + diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build.gradle.kts" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build.gradle.kts" index f204e87..43d3f54 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build.gradle.kts" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build.gradle.kts" @@ -1,6 +1,7 @@ plugins { - alias(libs.plugins.androidApplication) - alias(libs.plugins.jetbrainsKotlinAndroid) + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("kotlin-kapt") } android { @@ -9,7 +10,7 @@ android { defaultConfig { applicationId = "com.example.umcflo" - minSdk = 21 + minSdk = 23 targetSdk = 34 versionCode = 1 versionName = "1.0" @@ -27,22 +28,25 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = JavaVersion.VERSION_17.toString() } buildFeatures{ viewBinding = true } + } dependencies { -<<<<<<< Updated upstream + implementation("androidx.room:room-migration:2.6.0") + implementation("androidx.room:room-runtime:2.6.0") + kapt("androidx.room:room-compiler:2.6.0") + + implementation ("com.google.code.gson:gson:2.8.7") -======= ->>>>>>> Stashed changes implementation("me.relex:circleindicator:2.1.6") implementation(libs.androidx.core.ktx) implementation(libs.androidx.appcompat) diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/generated/data_binding_base_class_source_out/debug/out/com/example/umcflo/databinding/ActivitySongBinding.java" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/generated/data_binding_base_class_source_out/debug/out/com/example/umcflo/databinding/ActivitySongBinding.java" index 7539f1b..6b923a7 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/generated/data_binding_base_class_source_out/debug/out/com/example/umcflo/databinding/ActivitySongBinding.java" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/generated/data_binding_base_class_source_out/debug/out/com/example/umcflo/databinding/ActivitySongBinding.java" @@ -32,18 +32,9 @@ public final class ActivitySongBinding implements ViewBinding { @NonNull public final ImageView listIv; - @NonNull - public final ImageButton lowerIb; - @NonNull public final TextView lyrics01Iv; - @NonNull - public final TextView musicTitleTv; - - @NonNull - public final ImageView playerLikeIv; - @NonNull public final LinearLayout playerLikeIvLayout; @@ -63,20 +54,26 @@ public final class ActivitySongBinding implements ViewBinding { public final ImageButton settingIb; @NonNull - public final TextView singerNameTv; + public final ImageView songAlbumIv; @NonNull - public final ImageView songAlbumIUIv; + public final ImageButton songDownIb; @NonNull public final TextView songEndTimeTv; + @NonNull + public final ImageView songLikeIv; + @NonNull public final ImageView songMiniplayerIv; @NonNull public final TextView songMusicLyrics02Iv; + @NonNull + public final TextView songMusicTitleTv; + @NonNull public final ImageView songNextIv; @@ -95,6 +92,9 @@ public final class ActivitySongBinding implements ViewBinding { @NonNull public final ImageView songRepeatIv; + @NonNull + public final TextView songSingerNameTv; + @NonNull public final ImageView songSingerPlusIv; @@ -102,42 +102,43 @@ public final class ActivitySongBinding implements ViewBinding { public final TextView songStartTimeTv; private ActivitySongBinding(@NonNull ConstraintLayout rootView, @NonNull ImageButton eqIb, - @NonNull ImageView instagramIv, @NonNull ImageView listIv, @NonNull ImageButton lowerIb, - @NonNull TextView lyrics01Iv, @NonNull TextView musicTitleTv, @NonNull ImageView playerLikeIv, + @NonNull ImageView instagramIv, @NonNull ImageView listIv, @NonNull TextView lyrics01Iv, @NonNull LinearLayout playerLikeIvLayout, @NonNull ImageView playerUnlikeIv, @NonNull ImageButton plusIb, @NonNull ImageView randomIv, @NonNull ImageView relatedIv, - @NonNull ImageButton settingIb, @NonNull TextView singerNameTv, - @NonNull ImageView songAlbumIUIv, @NonNull TextView songEndTimeTv, - @NonNull ImageView songMiniplayerIv, @NonNull TextView songMusicLyrics02Iv, + @NonNull ImageButton settingIb, @NonNull ImageView songAlbumIv, + @NonNull ImageButton songDownIb, @NonNull TextView songEndTimeTv, + @NonNull ImageView songLikeIv, @NonNull ImageView songMiniplayerIv, + @NonNull TextView songMusicLyrics02Iv, @NonNull TextView songMusicTitleTv, @NonNull ImageView songNextIv, @NonNull ImageView songPauseIv, @NonNull LinearLayout songPlayerLayout, @NonNull ImageView songPreviousIv, @NonNull SeekBar songProgressSb, @NonNull ImageView songRepeatIv, - @NonNull ImageView songSingerPlusIv, @NonNull TextView songStartTimeTv) { + @NonNull TextView songSingerNameTv, @NonNull ImageView songSingerPlusIv, + @NonNull TextView songStartTimeTv) { this.rootView = rootView; this.eqIb = eqIb; this.instagramIv = instagramIv; this.listIv = listIv; - this.lowerIb = lowerIb; this.lyrics01Iv = lyrics01Iv; - this.musicTitleTv = musicTitleTv; - this.playerLikeIv = playerLikeIv; this.playerLikeIvLayout = playerLikeIvLayout; this.playerUnlikeIv = playerUnlikeIv; this.plusIb = plusIb; this.randomIv = randomIv; this.relatedIv = relatedIv; this.settingIb = settingIb; - this.singerNameTv = singerNameTv; - this.songAlbumIUIv = songAlbumIUIv; + this.songAlbumIv = songAlbumIv; + this.songDownIb = songDownIb; this.songEndTimeTv = songEndTimeTv; + this.songLikeIv = songLikeIv; this.songMiniplayerIv = songMiniplayerIv; this.songMusicLyrics02Iv = songMusicLyrics02Iv; + this.songMusicTitleTv = songMusicTitleTv; this.songNextIv = songNextIv; this.songPauseIv = songPauseIv; this.songPlayerLayout = songPlayerLayout; this.songPreviousIv = songPreviousIv; this.songProgressSb = songProgressSb; this.songRepeatIv = songRepeatIv; + this.songSingerNameTv = songSingerNameTv; this.songSingerPlusIv = songSingerPlusIv; this.songStartTimeTv = songStartTimeTv; } @@ -187,30 +188,12 @@ public static ActivitySongBinding bind(@NonNull View rootView) { break missingId; } - id = R.id.lower_ib; - ImageButton lowerIb = ViewBindings.findChildViewById(rootView, id); - if (lowerIb == null) { - break missingId; - } - id = R.id.lyrics_01_iv; TextView lyrics01Iv = ViewBindings.findChildViewById(rootView, id); if (lyrics01Iv == null) { break missingId; } - id = R.id.music_title_tv; - TextView musicTitleTv = ViewBindings.findChildViewById(rootView, id); - if (musicTitleTv == null) { - break missingId; - } - - id = R.id.player_like_iv; - ImageView playerLikeIv = ViewBindings.findChildViewById(rootView, id); - if (playerLikeIv == null) { - break missingId; - } - id = R.id.player_like_iv_layout; LinearLayout playerLikeIvLayout = ViewBindings.findChildViewById(rootView, id); if (playerLikeIvLayout == null) { @@ -247,15 +230,15 @@ public static ActivitySongBinding bind(@NonNull View rootView) { break missingId; } - id = R.id.singer_name_tv; - TextView singerNameTv = ViewBindings.findChildViewById(rootView, id); - if (singerNameTv == null) { + id = R.id.song_album_iv; + ImageView songAlbumIv = ViewBindings.findChildViewById(rootView, id); + if (songAlbumIv == null) { break missingId; } - id = R.id.song_album_IU_iv; - ImageView songAlbumIUIv = ViewBindings.findChildViewById(rootView, id); - if (songAlbumIUIv == null) { + id = R.id.song_down_ib; + ImageButton songDownIb = ViewBindings.findChildViewById(rootView, id); + if (songDownIb == null) { break missingId; } @@ -265,6 +248,12 @@ public static ActivitySongBinding bind(@NonNull View rootView) { break missingId; } + id = R.id.song_like_iv; + ImageView songLikeIv = ViewBindings.findChildViewById(rootView, id); + if (songLikeIv == null) { + break missingId; + } + id = R.id.song_miniplayer_iv; ImageView songMiniplayerIv = ViewBindings.findChildViewById(rootView, id); if (songMiniplayerIv == null) { @@ -277,6 +266,12 @@ public static ActivitySongBinding bind(@NonNull View rootView) { break missingId; } + id = R.id.song_music_title_tv; + TextView songMusicTitleTv = ViewBindings.findChildViewById(rootView, id); + if (songMusicTitleTv == null) { + break missingId; + } + id = R.id.song_next_iv; ImageView songNextIv = ViewBindings.findChildViewById(rootView, id); if (songNextIv == null) { @@ -313,6 +308,12 @@ public static ActivitySongBinding bind(@NonNull View rootView) { break missingId; } + id = R.id.song_singer_name_tv; + TextView songSingerNameTv = ViewBindings.findChildViewById(rootView, id); + if (songSingerNameTv == null) { + break missingId; + } + id = R.id.song_singer_plus_iv; ImageView songSingerPlusIv = ViewBindings.findChildViewById(rootView, id); if (songSingerPlusIv == null) { @@ -326,10 +327,10 @@ public static ActivitySongBinding bind(@NonNull View rootView) { } return new ActivitySongBinding((ConstraintLayout) rootView, eqIb, instagramIv, listIv, - lowerIb, lyrics01Iv, musicTitleTv, playerLikeIv, playerLikeIvLayout, playerUnlikeIv, - plusIb, randomIv, relatedIv, settingIb, singerNameTv, songAlbumIUIv, songEndTimeTv, - songMiniplayerIv, songMusicLyrics02Iv, songNextIv, songPauseIv, songPlayerLayout, - songPreviousIv, songProgressSb, songRepeatIv, songSingerPlusIv, songStartTimeTv); + lyrics01Iv, playerLikeIvLayout, playerUnlikeIv, plusIb, randomIv, relatedIv, settingIb, + songAlbumIv, songDownIb, songEndTimeTv, songLikeIv, songMiniplayerIv, songMusicLyrics02Iv, + songMusicTitleTv, songNextIv, songPauseIv, songPlayerLayout, songPreviousIv, + songProgressSb, songRepeatIv, songSingerNameTv, songSingerPlusIv, songStartTimeTv); } String missingId = rootView.getResources().getResourceName(id); throw new NullPointerException("Missing required view with ID: ".concat(missingId)); diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/generated/data_binding_base_class_source_out/debug/out/com/example/umcflo/databinding/FragmentLockerSavedalbumBinding.java" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/generated/data_binding_base_class_source_out/debug/out/com/example/umcflo/databinding/FragmentLockerSavedalbumBinding.java" index e86acec..279af7b 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/generated/data_binding_base_class_source_out/debug/out/com/example/umcflo/databinding/FragmentLockerSavedalbumBinding.java" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/generated/data_binding_base_class_source_out/debug/out/com/example/umcflo/databinding/FragmentLockerSavedalbumBinding.java" @@ -7,17 +7,25 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.recyclerview.widget.RecyclerView; import androidx.viewbinding.ViewBinding; +import androidx.viewbinding.ViewBindings; import com.example.umcflo.R; import java.lang.NullPointerException; import java.lang.Override; +import java.lang.String; public final class FragmentLockerSavedalbumBinding implements ViewBinding { @NonNull private final ConstraintLayout rootView; - private FragmentLockerSavedalbumBinding(@NonNull ConstraintLayout rootView) { + @NonNull + public final RecyclerView lockerSavedSongRecyclerView; + + private FragmentLockerSavedalbumBinding(@NonNull ConstraintLayout rootView, + @NonNull RecyclerView lockerSavedSongRecyclerView) { this.rootView = rootView; + this.lockerSavedSongRecyclerView = lockerSavedSongRecyclerView; } @Override @@ -43,10 +51,20 @@ public static FragmentLockerSavedalbumBinding inflate(@NonNull LayoutInflater in @NonNull public static FragmentLockerSavedalbumBinding bind(@NonNull View rootView) { - if (rootView == null) { - throw new NullPointerException("rootView"); - } + // The body of this method is generated in a way you would not otherwise write. + // This is done to optimize the compiled bytecode for size and performance. + int id; + missingId: { + id = R.id.locker_savedSong_recyclerView; + RecyclerView lockerSavedSongRecyclerView = ViewBindings.findChildViewById(rootView, id); + if (lockerSavedSongRecyclerView == null) { + break missingId; + } - return new FragmentLockerSavedalbumBinding((ConstraintLayout) rootView); + return new FragmentLockerSavedalbumBinding((ConstraintLayout) rootView, + lockerSavedSongRecyclerView); + } + String missingId = rootView.getResources().getResourceName(id); + throw new NullPointerException("Missing required view with ID: ".concat(missingId)); } } diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/annotation_processor_list/debug/javaPreCompileDebug/annotationProcessors.json" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/annotation_processor_list/debug/javaPreCompileDebug/annotationProcessors.json" index 9e26dfe..e2e7d08 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/annotation_processor_list/debug/javaPreCompileDebug/annotationProcessors.json" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/annotation_processor_list/debug/javaPreCompileDebug/annotationProcessors.json" @@ -1 +1 @@ -{} \ No newline at end of file +{"room-compiler-2.6.0.jar (androidx.room:room-compiler:2.6.0)":"KSP_PROCESSOR"} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/apk/debug/app-debug.apk" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/apk/debug/app-debug.apk" index 0c905a7..f41a651 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/apk/debug/app-debug.apk" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/apk/debug/app-debug.apk" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar" index 1739dcc..9ffbcce 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/processDebugResources/R.jar" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_base_class_log_artifact/debug/dataBindingGenBaseClassesDebug/out/com.example.umcflo-binding_classes.json" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_base_class_log_artifact/debug/dataBindingGenBaseClassesDebug/out/com.example.umcflo-binding_classes.json" index 5c7c2d6..cf6f45b 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_base_class_log_artifact/debug/dataBindingGenBaseClassesDebug/out/com.example.umcflo-binding_classes.json" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_base_class_log_artifact/debug/dataBindingGenBaseClassesDebug/out/com.example.umcflo-binding_classes.json" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_merge/debug/mergeDebugResources/out/activity_song-layout.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_merge/debug/mergeDebugResources/out/activity_song-layout.xml" index 59a717c..fb6e14d 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_merge/debug/mergeDebugResources/out/activity_song-layout.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_merge/debug/mergeDebugResources/out/activity_song-layout.xml" @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_merge/debug/mergeDebugResources/out/fragment_locker_savedalbum-layout.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_merge/debug/mergeDebugResources/out/fragment_locker_savedalbum-layout.xml" index b957ad2..21ba1a6 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_merge/debug/mergeDebugResources/out/fragment_locker_savedalbum-layout.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_merge/debug/mergeDebugResources/out/fragment_locker_savedalbum-layout.xml" @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_package/debug/packageDebugResources/out/activity_song-layout.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_package/debug/packageDebugResources/out/activity_song-layout.xml" index 59a717c..fb6e14d 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_package/debug/packageDebugResources/out/activity_song-layout.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_package/debug/packageDebugResources/out/activity_song-layout.xml" @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_package/debug/packageDebugResources/out/fragment_locker_savedalbum-layout.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_package/debug/packageDebugResources/out/fragment_locker_savedalbum-layout.xml" index b957ad2..21ba1a6 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_package/debug/packageDebugResources/out/fragment_locker_savedalbum-layout.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/data_binding_layout_info_type_package/debug/packageDebugResources/out/fragment_locker_savedalbum-layout.xml" @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_0/graph.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_0/graph.bin" index 601f245..1f1488f 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_0/graph.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_0/graph.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_1/graph.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_1/graph.bin" index 601f245..a06806f 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_1/graph.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_1/graph.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_2/graph.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_2/graph.bin" index 601f245..737ae9a 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_2/graph.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_2/graph.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_3/graph.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_3/graph.bin" index 601f245..7019c28 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_3/graph.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_3/graph.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_4/graph.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_4/graph.bin" index 601f245..ad16cfb 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_4/graph.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_4/graph.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_5/graph.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_5/graph.bin" index 601f245..4757e1c 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_5/graph.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/dirs_bucket_5/graph.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex" index 94465c5..783d082 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex" index 035b801..4cef9ec 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex" index dcc12e6..2c77891 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex" index 0aa254d..5af5bde 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out" index af38ae3..d2123ef 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/dex_archive_input_jar_hashes/debug/dexBuilderDebug/out" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json" index f68e459..eaef50f 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state" index abf59ff..7d3f516 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1o8KaRJ1QgX6iTwbvJfVi6bEsCY=" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1o8KaRJ1QgX6iTwbvJfVi6bEsCY=" index 9426e40..37fadce 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1o8KaRJ1QgX6iTwbvJfVi6bEsCY=" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1o8KaRJ1QgX6iTwbvJfVi6bEsCY=" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/68WKgboNj4WntgBIfThHrPJz69w=" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/68WKgboNj4WntgBIfThHrPJz69w=" index 833b095..f29b46c 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/68WKgboNj4WntgBIfThHrPJz69w=" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/68WKgboNj4WntgBIfThHrPJz69w=" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6LvW7EG_4ixmF_ARHr2Rvd_rB3U=" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6LvW7EG_4ixmF_ARHr2Rvd_rB3U=" index ae9d872..d826b0a 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6LvW7EG_4ixmF_ARHr2Rvd_rB3U=" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6LvW7EG_4ixmF_ARHr2Rvd_rB3U=" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9yzwXTOrEbFsk+qxWvPvDHayA5s=" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9yzwXTOrEbFsk+qxWvPvDHayA5s=" index 21eb307..79b667a 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9yzwXTOrEbFsk+qxWvPvDHayA5s=" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9yzwXTOrEbFsk+qxWvPvDHayA5s=" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/A3pgWXj_wYv+2XZpLTZLGGNADzs=" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/A3pgWXj_wYv+2XZpLTZLGGNADzs=" index 761fe3b..b42ca4f 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/A3pgWXj_wYv+2XZpLTZLGGNADzs=" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/A3pgWXj_wYv+2XZpLTZLGGNADzs=" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Grh8SCdK5VBsxX1BVNp48SdnoOI=" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Grh8SCdK5VBsxX1BVNp48SdnoOI=" index 4c9f52f..b4c6c3e 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Grh8SCdK5VBsxX1BVNp48SdnoOI=" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Grh8SCdK5VBsxX1BVNp48SdnoOI=" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/K19u8R1yaGOzE9tTOFwjq6V_+ko=" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/K19u8R1yaGOzE9tTOFwjq6V_+ko=" index b2efafc..bdd0cbe 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/K19u8R1yaGOzE9tTOFwjq6V_+ko=" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/K19u8R1yaGOzE9tTOFwjq6V_+ko=" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/T8FpooU6PmYBR9L7FWZ3FgfdooY=" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/T8FpooU6PmYBR9L7FWZ3FgfdooY=" index 90d5279..219f2c2 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/T8FpooU6PmYBR9L7FWZ3FgfdooY=" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/T8FpooU6PmYBR9L7FWZ3FgfdooY=" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cfz7n2ql2z_o4ac_LojjM1gvIl8=" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cfz7n2ql2z_o4ac_LojjM1gvIl8=" index de755d1..4b56a48 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cfz7n2ql2z_o4ac_LojjM1gvIl8=" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cfz7n2ql2z_o4ac_LojjM1gvIl8=" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ufS+HJym3gC+itPOkYusG+mZllA=" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ufS+HJym3gC+itPOkYusG+mZllA=" index c68ea7a..310a04a 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ufS+HJym3gC+itPOkYusG+mZllA=" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ufS+HJym3gC+itPOkYusG+mZllA=" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vF5wWnXQbAh0U_u5XDtNiuSOpJo=" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vF5wWnXQbAh0U_u5XDtNiuSOpJo=" index 10a2fd4..62610bf 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vF5wWnXQbAh0U_u5XDtNiuSOpJo=" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vF5wWnXQbAh0U_u5XDtNiuSOpJo=" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wUPPlvGhk6oDVJNe_zN9yP6OrVQ=" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wUPPlvGhk6oDVJNe_zN9yP6OrVQ=" index 8568b5b..1391454 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wUPPlvGhk6oDVJNe_zN9yP6OrVQ=" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wUPPlvGhk6oDVJNe_zN9yP6OrVQ=" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties" index aa0c8f8..2da4eb8 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties" @@ -1,4 +1,4 @@ -#Mon May 20 10:56:45 KST 2024 +#Mon Jun 03 03:17:44 KST 2024 com.example.umcflo.app-main-33\:/drawable/_786635_719636_923.jpg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable__786635_719636_923.jpg.flat com.example.umcflo.app-main-33\:/drawable/apple_44.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_apple_44.png.flat com.example.umcflo.app-main-33\:/drawable/aquaman.jpeg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_aquaman.jpeg.flat @@ -268,6 +268,156 @@ com.example.umcflo.app-main-34\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\User com.example.umcflo.app-main-34\:/raw/music_lilac.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_music_lilac.mp3.flat com.example.umcflo.app-main-34\:/xml/backup_rules.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_backup_rules.xml.flat com.example.umcflo.app-main-34\:/xml/data_extraction_rules.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_data_extraction_rules.xml.flat +com.example.umcflo.app-main-37\:/drawable/_786635_719636_923.jpg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable__786635_719636_923.jpg.flat +com.example.umcflo.app-main-37\:/drawable/apple_44.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_apple_44.png.flat +com.example.umcflo.app-main-37\:/drawable/aquaman.jpeg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_aquaman.jpeg.flat +com.example.umcflo.app-main-37\:/drawable/bangbangbang.jpeg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_bangbangbang.jpeg.flat +com.example.umcflo.app-main-37\:/drawable/beautiful.jpeg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_beautiful.jpeg.flat +com.example.umcflo.app-main-37\:/drawable/bibi_album.jpeg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_bibi_album.jpeg.flat +com.example.umcflo.app-main-37\:/drawable/blue_radius.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_blue_radius.xml.flat +com.example.umcflo.app-main-37\:/drawable/btm_color_selector.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btm_color_selector.xml.flat +com.example.umcflo.app-main-37\:/drawable/btn_actionbar_close.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_actionbar_close.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_actionbar_instagram.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_actionbar_instagram.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_arrow_black.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_arrow_black.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_arrow_more.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_arrow_more.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_editbar_addplaylist.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_editbar_addplaylist.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_editbar_delete.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_editbar_delete.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_editbar_download.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_editbar_download.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_editbar_mylist.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_editbar_mylist.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_editbar_play.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_editbar_play.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_input_password.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_input_password.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_input_password_off.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_input_password_off.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_main_arrow_more.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_main_arrow_more.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_main_mike.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_main_mike.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_main_setting.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_main_setting.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_main_ticket.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_main_ticket.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_miniplay_mvpause.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_miniplay_mvpause.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_miniplay_mvplay.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_miniplay_mvplay.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_miniplay_pause.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_miniplay_pause.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_miniplayer_go_list.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_miniplayer_go_list.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_miniplayer_next.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_miniplayer_next.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_miniplayer_play.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_miniplayer_play.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_miniplayer_previous.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_miniplayer_previous.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_nugu.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_nugu.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_panel_play_large.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_panel_play_large.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_player_eq_off.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_player_eq_off.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_player_go_list.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_player_go_list.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_player_more.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_player_more.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_player_play.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_player_play.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_player_related.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_player_related.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_player_setting.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_player_setting.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_player_unlike_off.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_player_unlike_off.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_player_unlike_on.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_player_unlike_on.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_playlist_select_off.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_playlist_select_off.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_playlist_select_on.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_playlist_select_on.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_setting_phone.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_setting_phone.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_textbox_close.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_textbox_close.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_titlebar_close.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_titlebar_close.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_toggle_off.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_toggle_off.png.flat +com.example.umcflo.app-main-37\:/drawable/btn_toggle_on.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_btn_toggle_on.png.flat +com.example.umcflo.app-main-37\:/drawable/button_background_black_color.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_button_background_black_color.xml.flat +com.example.umcflo.app-main-37\:/drawable/button_background_flo_color.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_button_background_flo_color.xml.flat +com.example.umcflo.app-main-37\:/drawable/button_background_gray_color.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_button_background_gray_color.xml.flat +com.example.umcflo.app-main-37\:/drawable/button_background_white_color.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_button_background_white_color.xml.flat +com.example.umcflo.app-main-37\:/drawable/discovery_banner_aos.jpg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_discovery_banner_aos.jpg.flat +com.example.umcflo.app-main-37\:/drawable/fragment_look_chart_background.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_fragment_look_chart_background.xml.flat +com.example.umcflo.app-main-37\:/drawable/fragment_look_chip_off_background.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_fragment_look_chip_off_background.xml.flat +com.example.umcflo.app-main-37\:/drawable/fragment_look_chip_on_background.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_fragment_look_chip_on_background.xml.flat +com.example.umcflo.app-main-37\:/drawable/gray_radius.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_gray_radius.xml.flat +com.example.umcflo.app-main-37\:/drawable/grey_radius.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_grey_radius.xml.flat +com.example.umcflo.app-main-37\:/drawable/ic_bottom_home_no_select.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_bottom_home_no_select.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_bottom_home_select.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_bottom_home_select.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_bottom_locker_no_select.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_bottom_locker_no_select.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_bottom_locker_select.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_bottom_locker_select.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_bottom_look_no_select.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_bottom_look_no_select.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_bottom_look_select.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_bottom_look_select.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_bottom_my_no_select.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_bottom_my_no_select.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_bottom_my_select.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_bottom_my_select.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_bottom_search_no_select.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_bottom_search_no_select.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_bottom_search_select.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_bottom_search_select.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_browse_arrow_right.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_browse_arrow_right.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_dashboard_black_24dp.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_dashboard_black_24dp.xml.flat +com.example.umcflo.app-main-37\:/drawable/ic_flo_logo.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_flo_logo.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_home_black_24dp.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_home_black_24dp.xml.flat +com.example.umcflo.app-main-37\:/drawable/ic_launcher_background.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_launcher_background.xml.flat +com.example.umcflo.app-main-37\:/drawable/ic_main_facebook.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_main_facebook.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_main_facebook_btn.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_main_facebook_btn.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_main_instagram.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_main_instagram.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_main_instagram_btn.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_main_instagram_btn.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_main_twitter.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_main_twitter.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_main_twitter_btn.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_main_twitter_btn.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_main_youtube.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_main_youtube.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_main_youtube_btn.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_main_youtube_btn.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_my_like_off.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_my_like_off.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_my_like_on.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_my_like_on.png.flat +com.example.umcflo.app-main-37\:/drawable/ic_notifications_black_24dp.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ic_notifications_black_24dp.xml.flat +com.example.umcflo.app-main-37\:/drawable/ico_20_logo_tid_white.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_ico_20_logo_tid_white.png.flat +com.example.umcflo.app-main-37\:/drawable/icon_browse_arrow_right.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_icon_browse_arrow_right.png.flat +com.example.umcflo.app-main-37\:/drawable/img_album_exp.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_album_exp.png.flat +com.example.umcflo.app-main-37\:/drawable/img_album_exp2.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_album_exp2.png.flat +com.example.umcflo.app-main-37\:/drawable/img_album_exp3.jpg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_album_exp3.jpg.flat +com.example.umcflo.app-main-37\:/drawable/img_album_exp4.jpg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_album_exp4.jpg.flat +com.example.umcflo.app-main-37\:/drawable/img_album_exp5.jpg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_album_exp5.jpg.flat +com.example.umcflo.app-main-37\:/drawable/img_album_exp6.jpg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_album_exp6.jpg.flat +com.example.umcflo.app-main-37\:/drawable/img_album_lp.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_album_lp.png.flat +com.example.umcflo.app-main-37\:/drawable/img_default_4_x_1.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_default_4_x_1.png.flat +com.example.umcflo.app-main-37\:/drawable/img_first_album_default.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_first_album_default.png.flat +com.example.umcflo.app-main-37\:/drawable/img_home_viewpager_exp.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_home_viewpager_exp.png.flat +com.example.umcflo.app-main-37\:/drawable/img_home_viewpager_exp2.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_home_viewpager_exp2.png.flat +com.example.umcflo.app-main-37\:/drawable/img_iu_album.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_iu_album.png.flat +com.example.umcflo.app-main-37\:/drawable/img_jenre_exp_1.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_jenre_exp_1.png.flat +com.example.umcflo.app-main-37\:/drawable/img_jenre_exp_2.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_jenre_exp_2.png.flat +com.example.umcflo.app-main-37\:/drawable/img_jenre_exp_3.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_jenre_exp_3.png.flat +com.example.umcflo.app-main-37\:/drawable/img_potcast_exp.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_potcast_exp.png.flat +com.example.umcflo.app-main-37\:/drawable/img_video_exp.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_img_video_exp.png.flat +com.example.umcflo.app-main-37\:/drawable/kakako_44.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_kakako_44.png.flat +com.example.umcflo.app-main-37\:/drawable/main_btm_color_selector.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_main_btm_color_selector.xml.flat +com.example.umcflo.app-main-37\:/drawable/main_btm_home_selector.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_main_btm_home_selector.xml.flat +com.example.umcflo.app-main-37\:/drawable/main_btm_look_selector.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_main_btm_look_selector.xml.flat +com.example.umcflo.app-main-37\:/drawable/main_btm_my_selector.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_main_btm_my_selector.xml.flat +com.example.umcflo.app-main-37\:/drawable/main_btm_search_selector.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_main_btm_search_selector.xml.flat +com.example.umcflo.app-main-37\:/drawable/naver_44.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_naver_44.png.flat +com.example.umcflo.app-main-37\:/drawable/nugu_btn_down.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_nugu_btn_down.png.flat +com.example.umcflo.app-main-37\:/drawable/nugu_btn_pause_32.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_nugu_btn_pause_32.png.flat +com.example.umcflo.app-main-37\:/drawable/nugu_btn_play_32.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_nugu_btn_play_32.png.flat +com.example.umcflo.app-main-37\:/drawable/nugu_btn_random_inactive.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_nugu_btn_random_inactive.png.flat +com.example.umcflo.app-main-37\:/drawable/nugu_btn_repeat_inactive.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_nugu_btn_repeat_inactive.png.flat +com.example.umcflo.app-main-37\:/drawable/nugu_btn_skip_next_32.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_nugu_btn_skip_next_32.png.flat +com.example.umcflo.app-main-37\:/drawable/nugu_btn_skip_previous_32.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_nugu_btn_skip_previous_32.png.flat +com.example.umcflo.app-main-37\:/drawable/purple_radius.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_purple_radius.xml.flat +com.example.umcflo.app-main-37\:/drawable/selector_indicator.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_selector_indicator.xml.flat +com.example.umcflo.app-main-37\:/drawable/skplanet_musicmate_sc0_2021_03_12_16_59_19.jpg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_skplanet_musicmate_sc0_2021_03_12_16_59_19.jpg.flat +com.example.umcflo.app-main-37\:/drawable/splash.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_splash.xml.flat +com.example.umcflo.app-main-37\:/drawable/textview_background_color_radius.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_textview_background_color_radius.xml.flat +com.example.umcflo.app-main-37\:/drawable/textview_background_radius.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_textview_background_radius.xml.flat +com.example.umcflo.app-main-37\:/drawable/textview_background_select_color_radius.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_textview_background_select_color_radius.xml.flat +com.example.umcflo.app-main-37\:/drawable/widget_black_play.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable_widget_black_play.png.flat +com.example.umcflo.app-main-37\:/menu/bottom_nav_menu.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\menu_bottom_nav_menu.xml.flat +com.example.umcflo.app-main-37\:/mipmap-anydpi-v26/ic_launcher.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-anydpi-v26_ic_launcher.xml.flat +com.example.umcflo.app-main-37\:/mipmap-anydpi-v26/ic_launcher_round.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-anydpi-v26_ic_launcher_round.xml.flat +com.example.umcflo.app-main-37\:/mipmap-hdpi/ic_launcher.webp=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-hdpi_ic_launcher.webp.flat +com.example.umcflo.app-main-37\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-hdpi_ic_launcher_round.webp.flat +com.example.umcflo.app-main-37\:/mipmap-mdpi/ic_launcher.webp=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-mdpi_ic_launcher.webp.flat +com.example.umcflo.app-main-37\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-mdpi_ic_launcher_round.webp.flat +com.example.umcflo.app-main-37\:/mipmap-xhdpi/ic_launcher.webp=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xhdpi_ic_launcher.webp.flat +com.example.umcflo.app-main-37\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xhdpi_ic_launcher_round.webp.flat +com.example.umcflo.app-main-37\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxhdpi_ic_launcher.webp.flat +com.example.umcflo.app-main-37\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxhdpi_ic_launcher_round.webp.flat +com.example.umcflo.app-main-37\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxxhdpi_ic_launcher.webp.flat +com.example.umcflo.app-main-37\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\mipmap-xxxhdpi_ic_launcher_round.webp.flat +com.example.umcflo.app-main-37\:/raw/music_bboom.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_music_bboom.mp3.flat +com.example.umcflo.app-main-37\:/raw/music_boy.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_music_boy.mp3.flat +com.example.umcflo.app-main-37\:/raw/music_butter.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_music_butter.mp3.flat +com.example.umcflo.app-main-37\:/raw/music_flu.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_music_flu.mp3.flat +com.example.umcflo.app-main-37\:/raw/music_fool.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_music_fool.mp3.flat +com.example.umcflo.app-main-37\:/raw/music_lilac.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_music_lilac.mp3.flat +com.example.umcflo.app-main-37\:/raw/music_lovedive.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_music_lovedive.mp3.flat +com.example.umcflo.app-main-37\:/raw/music_mylove.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_music_mylove.mp3.flat +com.example.umcflo.app-main-37\:/raw/music_nakka.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_music_nakka.mp3.flat +com.example.umcflo.app-main-37\:/raw/music_next.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_music_next.mp3.flat +com.example.umcflo.app-main-37\:/raw/music_nextlevel.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\raw_music_nextlevel.mp3.flat +com.example.umcflo.app-main-37\:/xml/backup_rules.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_backup_rules.xml.flat +com.example.umcflo.app-main-37\:/xml/data_extraction_rules.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\xml_data_extraction_rules.xml.flat com.example.umcflo.app-mergeDebugResources-30\:/layout/activity_main.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_main.xml.flat com.example.umcflo.app-mergeDebugResources-30\:/layout/activity_song.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_song.xml.flat com.example.umcflo.app-mergeDebugResources-30\:/layout/fragment_album.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_album.xml.flat @@ -299,6 +449,26 @@ com.example.umcflo.app-mergeDebugResources-31\:/layout/fragment_song.xml=C\:\\Us com.example.umcflo.app-mergeDebugResources-31\:/layout/fragment_video.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_video.xml.flat com.example.umcflo.app-mergeDebugResources-31\:/layout/item_album.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_item_album.xml.flat com.example.umcflo.app-mergeDebugResources-31\:/layout/item_locker_album.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_item_locker_album.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/activity_login.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_login.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/activity_main.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_main.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/activity_sign_up.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_sign_up.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/activity_song.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_song.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/activity_splash.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_activity_splash.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/fragment_album.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_album.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/fragment_banner.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_banner.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/fragment_detail.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_detail.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/fragment_home.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_home.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/fragment_locker.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_locker.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/fragment_locker_savedalbum.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_locker_savedalbum.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/fragment_locker_savedsong.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_locker_savedsong.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/fragment_look.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_look.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/fragment_music_file.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_music_file.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/fragment_pannel.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_pannel.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/fragment_search.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_search.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/fragment_song.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_song.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/fragment_video.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_fragment_video.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/item_album.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_item_album.xml.flat +com.example.umcflo.app-mergeDebugResources-34\:/layout/item_locker_album.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\layout_item_locker_album.xml.flat com.example.umcflo.app-pngs-27\:/drawable-anydpi-v24/ic_launcher_foreground.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable-anydpi-v24_ic_launcher_foreground.xml.flat com.example.umcflo.app-pngs-27\:/drawable-hdpi/ic_launcher_foreground.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable-hdpi_ic_launcher_foreground.png.flat com.example.umcflo.app-pngs-27\:/drawable-ldpi/ic_launcher_foreground.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable-ldpi_ic_launcher_foreground.png.flat @@ -313,3 +483,10 @@ com.example.umcflo.app-pngs-28\:/drawable-mdpi/ic_launcher_foreground.png=C\:\\U com.example.umcflo.app-pngs-28\:/drawable-xhdpi/ic_launcher_foreground.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable-xhdpi_ic_launcher_foreground.png.flat com.example.umcflo.app-pngs-28\:/drawable-xxhdpi/ic_launcher_foreground.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable-xxhdpi_ic_launcher_foreground.png.flat com.example.umcflo.app-pngs-28\:/drawable-xxxhdpi/ic_launcher_foreground.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable-xxxhdpi_ic_launcher_foreground.png.flat +com.example.umcflo.app-pngs-31\:/drawable-anydpi-v24/ic_launcher_foreground.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable-anydpi-v24_ic_launcher_foreground.xml.flat +com.example.umcflo.app-pngs-31\:/drawable-hdpi/ic_launcher_foreground.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable-hdpi_ic_launcher_foreground.png.flat +com.example.umcflo.app-pngs-31\:/drawable-ldpi/ic_launcher_foreground.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable-ldpi_ic_launcher_foreground.png.flat +com.example.umcflo.app-pngs-31\:/drawable-mdpi/ic_launcher_foreground.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable-mdpi_ic_launcher_foreground.png.flat +com.example.umcflo.app-pngs-31\:/drawable-xhdpi/ic_launcher_foreground.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable-xhdpi_ic_launcher_foreground.png.flat +com.example.umcflo.app-pngs-31\:/drawable-xxhdpi/ic_launcher_foreground.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable-xxhdpi_ic_launcher_foreground.png.flat +com.example.umcflo.app-pngs-31\:/drawable-xxxhdpi/ic_launcher_foreground.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\merged_res\\debug\\mergeDebugResources\\drawable-xxxhdpi_ic_launcher_foreground.png.flat diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml" index 732d253..cec6b76 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml" @@ -1,5 +1,5 @@ -androidx.startup#FF424242#FFFFFFFF#03000000#37000000 +androidx.startup#FF424242#FFFFFFFF#03000000#37000000 @@ -39,7 +39,7 @@ @color/cardview_light_background #1f000000#8a000000#1d873b#d93025#ffffffff#ff9e9e9e4dp6dp8dp4dp2dp320dp320dp32dp13sp12dp8dp64dp64dp10dp@dimen/notification_content_margin_start16dp4dp3dp24dp13sp10dp5dp#3333B5E5#0cffffff999AnswerVideoDeclineHang UpIncoming callOngoing callScreening an incoming call999+#1f000000#8a000000#1d873b#d93025#ffffffff#ff9e9e9e4dp6dp8dp4dp2dp320dp320dp32dp13sp12dp8dp64dp64dp10dp@dimen/notification_content_margin_start16dp4dp3dp24dp13sp10dp5dp#3333B5E5#0cffffff999AnswerVideoDeclineHang UpIncoming callOngoing callScreening an incoming call999+ + diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/activity_song.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/activity_song.xml" deleted file mode 100644 index ad84042..0000000 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/mergeDebugResources/stripped.dir/layout/activity_song.xml" +++ /dev/null @@ -1,300 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties" index 9696596..c106829 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties" @@ -1,4 +1,4 @@ -#Mon May 20 10:56:46 KST 2024 +#Mon Jun 03 03:17:44 KST 2024 com.example.umcflo.app-main-5\:/drawable-v24/ic_launcher_foreground.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable-v24\\ic_launcher_foreground.xml com.example.umcflo.app-main-5\:/drawable/_786635_719636_923.jpg=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\_786635_719636_923.jpg com.example.umcflo.app-main-5\:/drawable/apple_44.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\apple_44.png @@ -12,6 +12,11 @@ com.example.umcflo.app-main-5\:/drawable/btn_actionbar_close.png=C\:\\Users\\san com.example.umcflo.app-main-5\:/drawable/btn_actionbar_instagram.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\btn_actionbar_instagram.png com.example.umcflo.app-main-5\:/drawable/btn_arrow_black.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\btn_arrow_black.png com.example.umcflo.app-main-5\:/drawable/btn_arrow_more.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\btn_arrow_more.png +com.example.umcflo.app-main-5\:/drawable/btn_editbar_addplaylist.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\btn_editbar_addplaylist.png +com.example.umcflo.app-main-5\:/drawable/btn_editbar_delete.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\btn_editbar_delete.png +com.example.umcflo.app-main-5\:/drawable/btn_editbar_download.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\btn_editbar_download.png +com.example.umcflo.app-main-5\:/drawable/btn_editbar_mylist.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\btn_editbar_mylist.png +com.example.umcflo.app-main-5\:/drawable/btn_editbar_play.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\btn_editbar_play.png com.example.umcflo.app-main-5\:/drawable/btn_input_password.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\btn_input_password.png com.example.umcflo.app-main-5\:/drawable/btn_input_password_off.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\btn_input_password_off.png com.example.umcflo.app-main-5\:/drawable/btn_main_arrow_more.png=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\drawable\\btn_main_arrow_more.png @@ -133,10 +138,22 @@ com.example.umcflo.app-main-5\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\sangj com.example.umcflo.app-main-5\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxhdpi-v4\\ic_launcher_round.webp com.example.umcflo.app-main-5\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxxhdpi-v4\\ic_launcher.webp com.example.umcflo.app-main-5\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\mipmap-xxxhdpi-v4\\ic_launcher_round.webp +com.example.umcflo.app-main-5\:/raw/music_bboom.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\music_bboom.mp3 +com.example.umcflo.app-main-5\:/raw/music_boy.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\music_boy.mp3 +com.example.umcflo.app-main-5\:/raw/music_butter.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\music_butter.mp3 +com.example.umcflo.app-main-5\:/raw/music_flu.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\music_flu.mp3 +com.example.umcflo.app-main-5\:/raw/music_fool.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\music_fool.mp3 com.example.umcflo.app-main-5\:/raw/music_lilac.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\music_lilac.mp3 +com.example.umcflo.app-main-5\:/raw/music_lovedive.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\music_lovedive.mp3 +com.example.umcflo.app-main-5\:/raw/music_mylove.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\music_mylove.mp3 +com.example.umcflo.app-main-5\:/raw/music_nakka.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\music_nakka.mp3 +com.example.umcflo.app-main-5\:/raw/music_next.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\music_next.mp3 +com.example.umcflo.app-main-5\:/raw/music_nextlevel.mp3=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\raw\\music_nextlevel.mp3 com.example.umcflo.app-main-5\:/xml/backup_rules.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\backup_rules.xml com.example.umcflo.app-main-5\:/xml/data_extraction_rules.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\xml\\data_extraction_rules.xml +com.example.umcflo.app-packageDebugResources-2\:/layout/activity_login.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_login.xml com.example.umcflo.app-packageDebugResources-2\:/layout/activity_main.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_main.xml +com.example.umcflo.app-packageDebugResources-2\:/layout/activity_sign_up.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_sign_up.xml com.example.umcflo.app-packageDebugResources-2\:/layout/activity_song.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_song.xml com.example.umcflo.app-packageDebugResources-2\:/layout/activity_splash.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_splash.xml com.example.umcflo.app-packageDebugResources-2\:/layout/fragment_album.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\fragment_album.xml @@ -147,6 +164,7 @@ com.example.umcflo.app-packageDebugResources-2\:/layout/fragment_locker.xml=C\:\ com.example.umcflo.app-packageDebugResources-2\:/layout/fragment_locker_savedalbum.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\fragment_locker_savedalbum.xml com.example.umcflo.app-packageDebugResources-2\:/layout/fragment_locker_savedsong.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\fragment_locker_savedsong.xml com.example.umcflo.app-packageDebugResources-2\:/layout/fragment_look.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\fragment_look.xml +com.example.umcflo.app-packageDebugResources-2\:/layout/fragment_music_file.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\fragment_music_file.xml com.example.umcflo.app-packageDebugResources-2\:/layout/fragment_pannel.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\fragment_pannel.xml com.example.umcflo.app-packageDebugResources-2\:/layout/fragment_search.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\fragment_search.xml com.example.umcflo.app-packageDebugResources-2\:/layout/fragment_song.xml=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\fragment_song.xml diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml" index 4da6e34..3f833bc 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml" @@ -24,4 +24,4 @@ 16dp16dp \ No newline at end of file + 16dp16dp \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/activity_song.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/activity_song.xml" deleted file mode 100644 index ad84042..0000000 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/debug/packageDebugResources/stripped.dir/layout/activity_song.xml" +++ /dev/null @@ -1,300 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" index a45bf5e..e0f253b 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" @@ -1,4 +1,4 @@ -#Mon May 20 18:37:56 KST 2024 +#Mon Jun 03 19:55:18 KST 2024 base.0=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex base.1=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex base.2=C\:\\Users\\sangj\\AndroidStudioProjects\\UMCflo\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" index c1c8203..4c5ac29 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0" index 653d052..f3ed66e 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/ActivityMainBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/ActivityMainBinding.class" index 0a35d70..4df02fd 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/ActivityMainBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/ActivityMainBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/ActivitySongBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/ActivitySongBinding.class" index 869dd2e..06bd7f8 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/ActivitySongBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/ActivitySongBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/ActivitySplashBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/ActivitySplashBinding.class" index 043b3ca..3d7aae3 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/ActivitySplashBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/ActivitySplashBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentAlbumBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentAlbumBinding.class" index 051eb05..8b2e8d2 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentAlbumBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentAlbumBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentBannerBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentBannerBinding.class" index 68a4a7e..78d8110 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentBannerBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentBannerBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentDetailBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentDetailBinding.class" index 44b5a39..52a819f 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentDetailBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentDetailBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentHomeBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentHomeBinding.class" index 6e37670..c26b293 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentHomeBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentHomeBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLockerBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLockerBinding.class" index 551029e..7b84449 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLockerBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLockerBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLockerSavedalbumBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLockerSavedalbumBinding.class" index 5785aef..85dd873 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLockerSavedalbumBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLockerSavedalbumBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLockerSavedsongBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLockerSavedsongBinding.class" index d8f8943..e92d223 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLockerSavedsongBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLockerSavedsongBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLookBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLookBinding.class" index 83a2b03..9d8ea0f 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLookBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentLookBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentPannelBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentPannelBinding.class" index cd955c4..e4057eb 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentPannelBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentPannelBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentSearchBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentSearchBinding.class" index 89a70a4..6540279 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentSearchBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentSearchBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentSongBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentSongBinding.class" index a3b7690..73cab05 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentSongBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentSongBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentVideoBinding.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentVideoBinding.class" index 5bc9ac4..8bd11ce 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentVideoBinding.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/umcflo/databinding/FragmentVideoBinding.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt" index 0f95e3a..4a537ce 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/local_only_symbol_list/debug/parseDebugLocalResources/R-def.txt" @@ -34,6 +34,11 @@ drawable btn_actionbar_close drawable btn_actionbar_instagram drawable btn_arrow_black drawable btn_arrow_more +drawable btn_editbar_addplaylist +drawable btn_editbar_delete +drawable btn_editbar_download +drawable btn_editbar_mylist +drawable btn_editbar_play drawable btn_input_password drawable btn_input_password_off drawable btn_main_arrow_more @@ -230,11 +235,33 @@ id locker_login_tv id locker_music_album_rv id locker_play_all_img_iv id locker_play_all_tv +id locker_savedSong_recyclerView id locker_select_all_img_iv id locker_select_all_tv id locker_title_tv +id login_address_underscore_view +id login_apple_login_iv +id login_at_sign_tv +id login_close_iv +id login_direct_input_et +id login_division_tv +id login_email_list_iv +id login_find_id_tv +id login_find_password_tv +id login_flo_logo_iv +id login_hide_password_iv +id login_id_et +id login_id_underscore_view +id login_kakako_login_iv +id login_naver_login_iv +id login_password_et +id login_password_underscore_view +id login_phone_number_login_layout +id login_sign_in_btn +id login_sign_up_tv +id login_social_login_layout +id login_t_world_login_layout id lookFragment -id lower_ib id lyrics_01_iv id mainMiniplayerSingerTv id mainMiniplayerTitleTv @@ -244,9 +271,7 @@ id main_miniplayer_btn id main_miniplayer_progress_sb id main_pause_btn id main_player_cl -id music_title_tv id pannel_image_iv -id player_like_iv id player_like_iv_layout id player_unlike_iv id plus_ib @@ -254,17 +279,36 @@ id random_iv id related_iv id searchFragment id setting_ib -id singer_name_tv -id song_album_IU_iv +id sign_up_address_underscore_view +id sign_up_at_sign_tv +id sign_up_direct_input_et +id sign_up_email_error_tv +id sign_up_email_list_iv +id sign_up_hide_password_check_iv +id sign_up_hide_password_iv +id sign_up_id_et +id sign_up_id_underscore_view +id sign_up_loading_pb +id sign_up_name_et +id sign_up_name_underscore_view +id sign_up_password_check_et +id sign_up_password_check_underscore_view +id sign_up_password_et +id sign_up_password_underscore_view +id sign_up_sign_up_btn +id sign_up_sign_up_tv +id song_album_iv id song_all_listen_iv id song_all_listen_tv id song_all_select_iv id song_all_select_tv id song_celebrity_layout id song_coin_layout +id song_down_ib id song_end_time_tv id song_flu_layout id song_lalac_layout +id song_like_iv id song_list_order_01_tv id song_list_order_02_tv id song_list_order_03_tv @@ -292,6 +336,7 @@ id song_music_title_03_tv id song_music_title_04_tv id song_music_title_05_tv id song_music_title_06_tv +id song_music_title_tv id song_next_iv id song_pause_iv id song_play_01_iv @@ -311,9 +356,11 @@ id song_singer_name_03_tv id song_singer_name_04_tv id song_singer_name_05_tv id song_singer_name_06_tv +id song_singer_name_tv id song_singer_plus_iv id song_spring_layout id song_start_time_tv +id switchRV id video_video_01_cv id video_video_01_vv id video_video_02_cv @@ -327,7 +374,9 @@ id video_video_title_01_tv id video_video_title_02_tv id video_video_title_03_tv id video_video_title_04_tv +layout activity_login layout activity_main +layout activity_sign_up layout activity_song layout activity_splash layout fragment_album @@ -338,6 +387,7 @@ layout fragment_locker layout fragment_locker_savedalbum layout fragment_locker_savedsong layout fragment_look +layout fragment_music_file layout fragment_pannel layout fragment_search layout fragment_song @@ -347,7 +397,17 @@ layout item_locker_album menu bottom_nav_menu mipmap ic_launcher mipmap ic_launcher_round +raw music_bboom +raw music_boy +raw music_butter +raw music_flu +raw music_fool raw music_lilac +raw music_lovedive +raw music_mylove +raw music_nakka +raw music_next +raw music_nextlevel string _2012_07_03 string app_name string beenzino diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt" index 9fa4907..c25a246 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt" @@ -20,7 +20,7 @@ 15-->[androidx.core:core:1.13.1] C:\Users\sangj\.gradle\caches\transforms-3\512dd553433fed0a183acc4f624d5ec9\transformed\core-1.13.1\AndroidManifest.xml:26:22-94 16 17 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:5:5-30:19 +17-->C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:5:5-32:19 18 android:allowBackup="true" 18-->C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:6:9-35 19 android:appComponentFactory="androidx.core.app.CoreComponentFactory" @@ -61,75 +61,90 @@ 37-->C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:22:27-74 38 39 -40 -40-->C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:27:9-28:62 -40-->C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:28:13-59 -41 -42 [androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:24:9-32:20 -43 android:name="androidx.startup.InitializationProvider" -43-->[androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:25:13-67 -44 android:authorities="com.example.umcflo.androidx-startup" -44-->[androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:26:13-68 -45 android:exported="false" > -45-->[androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:27:13-37 -46 [androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:29:13-31:52 -47 android:name="androidx.emoji2.text.EmojiCompatInitializer" -47-->[androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:30:17-75 -48 android:value="androidx.startup" /> -48-->[androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:31:17-49 -49 [androidx.lifecycle:lifecycle-process:2.6.2] C:\Users\sangj\.gradle\caches\transforms-3\1b60d9b1479e1620ea7a73a3e70cb116\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:29:13-31:52 -50 android:name="androidx.lifecycle.ProcessLifecycleInitializer" -50-->[androidx.lifecycle:lifecycle-process:2.6.2] C:\Users\sangj\.gradle\caches\transforms-3\1b60d9b1479e1620ea7a73a3e70cb116\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:30:17-78 -51 android:value="androidx.startup" /> -51-->[androidx.lifecycle:lifecycle-process:2.6.2] C:\Users\sangj\.gradle\caches\transforms-3\1b60d9b1479e1620ea7a73a3e70cb116\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:31:17-49 -52 [androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:29:13-31:52 -53 android:name="androidx.profileinstaller.ProfileInstallerInitializer" -53-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:30:17-85 -54 android:value="androidx.startup" /> -54-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:31:17-49 -55 -56 -57 [androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:34:9-52:20 -58 android:name="androidx.profileinstaller.ProfileInstallReceiver" -58-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:35:13-76 -59 android:directBootAware="false" -59-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:36:13-44 -60 android:enabled="true" -60-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:37:13-35 -61 android:exported="true" -61-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:38:13-36 -62 android:permission="android.permission.DUMP" > -62-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:39:13-57 -63 -63-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:40:13-42:29 -64 -64-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:41:17-91 -64-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:41:25-88 -65 -66 -66-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:43:13-45:29 -67 -67-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:44:17-85 -67-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:44:25-82 -68 -69 -69-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:46:13-48:29 -70 -70-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:47:17-88 -70-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:47:25-85 -71 -72 -72-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:49:13-51:29 -73 -73-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:50:17-95 -73-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:50:25-92 -74 -75 -76 -77 -78 +40 +40-->C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:25:5-26:45 +40-->C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:26:13-42 +41 +41-->C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:27:9-28:46 +41-->C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:28:13-43 +42 +42-->C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:30:5-31:44 +42-->C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:31:13-41 +43 +44 [androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:24:9-28:63 +45 android:name="androidx.room.MultiInstanceInvalidationService" +45-->[androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:25:13-74 +46 android:directBootAware="true" +46-->[androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:26:13-43 +47 android:exported="false" /> +47-->[androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:27:13-37 +48 +49 [androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:24:9-32:20 +50 android:name="androidx.startup.InitializationProvider" +50-->[androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:25:13-67 +51 android:authorities="com.example.umcflo.androidx-startup" +51-->[androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:26:13-68 +52 android:exported="false" > +52-->[androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:27:13-37 +53 [androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:29:13-31:52 +54 android:name="androidx.emoji2.text.EmojiCompatInitializer" +54-->[androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:30:17-75 +55 android:value="androidx.startup" /> +55-->[androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:31:17-49 +56 [androidx.lifecycle:lifecycle-process:2.6.2] C:\Users\sangj\.gradle\caches\transforms-3\1b60d9b1479e1620ea7a73a3e70cb116\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:29:13-31:52 +57 android:name="androidx.lifecycle.ProcessLifecycleInitializer" +57-->[androidx.lifecycle:lifecycle-process:2.6.2] C:\Users\sangj\.gradle\caches\transforms-3\1b60d9b1479e1620ea7a73a3e70cb116\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:30:17-78 +58 android:value="androidx.startup" /> +58-->[androidx.lifecycle:lifecycle-process:2.6.2] C:\Users\sangj\.gradle\caches\transforms-3\1b60d9b1479e1620ea7a73a3e70cb116\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:31:17-49 +59 [androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:29:13-31:52 +60 android:name="androidx.profileinstaller.ProfileInstallerInitializer" +60-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:30:17-85 +61 android:value="androidx.startup" /> +61-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:31:17-49 +62 +63 +64 [androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:34:9-52:20 +65 android:name="androidx.profileinstaller.ProfileInstallReceiver" +65-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:35:13-76 +66 android:directBootAware="false" +66-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:36:13-44 +67 android:enabled="true" +67-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:37:13-35 +68 android:exported="true" +68-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:38:13-36 +69 android:permission="android.permission.DUMP" > +69-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:39:13-57 +70 +70-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:40:13-42:29 +71 +71-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:41:17-91 +71-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:41:25-88 +72 +73 +73-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:43:13-45:29 +74 +74-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:44:17-85 +74-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:44:25-82 +75 +76 +76-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:46:13-48:29 +77 +77-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:47:17-88 +77-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:47:25-85 +78 +79 +79-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:49:13-51:29 +80 +80-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:50:17-95 +80-->[androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:50:25-92 +81 +82 +83 +84 +85 diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/merged_java_res/debug/mergeDebugJavaResource/base.jar" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/merged_java_res/debug/mergeDebugJavaResource/base.jar" index 69520d8..4b22ccc 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/merged_java_res/debug/mergeDebugJavaResource/base.jar" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/merged_java_res/debug/mergeDebugJavaResource/base.jar" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/merged_manifest/debug/processDebugMainManifest/AndroidManifest.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/merged_manifest/debug/processDebugMainManifest/AndroidManifest.xml" index fae9909..cf335fc 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/merged_manifest/debug/processDebugMainManifest/AndroidManifest.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/merged_manifest/debug/processDebugMainManifest/AndroidManifest.xml" @@ -37,8 +37,15 @@ + + + + + + + + + + + + + app:layout_constraintEnd_toEndOf="@+id/song_down_ib" + app:layout_constraintStart_toStartOf="@+id/song_down_ib" + app:layout_constraintTop_toBottomOf="@+id/song_down_ib" /> + app:layout_constraintEnd_toEndOf="@+id/song_music_title_tv" + app:layout_constraintStart_toStartOf="@+id/song_music_title_tv" + app:layout_constraintTop_toBottomOf="@+id/song_music_title_tv" /> + app:layout_constraintBottom_toBottomOf="@+id/song_singer_name_tv" + app:layout_constraintStart_toEndOf="@+id/song_singer_name_tv" + app:layout_constraintTop_toTopOf="@+id/song_singer_name_tv" /> + app:layout_constraintEnd_toEndOf="@+id/song_album_iv" + app:layout_constraintStart_toStartOf="@+id/song_album_iv" + app:layout_constraintTop_toBottomOf="@+id/song_album_iv" /> diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/fragment_locker.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/fragment_locker.xml" index 1514c2c..f8682ef 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/fragment_locker.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/fragment_locker.xml" @@ -31,7 +31,7 @@ - + + \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_" index f939652..f8d23e6 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_0.jar" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_0.jar" deleted file mode 100644 index a73d80b..0000000 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_0.jar" and /dev/null differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_1.jar" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_1.jar" deleted file mode 100644 index 3bf375f..0000000 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_1.jar" and /dev/null differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_2.jar" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_2.jar" deleted file mode 100644 index e642086..0000000 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_2.jar" and /dev/null differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_3.jar" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_3.jar" deleted file mode 100644 index eb23349..0000000 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_3.jar" and /dev/null differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_4.jar" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_4.jar" deleted file mode 100644 index 2ba90ff..0000000 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_4.jar" and /dev/null differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_5.jar" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_5.jar" deleted file mode 100644 index cb2d618..0000000 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/7b75a85ecc0d1b15ae444d57e94855c536b438c87c2834cfa8d09c76c8cfac69_5.jar" and /dev/null differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/AlbumFragment.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/AlbumFragment.dex" index 8cb5d10..82d85bf 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/AlbumFragment.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/AlbumFragment.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/AlbumVPAdapter.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/AlbumVPAdapter.dex" index 94ab653..b3235c1 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/AlbumVPAdapter.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/AlbumVPAdapter.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/BannerFragment.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/BannerFragment.dex" index 1ce1685..e0a6b8f 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/BannerFragment.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/BannerFragment.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/BannerVPAdapter.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/BannerVPAdapter.dex" index e5027d0..8d38860 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/BannerVPAdapter.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/BannerVPAdapter.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/DetailFragment.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/DetailFragment.dex" index cc9b0a7..9ccc48e 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/DetailFragment.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/DetailFragment.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/HomeFragment$autoSlide$1.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/HomeFragment$autoSlide$1.dex" index f63fd5e..e1ab4f3 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/HomeFragment$autoSlide$1.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/HomeFragment$autoSlide$1.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/HomeFragment.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/HomeFragment.dex" index af66072..94c65fb 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/HomeFragment.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/HomeFragment.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/LockerFragment.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/LockerFragment.dex" index 71b25c3..f34f1ad 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/LockerFragment.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/LockerFragment.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/LockerVPAdapter.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/LockerVPAdapter.dex" index 8d8574c..f20024c 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/LockerVPAdapter.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/LockerVPAdapter.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/LookFragment.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/LookFragment.dex" index 4663703..36cc0a1 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/LookFragment.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/LookFragment.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/MainActivity.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/MainActivity.dex" index 1335b87..16e17ca 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/MainActivity.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/MainActivity.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/PannelFragment.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/PannelFragment.dex" index 0d5c89a..ebbcec8 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/PannelFragment.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/PannelFragment.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/PannelVpAdapter.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/PannelVpAdapter.dex" index 183dcc8..6d9add8 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/PannelVpAdapter.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/PannelVpAdapter.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SavedAlbumFragment.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SavedAlbumFragment.dex" index 17f41bc..5675859 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SavedAlbumFragment.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SavedAlbumFragment.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SavedSongFragment.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SavedSongFragment.dex" index b25ee22..c685858 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SavedSongFragment.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SavedSongFragment.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SearchFragment.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SearchFragment.dex" index 759c204..9e9035f 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SearchFragment.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SearchFragment.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/Song.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/Song.dex" index d57a6c6..1c4d001 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/Song.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/Song.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SongActivity$Timer.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SongActivity$Timer.dex" index 0037f1b..2ed7adc 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SongActivity$Timer.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SongActivity$Timer.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SongActivity.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SongActivity.dex" index fe367b5..1c46208 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SongActivity.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SongActivity.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SongFragment.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SongFragment.dex" index f2fc68a..3b2e810 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SongFragment.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SongFragment.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SplashActivity.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SplashActivity.dex" index 1c18594..6ed01cd 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SplashActivity.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/SplashActivity.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/VideoFragment.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/VideoFragment.dex" index 5d110dc..f1d6920 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/VideoFragment.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/VideoFragment.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/ActivityMainBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/ActivityMainBinding.dex" index c32af43..ad21e50 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/ActivityMainBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/ActivityMainBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/ActivitySongBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/ActivitySongBinding.dex" index a52d23f..53003b3 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/ActivitySongBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/ActivitySongBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/ActivitySplashBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/ActivitySplashBinding.dex" index 6964d2f..8fb9259 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/ActivitySplashBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/ActivitySplashBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentAlbumBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentAlbumBinding.dex" index 4484d26..8811e91 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentAlbumBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentAlbumBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentBannerBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentBannerBinding.dex" index 4296b1e..4708028 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentBannerBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentBannerBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentDetailBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentDetailBinding.dex" index 9834fb6..5c1bacf 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentDetailBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentDetailBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentHomeBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentHomeBinding.dex" index 9a8aa07..c5f234b 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentHomeBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentHomeBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLockerBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLockerBinding.dex" index bc0e251..4f30a7d 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLockerBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLockerBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLockerSavedalbumBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLockerSavedalbumBinding.dex" index 665ccb9..682257e 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLockerSavedalbumBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLockerSavedalbumBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLockerSavedsongBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLockerSavedsongBinding.dex" index 175bc2e..296cd99 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLockerSavedsongBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLockerSavedsongBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLookBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLookBinding.dex" index 7819659..bb0aba6 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLookBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentLookBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentPannelBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentPannelBinding.dex" index 46e8d08..61637d5 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentPannelBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentPannelBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentSearchBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentSearchBinding.dex" index f5efece..a19ce5f 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentSearchBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentSearchBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentSongBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentSongBinding.dex" index 1dec3e4..16f3253 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentSongBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentSongBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentVideoBinding.dex" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentVideoBinding.dex" index 03436dc..4718ba6 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentVideoBinding.dex" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/com/example/umcflo/databinding/FragmentVideoBinding.dex" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/runtime_symbol_list/debug/processDebugResources/R.txt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/runtime_symbol_list/debug/processDebugResources/R.txt" index a393e0b..9e614de 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/runtime_symbol_list/debug/processDebugResources/R.txt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/runtime_symbol_list/debug/processDebugResources/R.txt" @@ -3032,6 +3032,11 @@ int drawable btn_checkbox_checked_mtrl 0x7f070086 int drawable btn_checkbox_checked_to_unchecked_mtrl_animation 0x7f070087 int drawable btn_checkbox_unchecked_mtrl 0x7f070088 int drawable btn_checkbox_unchecked_to_checked_mtrl_animation 0x7f070089 +int drawable btn_editbar_addplaylist 0x7f07015e +int drawable btn_editbar_delete 0x7f07015f +int drawable btn_editbar_download 0x7f070160 +int drawable btn_editbar_mylist 0x7f070161 +int drawable btn_editbar_play 0x7f070162 int drawable btn_input_password 0x7f07008a int drawable btn_input_password_off 0x7f07008b int drawable btn_main_arrow_more 0x7f07008c @@ -3574,11 +3579,33 @@ int id locker_login_tv 0x7f080146 int id locker_music_album_rv 0x7f0802bc int id locker_play_all_img_iv 0x7f0802b3 int id locker_play_all_tv 0x7f0802b4 +int id locker_savedSong_recyclerView 0x7f0802eb int id locker_select_all_img_iv 0x7f0802b5 int id locker_select_all_tv 0x7f0802b6 int id locker_title_tv 0x7f080148 +int id login_address_underscore_view 0x7f0802c3 +int id login_apple_login_iv 0x7f0802c4 +int id login_at_sign_tv 0x7f0802c5 +int id login_close_iv 0x7f0802c6 +int id login_direct_input_et 0x7f0802c7 +int id login_division_tv 0x7f0802c8 +int id login_email_list_iv 0x7f0802c9 +int id login_find_id_tv 0x7f0802ca +int id login_find_password_tv 0x7f0802cb +int id login_flo_logo_iv 0x7f0802cc +int id login_hide_password_iv 0x7f0802cd +int id login_id_et 0x7f0802ce +int id login_id_underscore_view 0x7f0802cf +int id login_kakako_login_iv 0x7f0802d0 +int id login_naver_login_iv 0x7f0802d1 +int id login_password_et 0x7f0802d2 +int id login_password_underscore_view 0x7f0802d3 +int id login_phone_number_login_layout 0x7f0802d4 +int id login_sign_in_btn 0x7f0802d5 +int id login_sign_up_tv 0x7f0802d6 +int id login_social_login_layout 0x7f0802d7 +int id login_t_world_login_layout 0x7f0802d8 int id lookFragment 0x7f080149 -int id lower_ib 0x7f08014a int id lyrics_01_iv 0x7f08014b int id m3_side_sheet 0x7f08014c int id mainMiniplayerSingerTv 0x7f0802aa @@ -3648,7 +3675,6 @@ int id mtrl_picker_text_input_range_start 0x7f08018b int id mtrl_picker_title_text 0x7f08018c int id mtrl_view_tag_bottom_padding 0x7f08018d int id multiply 0x7f08018e -int id music_title_tv 0x7f08018f int id navigation_bar_item_active_indicator_view 0x7f080190 int id navigation_bar_item_icon_container 0x7f080191 int id navigation_bar_item_icon_view 0x7f080192 @@ -3700,7 +3726,6 @@ int id pathRelative 0x7f0801bf int id peekHeight 0x7f0801c0 int id percent 0x7f0801c1 int id pin 0x7f0801c2 -int id player_like_iv 0x7f0801c3 int id player_like_iv_layout 0x7f0801c4 int id player_unlike_iv 0x7f0801c5 int id plus_ib 0x7f0801c6 @@ -3753,8 +3778,25 @@ int id shortcut 0x7f0801f4 int id showCustom 0x7f0801f5 int id showHome 0x7f0801f6 int id showTitle 0x7f0801f7 +int id sign_up_address_underscore_view 0x7f0802d9 +int id sign_up_at_sign_tv 0x7f0802da +int id sign_up_direct_input_et 0x7f0802db +int id sign_up_email_error_tv 0x7f0802dc +int id sign_up_email_list_iv 0x7f0802dd +int id sign_up_hide_password_check_iv 0x7f0802de +int id sign_up_hide_password_iv 0x7f0802df +int id sign_up_id_et 0x7f0802e0 +int id sign_up_id_underscore_view 0x7f0802e1 +int id sign_up_loading_pb 0x7f0802e2 +int id sign_up_name_et 0x7f0802e3 +int id sign_up_name_underscore_view 0x7f0802e4 +int id sign_up_password_check_et 0x7f0802e5 +int id sign_up_password_check_underscore_view 0x7f0802e6 +int id sign_up_password_et 0x7f0802e7 +int id sign_up_password_underscore_view 0x7f0802e8 +int id sign_up_sign_up_btn 0x7f0802e9 +int id sign_up_sign_up_tv 0x7f0802ea int id sin 0x7f0801f8 -int id singer_name_tv 0x7f0801f9 int id skipCollapsed 0x7f0801fa int id skipped 0x7f0801fb int id slide 0x7f0801fc @@ -3762,16 +3804,18 @@ int id snackbar_action 0x7f0801fd int id snackbar_text 0x7f0801fe int id snap 0x7f0801ff int id snapMargins 0x7f080200 -int id song_album_IU_iv 0x7f080201 +int id song_album_iv 0x7f0802bd int id song_all_listen_iv 0x7f080202 int id song_all_listen_tv 0x7f080203 int id song_all_select_iv 0x7f080204 int id song_all_select_tv 0x7f080205 int id song_celebrity_layout 0x7f080206 int id song_coin_layout 0x7f080207 +int id song_down_ib 0x7f0802be int id song_end_time_tv 0x7f080208 int id song_flu_layout 0x7f080209 int id song_lalac_layout 0x7f08020a +int id song_like_iv 0x7f0802c1 int id song_list_order_01_tv 0x7f08020b int id song_list_order_02_tv 0x7f08020c int id song_list_order_03_tv 0x7f08020d @@ -3799,6 +3843,7 @@ int id song_music_title_03_tv 0x7f080222 int id song_music_title_04_tv 0x7f080223 int id song_music_title_05_tv 0x7f080224 int id song_music_title_06_tv 0x7f080225 +int id song_music_title_tv 0x7f0802bf int id song_next_iv 0x7f080226 int id song_pause_iv 0x7f080227 int id song_play_01_iv 0x7f080228 @@ -3818,6 +3863,7 @@ int id song_singer_name_03_tv 0x7f080235 int id song_singer_name_04_tv 0x7f080236 int id song_singer_name_05_tv 0x7f080237 int id song_singer_name_06_tv 0x7f080238 +int id song_singer_name_tv 0x7f0802c0 int id song_singer_plus_iv 0x7f080239 int id song_spring_layout 0x7f08023a int id song_start_time_tv 0x7f08023b @@ -3845,6 +3891,7 @@ int id stretch 0x7f080250 int id submenuarrow 0x7f080251 int id submit_area 0x7f080252 int id supportScrollUp 0x7f080253 +int id switchRV 0x7f0802c2 int id tabMode 0x7f080254 int id tag_accessibility_actions 0x7f080255 int id tag_accessibility_clickable_spans 0x7f080256 @@ -4045,7 +4092,9 @@ int layout abc_search_dropdown_item_icons_2line 0x7f0b0018 int layout abc_search_view 0x7f0b0019 int layout abc_select_dialog_material 0x7f0b001a int layout abc_tooltip 0x7f0b001b +int layout activity_login 0x7f0b007c int layout activity_main 0x7f0b001c +int layout activity_sign_up 0x7f0b007d int layout activity_song 0x7f0b001d int layout activity_splash 0x7f0b0079 int layout custom_dialog 0x7f0b001e @@ -4072,6 +4121,7 @@ int layout fragment_locker 0x7f0b0032 int layout fragment_locker_savedalbum 0x7f0b0033 int layout fragment_locker_savedsong 0x7f0b0034 int layout fragment_look 0x7f0b0035 +int layout fragment_music_file 0x7f0b007e int layout fragment_pannel 0x7f0b0036 int layout fragment_search 0x7f0b0037 int layout fragment_song 0x7f0b0038 @@ -4145,7 +4195,17 @@ int menu bottom_nav_menu 0x7f0d0000 int mipmap ic_launcher 0x7f0e0000 int mipmap ic_launcher_round 0x7f0e0001 int plurals mtrl_badge_content_description 0x7f0f0000 +int raw music_bboom 0x7f140006 +int raw music_boy 0x7f140007 +int raw music_butter 0x7f140008 +int raw music_flu 0x7f140009 +int raw music_fool 0x7f140001 int raw music_lilac 0x7f140000 +int raw music_lovedive 0x7f140002 +int raw music_mylove 0x7f140003 +int raw music_nakka 0x7f140004 +int raw music_next 0x7f14000a +int raw music_nextlevel 0x7f140005 int string _2012_07_03 0x7f100000 int string abc_action_bar_home_description 0x7f100001 int string abc_action_bar_up_description 0x7f100002 diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/source_set_path_map/debug/mapDebugSourceSetPaths/file-map.txt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/source_set_path_map/debug/mapDebugSourceSetPaths/file-map.txt" index 9d74ca8..4e4aef3 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/source_set_path_map/debug/mapDebugSourceSetPaths/file-map.txt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/source_set_path_map/debug/mapDebugSourceSetPaths/file-map.txt" @@ -2,34 +2,37 @@ com.example.umcflo.app-emoji2-views-helper-1.2.0-0 C:\Users\sangj\.gradle\caches com.example.umcflo.app-profileinstaller-1.3.0-1 C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\res com.example.umcflo.app-fragment-1.3.6-2 C:\Users\sangj\.gradle\caches\transforms-3\0a96882815cddc737f042bccad4a7e84\transformed\fragment-1.3.6\res com.example.umcflo.app-annotation-experimental-1.4.0-3 C:\Users\sangj\.gradle\caches\transforms-3\168d98ad2ac81c48a06c104950d47bb7\transformed\annotation-experimental-1.4.0\res -com.example.umcflo.app-lifecycle-process-2.6.2-4 C:\Users\sangj\.gradle\caches\transforms-3\1b60d9b1479e1620ea7a73a3e70cb116\transformed\lifecycle-process-2.6.2\res -com.example.umcflo.app-emoji2-1.2.0-5 C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\res -com.example.umcflo.app-transition-1.5.0-6 C:\Users\sangj\.gradle\caches\transforms-3\34f7f0ded6930e2381c2e4597741c5f8\transformed\transition-1.5.0\res -com.example.umcflo.app-lifecycle-viewmodel-2.6.2-7 C:\Users\sangj\.gradle\caches\transforms-3\3a89fe290859ed7414fc7708b175a6b3\transformed\lifecycle-viewmodel-2.6.2\res -com.example.umcflo.app-cardview-1.0.0-8 C:\Users\sangj\.gradle\caches\transforms-3\44f2e44cbbbd3053723086f6aa1a7560\transformed\cardview-1.0.0\res -com.example.umcflo.app-lifecycle-runtime-2.6.2-9 C:\Users\sangj\.gradle\caches\transforms-3\45617d0db468f8d53a3937da11d742dd\transformed\lifecycle-runtime-2.6.2\res -com.example.umcflo.app-viewpager2-1.0.0-10 C:\Users\sangj\.gradle\caches\transforms-3\4ef3e4eef32e2bba96e0ebebee5744b4\transformed\viewpager2-1.0.0\res -com.example.umcflo.app-coordinatorlayout-1.1.0-11 C:\Users\sangj\.gradle\caches\transforms-3\512d4a7aae01e90f5c797a9761e6e369\transformed\coordinatorlayout-1.1.0\res -com.example.umcflo.app-core-1.13.1-12 C:\Users\sangj\.gradle\caches\transforms-3\512dd553433fed0a183acc4f624d5ec9\transformed\core-1.13.1\res -com.example.umcflo.app-startup-runtime-1.1.1-13 C:\Users\sangj\.gradle\caches\transforms-3\5626bc91db35ebf1e3aceb6f36f4e774\transformed\startup-runtime-1.1.1\res -com.example.umcflo.app-activity-1.8.0-14 C:\Users\sangj\.gradle\caches\transforms-3\5e9d662c2c00a197b09ee17192eb9cc1\transformed\activity-1.8.0\res -com.example.umcflo.app-lifecycle-livedata-2.6.2-15 C:\Users\sangj\.gradle\caches\transforms-3\7317357d9c074f8cfcba360885f52b16\transformed\lifecycle-livedata-2.6.2\res -com.example.umcflo.app-core-ktx-1.13.1-16 C:\Users\sangj\.gradle\caches\transforms-3\7ea22f16f402ebc6e883abb2d8e44a21\transformed\core-ktx-1.13.1\res -com.example.umcflo.app-appcompat-1.6.1-17 C:\Users\sangj\.gradle\caches\transforms-3\7fd3f7b85cd11588703f2df3b96d3544\transformed\appcompat-1.6.1\res -com.example.umcflo.app-material-1.12.0-18 C:\Users\sangj\.gradle\caches\transforms-3\8c6e71333fe2aed7ac5ef9137e285269\transformed\material-1.12.0\res -com.example.umcflo.app-recyclerview-1.1.0-19 C:\Users\sangj\.gradle\caches\transforms-3\9e72763cedc94cb385f1ce8e4a2afb2a\transformed\recyclerview-1.1.0\res -com.example.umcflo.app-lifecycle-livedata-core-2.6.2-20 C:\Users\sangj\.gradle\caches\transforms-3\b3558c2520a00a64394b59158d805989\transformed\lifecycle-livedata-core-2.6.2\res -com.example.umcflo.app-lifecycle-viewmodel-savedstate-2.6.2-21 C:\Users\sangj\.gradle\caches\transforms-3\bfecaebf84eb07da35698e85c53e0473\transformed\lifecycle-viewmodel-savedstate-2.6.2\res -com.example.umcflo.app-drawerlayout-1.1.1-22 C:\Users\sangj\.gradle\caches\transforms-3\cd8ecaa2eaedd9ec64442c583f14f074\transformed\drawerlayout-1.1.1\res -com.example.umcflo.app-constraintlayout-2.1.4-23 C:\Users\sangj\.gradle\caches\transforms-3\ddf324b6a45754fc446fc6eab33ec636\transformed\constraintlayout-2.1.4\res -com.example.umcflo.app-appcompat-resources-1.6.1-24 C:\Users\sangj\.gradle\caches\transforms-3\e0b36974138b4f555dc681ab61bd7cef\transformed\appcompat-resources-1.6.1\res -com.example.umcflo.app-circleindicator-2.1.6-25 C:\Users\sangj\.gradle\caches\transforms-3\efc84bcfe34efd1c7a32aeb28b74b51a\transformed\circleindicator-2.1.6\res -com.example.umcflo.app-savedstate-1.2.1-26 C:\Users\sangj\.gradle\caches\transforms-3\fa12240bf32b116bab2be3fd2087a5f7\transformed\savedstate-1.2.1\res -com.example.umcflo.app-core-runtime-2.2.0-27 C:\Users\sangj\.gradle\caches\transforms-3\fb953d4e36c118eb086d73b35b68b69a\transformed\core-runtime-2.2.0\res -com.example.umcflo.app-pngs-28 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\build\generated\res\pngs\debug -com.example.umcflo.app-resValues-29 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\build\generated\res\resValues\debug -com.example.umcflo.app-packageDebugResources-30 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir -com.example.umcflo.app-packageDebugResources-31 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir -com.example.umcflo.app-debug-32 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\build\intermediates\merged_res\debug\mergeDebugResources -com.example.umcflo.app-debug-33 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\debug\res -com.example.umcflo.app-main-34 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\res +com.example.umcflo.app-room-runtime-2.6.0-4 C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\res +com.example.umcflo.app-lifecycle-process-2.6.2-5 C:\Users\sangj\.gradle\caches\transforms-3\1b60d9b1479e1620ea7a73a3e70cb116\transformed\lifecycle-process-2.6.2\res +com.example.umcflo.app-emoji2-1.2.0-6 C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\res +com.example.umcflo.app-transition-1.5.0-7 C:\Users\sangj\.gradle\caches\transforms-3\34f7f0ded6930e2381c2e4597741c5f8\transformed\transition-1.5.0\res +com.example.umcflo.app-lifecycle-viewmodel-2.6.2-8 C:\Users\sangj\.gradle\caches\transforms-3\3a89fe290859ed7414fc7708b175a6b3\transformed\lifecycle-viewmodel-2.6.2\res +com.example.umcflo.app-cardview-1.0.0-9 C:\Users\sangj\.gradle\caches\transforms-3\44f2e44cbbbd3053723086f6aa1a7560\transformed\cardview-1.0.0\res +com.example.umcflo.app-lifecycle-runtime-2.6.2-10 C:\Users\sangj\.gradle\caches\transforms-3\45617d0db468f8d53a3937da11d742dd\transformed\lifecycle-runtime-2.6.2\res +com.example.umcflo.app-viewpager2-1.0.0-11 C:\Users\sangj\.gradle\caches\transforms-3\4ef3e4eef32e2bba96e0ebebee5744b4\transformed\viewpager2-1.0.0\res +com.example.umcflo.app-coordinatorlayout-1.1.0-12 C:\Users\sangj\.gradle\caches\transforms-3\512d4a7aae01e90f5c797a9761e6e369\transformed\coordinatorlayout-1.1.0\res +com.example.umcflo.app-core-1.13.1-13 C:\Users\sangj\.gradle\caches\transforms-3\512dd553433fed0a183acc4f624d5ec9\transformed\core-1.13.1\res +com.example.umcflo.app-startup-runtime-1.1.1-14 C:\Users\sangj\.gradle\caches\transforms-3\5626bc91db35ebf1e3aceb6f36f4e774\transformed\startup-runtime-1.1.1\res +com.example.umcflo.app-activity-1.8.0-15 C:\Users\sangj\.gradle\caches\transforms-3\5e9d662c2c00a197b09ee17192eb9cc1\transformed\activity-1.8.0\res +com.example.umcflo.app-lifecycle-livedata-2.6.2-16 C:\Users\sangj\.gradle\caches\transforms-3\7317357d9c074f8cfcba360885f52b16\transformed\lifecycle-livedata-2.6.2\res +com.example.umcflo.app-sqlite-2.4.0-17 C:\Users\sangj\.gradle\caches\transforms-3\76aa7fb7878c5ba2b61daf425809b90f\transformed\sqlite-2.4.0\res +com.example.umcflo.app-core-ktx-1.13.1-18 C:\Users\sangj\.gradle\caches\transforms-3\7ea22f16f402ebc6e883abb2d8e44a21\transformed\core-ktx-1.13.1\res +com.example.umcflo.app-appcompat-1.6.1-19 C:\Users\sangj\.gradle\caches\transforms-3\7fd3f7b85cd11588703f2df3b96d3544\transformed\appcompat-1.6.1\res +com.example.umcflo.app-material-1.12.0-20 C:\Users\sangj\.gradle\caches\transforms-3\8c6e71333fe2aed7ac5ef9137e285269\transformed\material-1.12.0\res +com.example.umcflo.app-sqlite-framework-2.4.0-21 C:\Users\sangj\.gradle\caches\transforms-3\9bfec0c6661302fba0b1ec4a95ff58d8\transformed\sqlite-framework-2.4.0\res +com.example.umcflo.app-recyclerview-1.1.0-22 C:\Users\sangj\.gradle\caches\transforms-3\9e72763cedc94cb385f1ce8e4a2afb2a\transformed\recyclerview-1.1.0\res +com.example.umcflo.app-lifecycle-livedata-core-2.6.2-23 C:\Users\sangj\.gradle\caches\transforms-3\b3558c2520a00a64394b59158d805989\transformed\lifecycle-livedata-core-2.6.2\res +com.example.umcflo.app-lifecycle-viewmodel-savedstate-2.6.2-24 C:\Users\sangj\.gradle\caches\transforms-3\bfecaebf84eb07da35698e85c53e0473\transformed\lifecycle-viewmodel-savedstate-2.6.2\res +com.example.umcflo.app-drawerlayout-1.1.1-25 C:\Users\sangj\.gradle\caches\transforms-3\cd8ecaa2eaedd9ec64442c583f14f074\transformed\drawerlayout-1.1.1\res +com.example.umcflo.app-constraintlayout-2.1.4-26 C:\Users\sangj\.gradle\caches\transforms-3\ddf324b6a45754fc446fc6eab33ec636\transformed\constraintlayout-2.1.4\res +com.example.umcflo.app-appcompat-resources-1.6.1-27 C:\Users\sangj\.gradle\caches\transforms-3\e0b36974138b4f555dc681ab61bd7cef\transformed\appcompat-resources-1.6.1\res +com.example.umcflo.app-circleindicator-2.1.6-28 C:\Users\sangj\.gradle\caches\transforms-3\efc84bcfe34efd1c7a32aeb28b74b51a\transformed\circleindicator-2.1.6\res +com.example.umcflo.app-savedstate-1.2.1-29 C:\Users\sangj\.gradle\caches\transforms-3\fa12240bf32b116bab2be3fd2087a5f7\transformed\savedstate-1.2.1\res +com.example.umcflo.app-core-runtime-2.2.0-30 C:\Users\sangj\.gradle\caches\transforms-3\fb953d4e36c118eb086d73b35b68b69a\transformed\core-runtime-2.2.0\res +com.example.umcflo.app-pngs-31 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\build\generated\res\pngs\debug +com.example.umcflo.app-resValues-32 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\build\generated\res\resValues\debug +com.example.umcflo.app-packageDebugResources-33 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir +com.example.umcflo.app-packageDebugResources-34 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir +com.example.umcflo.app-debug-35 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\build\intermediates\merged_res\debug\mergeDebugResources +com.example.umcflo.app-debug-36 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\debug\res +com.example.umcflo.app-main-37 C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\res diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/stable_resource_ids_file/debug/processDebugResources/stableIds.txt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/stable_resource_ids_file/debug/processDebugResources/stableIds.txt" index 1a7a0e5..45a2b8a 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/stable_resource_ids_file/debug/processDebugResources/stableIds.txt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/stable_resource_ids_file/debug/processDebugResources/stableIds.txt" @@ -1,161 +1,164 @@ -com.example.umcflo:layout/item_locker_album = 0x7f0b007b -com.example.umcflo:id/locker_music_album_rv = 0x7f0802bc -com.example.umcflo:id/item_locker_album_play_img_iv = 0x7f0802b9 -com.example.umcflo:id/item_locker_album_more_iv = 0x7f0802b8 -com.example.umcflo:id/item_locker_album_cover_img_iv = 0x7f0802b7 -com.example.umcflo:string/mtrl_switch_thumb_path_name = 0x7f100099 -com.example.umcflo:style/Theme.MaterialComponents.Light.Dialog.Bridge = 0x7f11026b -com.example.umcflo:style/Widget.Material3.CompoundButton.Switch = 0x7f110380 -com.example.umcflo:style/Theme.Material3.DayNight.Dialog = 0x7f110232 -com.example.umcflo:style/Widget.Material3.MaterialTimePicker = 0x7f1103b3 -com.example.umcflo:style/TextAppearance.Material3.SearchBar = 0x7f1101f2 -com.example.umcflo:color/material_dynamic_primary95 = 0x7f05024f +com.example.umcflo:style/Widget.Material3.Slider = 0x7f1103cf com.example.umcflo:style/TextAppearance.Design.Counter = 0x7f1101ca -com.example.umcflo:macro/m3_comp_navigation_bar_inactive_hover_state_layer_color = 0x7f0c0071 +com.example.umcflo:styleable/Capability = 0x7f12001a +com.example.umcflo:color/material_dynamic_primary95 = 0x7f05024f +com.example.umcflo:style/TextAppearance.Material3.SearchBar = 0x7f1101f2 +com.example.umcflo:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.Shortcut = 0x7f11014a com.example.umcflo:style/Base.V21.Theme.AppCompat.Dialog = 0x7f1100a3 -com.example.umcflo:styleable/NavigationBarActiveIndicator = 0x7f12006a -com.example.umcflo:style/Widget.Material3.ChipGroup = 0x7f110371 -com.example.umcflo:styleable/CollapsingToolbarLayout_Layout = 0x7f120024 -com.example.umcflo:style/Widget.MaterialComponents.PopupMenu.ContextMenu = 0x7f11043f -com.example.umcflo:id/up = 0x7f080288 -com.example.umcflo:style/Widget.AppCompat.Light.SearchView = 0x7f110316 +com.example.umcflo:macro/m3_comp_navigation_bar_inactive_hover_state_layer_color = 0x7f0c0071 +com.example.umcflo:style/Theme.Material3.DayNight.Dialog = 0x7f110232 +com.example.umcflo:style/Widget.Material3.MaterialTimePicker = 0x7f1103b3 +com.example.umcflo:drawable/btn_editbar_mylist = 0x7f070161 +com.example.umcflo:style/Theme.MaterialComponents.Light.Dialog.Bridge = 0x7f11026b com.example.umcflo:style/Theme.MaterialComponents.Light.NoActionBar = 0x7f110271 -com.example.umcflo:style/Widget.MaterialComponents.ActionBar.Primary = 0x7f1103e9 -com.example.umcflo:style/Widget.Material3.Slider = 0x7f1103cf -com.example.umcflo:style/Widget.AppCompat.SeekBar.Discrete = 0x7f110328 -com.example.umcflo:style/Widget.Material3.FloatingActionButton.Large.Surface = 0x7f11038c -com.example.umcflo:style/Widget.MaterialComponents.CollapsingToolbar = 0x7f110415 -com.example.umcflo:style/Base.V21.Theme.MaterialComponents.Light = 0x7f1100a8 -com.example.umcflo:id/search_bar = 0x7f0801e5 -com.example.umcflo:styleable/ActionMenuView = 0x7f120003 -com.example.umcflo:style/Base.Widget.Material3.CardView = 0x7f110101 +com.example.umcflo:id/login_division_tv = 0x7f0802c8 com.example.umcflo:style/Widget.Material3.Search.Toolbar.Button.Navigation = 0x7f1103c5 -com.example.umcflo:dimen/m3_comp_top_app_bar_small_container_elevation = 0x7f0601ac -com.example.umcflo:style/TextAppearance.MaterialComponents.Subtitle1 = 0x7f110205 +com.example.umcflo:id/locker_music_album_rv = 0x7f0802bc +com.example.umcflo:id/login_naver_login_iv = 0x7f0802d1 com.example.umcflo:styleable/AnimatedStateListDrawableCompat = 0x7f120007 -com.example.umcflo:styleable/ButtonBarLayout = 0x7f120019 -com.example.umcflo:string/material_clock_display_divider = 0x7f10004c +com.example.umcflo:layout/item_locker_album = 0x7f0b007b +com.example.umcflo:style/Widget.MaterialComponents.PopupMenu.ContextMenu = 0x7f11043f +com.example.umcflo:style/Widget.AppCompat.CompoundButton.Switch = 0x7f1102fd +com.example.umcflo:id/up = 0x7f080288 +com.example.umcflo:style/Widget.Material3.CardView.Elevated = 0x7f110363 com.example.umcflo:style/Base.Theme.MaterialComponents = 0x7f110065 -com.example.umcflo:dimen/abc_disabled_alpha_material_light = 0x7f060028 -com.example.umcflo:macro/m3_comp_text_button_hover_state_layer_color = 0x7f0c0143 -com.example.umcflo:style/Theme.AppCompat.Dialog.MinWidth = 0x7f110217 -com.example.umcflo:style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dense.ExposedDropdownMenu = 0x7f110451 -com.example.umcflo:layout/material_clockface_view = 0x7f0b0047 -com.example.umcflo:macro/m3_comp_navigation_rail_inactive_pressed_state_layer_color = 0x7f0c009e -com.example.umcflo:styleable/BaseProgressIndicator = 0x7f120015 -com.example.umcflo:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.Shortcut = 0x7f11014a -com.example.umcflo:style/ThemeOverlay.MaterialComponents.TimePicker.Display.TextInputEditText = 0x7f1102e4 -com.example.umcflo:style/Widget.MaterialComponents.Button.TextButton.Icon = 0x7f110406 +com.example.umcflo:string/material_clock_display_divider = 0x7f10004c +com.example.umcflo:style/ThemeOverlay.Material3.Search = 0x7f1102b5 com.example.umcflo:style/Widget.MaterialComponents.MaterialCalendar.DayTextView = 0x7f110425 com.example.umcflo:macro/m3_comp_navigation_drawer_modal_container_color = 0x7f0c0092 com.example.umcflo:style/Theme.Design.Light.BottomSheetDialog = 0x7f110225 -com.example.umcflo:style/ThemeOverlay.Material3.Search = 0x7f1102b5 -com.example.umcflo:string/mtrl_switch_thumb_path_morphing = 0x7f100098 +com.example.umcflo:id/login_id_et = 0x7f0802ce +com.example.umcflo:macro/m3_comp_text_button_hover_state_layer_color = 0x7f0c0143 +com.example.umcflo:dimen/abc_disabled_alpha_material_light = 0x7f060028 +com.example.umcflo:style/Widget.AppCompat.Light.SearchView = 0x7f110316 +com.example.umcflo:id/sign_up_id_underscore_view = 0x7f0802e1 +com.example.umcflo:dimen/m3_bottom_sheet_modal_elevation = 0x7f0600c6 +com.example.umcflo:style/Theme.Material3.Light.DialogWhenLarge = 0x7f110243 com.example.umcflo:styleable/SwitchCompat = 0x7f120086 com.example.umcflo:style/TextAppearance.Design.Snackbar.Message = 0x7f1101d1 com.example.umcflo:style/Theme.Material3.Dark = 0x7f110228 -com.example.umcflo:id/scrollable = 0x7f0801e2 +com.example.umcflo:string/mtrl_switch_thumb_path_morphing = 0x7f100098 +com.example.umcflo:id/login_password_underscore_view = 0x7f0802d3 +com.example.umcflo:styleable/NavigationBarActiveIndicator = 0x7f12006a +com.example.umcflo:style/Widget.Material3.ChipGroup = 0x7f110371 +com.example.umcflo:color/material_personalized_primary_text_disable_only = 0x7f0502b3 com.example.umcflo:id/mini_player_singer_tv = 0x7f08016e -com.example.umcflo:style/Theme.Material3.Light.DialogWhenLarge = 0x7f110243 -com.example.umcflo:xml/backup_rules = 0x7f130000 -com.example.umcflo:id/peekHeight = 0x7f0801c0 -com.example.umcflo:string/m3_sys_motion_easing_emphasized_path_data = 0x7f100044 -com.example.umcflo:macro/m3_comp_switch_unselected_pressed_track_outline_color = 0x7f0c013f -com.example.umcflo:styleable/MaterialCheckBox = 0x7f120055 -com.example.umcflo:style/Widget.Material3.CompoundButton.RadioButton = 0x7f11037f +com.example.umcflo:styleable/ButtonBarLayout = 0x7f120019 +com.example.umcflo:macro/m3_comp_checkbox_selected_disabled_icon_color = 0x7f0c0008 +com.example.umcflo:interpolator/m3_sys_motion_easing_standard_accelerate = 0x7f0a000c +com.example.umcflo:styleable/CollapsingToolbarLayout_Layout = 0x7f120024 +com.example.umcflo:style/Widget.Material3.FloatingActionButton.Large.Surface = 0x7f11038c +com.example.umcflo:style/Widget.AppCompat.SeekBar.Discrete = 0x7f110328 +com.example.umcflo:style/Widget.MaterialComponents.Button.TextButton.Icon = 0x7f110406 +com.example.umcflo:id/home_pannel_album_bibi = 0x7f080100 +com.example.umcflo:style/Theme.Material3.DayNight.NoActionBar = 0x7f110236 +com.example.umcflo:id/cradle = 0x7f080091 +com.example.umcflo:style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dense.ExposedDropdownMenu = 0x7f110451 +com.example.umcflo:layout/material_clockface_view = 0x7f0b0047 +com.example.umcflo:style/Theme.AppCompat.Dialog.MinWidth = 0x7f110217 +com.example.umcflo:id/scrollable = 0x7f0801e2 +com.example.umcflo:style/Base.V21.Theme.MaterialComponents.Light = 0x7f1100a8 +com.example.umcflo:style/Widget.MaterialComponents.CollapsingToolbar = 0x7f110415 +com.example.umcflo:style/Widget.Material3.ExtendedFloatingActionButton.Secondary = 0x7f110387 +com.example.umcflo:style/Theme.AppCompat.DayNight = 0x7f11020e com.example.umcflo:style/TextAppearance.Material3.ActionBar.Subtitle = 0x7f1101e3 com.example.umcflo:integer/m3_sys_shape_corner_extra_large_corner_family = 0x7f090020 -com.example.umcflo:styleable/NavigationView = 0x7f12006d -com.example.umcflo:macro/m3_comp_outlined_text_field_disabled_label_text_color = 0x7f0c00b3 -com.example.umcflo:style/ShapeAppearanceOverlay.Material3.FloatingActionButton = 0x7f110187 -com.example.umcflo:style/ThemeOverlay.Material3.FloatingActionButton.Surface = 0x7f1102a5 -com.example.umcflo:style/Widget.Material3.FloatingActionButton.Small.Primary = 0x7f110390 -com.example.umcflo:style/Theme.Material3.DayNight.NoActionBar = 0x7f110236 com.example.umcflo:style/ThemeOverlay.MaterialComponents.TimePicker = 0x7f1102e2 -com.example.umcflo:style/ThemeOverlay.MaterialComponents.MaterialAlertDialog.Centered = 0x7f1102d5 -com.example.umcflo:style/Widget.MaterialComponents.CircularProgressIndicator = 0x7f110411 -com.example.umcflo:style/Widget.MaterialComponents.NavigationRailView.Compact = 0x7f11043b -com.example.umcflo:style/Widget.AppCompat.ActionBar.TabText = 0x7f1102eb -com.example.umcflo:style/Base.ThemeOverlay.MaterialComponents.Dialog.Alert = 0x7f110086 -com.example.umcflo:style/Widget.Material3.Button.TextButton.Dialog = 0x7f11035b -com.example.umcflo:dimen/m3_sys_motion_easing_standard_accelerate_control_y2 = 0x7f060213 -com.example.umcflo:layout/abc_alert_dialog_button_bar_material = 0x7f0b0008 -com.example.umcflo:style/Widget.Material3.ExtendedFloatingActionButton.Icon.Primary = 0x7f110382 -com.example.umcflo:style/Theme.MaterialComponents.CompactMenu = 0x7f110249 +com.example.umcflo:id/login_password_et = 0x7f0802d2 com.example.umcflo:id/open_search_view_root = 0x7f0801ad com.example.umcflo:style/ShapeAppearance.MaterialComponents = 0x7f11017b -com.example.umcflo:id/wrap_content = 0x7f0802a6 -com.example.umcflo:style/Widget.AppCompat.Button.ButtonBar.AlertDialog = 0x7f1102f6 -com.example.umcflo:id/image = 0x7f08012b -com.example.umcflo:string/hide_bottom_view_on_scroll_behavior = 0x7f100039 -com.example.umcflo:style/Widget.MaterialComponents.TabLayout.PrimarySurface = 0x7f11044a -com.example.umcflo:style/Widget.MaterialComponents.MaterialDivider = 0x7f110437 -com.example.umcflo:style/Widget.Material3.AutoCompleteTextView.FilledBox = 0x7f110341 -com.example.umcflo:styleable/BaseCircleIndicator = 0x7f120014 -com.example.umcflo:style/Theme.AppCompat.CompactMenu = 0x7f11020d -com.example.umcflo:id/item_album_cover_img_cardView = 0x7f0802ae -com.example.umcflo:style/Widget.AppCompat.AutoCompleteTextView = 0x7f1102f2 -com.example.umcflo:string/m3_sys_motion_easing_legacy_decelerate = 0x7f100047 -com.example.umcflo:style/Widget.Material3.SideSheet.Detached = 0x7f1103cc -com.example.umcflo:style/Theme.AppCompat.DayNight.Dialog = 0x7f110210 -com.example.umcflo:style/Base.Theme.AppCompat.Light.Dialog = 0x7f110054 -com.example.umcflo:style/ThemeOverlay.Material3.NavigationRailView = 0x7f1102b2 -com.example.umcflo:style/Theme.MaterialComponents.Light.Dialog.MinWidth = 0x7f11026e -com.example.umcflo:style/TextAppearance.Compat.Notification.Title = 0x7f1101c8 -com.example.umcflo:drawable/ic_call_answer_low = 0x7f0700c8 -com.example.umcflo:interpolator/m3_sys_motion_easing_standard_accelerate = 0x7f0a000c -com.example.umcflo:macro/m3_comp_checkbox_selected_disabled_icon_color = 0x7f0c0008 -com.example.umcflo:string/material_timepicker_minute = 0x7f10005e +com.example.umcflo:style/Widget.Material3.CompoundButton.Switch = 0x7f110380 +com.example.umcflo:xml/backup_rules = 0x7f130000 +com.example.umcflo:id/peekHeight = 0x7f0801c0 +com.example.umcflo:string/m3_sys_motion_easing_emphasized_path_data = 0x7f100044 +com.example.umcflo:style/Widget.Material3.ExtendedFloatingActionButton.Icon.Primary = 0x7f110382 +com.example.umcflo:style/Theme.MaterialComponents.CompactMenu = 0x7f110249 +com.example.umcflo:layout/abc_alert_dialog_button_bar_material = 0x7f0b0008 +com.example.umcflo:style/ThemeOverlay.MaterialComponents.TimePicker.Display.TextInputEditText = 0x7f1102e4 com.example.umcflo:style/Widget.Material3.FloatingActionButton.Large.Secondary = 0x7f11038b com.example.umcflo:style/TextAppearance.AppCompat.Title = 0x7f1101ae -com.example.umcflo:id/add = 0x7f080046 +com.example.umcflo:string/material_timepicker_minute = 0x7f10005e com.example.umcflo:style/Widget.Material3.TextInputLayout.OutlinedBox = 0x7f1103e1 -com.example.umcflo:style/Widget.AppCompat.ActionButton = 0x7f1102ed +com.example.umcflo:id/add = 0x7f080046 +com.example.umcflo:style/Widget.AppCompat.ActionBar.TabText = 0x7f1102eb +com.example.umcflo:style/ShapeAppearanceOverlay.Material3.FloatingActionButton = 0x7f110187 +com.example.umcflo:style/ThemeOverlay.Material3.FloatingActionButton.Surface = 0x7f1102a5 +com.example.umcflo:style/Widget.Material3.FloatingActionButton.Small.Primary = 0x7f110390 +com.example.umcflo:id/textinput_helper_text = 0x7f08026e +com.example.umcflo:style/Theme.AppCompat.Light.Dialog = 0x7f11021c +com.example.umcflo:style/ThemeOverlay.MaterialComponents.MaterialAlertDialog.Centered = 0x7f1102d5 +com.example.umcflo:styleable/MaterialCheckBox = 0x7f120055 +com.example.umcflo:style/Widget.Material3.CompoundButton.RadioButton = 0x7f11037f com.example.umcflo:style/Widget.Material3.Button.TextButton.Dialog.Icon = 0x7f11035d -com.example.umcflo:style/Widget.Material3.ExtendedFloatingActionButton.Secondary = 0x7f110387 -com.example.umcflo:style/Theme.AppCompat.DayNight = 0x7f11020e -com.example.umcflo:style/Widget.AppCompat.CompoundButton.Switch = 0x7f1102fd -com.example.umcflo:styleable/Capability = 0x7f12001a -com.example.umcflo:id/actionDown = 0x7f080030 -com.example.umcflo:styleable/CompoundButton = 0x7f120026 -com.example.umcflo:style/Widget.MaterialComponents.TimePicker.Display.Divider = 0x7f11045c -com.example.umcflo:style/Base.Widget.AppCompat.SearchView.ActionBar = 0x7f1100f4 -com.example.umcflo:style/TextAppearance.M3.Sys.Typescale.LabelMedium = 0x7f1101de -com.example.umcflo:id/textTop = 0x7f080268 -com.example.umcflo:style/Base.TextAppearance.AppCompat.SearchResult.Subtitle = 0x7f110029 -com.example.umcflo:string/searchview_clear_text_content_description = 0x7f1000a7 -com.example.umcflo:style/Widget.Material3.Button.TonalButton = 0x7f110360 -com.example.umcflo:style/Widget.Material3.LinearProgressIndicator = 0x7f110397 -com.example.umcflo:styleable/FragmentContainerView = 0x7f12003b +com.example.umcflo:style/Widget.MaterialComponents.NavigationRailView.Compact = 0x7f11043b +com.example.umcflo:style/Widget.MaterialComponents.CircularProgressIndicator = 0x7f110411 +com.example.umcflo:style/Widget.AppCompat.Button.ButtonBar.AlertDialog = 0x7f1102f6 com.example.umcflo:dimen/m3_sys_motion_easing_emphasized_accelerate_control_x2 = 0x7f0601f9 com.example.umcflo:styleable/KeyFrame = 0x7f120042 -com.example.umcflo:id/cradle = 0x7f080091 -com.example.umcflo:style/Widget.Material3.Chip.Filter.Elevated = 0x7f11036a -com.example.umcflo:macro/m3_comp_navigation_rail_active_pressed_state_layer_color = 0x7f0c0098 -com.example.umcflo:style/Theme.MaterialComponents.DayNight.Dialog.MinWidth = 0x7f110255 -com.example.umcflo:style/Base.Widget.AppCompat.ActionBar.TabView = 0x7f1100c7 -com.example.umcflo:style/Theme.MaterialComponents.Dialog.Alert = 0x7f11025b -com.example.umcflo:style/Base.Theme.AppCompat.DialogWhenLarge = 0x7f110051 -com.example.umcflo:style/MaterialAlertDialog.Material3.Title.Text.CenterStacked = 0x7f11012c -com.example.umcflo:integer/mtrl_view_visible = 0x7f090041 com.example.umcflo:integer/m3_sys_motion_duration_extra_long2 = 0x7f090010 com.example.umcflo:style/Widget.AppCompat.PopupMenu.Overflow = 0x7f11031e com.example.umcflo:layout/material_clock_display = 0x7f0b0042 com.example.umcflo:drawable/mtrl_switch_track = 0x7f070139 com.example.umcflo:id/textEnd = 0x7f080264 com.example.umcflo:string/mtrl_picker_text_input_date_range_start_hint = 0x7f10008d -com.example.umcflo:macro/m3_comp_outlined_text_field_hover_input_text_color = 0x7f0c00bd -com.example.umcflo:layout/m3_side_sheet_dialog = 0x7f0b0040 +com.example.umcflo:macro/m3_comp_navigation_rail_inactive_pressed_state_layer_color = 0x7f0c009e +com.example.umcflo:styleable/BaseProgressIndicator = 0x7f120015 +com.example.umcflo:id/item_locker_album_cover_img_iv = 0x7f0802b7 +com.example.umcflo:string/m3_sys_motion_easing_legacy_decelerate = 0x7f100047 +com.example.umcflo:style/Widget.Material3.Button.TonalButton = 0x7f110360 +com.example.umcflo:style/Widget.Material3.LinearProgressIndicator = 0x7f110397 +com.example.umcflo:styleable/FragmentContainerView = 0x7f12003b +com.example.umcflo:style/Widget.Material3.FloatingActionButton.Secondary = 0x7f11038f +com.example.umcflo:style/Base.TextAppearance.AppCompat.SearchResult.Subtitle = 0x7f110029 +com.example.umcflo:id/image = 0x7f08012b +com.example.umcflo:string/hide_bottom_view_on_scroll_behavior = 0x7f100039 +com.example.umcflo:style/Widget.MaterialComponents.TabLayout.PrimarySurface = 0x7f11044a +com.example.umcflo:id/sign_up_password_et = 0x7f0802e7 +com.example.umcflo:style/Theme.AppCompat.CompactMenu = 0x7f11020d +com.example.umcflo:id/item_album_cover_img_cardView = 0x7f0802ae com.example.umcflo:style/Theme.Material3.Dark.NoActionBar = 0x7f11022e com.example.umcflo:macro/m3_sys_color_dark_surface_tint = 0x7f0c0175 -com.example.umcflo:style/Widget.AppCompat.Spinner.Underlined = 0x7f11032c -com.example.umcflo:styleable/BottomNavigationView = 0x7f120017 -com.example.umcflo:macro/m3_comp_navigation_bar_active_hover_label_text_color = 0x7f0c0063 +com.example.umcflo:style/Base.Widget.Material3.CardView = 0x7f110101 +com.example.umcflo:styleable/ActionMenuView = 0x7f120003 +com.example.umcflo:style/Base.Widget.MaterialComponents.Chip = 0x7f110114 +com.example.umcflo:string/mtrl_picker_day_of_week_column_header = 0x7f10007b +com.example.umcflo:id/wrap_content = 0x7f0802a6 +com.example.umcflo:style/Widget.Material3.AutoCompleteTextView.FilledBox = 0x7f110341 +com.example.umcflo:styleable/BaseCircleIndicator = 0x7f120014 +com.example.umcflo:style/Widget.MaterialComponents.MaterialDivider = 0x7f110437 +com.example.umcflo:dimen/m3_ripple_focused_alpha = 0x7f0601d8 +com.example.umcflo:id/song_like_iv = 0x7f0802c1 com.example.umcflo:styleable/StateListDrawableItem = 0x7f120084 com.example.umcflo:drawable/mtrl_checkbox_button_icon_unchecked_indeterminate = 0x7f070120 com.example.umcflo:style/Platform.ThemeOverlay.AppCompat.Light = 0x7f11013f com.example.umcflo:id/home_pannel_album_singer_tv = 0x7f080108 -com.example.umcflo:style/Widget.Compat.NotificationActionContainer = 0x7f110331 +com.example.umcflo:style/Base.Theme.MaterialComponents.Dialog.Alert = 0x7f110069 +com.example.umcflo:macro/m3_comp_icon_button_selected_icon_color = 0x7f0c0059 +com.example.umcflo:dimen/m3_comp_top_app_bar_small_container_elevation = 0x7f0601ac +com.example.umcflo:style/TextAppearance.MaterialComponents.Subtitle1 = 0x7f110205 +com.example.umcflo:string/mtrl_switch_thumb_path_name = 0x7f100099 +com.example.umcflo:macro/m3_comp_outlined_text_field_hover_input_text_color = 0x7f0c00bd +com.example.umcflo:layout/m3_side_sheet_dialog = 0x7f0b0040 +com.example.umcflo:color/mtrl_textinput_disabled_color = 0x7f0502f2 +com.example.umcflo:style/TextAppearance.M3.Sys.Typescale.HeadlineLarge = 0x7f1101da +com.example.umcflo:style/ThemeOverlay.Material3 = 0x7f110280 +com.example.umcflo:id/sign_up_sign_up_tv = 0x7f0802ea +com.example.umcflo:id/textStart = 0x7f080267 +com.example.umcflo:macro/m3_comp_switch_unselected_pressed_track_outline_color = 0x7f0c013f +com.example.umcflo:raw/music_nextlevel = 0x7f140005 +com.example.umcflo:style/Base.Widget.AppCompat.ActionBar.TabView = 0x7f1100c7 +com.example.umcflo:style/Theme.MaterialComponents.Dialog.Alert = 0x7f11025b +com.example.umcflo:style/Base.Theme.AppCompat.DialogWhenLarge = 0x7f110051 +com.example.umcflo:integer/mtrl_view_visible = 0x7f090041 +com.example.umcflo:string/material_timepicker_am = 0x7f10005b +com.example.umcflo:style/ThemeOverlay.AppCompat.DayNight = 0x7f11027a +com.example.umcflo:raw/music_next = 0x7f14000a +com.example.umcflo:style/Base.Widget.AppCompat.SearchView.ActionBar = 0x7f1100f4 +com.example.umcflo:style/TextAppearance.M3.Sys.Typescale.LabelMedium = 0x7f1101de +com.example.umcflo:id/textTop = 0x7f080268 +com.example.umcflo:style/Widget.MaterialComponents.TimePicker.Display.Divider = 0x7f11045c +com.example.umcflo:id/actionDown = 0x7f080030 +com.example.umcflo:styleable/CompoundButton = 0x7f120026 com.example.umcflo:style/ThemeOverlay.Material3.Chip = 0x7f110293 com.example.umcflo:style/Widget.MaterialComponents.TimePicker.Clock = 0x7f11045a com.example.umcflo:style/Widget.MaterialComponents.Button.UnelevatedButton = 0x7f110408 @@ -166,43 +169,63 @@ com.example.umcflo:style/Widget.Material3.Button = 0x7f110350 com.example.umcflo:drawable/notification_bg_low = 0x7f070140 com.example.umcflo:style/ThemeOverlay.MaterialComponents.BottomAppBar.Primary = 0x7f1102c9 com.example.umcflo:macro/m3_comp_switch_selected_pressed_icon_color = 0x7f0c012b +com.example.umcflo:macro/m3_comp_outlined_text_field_disabled_label_text_color = 0x7f0c00b3 +com.example.umcflo:styleable/NavigationView = 0x7f12006d +com.example.umcflo:drawable/abc_action_bar_item_background_material = 0x7f07002b +com.example.umcflo:style/Widget.Material3.MaterialCalendar.HeaderToggleButton = 0x7f1103a9 +com.example.umcflo:integer/m3_sys_motion_duration_medium2 = 0x7f090018 +com.example.umcflo:style/Widget.MaterialComponents.BottomAppBar = 0x7f1103f6 +com.example.umcflo:style/Theme.AppCompat = 0x7f11020c +com.example.umcflo:style/Theme.AppCompat.DayNight.Dialog = 0x7f110210 +com.example.umcflo:style/Widget.Material3.SideSheet.Detached = 0x7f1103cc +com.example.umcflo:style/Base.Theme.AppCompat.Light.Dialog = 0x7f110054 +com.example.umcflo:style/Theme.MaterialComponents.DayNight.Dialog.MinWidth = 0x7f110255 +com.example.umcflo:style/Widget.Material3.Chip.Filter.Elevated = 0x7f11036a +com.example.umcflo:macro/m3_comp_navigation_rail_active_pressed_state_layer_color = 0x7f0c0098 +com.example.umcflo:style/Theme.MaterialComponents.Light.Dialog.MinWidth = 0x7f11026e +com.example.umcflo:style/ThemeOverlay.Material3.NavigationRailView = 0x7f1102b2 +com.example.umcflo:style/Base.ThemeOverlay.MaterialComponents.Dialog.Alert = 0x7f110086 +com.example.umcflo:style/Widget.Material3.Button.TextButton.Dialog = 0x7f11035b +com.example.umcflo:dimen/m3_sys_motion_easing_standard_accelerate_control_y2 = 0x7f060213 com.example.umcflo:macro/m3_comp_filled_autocomplete_text_field_input_text_type = 0x7f0c0042 com.example.umcflo:style/ShapeAppearance.M3.Sys.Shape.Corner.None = 0x7f11016d com.example.umcflo:style/ShapeAppearance.M3.Sys.Shape.Corner.Medium = 0x7f11016c com.example.umcflo:style/Widget.MaterialComponents.MaterialCalendar.Day.Today = 0x7f110423 -com.example.umcflo:style/Widget.MaterialComponents.TimePicker.Display.TextInputLayout = 0x7f11045f -com.example.umcflo:style/Widget.Material3.AutoCompleteTextView.OutlinedBox.Dense = 0x7f110344 -com.example.umcflo:style/Widget.Material3.MaterialCalendar.HeaderToggleButton = 0x7f1103a9 -com.example.umcflo:drawable/abc_action_bar_item_background_material = 0x7f07002b -com.example.umcflo:style/Theme.AppCompat = 0x7f11020c -com.example.umcflo:integer/m3_sys_motion_duration_medium2 = 0x7f090018 -com.example.umcflo:style/Widget.MaterialComponents.BottomAppBar = 0x7f1103f6 com.example.umcflo:macro/m3_comp_primary_navigation_tab_with_label_text_inactive_label_text_color = 0x7f0c00d2 +com.example.umcflo:style/Theme.MaterialComponents.Dialog.Bridge = 0x7f11025d +com.example.umcflo:drawable/ic_call_answer_low = 0x7f0700c8 +com.example.umcflo:style/TextAppearance.Compat.Notification.Title = 0x7f1101c8 +com.example.umcflo:style/MaterialAlertDialog.Material3.Body.Text = 0x7f110125 com.example.umcflo:style/Theme.MaterialComponents.Dialog.FixedSize.Bridge = 0x7f11025f com.example.umcflo:style/Widget.Design.CollapsingToolbar = 0x7f110336 -com.example.umcflo:style/MaterialAlertDialog.Material3.Body.Text = 0x7f110125 -com.example.umcflo:style/Theme.MaterialComponents.Dialog.Bridge = 0x7f11025d +com.example.umcflo:style/Widget.AppCompat.AutoCompleteTextView = 0x7f1102f2 +com.example.umcflo:id/search_bar = 0x7f0801e5 com.example.umcflo:style/Theme.AppCompat.DayNight.DialogWhenLarge = 0x7f110213 com.example.umcflo:string/clear_text_end_icon_content_description = 0x7f100031 -com.example.umcflo:style/Widget.Material3.AutoCompleteTextView.FilledBox.Dense = 0x7f110342 +com.example.umcflo:style/Widget.Compat.NotificationActionContainer = 0x7f110331 +com.example.umcflo:style/ShapeAppearance.M3.Comp.NavigationBar.Container.Shape = 0x7f11015c com.example.umcflo:drawable/notification_bg_normal = 0x7f070143 com.example.umcflo:style/ThemeOverlay.MaterialComponents.Light.Dialog.Alert.Framework = 0x7f1102d3 -com.example.umcflo:style/ShapeAppearance.M3.Comp.NavigationBar.Container.Shape = 0x7f11015c -com.example.umcflo:macro/m3_comp_navigation_rail_active_hover_state_layer_color = 0x7f0c0094 +com.example.umcflo:style/Widget.Material3.AutoCompleteTextView.FilledBox.Dense = 0x7f110342 com.example.umcflo:style/ThemeOverlay.Material3.Toolbar.Surface = 0x7f1102be -com.example.umcflo:style/Widget.Material3.FloatingActionButton.Primary = 0x7f11038e +com.example.umcflo:macro/m3_comp_navigation_rail_active_hover_state_layer_color = 0x7f0c0094 +com.example.umcflo:style/Widget.AppCompat.ActionButton = 0x7f1102ed +com.example.umcflo:style/Widget.MaterialComponents.TimePicker.Display.TextInputLayout = 0x7f11045f +com.example.umcflo:style/Widget.Material3.AutoCompleteTextView.OutlinedBox.Dense = 0x7f110344 +com.example.umcflo:id/login_direct_input_et = 0x7f0802c7 com.example.umcflo:style/TextAppearance.Material3.SearchView.Prefix = 0x7f1101f4 com.example.umcflo:styleable/ConstraintLayout_Layout = 0x7f120028 com.example.umcflo:interpolator/mtrl_fast_out_linear_in = 0x7f0a000e com.example.umcflo:style/ThemeOverlay.MaterialComponents.ActionBar.Surface = 0x7f1102c3 com.example.umcflo:style/ThemeOverlay.Material3.TextInputEditText.OutlinedBox.Dense = 0x7f1102bd com.example.umcflo:string/material_motion_easing_linear = 0x7f100056 +com.example.umcflo:style/Widget.Material3.FloatingActionButton.Primary = 0x7f11038e +com.example.umcflo:dimen/m3_bottom_nav_item_active_indicator_height = 0x7f0600be com.example.umcflo:styleable/MotionLabel = 0x7f120066 com.example.umcflo:style/Widget.AppCompat.CompoundButton.CheckBox = 0x7f1102fb com.example.umcflo:style/Base.V28.Theme.AppCompat.Light = 0x7f1100ba -com.example.umcflo:dimen/m3_bottom_nav_item_active_indicator_height = 0x7f0600be -com.example.umcflo:styleable/Layout = 0x7f120048 com.example.umcflo:dimen/m3_ripple_default_alpha = 0x7f0601d7 +com.example.umcflo:styleable/Layout = 0x7f120048 com.example.umcflo:macro/m3_comp_outlined_text_field_disabled_supporting_text_color = 0x7f0c00b5 com.example.umcflo:style/Widget.Material3.Snackbar = 0x7f1103d3 com.example.umcflo:style/Widget.Design.TabLayout = 0x7f11033b @@ -210,15 +233,15 @@ com.example.umcflo:style/Widget.AppCompat.Light.PopupMenu = 0x7f110314 com.example.umcflo:macro/m3_comp_switch_unselected_focus_track_color = 0x7f0c0132 com.example.umcflo:macro/m3_comp_switch_selected_hover_track_color = 0x7f0c0128 com.example.umcflo:style/Base.V26.Theme.AppCompat.Light = 0x7f1100b7 -com.example.umcflo:id/home_today_music_album_rv = 0x7f0802ad com.example.umcflo:drawable/ic_bottom_look_no_select = 0x7f0700c0 +com.example.umcflo:id/home_today_music_album_rv = 0x7f0802ad com.example.umcflo:style/ShapeAppearanceOverlay.MaterialComponents.Chip = 0x7f11018d com.example.umcflo:style/ThemeOverlay.Material3.MaterialCalendar.HeaderCancelButton = 0x7f1102af com.example.umcflo:id/bounceBoth = 0x7f08006c com.example.umcflo:macro/m3_comp_switch_selected_focus_state_layer_color = 0x7f0c0122 com.example.umcflo:style/ThemeOverlay.Material3.MaterialCalendar = 0x7f1102ad -com.example.umcflo:style/Widget.Material3.FloatingActionButton.Secondary = 0x7f11038f com.example.umcflo:id/report_drawn = 0x7f0801d1 +com.example.umcflo:style/Widget.AppCompat.ActivityChooserView = 0x7f1102f1 com.example.umcflo:integer/mtrl_card_anim_duration_ms = 0x7f090034 com.example.umcflo:macro/m3_comp_badge_large_label_text_type = 0x7f0c0004 com.example.umcflo:style/TextAppearance.MaterialComponents.Headline6 = 0x7f110203 @@ -254,39 +277,37 @@ com.example.umcflo:style/Widget.MaterialComponents.TextInputEditText.FilledBox.D com.example.umcflo:drawable/btn_playlist_select_on = 0x7f0700a2 com.example.umcflo:style/Theme.MaterialComponents.Light.DarkActionBar = 0x7f110266 com.example.umcflo:layout/abc_popup_menu_header_item_layout = 0x7f0b0012 -com.example.umcflo:dimen/m3_comp_slider_disabled_active_track_opacity = 0x7f060186 +com.example.umcflo:drawable/btn_editbar_play = 0x7f070162 com.example.umcflo:integer/m3_sys_shape_corner_extra_small_corner_family = 0x7f090021 +com.example.umcflo:style/Base.Theme.MaterialComponents.DialogWhenLarge = 0x7f11006d +com.example.umcflo:layout/fragment_detail = 0x7f0b0030 +com.example.umcflo:style/TextAppearance.Material3.BodyLarge = 0x7f1101e5 com.example.umcflo:style/Theme.Material3.DynamicColors.Dark = 0x7f110238 com.example.umcflo:style/Base.Widget.Material3.Snackbar = 0x7f11010e com.example.umcflo:style/Widget.Design.Snackbar = 0x7f11033a com.example.umcflo:style/Platform.MaterialComponents.Dialog = 0x7f11013a -com.example.umcflo:style/Widget.MaterialComponents.TextInputEditText.OutlinedBox.Dense = 0x7f11044e -com.example.umcflo:id/home_pannel_album_bibi = 0x7f080100 com.example.umcflo:style/Theme.MaterialComponents.DialogWhenLarge = 0x7f110262 com.example.umcflo:style/ShapeAppearance.M3.Comp.Switch.StateLayer.Shape = 0x7f110165 com.example.umcflo:id/fixed = 0x7f0800d9 com.example.umcflo:style/TextAppearance.Material3.DisplayMedium = 0x7f1101e9 -com.example.umcflo:style/ThemeOverlay.Material3 = 0x7f110280 -com.example.umcflo:id/onInterceptTouchReturnSwipe = 0x7f0801a4 -com.example.umcflo:style/Base.V7.Theme.AppCompat.Light.Dialog = 0x7f1100be -com.example.umcflo:style/Base.V14.Theme.MaterialComponents.Light.Dialog = 0x7f110099 +com.example.umcflo:styleable/FloatingActionButton = 0x7f120034 +com.example.umcflo:string/mtrl_picker_end_date_description = 0x7f10007c com.example.umcflo:style/Widget.Material3.Light.ActionBar.Solid = 0x7f110396 com.example.umcflo:dimen/abc_dialog_fixed_height_major = 0x7f06001c -com.example.umcflo:string/mtrl_picker_end_date_description = 0x7f10007c -com.example.umcflo:styleable/FloatingActionButton = 0x7f120034 +com.example.umcflo:id/onInterceptTouchReturnSwipe = 0x7f0801a4 com.example.umcflo:style/ThemeOverlay.Material3.Light.Dialog.Alert.Framework = 0x7f1102aa com.example.umcflo:string/abc_menu_enter_shortcut_label = 0x7f10000c +com.example.umcflo:style/Base.V14.Theme.MaterialComponents.Light.Dialog = 0x7f110099 +com.example.umcflo:style/Base.V7.Theme.AppCompat.Light.Dialog = 0x7f1100be com.example.umcflo:id/action_context_bar = 0x7f08003b com.example.umcflo:style/Base.Widget.AppCompat.Light.ActionBar.Solid = 0x7f1100df -com.example.umcflo:style/Base.Widget.MaterialComponents.PopupMenu = 0x7f110117 -com.example.umcflo:style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu = 0x7f110452 -com.example.umcflo:style/ThemeOverlay.Material3.AutoCompleteTextView.OutlinedBox.Dense = 0x7f110286 +com.example.umcflo:style/Base.Widget.MaterialComponents.PopupMenu = 0x7f110117 com.example.umcflo:style/Widget.MaterialComponents.BottomNavigationView.PrimarySurface = 0x7f1103fb com.example.umcflo:style/Widget.Material3.MaterialCalendar.MonthTextView = 0x7f1103ac +com.example.umcflo:style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu = 0x7f110452 +com.example.umcflo:style/ThemeOverlay.Material3.AutoCompleteTextView.OutlinedBox.Dense = 0x7f110286 com.example.umcflo:macro/m3_comp_fab_secondary_container_color = 0x7f0c003b com.example.umcflo:color/material_personalized_color_surface_container = 0x7f0502a1 -com.example.umcflo:color/mtrl_textinput_disabled_color = 0x7f0502f2 -com.example.umcflo:style/TextAppearance.M3.Sys.Typescale.HeadlineLarge = 0x7f1101da com.example.umcflo:style/Widget.Material3.BottomNavigationView.ActiveIndicator = 0x7f11034c com.example.umcflo:dimen/abc_star_big = 0x7f06003b com.example.umcflo:style/Widget.Design.AppBarLayout = 0x7f110333 @@ -300,9 +321,6 @@ com.example.umcflo:style/Widget.Material3.Chip.Input = 0x7f11036b com.example.umcflo:style/Base.Widget.MaterialComponents.TextInputEditText = 0x7f11011d com.example.umcflo:style/Base.TextAppearance.AppCompat.Title.Inverse = 0x7f110030 com.example.umcflo:id/video_video_01_vv = 0x7f08028d -com.example.umcflo:style/TextAppearance.Material3.BodyLarge = 0x7f1101e5 -com.example.umcflo:style/Base.Theme.MaterialComponents.DialogWhenLarge = 0x7f11006d -com.example.umcflo:layout/fragment_detail = 0x7f0b0030 com.example.umcflo:dimen/mtrl_exposed_dropdown_menu_popup_elevation = 0x7f0602a5 com.example.umcflo:styleable/MenuView = 0x7f120061 com.example.umcflo:color/primary_text_disabled_material_light = 0x7f0502ff @@ -321,8 +339,11 @@ com.example.umcflo:style/Widget.MaterialComponents.TextInputLayout.FilledBox = 0 com.example.umcflo:styleable/KeyFramesVelocity = 0x7f120044 com.example.umcflo:macro/m3_comp_fab_surface_container_color = 0x7f0c003d com.example.umcflo:styleable/ActionMode = 0x7f120004 +com.example.umcflo:id/song_album_iv = 0x7f0802bd com.example.umcflo:drawable/abc_list_selector_disabled_holo_light = 0x7f070057 com.example.umcflo:id/staticLayout = 0x7f08024d +com.example.umcflo:id/login_email_list_iv = 0x7f0802c9 +com.example.umcflo:string/searchview_clear_text_content_description = 0x7f1000a7 com.example.umcflo:id/screen = 0x7f0801dd com.example.umcflo:style/Base.TextAppearance.AppCompat.Subhead = 0x7f11002d com.example.umcflo:style/SplashTheme = 0x7f110468 @@ -338,15 +359,14 @@ com.example.umcflo:style/Widget.Compat.NotificationActionText = 0x7f110332 com.example.umcflo:dimen/m3_card_elevation = 0x7f0600ec com.example.umcflo:styleable/AppCompatTextHelper = 0x7f120010 com.example.umcflo:style/ThemeOverlay.MaterialComponents.TextInputEditText = 0x7f1102dd -com.example.umcflo:style/Theme.Material3.DayNight.DialogWhenLarge = 0x7f110235 com.example.umcflo:style/Platform.MaterialComponents = 0x7f110139 com.example.umcflo:string/call_notification_screening_text = 0x7f10002d -com.example.umcflo:layout/abc_action_bar_title_item = 0x7f0b0000 +com.example.umcflo:style/Widget.AppCompat.Light.ActionBar.Solid = 0x7f110303 +com.example.umcflo:drawable/ic_mtrl_chip_checked_circle = 0x7f0700e2 com.example.umcflo:string/material_motion_easing_standard = 0x7f100057 +com.example.umcflo:layout/abc_action_bar_title_item = 0x7f0b0000 com.example.umcflo:style/Base.Widget.AppCompat.Toolbar = 0x7f1100fb com.example.umcflo:style/Widget.MaterialComponents.Badge = 0x7f1103f5 -com.example.umcflo:style/Widget.AppCompat.Light.ActionBar.Solid = 0x7f110303 -com.example.umcflo:drawable/ic_mtrl_chip_checked_circle = 0x7f0700e2 com.example.umcflo:style/TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f11020b com.example.umcflo:style/Widget.AppCompat.Button.Borderless = 0x7f1102f4 com.example.umcflo:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon2 = 0x7f110150 @@ -360,38 +380,42 @@ com.example.umcflo:style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle = 0x com.example.umcflo:style/TextAppearance.MaterialComponents.TimePicker.Title = 0x7f110207 com.example.umcflo:dimen/design_tab_max_width = 0x7f06008b com.example.umcflo:styleable/MaterialToolbar = 0x7f12005e -com.example.umcflo:string/mtrl_picker_day_of_week_column_header = 0x7f10007b -com.example.umcflo:style/Base.Widget.MaterialComponents.Chip = 0x7f110114 +com.example.umcflo:styleable/LinearProgressIndicator = 0x7f12004b +com.example.umcflo:id/login_sign_in_btn = 0x7f0802d5 +com.example.umcflo:id/customPanel = 0x7f080094 com.example.umcflo:style/Widget.AppCompat.Light.ActivityChooserView = 0x7f11030f com.example.umcflo:style/TextAppearance.M3.Sys.Typescale.TitleSmall = 0x7f1101e2 com.example.umcflo:drawable/mtrl_ic_check_mark = 0x7f070127 com.example.umcflo:style/Widget.Material3.MaterialCalendar.DayTextView = 0x7f1103a0 -com.example.umcflo:id/dragRight = 0x7f0800b9 -com.example.umcflo:id/video_video_info_04_tv = 0x7f080294 +com.example.umcflo:styleable/ClockHandView = 0x7f120022 com.example.umcflo:string/material_slider_range_start = 0x7f100059 -com.example.umcflo:style/Base.Theme.MaterialComponents.Light.Dialog.FixedSize = 0x7f110075 +com.example.umcflo:dimen/mtrl_high_ripple_focused_alpha = 0x7f0602bd +com.example.umcflo:dimen/m3_comp_switch_track_height = 0x7f060199 +com.example.umcflo:id/video_video_info_04_tv = 0x7f080294 +com.example.umcflo:id/dragRight = 0x7f0800b9 com.example.umcflo:style/Widget.AppCompat.Button = 0x7f1102f3 -com.example.umcflo:styleable/ClockHandView = 0x7f120022 -com.example.umcflo:macro/m3_comp_search_bar_trailing_icon_color = 0x7f0c00f0 +com.example.umcflo:style/Base.Theme.MaterialComponents.Light.Dialog.FixedSize = 0x7f110075 com.example.umcflo:style/TextAppearance.MaterialComponents.Button = 0x7f1101fb com.example.umcflo:style/Widget.MaterialComponents.CompoundButton.CheckBox = 0x7f110416 com.example.umcflo:layout/activity_song = 0x7f0b001d -com.example.umcflo:string/abc_activitychooserview_choose_application = 0x7f100006 -com.example.umcflo:styleable/ColorStateListItem = 0x7f120025 -com.example.umcflo:id/listMode = 0x7f080140 -com.example.umcflo:style/Widget.Material3.MaterialCalendar.YearNavigationButton = 0x7f1103b0 -com.example.umcflo:string/abc_capital_on = 0x7f100008 -com.example.umcflo:color/m3_sys_color_dynamic_light_surface_container = 0x7f0501bf com.example.umcflo:style/RtlOverlay.Widget.AppCompat.DialogTitle.Icon = 0x7f110147 com.example.umcflo:style/Widget.MaterialComponents.TextInputEditText.FilledBox = 0x7f11044b -com.example.umcflo:style/Base.Widget.AppCompat.Light.ActionBar.TabBar = 0x7f1100e0 -com.example.umcflo:string/mtrl_picker_range_header_only_start_selected = 0x7f100085 -com.example.umcflo:style/TextAppearance.AppCompat.Subhead.Inverse = 0x7f1101ad -com.example.umcflo:style/Theme.Design.BottomSheetDialog = 0x7f110223 +com.example.umcflo:string/abc_capital_on = 0x7f100008 +com.example.umcflo:color/m3_sys_color_dynamic_light_surface_container = 0x7f0501bf +com.example.umcflo:style/Widget.Material3.MaterialCalendar.YearNavigationButton = 0x7f1103b0 +com.example.umcflo:macro/m3_comp_search_bar_trailing_icon_color = 0x7f0c00f0 +com.example.umcflo:id/listMode = 0x7f080140 +com.example.umcflo:styleable/ColorStateListItem = 0x7f120025 +com.example.umcflo:style/Widget.MaterialComponents.TextInputEditText.OutlinedBox.Dense = 0x7f11044e +com.example.umcflo:dimen/m3_navigation_rail_item_padding_bottom = 0x7f0601d2 +com.example.umcflo:id/song_play_06_iv = 0x7f08022d com.example.umcflo:style/Theme.MaterialComponents.Light.Dialog.FixedSize = 0x7f11026c -com.example.umcflo:dimen/m3_back_progress_side_container_max_scale_x_distance_grow = 0x7f0600b2 +com.example.umcflo:style/Theme.Design.BottomSheetDialog = 0x7f110223 com.example.umcflo:style/Theme.MaterialComponents.DayNight.Dialog.Alert = 0x7f110250 -com.example.umcflo:id/song_play_06_iv = 0x7f08022d +com.example.umcflo:dimen/m3_back_progress_side_container_max_scale_x_distance_grow = 0x7f0600b2 +com.example.umcflo:color/material_personalized_color_surface_dim = 0x7f0502a6 +com.example.umcflo:id/login_close_iv = 0x7f0802c6 +com.example.umcflo:style/Theme.Material3.DayNight.DialogWhenLarge = 0x7f110235 com.example.umcflo:style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked = 0x7f110128 com.example.umcflo:styleable/MaterialAutoCompleteTextView = 0x7f12004f com.example.umcflo:styleable/ImageFilterView = 0x7f12003e @@ -401,14 +425,17 @@ com.example.umcflo:layout/m3_auto_complete_simple_item = 0x7f0b003f com.example.umcflo:drawable/mtrl_ic_checkbox_unchecked = 0x7f070129 com.example.umcflo:dimen/m3_btn_padding_top = 0x7f0600de com.example.umcflo:dimen/abc_button_padding_vertical_material = 0x7f060015 -com.example.umcflo:styleable/MaterialTextView = 0x7f12005c +com.example.umcflo:style/Base.Widget.AppCompat.Light.ActionBar.TabBar = 0x7f1100e0 +com.example.umcflo:string/mtrl_picker_range_header_only_start_selected = 0x7f100085 +com.example.umcflo:style/TextAppearance.AppCompat.Subhead.Inverse = 0x7f1101ad com.example.umcflo:interpolator/mtrl_linear = 0x7f0a0010 +com.example.umcflo:styleable/MaterialTextView = 0x7f12005c com.example.umcflo:dimen/mtrl_transition_shared_axis_slide_distance = 0x7f06030d com.example.umcflo:styleable/TextInputEditText = 0x7f12008c com.example.umcflo:style/Animation.Material3.SideSheetDialog.Left = 0x7f110008 com.example.umcflo:layout/fragment_pannel = 0x7f0b0036 -com.example.umcflo:color/m3_sys_color_light_surface_variant = 0x7f0501f3 com.example.umcflo:style/Base.ThemeOverlay.AppCompat.Dialog = 0x7f11007d +com.example.umcflo:color/m3_sys_color_light_surface_variant = 0x7f0501f3 com.example.umcflo:macro/m3_comp_outlined_card_disabled_outline_color = 0x7f0c00aa com.example.umcflo:styleable/KeyFramesAcceleration = 0x7f120043 com.example.umcflo:id/sharedValueSet = 0x7f0801f2 @@ -442,8 +469,8 @@ com.example.umcflo:style/Base.Widget.AppCompat.TextView = 0x7f1100f9 com.example.umcflo:style/ShapeAppearanceOverlay.Material3.Corner.Left = 0x7f110184 com.example.umcflo:dimen/m3_sys_motion_easing_emphasized_accelerate_control_x1 = 0x7f0601f8 com.example.umcflo:style/ShapeAppearanceOverlay.Material3.Corner.Bottom = 0x7f110183 -com.example.umcflo:style/Widget.AppCompat.ActionBar.Solid = 0x7f1102e9 com.example.umcflo:style/ShapeAppearance.MaterialComponents.MediumComponent = 0x7f11017e +com.example.umcflo:style/Widget.AppCompat.ActionBar.Solid = 0x7f1102e9 com.example.umcflo:style/ShapeAppearance.MaterialComponents.LargeComponent = 0x7f11017d com.example.umcflo:dimen/m3_navigation_item_shape_inset_end = 0x7f0601c5 com.example.umcflo:style/ShapeAppearance.Material3.MediumComponent = 0x7f110177 @@ -495,10 +522,14 @@ com.example.umcflo:color/material_personalized_color_on_background = 0x7f050288 com.example.umcflo:styleable/CircularProgressIndicator = 0x7f120020 com.example.umcflo:style/ThemeOverlay.Material3.Button.TextButton = 0x7f110290 com.example.umcflo:style/Base.Theme.MaterialComponents.Light.Dialog = 0x7f110072 -com.example.umcflo:color/m3_sys_color_light_primary_container = 0x7f0501e8 +com.example.umcflo:style/MaterialAlertDialog.Material3.Title.Text.CenterStacked = 0x7f11012c +com.example.umcflo:id/sign_up_at_sign_tv = 0x7f0802da com.example.umcflo:drawable/ic_dashboard_black_24dp = 0x7f0700cf com.example.umcflo:style/MaterialAlertDialog.Material3.Title.Icon = 0x7f110127 +com.example.umcflo:color/m3_sys_color_light_primary_container = 0x7f0501e8 com.example.umcflo:style/Base.Theme.MaterialComponents.Dialog.Bridge = 0x7f11006a +com.example.umcflo:style/Animation.Material3.SideSheetDialog = 0x7f110007 +com.example.umcflo:style/ThemeOverlay.Material3.Dialog.Alert.Framework = 0x7f11029b com.example.umcflo:id/song_progress_sb = 0x7f080230 com.example.umcflo:id/title = 0x7f080273 com.example.umcflo:style/Base.V14.ThemeOverlay.MaterialComponents.MaterialAlertDialog = 0x7f1100a0 @@ -508,8 +539,6 @@ com.example.umcflo:dimen/m3_comp_time_picker_period_selector_focus_state_layer_o com.example.umcflo:dimen/abc_select_dialog_padding_start_material = 0x7f06003a com.example.umcflo:styleable/MotionLayout = 0x7f120067 com.example.umcflo:id/circle_center = 0x7f08007f -com.example.umcflo:style/ThemeOverlay.Material3.Dialog.Alert.Framework = 0x7f11029b -com.example.umcflo:style/Animation.Material3.SideSheetDialog = 0x7f110007 com.example.umcflo:style/ThemeOverlay.Material3.AutoCompleteTextView.FilledBox.Dense = 0x7f110284 com.example.umcflo:style/MaterialAlertDialog.Material3.Body.Text.CenterStacked = 0x7f110126 com.example.umcflo:style/Base.Widget.MaterialComponents.Snackbar = 0x7f11011c @@ -524,13 +553,6 @@ com.example.umcflo:drawable/ic_main_twitter_btn = 0x7f0700dd com.example.umcflo:style/Base.Widget.AppCompat.Button.ButtonBar.AlertDialog = 0x7f1100d1 com.example.umcflo:style/Theme.Material3.DynamicColors.Light.NoActionBar = 0x7f11023d com.example.umcflo:string/abc_activity_chooser_view_see_all = 0x7f100005 -com.example.umcflo:mipmap/ic_launcher = 0x7f0e0000 -com.example.umcflo:style/Theme.Material3.DynamicColors.DayNight = 0x7f11023a -com.example.umcflo:macro/m3_comp_elevated_card_container_shape = 0x7f0c002b -com.example.umcflo:dimen/m3_badge_vertical_offset = 0x7f0600b8 -com.example.umcflo:style/Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f110024 -com.example.umcflo:string/m3_sys_motion_easing_linear = 0x7f100048 -com.example.umcflo:integer/mtrl_btn_anim_duration_ms = 0x7f09002f com.example.umcflo:style/Base.Widget.Material3.FloatingActionButton.Large = 0x7f11010a com.example.umcflo:layout/mtrl_picker_fullscreen = 0x7f0b0065 com.example.umcflo:drawable/abc_list_pressed_holo_dark = 0x7f070052 @@ -542,10 +564,15 @@ com.example.umcflo:style/Base.Widget.Material3.ActionMode = 0x7f1100ff com.example.umcflo:style/Widget.Design.BottomSheet.Modal = 0x7f110335 com.example.umcflo:id/withText = 0x7f0802a2 com.example.umcflo:style/Theme.Material3.Light.Dialog.Alert = 0x7f110241 +com.example.umcflo:style/Widget.MaterialComponents.ActionBar.Primary = 0x7f1103e9 +com.example.umcflo:macro/m3_comp_navigation_bar_active_hover_label_text_color = 0x7f0c0063 +com.example.umcflo:styleable/BottomNavigationView = 0x7f120017 +com.example.umcflo:style/Widget.AppCompat.Spinner.Underlined = 0x7f11032c com.example.umcflo:style/TextAppearance.AppCompat.Large.Inverse = 0x7f1101a0 com.example.umcflo:macro/m3_comp_time_picker_time_selector_unselected_focus_state_layer_color = 0x7f0c0168 com.example.umcflo:style/Theme.Design.NoActionBar = 0x7f110227 com.example.umcflo:style/ThemeOverlay.MaterialComponents.Toolbar.Primary = 0x7f1102e6 +com.example.umcflo:id/login_kakako_login_iv = 0x7f0802d0 com.example.umcflo:dimen/highlight_alpha_material_dark = 0x7f060096 com.example.umcflo:style/Widget.MaterialComponents.MaterialCalendar.Year = 0x7f110433 com.example.umcflo:id/song_mixon_tg = 0x7f080217 @@ -557,20 +584,18 @@ com.example.umcflo:style/ThemeOverlay.Material3.Button = 0x7f11028b com.example.umcflo:macro/m3_comp_navigation_drawer_active_icon_color = 0x7f0c007e com.example.umcflo:style/AlertDialog.AppCompat.Light = 0x7f110001 com.example.umcflo:macro/m3_comp_plain_tooltip_supporting_text_type = 0x7f0c00c6 +com.example.umcflo:style/Widget.Material3.SearchBar = 0x7f1103c6 com.example.umcflo:style/Widget.Material3.TextInputLayout.OutlinedBox.Dense = 0x7f1103e2 com.example.umcflo:style/Base.Widget.Material3.CompoundButton.CheckBox = 0x7f110104 +com.example.umcflo:styleable/ExtendedFloatingActionButton_Behavior_Layout = 0x7f120033 +com.example.umcflo:style/Widget.Material3.ExtendedFloatingActionButton.Icon.Tertiary = 0x7f110385 com.example.umcflo:style/Widget.MaterialComponents.ChipGroup = 0x7f110410 com.example.umcflo:style/Base.Widget.AppCompat.RatingBar = 0x7f1100f0 -com.example.umcflo:macro/m3_comp_icon_button_selected_icon_color = 0x7f0c0059 -com.example.umcflo:style/Base.Theme.MaterialComponents.Dialog.Alert = 0x7f110069 com.example.umcflo:id/accessibility_custom_action_22 = 0x7f08001f com.example.umcflo:styleable/State = 0x7f120082 com.example.umcflo:style/ThemeOverlay.Material3.BottomSheetDialog = 0x7f11028a -com.example.umcflo:macro/m3_comp_navigation_drawer_active_hover_icon_color = 0x7f0c007b -com.example.umcflo:id/accessibility_custom_action_6 = 0x7f08002c -com.example.umcflo:style/Base.Widget.AppCompat.SeekBar = 0x7f1100f5 -com.example.umcflo:string/material_hour_24h_suffix = 0x7f10004e -com.example.umcflo:styleable/StateSet = 0x7f120085 +com.example.umcflo:style/Base.ThemeOverlay.AppCompat.Dark = 0x7f11007b +com.example.umcflo:macro/m3_comp_switch_unselected_pressed_state_layer_color = 0x7f0c013d com.example.umcflo:style/ThemeOverlay.MaterialComponents.MaterialAlertDialog.Picker.Date.Calendar = 0x7f1102d7 com.example.umcflo:dimen/mtrl_progress_indicator_full_rounded_corner_radius = 0x7f0602e2 com.example.umcflo:color/material_blue_grey_800 = 0x7f05021b @@ -581,8 +606,11 @@ com.example.umcflo:styleable/MaterialTimePicker = 0x7f12005d com.example.umcflo:id/item_album_singer_tv = 0x7f0802b1 com.example.umcflo:styleable/DrawerArrowToggle = 0x7f120030 com.example.umcflo:styleable/MaterialShape = 0x7f120059 -com.example.umcflo:string/material_timepicker_am = 0x7f10005b -com.example.umcflo:style/ThemeOverlay.AppCompat.DayNight = 0x7f11027a +com.example.umcflo:macro/m3_comp_navigation_drawer_active_hover_icon_color = 0x7f0c007b +com.example.umcflo:id/accessibility_custom_action_6 = 0x7f08002c +com.example.umcflo:string/material_hour_24h_suffix = 0x7f10004e +com.example.umcflo:style/Base.Widget.AppCompat.SeekBar = 0x7f1100f5 +com.example.umcflo:styleable/StateSet = 0x7f120085 com.example.umcflo:id/song_play_05_iv = 0x7f08022c com.example.umcflo:style/MaterialAlertDialog.MaterialComponents.Title.Icon = 0x7f110131 com.example.umcflo:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle = 0x7f1101b6 @@ -611,11 +639,10 @@ com.example.umcflo:style/Base.TextAppearance.MaterialComponents.Headline6 = 0x7f com.example.umcflo:style/TextAppearance.Material3.MaterialTimePicker.Title = 0x7f1101f1 com.example.umcflo:id/embed = 0x7f0800c5 com.example.umcflo:style/MaterialAlertDialog.Material3 = 0x7f110123 -com.example.umcflo:id/textStart = 0x7f080267 com.example.umcflo:dimen/m3_bottom_nav_item_padding_bottom = 0x7f0600c1 +com.example.umcflo:color/material_personalized__highlighted_text = 0x7f050280 com.example.umcflo:style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Secondary = 0x7f1102a0 com.example.umcflo:style/Base.V7.Widget.AppCompat.Toolbar = 0x7f1100c2 -com.example.umcflo:color/material_personalized__highlighted_text = 0x7f050280 com.example.umcflo:style/Widget.AppCompat.ImageButton = 0x7f110301 com.example.umcflo:style/Base.V28.Theme.AppCompat = 0x7f1100b9 com.example.umcflo:dimen/abc_edit_text_inset_bottom_material = 0x7f06002c @@ -640,19 +667,22 @@ com.example.umcflo:id/player_like_iv = 0x7f0801c3 com.example.umcflo:style/Widget.AppCompat.Button.Colored = 0x7f1102f7 com.example.umcflo:style/ShapeAppearance.M3.Comp.NavigationRail.Container.Shape = 0x7f11015f com.example.umcflo:string/path_password_eye = 0x7f1000a1 -com.example.umcflo:style/Platform.V25.AppCompat = 0x7f110142 -com.example.umcflo:macro/m3_comp_navigation_bar_active_focus_state_layer_color = 0x7f0c0061 -com.example.umcflo:id/home_pannel_today_music_title3_tv = 0x7f08011b -com.example.umcflo:macro/m3_comp_navigation_bar_inactive_pressed_label_text_color = 0x7f0c0075 +com.example.umcflo:drawable/btn_player_eq_off = 0x7f070099 +com.example.umcflo:style/TextAppearance.MaterialComponents.Headline3 = 0x7f110200 +com.example.umcflo:drawable/abc_ic_clear_material = 0x7f070041 +com.example.umcflo:id/material_timepicker_container = 0x7f080165 com.example.umcflo:style/Base.V14.Theme.MaterialComponents.Bridge = 0x7f110093 -com.example.umcflo:drawable/mtrl_switch_thumb_checked_unchecked = 0x7f070132 +com.example.umcflo:macro/m3_comp_navigation_bar_inactive_pressed_label_text_color = 0x7f0c0075 com.example.umcflo:style/Widget.MaterialComponents.BottomNavigationView.Colored = 0x7f1103fa -com.example.umcflo:style/TextAppearance.MaterialComponents.Tooltip = 0x7f110208 +com.example.umcflo:drawable/mtrl_switch_thumb_checked_unchecked = 0x7f070132 +com.example.umcflo:id/home_pannel_today_music_title3_tv = 0x7f08011b +com.example.umcflo:style/MaterialAlertDialog.Material3.Title.Panel.CenterStacked = 0x7f11012a +com.example.umcflo:color/material_dynamic_secondary40 = 0x7f050256 +com.example.umcflo:color/material_dynamic_color_light_error_container = 0x7f050227 com.example.umcflo:id/graph = 0x7f0800e3 -com.example.umcflo:id/material_timepicker_container = 0x7f080165 -com.example.umcflo:drawable/abc_ic_clear_material = 0x7f070041 -com.example.umcflo:style/TextAppearance.MaterialComponents.Headline3 = 0x7f110200 -com.example.umcflo:drawable/btn_player_eq_off = 0x7f070099 +com.example.umcflo:style/TextAppearance.MaterialComponents.Tooltip = 0x7f110208 +com.example.umcflo:style/Platform.V25.AppCompat = 0x7f110142 +com.example.umcflo:macro/m3_comp_navigation_bar_active_focus_state_layer_color = 0x7f0c0061 com.example.umcflo:layout/mtrl_calendar_year = 0x7f0b005f com.example.umcflo:style/ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox.Dense = 0x7f1102df com.example.umcflo:style/Animation.AppCompat.Dialog = 0x7f110002 @@ -664,13 +694,23 @@ com.example.umcflo:style/ThemeOverlay.Material3.Light = 0x7f1102a9 com.example.umcflo:style/Widget.Material3.Button.OutlinedButton.Icon = 0x7f110359 com.example.umcflo:style/Base.V14.Theme.Material3.Light = 0x7f11008e com.example.umcflo:style/RtlOverlay.Widget.AppCompat.ActionBar.TitleItem = 0x7f110146 +com.example.umcflo:id/sign_up_direct_input_et = 0x7f0802db +com.example.umcflo:integer/mtrl_btn_anim_duration_ms = 0x7f09002f +com.example.umcflo:style/Base.TextAppearance.AppCompat.Light.Widget.PopupMenu.Small = 0x7f110024 +com.example.umcflo:string/m3_sys_motion_easing_linear = 0x7f100048 +com.example.umcflo:color/material_grey_600 = 0x7f05026e +com.example.umcflo:style/Theme.Material3.Dark.SideSheetDialog = 0x7f11022f +com.example.umcflo:layout/material_clock_period_toggle = 0x7f0b0044 +com.example.umcflo:style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Surface = 0x7f1102a1 com.example.umcflo:style/ThemeOverlay.Material3.DynamicColors.Dark = 0x7f11029c com.example.umcflo:style/TextAppearance.M3.Sys.Typescale.HeadlineSmall = 0x7f1101dc com.example.umcflo:style/Base.V14.Theme.Material3.Dark.BottomSheetDialog = 0x7f11008b -com.example.umcflo:style/Theme.Material3.Dark.SideSheetDialog = 0x7f11022f -com.example.umcflo:style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Surface = 0x7f1102a1 -com.example.umcflo:layout/material_clock_period_toggle = 0x7f0b0044 -com.example.umcflo:color/material_grey_600 = 0x7f05026e +com.example.umcflo:mipmap/ic_launcher = 0x7f0e0000 +com.example.umcflo:id/sign_up_sign_up_btn = 0x7f0802e9 +com.example.umcflo:style/Theme.Material3.DynamicColors.DayNight = 0x7f11023a +com.example.umcflo:macro/m3_comp_elevated_card_container_shape = 0x7f0c002b +com.example.umcflo:dimen/m3_badge_vertical_offset = 0x7f0600b8 +com.example.umcflo:id/item_locker_album_play_img_iv = 0x7f0802b9 com.example.umcflo:style/Theme.Material3.DynamicColors.Dark.NoActionBar = 0x7f110239 com.example.umcflo:style/Base.ThemeOverlay.MaterialComponents.Dialog.Alert.Framework = 0x7f110087 com.example.umcflo:style/Base.Theme.Material3.Light = 0x7f11005f @@ -681,7 +721,6 @@ com.example.umcflo:id/navigation_header_container = 0x7f080196 com.example.umcflo:style/Base.Theme.MaterialComponents.Bridge = 0x7f110066 com.example.umcflo:color/switch_thumb_disabled_material_light = 0x7f05030e com.example.umcflo:styleable/TextEffects = 0x7f12008b -com.example.umcflo:style/Widget.Material3.Button.TextButton.Icon = 0x7f11035e com.example.umcflo:style/Base.Theme.Material3.Dark.SideSheetDialog = 0x7f11005e com.example.umcflo:style/ShapeAppearance.M3.Sys.Shape.Corner.ExtraSmall = 0x7f110169 com.example.umcflo:id/bottom = 0x7f08006a @@ -704,12 +743,7 @@ com.example.umcflo:color/mtrl_btn_text_btn_ripple_color = 0x7f0502c3 com.example.umcflo:id/action_bar = 0x7f080033 com.example.umcflo:style/Base.Theme.AppCompat.Dialog.FixedSize = 0x7f11004f com.example.umcflo:style/TextAppearance.AppCompat.Subhead = 0x7f1101ac -com.example.umcflo:color/material_dynamic_color_light_error_container = 0x7f050227 -com.example.umcflo:style/MaterialAlertDialog.Material3.Title.Panel.CenterStacked = 0x7f11012a -com.example.umcflo:color/material_dynamic_secondary40 = 0x7f050256 com.example.umcflo:string/abc_menu_function_shortcut_label = 0x7f10000d -com.example.umcflo:style/Base.Theme.AppCompat.Dialog = 0x7f11004d -com.example.umcflo:style/Widget.Material3.MaterialCalendar.HeaderSelection.Fullscreen = 0x7f1103a7 com.example.umcflo:style/Base.TextAppearance.AppCompat.Button = 0x7f110019 com.example.umcflo:id/cancel_button = 0x7f080072 com.example.umcflo:string/call_notification_decline_action = 0x7f100029 @@ -739,6 +773,7 @@ com.example.umcflo:style/Widget.MaterialComponents.Button.UnelevatedButton.Icon com.example.umcflo:id/closest = 0x7f080084 com.example.umcflo:style/Widget.AppCompat.Light.ListPopupWindow = 0x7f110312 com.example.umcflo:layout/notification_template_custom_big = 0x7f0b0071 +com.example.umcflo:id/song_singer_name_tv = 0x7f0802c0 com.example.umcflo:style/Widget.AppCompat.ListView = 0x7f11031a com.example.umcflo:style/Widget.MaterialComponents.BottomAppBar.Colored = 0x7f1103f7 com.example.umcflo:id/none = 0x7f08019c @@ -759,37 +794,41 @@ com.example.umcflo:style/Base.V23.Theme.AppCompat = 0x7f1100b0 com.example.umcflo:macro/m3_comp_primary_navigation_tab_active_focus_state_layer_color = 0x7f0c00c7 com.example.umcflo:dimen/m3_comp_input_chip_with_avatar_avatar_size = 0x7f060135 com.example.umcflo:style/Base.V14.ThemeOverlay.Material3.SideSheetDialog = 0x7f11009c -com.example.umcflo:style/ThemeOverlay.Material3.BottomAppBar = 0x7f110287 -com.example.umcflo:style/Base.Animation.AppCompat.Tooltip = 0x7f11000f -com.example.umcflo:id/parent = 0x7f0801b9 com.example.umcflo:style/Widget.AppCompat.Light.ActionBar.TabText.Inverse = 0x7f110308 com.example.umcflo:style/TextAppearance.AppCompat.Small.Inverse = 0x7f1101ab -com.example.umcflo:id/locker_select_all_tv = 0x7f0802b6 -com.example.umcflo:drawable/material_ic_keyboard_arrow_next_black_24dp = 0x7f070112 -com.example.umcflo:style/Widget.Material3.CardView.Outlined = 0x7f110365 -com.example.umcflo:string/mtrl_checkbox_button_path_name = 0x7f100069 -com.example.umcflo:styleable/AppCompatEmojiHelper = 0x7f12000d +com.example.umcflo:id/parent = 0x7f0801b9 +com.example.umcflo:style/ThemeOverlay.Material3.BottomAppBar = 0x7f110287 +com.example.umcflo:style/Base.Animation.AppCompat.Tooltip = 0x7f11000f +com.example.umcflo:dimen/m3_comp_slider_disabled_active_track_opacity = 0x7f060186 com.example.umcflo:color/material_dynamic_tertiary100 = 0x7f050260 +com.example.umcflo:styleable/AppCompatEmojiHelper = 0x7f12000d com.example.umcflo:color/material_on_background_emphasis_medium = 0x7f050278 +com.example.umcflo:string/mtrl_checkbox_button_path_name = 0x7f100069 +com.example.umcflo:style/Widget.Material3.MaterialCalendar.HeaderSelection.Fullscreen = 0x7f1103a7 +com.example.umcflo:style/Base.Theme.AppCompat.Dialog = 0x7f11004d +com.example.umcflo:style/Widget.Material3.CardView.Outlined = 0x7f110365 +com.example.umcflo:drawable/material_ic_keyboard_arrow_next_black_24dp = 0x7f070112 +com.example.umcflo:id/locker_select_all_tv = 0x7f0802b6 com.example.umcflo:style/Animation.Material3.BottomSheetDialog = 0x7f110006 com.example.umcflo:style/Widget.AppCompat.DropDownItem.Spinner = 0x7f1102ff com.example.umcflo:style/Widget.Material3.MaterialCalendar.Day.Today = 0x7f11039e com.example.umcflo:id/accessibility_custom_action_11 = 0x7f080013 com.example.umcflo:style/AlertDialog.AppCompat = 0x7f110000 com.example.umcflo:macro/m3_comp_search_bar_pressed_supporting_text_color = 0x7f0c00ed -com.example.umcflo:color/m3_tonal_button_ripple_color_selector = 0x7f05021a +com.example.umcflo:style/Base.Widget.AppCompat.PopupWindow = 0x7f1100ed +com.example.umcflo:macro/m3_comp_outlined_button_hover_outline_color = 0x7f0c00a5 +com.example.umcflo:raw/music_lovedive = 0x7f140002 com.example.umcflo:style/Base.Widget.AppCompat.Toolbar.Button.Navigation = 0x7f1100fc -com.example.umcflo:string/searchbar_scrolling_view_behavior = 0x7f1000a6 +com.example.umcflo:id/login_hide_password_iv = 0x7f0802cd +com.example.umcflo:style/Widget.Material3.Button.TextButton.Icon = 0x7f11035e +com.example.umcflo:color/m3_tonal_button_ripple_color_selector = 0x7f05021a com.example.umcflo:style/TextAppearance.Design.Counter.Overflow = 0x7f1101cb +com.example.umcflo:string/searchbar_scrolling_view_behavior = 0x7f1000a6 com.example.umcflo:style/Widget.Material3.TextInputLayout.FilledBox = 0x7f1103dd com.example.umcflo:style/Base.Widget.Material3.TabLayout.OnSurface = 0x7f110110 -com.example.umcflo:style/TextAppearance.M3.Sys.Typescale.DisplayLarge = 0x7f1101d7 -com.example.umcflo:macro/m3_comp_primary_navigation_tab_with_icon_inactive_icon_color = 0x7f0c00d0 com.example.umcflo:style/ThemeOverlay.AppCompat.Dark = 0x7f110278 -com.example.umcflo:style/Base.ThemeOverlay.AppCompat.Dark = 0x7f11007b -com.example.umcflo:macro/m3_comp_switch_unselected_pressed_state_layer_color = 0x7f0c013d -com.example.umcflo:id/textinput_helper_text = 0x7f08026e -com.example.umcflo:style/Theme.AppCompat.Light.Dialog = 0x7f11021c +com.example.umcflo:macro/m3_comp_primary_navigation_tab_with_icon_inactive_icon_color = 0x7f0c00d0 +com.example.umcflo:style/TextAppearance.M3.Sys.Typescale.DisplayLarge = 0x7f1101d7 com.example.umcflo:id/fragment_container_view_tag = 0x7f0800dd com.example.umcflo:string/mtrl_picker_out_of_range = 0x7f100083 com.example.umcflo:id/icon = 0x7f080126 @@ -798,11 +837,12 @@ com.example.umcflo:style/Base.Widget.AppCompat.CompoundButton.CheckBox = 0x7f110 com.example.umcflo:string/mtrl_picker_navigate_to_current_year_description = 0x7f100081 com.example.umcflo:style/Widget.Design.ScrimInsetsFrameLayout = 0x7f110339 com.example.umcflo:style/ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox = 0x7f1102de +com.example.umcflo:style/TextAppearance.AppCompat.Display4 = 0x7f11019c +com.example.umcflo:style/Widget.MaterialComponents.ExtendedFloatingActionButton = 0x7f110419 com.example.umcflo:string/mtrl_picker_invalid_format_use = 0x7f10007f com.example.umcflo:style/Base.V14.Theme.Material3.Dark = 0x7f11008a -com.example.umcflo:style/Widget.MaterialComponents.ExtendedFloatingActionButton = 0x7f110419 -com.example.umcflo:style/TextAppearance.AppCompat.Display4 = 0x7f11019c com.example.umcflo:string/title_home = 0x7f1000ad +com.example.umcflo:style/Base.Widget.AppCompat.RatingBar.Indicator = 0x7f1100f1 com.example.umcflo:macro/m3_comp_navigation_rail_inactive_icon_color = 0x7f0c009c com.example.umcflo:id/counterclockwise = 0x7f080090 com.example.umcflo:style/Base.MaterialAlertDialog.MaterialComponents.Title.Text = 0x7f110015 @@ -817,6 +857,7 @@ com.example.umcflo:attr/buttonIconTint = 0x7f030093 com.example.umcflo:styleable/Motion = 0x7f120063 com.example.umcflo:string/mtrl_picker_date_header_selected = 0x7f100078 com.example.umcflo:string/mtrl_picker_announce_current_selection_none = 0x7f100075 +com.example.umcflo:id/locker_savedSong_recyclerView = 0x7f0802eb com.example.umcflo:id/fitCenter = 0x7f0800d4 com.example.umcflo:string/mtrl_checkbox_state_description_checked = 0x7f10006b com.example.umcflo:string/abc_action_menu_overflow_description = 0x7f100003 @@ -833,7 +874,9 @@ com.example.umcflo:string/material_motion_easing_emphasized = 0x7f100055 com.example.umcflo:styleable/PopupWindow = 0x7f120070 com.example.umcflo:id/selected = 0x7f0801ef com.example.umcflo:style/Widget.Material3.AppBarLayout = 0x7f110340 +com.example.umcflo:id/login_flo_logo_iv = 0x7f0802cc com.example.umcflo:layout/material_chip_input_combo = 0x7f0b0041 +com.example.umcflo:id/song_more_06_iv = 0x7f08021d com.example.umcflo:color/mtrl_card_view_foreground = 0x7f0502c9 com.example.umcflo:macro/m3_comp_navigation_drawer_inactive_focus_icon_color = 0x7f0c0086 com.example.umcflo:color/m3_sys_color_dynamic_dark_on_tertiary = 0x7f050193 @@ -943,6 +986,7 @@ com.example.umcflo:id/accessibility_custom_action_30 = 0x7f080028 com.example.umcflo:dimen/m3_chip_dragged_translation_z = 0x7f0600f8 com.example.umcflo:attr/shapeAppearanceCornerExtraSmall = 0x7f0303bc com.example.umcflo:string/mtrl_switch_thumb_path_pressed = 0x7f10009a +com.example.umcflo:id/sign_up_loading_pb = 0x7f0802e2 com.example.umcflo:color/select_color = 0x7f05030a com.example.umcflo:drawable/img_video_exp = 0x7f0700fa com.example.umcflo:macro/m3_comp_time_picker_container_shape = 0x7f0c014f @@ -956,7 +1000,6 @@ com.example.umcflo:macro/m3_comp_switch_unselected_focus_track_outline_color = 0 com.example.umcflo:style/Base.Widget.MaterialComponents.AutoCompleteTextView = 0x7f110112 com.example.umcflo:id/home_pannel_instagram_iv = 0x7f080112 com.example.umcflo:style/Widget.AppCompat.SearchView.ActionBar = 0x7f110326 -com.example.umcflo:style/Widget.Material3.SearchBar = 0x7f1103c6 com.example.umcflo:macro/m3_comp_switch_selected_icon_color = 0x7f0c0129 com.example.umcflo:dimen/material_font_2_0_box_collapsed_padding_top = 0x7f06023e com.example.umcflo:macro/m3_comp_switch_selected_hover_icon_color = 0x7f0c0126 @@ -1015,7 +1058,9 @@ com.example.umcflo:macro/m3_comp_radio_button_selected_pressed_icon_color = 0x7f com.example.umcflo:macro/m3_comp_radio_button_selected_hover_state_layer_color = 0x7f0c00db com.example.umcflo:style/Widget.Material3.MaterialTimePicker.Display.Divider = 0x7f1103b7 com.example.umcflo:macro/m3_comp_radio_button_selected_hover_icon_color = 0x7f0c00da -com.example.umcflo:style/Base.Widget.AppCompat.RatingBar.Indicator = 0x7f1100f1 +com.example.umcflo:drawable/btn_checkbox_unchecked_mtrl = 0x7f070088 +com.example.umcflo:attr/boxCornerRadiusTopStart = 0x7f030084 +com.example.umcflo:raw/music_nakka = 0x7f140004 com.example.umcflo:macro/m3_comp_radio_button_disabled_unselected_icon_color = 0x7f0c00d7 com.example.umcflo:styleable/FloatingActionButton_Behavior_Layout = 0x7f120035 com.example.umcflo:macro/m3_comp_progress_indicator_active_indicator_color = 0x7f0c00d4 @@ -1026,8 +1071,6 @@ com.example.umcflo:styleable/GradientColorItem = 0x7f12003d com.example.umcflo:styleable/Variant = 0x7f120093 com.example.umcflo:integer/m3_sys_motion_path = 0x7f09001f com.example.umcflo:layout/material_clock_display_divider = 0x7f0b0043 -com.example.umcflo:styleable/ExtendedFloatingActionButton_Behavior_Layout = 0x7f120033 -com.example.umcflo:style/Widget.Material3.ExtendedFloatingActionButton.Icon.Tertiary = 0x7f110385 com.example.umcflo:styleable/Constraint = 0x7f120027 com.example.umcflo:style/ShapeAppearance.M3.Sys.Shape.Corner.Full = 0x7f11016a com.example.umcflo:macro/m3_comp_primary_navigation_tab_with_icon_active_icon_color = 0x7f0c00cf @@ -1040,15 +1083,13 @@ com.example.umcflo:macro/m3_comp_switch_unselected_icon_color = 0x7f0c013a com.example.umcflo:macro/m3_comp_outlined_text_field_error_outline_color = 0x7f0c00b6 com.example.umcflo:macro/m3_comp_checkbox_unselected_outline_color = 0x7f0c000c com.example.umcflo:drawable/btn_player_setting = 0x7f07009e -com.example.umcflo:style/TextAppearance.AppCompat.Caption = 0x7f110198 com.example.umcflo:macro/m3_comp_outlined_card_focus_outline_color = 0x7f0c00ac -com.example.umcflo:style/Widget.AppCompat.ProgressBar.Horizontal = 0x7f110321 +com.example.umcflo:style/TextAppearance.AppCompat.Caption = 0x7f110198 com.example.umcflo:drawable/$mtrl_switch_thumb_pressed_checked__0 = 0x7f070024 com.example.umcflo:id/beginOnFirstDraw = 0x7f080066 +com.example.umcflo:style/Widget.AppCompat.ProgressBar.Horizontal = 0x7f110321 com.example.umcflo:style/Widget.MaterialComponents.ActionBar.Surface = 0x7f1103ec com.example.umcflo:macro/m3_comp_outlined_card_container_shape = 0x7f0c00a9 -com.example.umcflo:macro/m3_comp_outlined_button_hover_outline_color = 0x7f0c00a5 -com.example.umcflo:style/Base.Widget.AppCompat.PopupWindow = 0x7f1100ed com.example.umcflo:id/textinput_placeholder = 0x7f08026f com.example.umcflo:id/FUNCTION = 0x7f080004 com.example.umcflo:id/stretch = 0x7f080250 @@ -1064,7 +1105,6 @@ com.example.umcflo:macro/m3_comp_navigation_drawer_label_text_type = 0x7f0c0091 com.example.umcflo:macro/m3_comp_outlined_text_field_caret_color = 0x7f0c00b0 com.example.umcflo:macro/m3_comp_navigation_drawer_inactive_pressed_icon_color = 0x7f0c008e com.example.umcflo:style/ShapeAppearance.MaterialComponents.Badge = 0x7f11017c -com.example.umcflo:color/material_personalized_primary_text_disable_only = 0x7f0502b3 com.example.umcflo:macro/m3_comp_navigation_drawer_inactive_hover_state_layer_color = 0x7f0c008b com.example.umcflo:style/ShapeAppearance.M3.Comp.TextButton.Container.Shape = 0x7f110167 com.example.umcflo:style/Base.Widget.AppCompat.SearchView = 0x7f1100f3 @@ -1118,10 +1158,15 @@ com.example.umcflo:dimen/mtrl_calendar_content_padding = 0x7f060277 com.example.umcflo:macro/m3_comp_navigation_bar_active_icon_color = 0x7f0c0065 com.example.umcflo:macro/m3_comp_switch_selected_focus_handle_color = 0x7f0c0120 com.example.umcflo:style/Base.Widget.AppCompat.ActionMode = 0x7f1100cb +com.example.umcflo:style/Theme.AppCompat.DayNight.Dialog.Alert = 0x7f110211 +com.example.umcflo:id/sign_up_password_check_underscore_view = 0x7f0802e6 +com.example.umcflo:style/ThemeOverlay.MaterialComponents.AutoCompleteTextView.OutlinedBox = 0x7f1102c7 com.example.umcflo:macro/m3_comp_menu_list_item_selected_container_color = 0x7f0c005e com.example.umcflo:attr/itemTextColor = 0x7f030268 com.example.umcflo:drawable/$mtrl_switch_thumb_unchecked_checked__1 = 0x7f070027 -com.example.umcflo:style/ThemeOverlay.MaterialComponents.AutoCompleteTextView.OutlinedBox = 0x7f1102c7 +com.example.umcflo:id/login_t_world_login_layout = 0x7f0802d8 +com.example.umcflo:string/abc_activitychooserview_choose_application = 0x7f100006 +com.example.umcflo:id/sign_up_hide_password_iv = 0x7f0802df com.example.umcflo:color/material_on_primary_emphasis_high_type = 0x7f05027a com.example.umcflo:style/ThemeOverlay.MaterialComponents.Dialog.Alert.Framework = 0x7f1102d1 com.example.umcflo:style/Widget.Material3.Toolbar.OnSurface = 0x7f1103e6 @@ -1139,7 +1184,6 @@ com.example.umcflo:macro/m3_comp_filled_text_field_error_trailing_icon_color = 0 com.example.umcflo:dimen/m3_sys_motion_easing_standard_decelerate_control_y2 = 0x7f06021b com.example.umcflo:id/main_pause_btn = 0x7f080150 com.example.umcflo:style/Widget.Support.CoordinatorLayout = 0x7f110467 -com.example.umcflo:style/Widget.Material3.CardView.Elevated = 0x7f110363 com.example.umcflo:id/bounceEnd = 0x7f08006d com.example.umcflo:id/inward = 0x7f080133 com.example.umcflo:color/material_personalized_color_secondary_text = 0x7f05029d @@ -1166,6 +1210,8 @@ com.example.umcflo:macro/m3_comp_extended_fab_surface_icon_color = 0x7f0c0033 com.example.umcflo:style/ShapeAppearanceOverlay.MaterialComponents.TextInputLayout.FilledBox = 0x7f110193 com.example.umcflo:macro/m3_comp_extended_fab_primary_label_text_type = 0x7f0c002f com.example.umcflo:dimen/mtrl_fab_elevation = 0x7f0602b8 +com.example.umcflo:id/spread_inside = 0x7f080242 +com.example.umcflo:string/mtrl_picker_range_header_selected = 0x7f100086 com.example.umcflo:string/abc_menu_alt_shortcut_label = 0x7f100009 com.example.umcflo:macro/m3_comp_extended_fab_primary_icon_color = 0x7f0c002e com.example.umcflo:style/Widget.Material3.TabLayout = 0x7f1103d6 @@ -1225,9 +1271,9 @@ com.example.umcflo:layout/mtrl_calendar_horizontal = 0x7f0b0059 com.example.umcflo:id/horizontal_only = 0x7f080125 com.example.umcflo:layout/material_time_input = 0x7f0b004b com.example.umcflo:id/rightToLeft = 0x7f0801d4 -com.example.umcflo:style/Widget.AppCompat.ActivityChooserView = 0x7f1102f1 com.example.umcflo:layout/material_time_chip = 0x7f0b004a com.example.umcflo:styleable/CheckedTextView = 0x7f12001d +com.example.umcflo:layout/fragment_music_file = 0x7f0b007e com.example.umcflo:styleable/MaterialRadioButton = 0x7f120058 com.example.umcflo:style/Base.TextAppearance.AppCompat.Widget.TextView.SpinnerItem = 0x7f110042 com.example.umcflo:dimen/mtrl_snackbar_action_text_color_alpha = 0x7f0602f2 @@ -1242,6 +1288,8 @@ com.example.umcflo:macro/m3_comp_switch_unselected_track_outline_color = 0x7f0c0 com.example.umcflo:color/material_personalized_hint_foreground = 0x7f0502b0 com.example.umcflo:dimen/m3_comp_time_picker_time_selector_pressed_state_layer_opacity = 0x7f0601a9 com.example.umcflo:layout/fragment_search = 0x7f0b0037 +com.example.umcflo:id/skipped = 0x7f0801fb +com.example.umcflo:id/song_singer_name_04_tv = 0x7f080236 com.example.umcflo:layout/m3_alert_dialog_title = 0x7f0b003e com.example.umcflo:id/META = 0x7f080005 com.example.umcflo:style/ShapeAppearance.MaterialComponents.Tooltip = 0x7f110180 @@ -1286,8 +1334,8 @@ com.example.umcflo:id/row_index_key = 0x7f0801d8 com.example.umcflo:integer/m3_sys_motion_duration_long1 = 0x7f090013 com.example.umcflo:layout/design_layout_tab_text = 0x7f0b0024 com.example.umcflo:color/material_personalized__highlighted_text_inverse = 0x7f050281 -com.example.umcflo:dimen/m3_comp_navigation_rail_icon_size = 0x7f06014d com.example.umcflo:id/transition_current_scene = 0x7f08027d +com.example.umcflo:dimen/m3_comp_navigation_rail_icon_size = 0x7f06014d com.example.umcflo:id/mtrl_calendar_months = 0x7f08017c com.example.umcflo:style/Widget.Material3.TextInputEditText.FilledBox = 0x7f1103d9 com.example.umcflo:integer/m3_badge_max_number = 0x7f090009 @@ -1332,6 +1380,7 @@ com.example.umcflo:drawable/main_btm_search_selector = 0x7f07010c com.example.umcflo:interpolator/m3_sys_motion_easing_emphasized_accelerate = 0x7f0a0008 com.example.umcflo:string/mtrl_switch_track_path = 0x7f10009d com.example.umcflo:style/Base.Widget.MaterialComponents.CheckedTextView = 0x7f110113 +com.example.umcflo:id/sign_up_name_et = 0x7f0802e3 com.example.umcflo:id/accelerate = 0x7f08000e com.example.umcflo:color/mtrl_btn_stroke_color_selector = 0x7f0502c1 com.example.umcflo:style/Base.Widget.AppCompat.ListView = 0x7f1100e8 @@ -1377,9 +1426,10 @@ com.example.umcflo:integer/m3_sys_motion_duration_medium3 = 0x7f090019 com.example.umcflo:style/ShapeAppearanceOverlay.Material3.SearchBar = 0x7f110189 com.example.umcflo:style/ThemeOverlay.MaterialComponents.MaterialAlertDialog = 0x7f1102d4 com.example.umcflo:integer/m3_sys_motion_duration_long3 = 0x7f090015 +com.example.umcflo:id/sign_up_id_et = 0x7f0802e0 com.example.umcflo:macro/m3_comp_switch_selected_pressed_track_color = 0x7f0c012d -com.example.umcflo:style/TextAppearance.AppCompat.Widget.Button.Borderless.Colored = 0x7f1101bb com.example.umcflo:style/Base.Widget.AppCompat.Light.ActionBar = 0x7f1100de +com.example.umcflo:style/TextAppearance.AppCompat.Widget.Button.Borderless.Colored = 0x7f1101bb com.example.umcflo:dimen/m3_btn_icon_only_min_width = 0x7f0600d8 com.example.umcflo:macro/m3_comp_navigation_drawer_inactive_icon_color = 0x7f0c008c com.example.umcflo:id/song_next_iv = 0x7f080226 @@ -1407,6 +1457,7 @@ com.example.umcflo:dimen/m3_comp_top_app_bar_small_on_scroll_container_elevation com.example.umcflo:id/x_left = 0x7f0802a8 com.example.umcflo:style/TextAppearance.Design.Hint = 0x7f1101ce com.example.umcflo:id/marquee = 0x7f080152 +com.example.umcflo:id/item_locker_album_more_iv = 0x7f0802b8 com.example.umcflo:style/Base.V7.Widget.AppCompat.EditText = 0x7f1100c1 com.example.umcflo:style/Widget.Material3.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu = 0x7f1103e3 com.example.umcflo:macro/m3_comp_time_picker_period_selector_unselected_label_text_color = 0x7f0c015c @@ -1440,7 +1491,6 @@ com.example.umcflo:id/transition_position = 0x7f080281 com.example.umcflo:styleable/Spinner = 0x7f120081 com.example.umcflo:id/title_template = 0x7f080275 com.example.umcflo:style/ShapeAppearance.M3.Comp.BottomAppBar.Container.Shape = 0x7f110158 -com.example.umcflo:id/song_more_06_iv = 0x7f08021d com.example.umcflo:style/ThemeOverlay.MaterialComponents.Dialog.Alert = 0x7f1102d0 com.example.umcflo:drawable/material_cursor_drawable = 0x7f07010d com.example.umcflo:id/time = 0x7f080272 @@ -1474,15 +1524,13 @@ com.example.umcflo:style/Theme.Material3.DayNight.Dialog.MinWidth = 0x7f110234 com.example.umcflo:style/Widget.MaterialComponents.CircularProgressIndicator.ExtraSmall = 0x7f110412 com.example.umcflo:id/src_in = 0x7f080246 com.example.umcflo:color/mtrl_btn_text_btn_bg_color_selector = 0x7f0502c2 -com.example.umcflo:string/mtrl_picker_range_header_selected = 0x7f100086 -com.example.umcflo:id/spread_inside = 0x7f080242 -com.example.umcflo:style/Theme.AppCompat.DayNight.Dialog.Alert = 0x7f110211 com.example.umcflo:style/Base.Theme.MaterialComponents.Light = 0x7f11006e com.example.umcflo:id/song_singer_plus_iv = 0x7f080239 com.example.umcflo:id/item_album_title_tv = 0x7f0802b2 com.example.umcflo:attr/customStringValue = 0x7f030174 com.example.umcflo:dimen/m3_card_hovered_z = 0x7f0600ed com.example.umcflo:layout/abc_screen_content_include = 0x7f0b0014 +com.example.umcflo:id/sign_up_email_error_tv = 0x7f0802dc com.example.umcflo:style/Widget.MaterialComponents.Light.ActionBar.Solid = 0x7f11041c com.example.umcflo:id/song_singer_name_05_tv = 0x7f080237 com.example.umcflo:dimen/m3_bottomappbar_fab_cradle_rounded_corner_radius = 0x7f0600c8 @@ -1542,16 +1590,15 @@ com.example.umcflo:string/abc_search_hint = 0x7f100013 com.example.umcflo:style/TextAppearance.Material3.HeadlineMedium = 0x7f1101ec com.example.umcflo:id/slide = 0x7f0801fc com.example.umcflo:id/dialog_button = 0x7f0800ac -com.example.umcflo:id/song_singer_name_04_tv = 0x7f080236 -com.example.umcflo:id/skipped = 0x7f0801fb +com.example.umcflo:raw/music_flu = 0x7f140009 com.example.umcflo:string/m3_exceed_max_badge_text_suffix = 0x7f10003c com.example.umcflo:id/sin = 0x7f0801f8 com.example.umcflo:styleable/ListPopupWindow = 0x7f12004c com.example.umcflo:id/showCustom = 0x7f0801f5 com.example.umcflo:id/search_voice_btn = 0x7f0801ed com.example.umcflo:style/Base.Widget.AppCompat.ActionButton.Overflow = 0x7f1100ca -com.example.umcflo:style/Widget.MaterialComponents.Chip.Choice = 0x7f11040d com.example.umcflo:style/Widget.MaterialComponents.NavigationRailView.PrimarySurface = 0x7f11043c +com.example.umcflo:style/Widget.MaterialComponents.Chip.Choice = 0x7f11040d com.example.umcflo:dimen/design_tab_scrollable_min_width = 0x7f06008c com.example.umcflo:style/Base.Theme.MaterialComponents.Light.Bridge = 0x7f11006f com.example.umcflo:macro/m3_comp_switch_selected_track_color = 0x7f0c012e @@ -1579,16 +1626,16 @@ com.example.umcflo:macro/m3_comp_time_picker_period_selector_selected_pressed_st com.example.umcflo:style/Base.Theme.Material3.Light.DialogWhenLarge = 0x7f110063 com.example.umcflo:style/Base.TextAppearance.AppCompat.Widget.Button = 0x7f110039 com.example.umcflo:id/packed = 0x7f0801b6 -com.example.umcflo:style/Base.V14.Theme.Material3.Light.SideSheetDialog = 0x7f110091 com.example.umcflo:dimen/m3_comp_badge_large_size = 0x7f060101 +com.example.umcflo:style/Base.V14.Theme.Material3.Light.SideSheetDialog = 0x7f110091 com.example.umcflo:color/material_personalized_color_on_secondary = 0x7f05028d com.example.umcflo:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Small = 0x7f110040 com.example.umcflo:id/home_pannel_album_title2_tv = 0x7f080109 com.example.umcflo:macro/m3_comp_filter_chip_container_shape = 0x7f0c0057 com.example.umcflo:id/overshoot = 0x7f0801b5 +com.example.umcflo:style/Animation.MaterialComponents.BottomSheetDialog = 0x7f11000a com.example.umcflo:id/outward = 0x7f0801b4 com.example.umcflo:id/selection_type = 0x7f0801f0 -com.example.umcflo:style/Animation.MaterialComponents.BottomSheetDialog = 0x7f11000a com.example.umcflo:id/song_album_IU_iv = 0x7f080201 com.example.umcflo:string/m3_ref_typeface_plain_regular = 0x7f100040 com.example.umcflo:id/outline = 0x7f0801b3 @@ -1711,6 +1758,7 @@ com.example.umcflo:id/invisible = 0x7f080132 com.example.umcflo:macro/m3_comp_search_view_header_input_text_color = 0x7f0c00f4 com.example.umcflo:id/continuousVelocity = 0x7f08008d com.example.umcflo:id/home_album_potcast_01_iv = 0x7f0800ef +com.example.umcflo:raw/music_fool = 0x7f140001 com.example.umcflo:id/included = 0x7f08012d com.example.umcflo:id/showTitle = 0x7f0801f7 com.example.umcflo:style/Base.V26.Widget.AppCompat.Toolbar = 0x7f1100b8 @@ -1731,11 +1779,10 @@ com.example.umcflo:style/ThemeOverlay.Material3.TextInputEditText.FilledBox = 0x com.example.umcflo:attr/collapsedTitleTextAppearance = 0x7f0300f4 com.example.umcflo:string/status_bar_notification_info_overflow = 0x7f1000ab com.example.umcflo:dimen/m3_btn_icon_only_default_size = 0x7f0600d6 +com.example.umcflo:style/Base.V14.Theme.MaterialComponents = 0x7f110092 +com.example.umcflo:id/home_pannel_background_iv = 0x7f08010b com.example.umcflo:style/Widget.MaterialComponents.NavigationRailView.Colored.Compact = 0x7f11043a com.example.umcflo:string/abc_menu_space_shortcut_label = 0x7f100010 -com.example.umcflo:id/home_pannel_background_iv = 0x7f08010b -com.example.umcflo:style/Base.V14.Theme.MaterialComponents = 0x7f110092 -com.example.umcflo:dimen/m3_navigation_rail_item_padding_bottom = 0x7f0601d2 com.example.umcflo:id/home_pannel_album_info_iv = 0x7f080105 com.example.umcflo:layout/mtrl_calendar_days_of_week = 0x7f0b0058 com.example.umcflo:id/home_pannel_album_img1_iv = 0x7f080103 @@ -1831,10 +1878,6 @@ com.example.umcflo:id/groups = 0x7f0800e7 com.example.umcflo:style/Widget.Material3.Slider.Legacy.Label = 0x7f1103d2 com.example.umcflo:id/cut = 0x7f080095 com.example.umcflo:style/Base.Widget.AppCompat.ButtonBar.AlertDialog = 0x7f1100d5 -com.example.umcflo:id/customPanel = 0x7f080094 -com.example.umcflo:styleable/LinearProgressIndicator = 0x7f12004b -com.example.umcflo:dimen/m3_comp_switch_track_height = 0x7f060199 -com.example.umcflo:dimen/mtrl_high_ripple_focused_alpha = 0x7f0602bd com.example.umcflo:id/reverseSawtooth = 0x7f0801d2 com.example.umcflo:id/video_video_03_cv = 0x7f08028f com.example.umcflo:id/currentState = 0x7f080092 @@ -2010,6 +2053,7 @@ com.example.umcflo:macro/m3_comp_navigation_bar_active_hover_icon_color = 0x7f0c com.example.umcflo:macro/m3_comp_switch_unselected_pressed_icon_color = 0x7f0c013c com.example.umcflo:drawable/ic_call_decline_low = 0x7f0700cc com.example.umcflo:drawable/img_jenre_exp_2 = 0x7f0700f7 +com.example.umcflo:id/sign_up_name_underscore_view = 0x7f0802e4 com.example.umcflo:macro/m3_comp_navigation_rail_inactive_label_text_color = 0x7f0c009d com.example.umcflo:dimen/m3_comp_extended_fab_primary_container_elevation = 0x7f06010e com.example.umcflo:dimen/m3_badge_offset = 0x7f0600b6 @@ -2066,6 +2110,7 @@ com.example.umcflo:drawable/ic_arrow_back_black_24 = 0x7f0700bb com.example.umcflo:drawable/fragment_look_chip_off_background = 0x7f0700b7 com.example.umcflo:id/SHOW_PROGRESS = 0x7f08000a com.example.umcflo:drawable/button_background_black_color = 0x7f0700ac +com.example.umcflo:id/login_sign_up_tv = 0x7f0802d6 com.example.umcflo:dimen/m3_extended_fab_end_padding = 0x7f0601b2 com.example.umcflo:drawable/btn_setting_phone = 0x7f0700a7 com.example.umcflo:integer/m3_sys_motion_duration_short2 = 0x7f09001c @@ -2096,8 +2141,6 @@ com.example.umcflo:id/edge = 0x7f0800c1 com.example.umcflo:attr/layout_constraintHeight_default = 0x7f030290 com.example.umcflo:attr/motionEffect_strict = 0x7f030345 com.example.umcflo:drawable/btn_miniplay_mvpause = 0x7f070090 -com.example.umcflo:attr/boxCornerRadiusTopStart = 0x7f030084 -com.example.umcflo:drawable/btn_checkbox_unchecked_mtrl = 0x7f070088 com.example.umcflo:color/call_notification_decline_color = 0x7f05002b com.example.umcflo:drawable/btn_arrow_black = 0x7f070084 com.example.umcflo:style/Base.Widget.MaterialComponents.PopupMenu.Overflow = 0x7f11011a @@ -2176,6 +2219,7 @@ com.example.umcflo:drawable/$mtrl_checkbox_button_checked_unchecked__0 = 0x7f070 com.example.umcflo:style/Widget.MaterialComponents.CheckedTextView = 0x7f11040b com.example.umcflo:dimen/m3_searchview_elevation = 0x7f0601e5 com.example.umcflo:drawable/$m3_avd_hide_password__0 = 0x7f070007 +com.example.umcflo:id/sign_up_password_underscore_view = 0x7f0802e8 com.example.umcflo:styleable/MotionScene = 0x7f120068 com.example.umcflo:drawable/$avd_show_password__2 = 0x7f070005 com.example.umcflo:macro/m3_comp_input_chip_label_text_type = 0x7f0c005c @@ -2286,6 +2330,7 @@ com.example.umcflo:dimen/mtrl_low_ripple_hovered_alpha = 0x7f0602c2 com.example.umcflo:dimen/mtrl_btn_focused_z = 0x7f060260 com.example.umcflo:color/m3_sys_color_dynamic_dark_error_container = 0x7f050186 com.example.umcflo:dimen/mtrl_low_ripple_default_alpha = 0x7f0602c0 +com.example.umcflo:id/song_music_title_tv = 0x7f0802bf com.example.umcflo:dimen/mtrl_extended_fab_min_height = 0x7f0602b0 com.example.umcflo:color/material_personalized_color_surface_container_lowest = 0x7f0502a5 com.example.umcflo:style/ThemeOverlay.AppCompat.Dialog.Alert = 0x7f11027d @@ -2300,8 +2345,8 @@ com.example.umcflo:macro/m3_comp_navigation_drawer_active_indicator_color = 0x7f com.example.umcflo:string/error_icon_content_description = 0x7f100034 com.example.umcflo:dimen/mtrl_extended_fab_end_padding_icon = 0x7f0602ad com.example.umcflo:attr/paddingStart = 0x7f03036d -com.example.umcflo:dimen/mtrl_extended_fab_end_padding = 0x7f0602ac com.example.umcflo:style/Widget.AppCompat.Spinner.DropDown.ActionBar = 0x7f11032b +com.example.umcflo:dimen/mtrl_extended_fab_end_padding = 0x7f0602ac com.example.umcflo:attr/behavior_draggable = 0x7f030069 com.example.umcflo:style/Widget.MaterialComponents.MaterialCalendar.Day.Selected = 0x7f110422 com.example.umcflo:color/material_dynamic_neutral50 = 0x7f050230 @@ -2358,6 +2403,7 @@ com.example.umcflo:dimen/mtrl_btn_text_btn_padding_left = 0x7f06026f com.example.umcflo:dimen/mtrl_btn_text_btn_icon_padding = 0x7f06026e com.example.umcflo:dimen/mtrl_btn_snackbar_margin_horizontal = 0x7f06026c com.example.umcflo:style/Base.ThemeOverlay.Material3.TextInputEditText = 0x7f110084 +com.example.umcflo:id/login_phone_number_login_layout = 0x7f0802d4 com.example.umcflo:layout/select_dialog_multichoice_material = 0x7f0b0076 com.example.umcflo:dimen/mtrl_btn_pressed_z = 0x7f06026b com.example.umcflo:attr/minWidth = 0x7f03031d @@ -2431,8 +2477,8 @@ com.example.umcflo:style/Widget.Material3.Button.TextButton.Snackbar = 0x7f11035 com.example.umcflo:attr/checkedIconTint = 0x7f0300ba com.example.umcflo:dimen/m3_sys_motion_easing_legacy_decelerate_control_y1 = 0x7f06020a com.example.umcflo:attr/popupWindowStyle = 0x7f030389 -com.example.umcflo:dimen/m3_sys_motion_easing_legacy_decelerate_control_x2 = 0x7f060209 com.example.umcflo:id/song_all_listen_iv = 0x7f080202 +com.example.umcflo:dimen/m3_sys_motion_easing_legacy_decelerate_control_x2 = 0x7f060209 com.example.umcflo:style/Base.V14.Widget.MaterialComponents.AutoCompleteTextView = 0x7f1100a1 com.example.umcflo:dimen/m3_sys_motion_easing_legacy_control_y2 = 0x7f060207 com.example.umcflo:color/m3_ref_palette_dynamic_neutral_variant6 = 0x7f0500ca @@ -2452,6 +2498,7 @@ com.example.umcflo:attr/chipSpacingHorizontal = 0x7f0300ca com.example.umcflo:dimen/mtrl_btn_elevation = 0x7f06025f com.example.umcflo:drawable/abc_ic_menu_share_mtrl_alpha = 0x7f070049 com.example.umcflo:dimen/m3_side_sheet_width = 0x7f0601ea +com.example.umcflo:id/song_down_ib = 0x7f0802be com.example.umcflo:dimen/m3_side_sheet_modal_elevation = 0x7f0601e8 com.example.umcflo:dimen/m3_searchbar_outlined_stroke_width = 0x7f0601e0 com.example.umcflo:drawable/img_album_lp = 0x7f0700f0 @@ -2464,7 +2511,6 @@ com.example.umcflo:dimen/m3_comp_filled_card_dragged_state_layer_opacity = 0x7f0 com.example.umcflo:dimen/m3_ripple_selectable_pressed_alpha = 0x7f0601db com.example.umcflo:string/mtrl_picker_range_header_unselected = 0x7f100088 com.example.umcflo:dimen/m3_sys_motion_easing_standard_control_y1 = 0x7f060216 -com.example.umcflo:dimen/m3_ripple_focused_alpha = 0x7f0601d8 com.example.umcflo:color/m3_tabs_ripple_color = 0x7f050204 com.example.umcflo:dimen/m3_sys_elevation_level1 = 0x7f0601f3 com.example.umcflo:dimen/m3_navigation_rail_label_padding_horizontal = 0x7f0601d6 @@ -2674,11 +2720,10 @@ com.example.umcflo:attr/liftOnScroll = 0x7f0302bd com.example.umcflo:dimen/m3_bottomappbar_height = 0x7f0600cb com.example.umcflo:dimen/m3_bottomappbar_fab_cradle_margin = 0x7f0600c7 com.example.umcflo:color/material_personalized_color_primary = 0x7f050296 -com.example.umcflo:dimen/m3_bottom_sheet_modal_elevation = 0x7f0600c6 com.example.umcflo:drawable/$m3_avd_hide_password__2 = 0x7f070009 com.example.umcflo:dimen/m3_bottom_sheet_drag_handle_bottom_padding = 0x7f0600c4 -com.example.umcflo:style/Base.TextAppearance.MaterialComponents.Subtitle2 = 0x7f110047 com.example.umcflo:style/Widget.Material3.Button.ElevatedButton = 0x7f110351 +com.example.umcflo:style/Base.TextAppearance.MaterialComponents.Subtitle2 = 0x7f110047 com.example.umcflo:macro/m3_comp_radio_button_selected_focus_icon_color = 0x7f0c00d8 com.example.umcflo:dimen/m3_badge_with_text_vertical_padding = 0x7f0600bd com.example.umcflo:id/custom = 0x7f080093 @@ -2860,6 +2905,7 @@ com.example.umcflo:dimen/tooltip_precise_anchor_threshold = 0x7f060321 com.example.umcflo:attr/sideSheetModalStyle = 0x7f0303d2 com.example.umcflo:dimen/abc_button_inset_horizontal_material = 0x7f060012 com.example.umcflo:attr/dropDownBackgroundTint = 0x7f03019d +com.example.umcflo:layout/activity_login = 0x7f0b007c com.example.umcflo:dimen/abc_alert_dialog_button_bar_height = 0x7f060010 com.example.umcflo:dimen/m3_comp_switch_disabled_track_opacity = 0x7f060193 com.example.umcflo:dimen/m3_snackbar_margin = 0x7f0601f1 @@ -2898,9 +2944,9 @@ com.example.umcflo:color/purple_200 = 0x7f050301 com.example.umcflo:integer/m3_btn_anim_delay_ms = 0x7f09000a com.example.umcflo:color/primary_material_light = 0x7f0502fb com.example.umcflo:color/primary_text_disabled_material_dark = 0x7f0502fe -com.example.umcflo:layout/fragment_look = 0x7f0b0035 com.example.umcflo:color/mtrl_textinput_focused_box_stroke_color = 0x7f0502f4 com.example.umcflo:id/mtrl_picker_header_title_and_selection = 0x7f080187 +com.example.umcflo:layout/fragment_look = 0x7f0b0035 com.example.umcflo:id/detail_from_tv = 0x7f0800ab com.example.umcflo:style/Theme.MaterialComponents.Light.DarkActionBar.Bridge = 0x7f110267 com.example.umcflo:dimen/mtrl_alert_dialog_picker_background_inset = 0x7f06024c @@ -2921,8 +2967,8 @@ com.example.umcflo:color/mtrl_switch_thumb_tint = 0x7f0502e8 com.example.umcflo:style/ShapeAppearance.M3.Comp.Switch.Handle.Shape = 0x7f110164 com.example.umcflo:color/material_personalized_color_control_normal = 0x7f050285 com.example.umcflo:color/mtrl_switch_thumb_icon_tint = 0x7f0502e7 -com.example.umcflo:style/Base.TextAppearance.AppCompat.Widget.Switch = 0x7f110041 com.example.umcflo:color/mtrl_outlined_stroke_color = 0x7f0502e4 +com.example.umcflo:style/Base.TextAppearance.AppCompat.Widget.Switch = 0x7f110041 com.example.umcflo:dimen/mtrl_badge_with_text_size = 0x7f060254 com.example.umcflo:dimen/m3_comp_assist_chip_with_icon_icon_size = 0x7f060100 com.example.umcflo:drawable/nugu_btn_skip_next_32 = 0x7f070150 @@ -2933,9 +2979,9 @@ com.example.umcflo:dimen/design_fab_translation_z_hovered_focused = 0x7f060075 com.example.umcflo:attr/fontStyle = 0x7f03020d com.example.umcflo:color/m3_ref_palette_secondary30 = 0x7f050140 com.example.umcflo:color/mtrl_on_surface_ripple_color = 0x7f0502e2 -com.example.umcflo:attr/counterOverflowTextAppearance = 0x7f030162 com.example.umcflo:color/mtrl_navigation_bar_colored_item_tint = 0x7f0502da com.example.umcflo:attr/horizontalOffset = 0x7f03022b +com.example.umcflo:attr/counterOverflowTextAppearance = 0x7f030162 com.example.umcflo:dimen/m3_btn_padding_left = 0x7f0600dc com.example.umcflo:dimen/compat_notification_large_icon_max_width = 0x7f06005e com.example.umcflo:id/vertical_only = 0x7f08028b @@ -3011,7 +3057,6 @@ com.example.umcflo:attr/materialTimePickerTheme = 0x7f030308 com.example.umcflo:color/material_personalized_color_surface_variant = 0x7f0502a8 com.example.umcflo:id/fill_horizontal = 0x7f0800d1 com.example.umcflo:color/material_personalized_color_surface_inverse = 0x7f0502a7 -com.example.umcflo:color/material_personalized_color_surface_dim = 0x7f0502a6 com.example.umcflo:style/ShapeAppearance.Material3.Corner.Large = 0x7f110172 com.example.umcflo:color/material_personalized_color_surface_container_highest = 0x7f0502a3 com.example.umcflo:styleable/RecycleListView = 0x7f120075 @@ -3231,6 +3276,7 @@ com.example.umcflo:string/mtrl_picker_announce_current_range_selection = 0x7f100 com.example.umcflo:dimen/m3_comp_input_chip_container_height = 0x7f060133 com.example.umcflo:color/m3_sys_color_dynamic_dark_outline = 0x7f050195 com.example.umcflo:dimen/material_helper_text_default_padding_top = 0x7f06023f +com.example.umcflo:id/sign_up_address_underscore_view = 0x7f0802d9 com.example.umcflo:color/m3_sys_color_dynamic_dark_on_surface_variant = 0x7f050192 com.example.umcflo:attr/iconEndPadding = 0x7f03022f com.example.umcflo:color/m3_sys_color_dynamic_dark_on_surface = 0x7f050191 @@ -3254,6 +3300,7 @@ com.example.umcflo:dimen/mtrl_progress_circular_size_extra_small = 0x7f0602dc com.example.umcflo:attr/flow_horizontalStyle = 0x7f0301f8 com.example.umcflo:color/m3_sys_color_light_surface_container = 0x7f0501ed com.example.umcflo:color/m3_sys_color_dark_surface_container = 0x7f05017b +com.example.umcflo:id/login_id_underscore_view = 0x7f0802cf com.example.umcflo:dimen/m3_comp_switch_disabled_selected_handle_opacity = 0x7f060191 com.example.umcflo:color/abc_btn_colored_text_material = 0x7f050003 com.example.umcflo:color/m3_sys_color_dark_surface_bright = 0x7f05017a @@ -3380,6 +3427,7 @@ com.example.umcflo:color/m3_ref_palette_neutral87 = 0x7f05011a com.example.umcflo:color/m3_ref_palette_neutral80 = 0x7f050119 com.example.umcflo:color/m3_ref_palette_neutral70 = 0x7f050118 com.example.umcflo:dimen/mtrl_navigation_item_shape_horizontal_margin = 0x7f0602cb +com.example.umcflo:raw/music_bboom = 0x7f140006 com.example.umcflo:color/m3_ref_palette_neutral60 = 0x7f050117 com.example.umcflo:color/m3_slider_inactive_track_color_legacy = 0x7f05015d com.example.umcflo:drawable/m3_avd_hide_password = 0x7f0700fd @@ -3420,6 +3468,7 @@ com.example.umcflo:color/m3_ref_palette_error10 = 0x7f0500fe com.example.umcflo:attr/showTitle = 0x7f0303cf com.example.umcflo:attr/drawableTint = 0x7f030197 com.example.umcflo:color/m3_ref_palette_error0 = 0x7f0500fd +com.example.umcflo:id/login_find_id_tv = 0x7f0802ca com.example.umcflo:layout/notification_template_icon_group = 0x7f0b0072 com.example.umcflo:color/m3_ref_palette_dynamic_tertiary60 = 0x7f0500f7 com.example.umcflo:attr/motionEasingLinearInterpolator = 0x7f03033c @@ -3768,6 +3817,7 @@ com.example.umcflo:attr/colorControlActivated = 0x7f030100 com.example.umcflo:attr/warmth = 0x7f0304d5 com.example.umcflo:color/m3_ref_palette_tertiary60 = 0x7f050150 com.example.umcflo:color/abc_tint_default = 0x7f050014 +com.example.umcflo:id/login_find_password_tv = 0x7f0802cb com.example.umcflo:integer/mtrl_card_anim_delay_ms = 0x7f090033 com.example.umcflo:dimen/abc_text_size_caption_material = 0x7f060042 com.example.umcflo:attr/viewTransitionOnNegativeCross = 0x7f0304d1 @@ -3866,6 +3916,7 @@ com.example.umcflo:style/Widget.AppCompat.ListView.DropDown = 0x7f11031b com.example.umcflo:attr/mock_showDiagonals = 0x7f030322 com.example.umcflo:attr/textureBlurFactor = 0x7f030472 com.example.umcflo:attr/titleCentered = 0x7f030494 +com.example.umcflo:drawable/btn_editbar_addplaylist = 0x7f07015e com.example.umcflo:style/ThemeOverlay.AppCompat.Dialog = 0x7f11027c com.example.umcflo:attr/title = 0x7f030493 com.example.umcflo:style/Widget.Material3.Button.TonalButton.Icon = 0x7f110361 @@ -3959,6 +4010,7 @@ com.example.umcflo:attr/textBackgroundPanY = 0x7f03045d com.example.umcflo:style/Base.Widget.AppCompat.Button.Colored = 0x7f1100d2 com.example.umcflo:macro/m3_comp_switch_disabled_unselected_track_color = 0x7f0c011e com.example.umcflo:attr/layout_optimizationLevel = 0x7f0302b8 +com.example.umcflo:id/switchRV = 0x7f0802c2 com.example.umcflo:style/ThemeOverlay.MaterialComponents.BottomSheetDialog = 0x7f1102cb com.example.umcflo:attr/textBackgroundPanX = 0x7f03045c com.example.umcflo:style/Widget.Material3.CircularProgressIndicator.Legacy.Small = 0x7f110377 @@ -4732,6 +4784,7 @@ com.example.umcflo:macro/m3_comp_outlined_autocomplete_menu_container_color = 0x com.example.umcflo:attr/extendedFloatingActionButtonTertiaryStyle = 0x7f0301d1 com.example.umcflo:color/m3_ref_palette_secondary0 = 0x7f05013c com.example.umcflo:attr/contentPaddingEnd = 0x7f03014b +com.example.umcflo:id/sign_up_password_check_et = 0x7f0802e5 com.example.umcflo:dimen/mtrl_fab_translation_z_pressed = 0x7f0602bb com.example.umcflo:attr/menuGravity = 0x7f030317 com.example.umcflo:style/ThemeOverlay.Material3.TextInputEditText = 0x7f1102b9 @@ -4836,6 +4889,7 @@ com.example.umcflo:id/ghost_view_holder = 0x7f0800e1 com.example.umcflo:attr/errorAccessibilityLabel = 0x7f0301b6 com.example.umcflo:attr/isMaterial3DynamicColorApplied = 0x7f030249 com.example.umcflo:attr/mock_label = 0x7f03031f +com.example.umcflo:id/sign_up_email_list_iv = 0x7f0802dd com.example.umcflo:attr/buttonTint = 0x7f030098 com.example.umcflo:attr/initialActivityCount = 0x7f030246 com.example.umcflo:attr/layout_constraintTop_toBottomOf = 0x7f0302a1 @@ -4956,6 +5010,7 @@ com.example.umcflo:dimen/mtrl_navigation_rail_active_text_size = 0x7f0602cd com.example.umcflo:dimen/abc_action_bar_stacked_max_height = 0x7f060009 com.example.umcflo:attr/flow_verticalGap = 0x7f030201 com.example.umcflo:color/mtrl_chip_text_color = 0x7f0502ce +com.example.umcflo:drawable/btn_editbar_download = 0x7f070160 com.example.umcflo:style/TextAppearance.M3.Sys.Typescale.BodyLarge = 0x7f1101d4 com.example.umcflo:macro/m3_comp_time_input_time_input_field_focus_outline_color = 0x7f0c0148 com.example.umcflo:attr/lineHeight = 0x7f0302c1 @@ -5301,6 +5356,7 @@ com.example.umcflo:attr/contentInsetStart = 0x7f030147 com.example.umcflo:dimen/m3_sys_motion_easing_legacy_control_x1 = 0x7f060204 com.example.umcflo:attr/layoutDescription = 0x7f030275 com.example.umcflo:attr/maxWidth = 0x7f030313 +com.example.umcflo:raw/music_mylove = 0x7f140003 com.example.umcflo:attr/motionDurationShort3 = 0x7f030333 com.example.umcflo:attr/contentInsetEnd = 0x7f030143 com.example.umcflo:id/plus_ib = 0x7f0801c6 @@ -5347,6 +5403,7 @@ com.example.umcflo:style/TextAppearance.MaterialComponents.Headline4 = 0x7f11020 com.example.umcflo:color/m3_fab_ripple_color_selector = 0x7f050092 com.example.umcflo:attr/actionTextColorAlpha = 0x7f030024 com.example.umcflo:attr/borderRoundPercent = 0x7f030075 +com.example.umcflo:id/login_social_login_layout = 0x7f0802d7 com.example.umcflo:attr/addElevationShadow = 0x7f030028 com.example.umcflo:attr/colorSurfaceContainerLowest = 0x7f03012f com.example.umcflo:macro/m3_comp_outlined_text_field_disabled_input_text_color = 0x7f0c00b2 @@ -5469,11 +5526,13 @@ com.example.umcflo:color/m3_sys_color_light_outline_variant = 0x7f0501e6 com.example.umcflo:dimen/mtrl_extended_fab_start_padding_icon = 0x7f0602b3 com.example.umcflo:attr/bottomSheetDragHandleStyle = 0x7f03007c com.example.umcflo:drawable/abc_tab_indicator_mtrl_alpha = 0x7f07006e +com.example.umcflo:raw/music_boy = 0x7f140007 com.example.umcflo:attr/collapseIcon = 0x7f0300f1 com.example.umcflo:dimen/abc_dialog_fixed_width_minor = 0x7f06001f com.example.umcflo:attr/reactiveGuide_animateChange = 0x7f03039c com.example.umcflo:style/Base.Widget.MaterialComponents.TextView = 0x7f11011f com.example.umcflo:dimen/m3_searchbar_text_margin_start_no_navigation_icon = 0x7f0601e2 +com.example.umcflo:raw/music_butter = 0x7f140008 com.example.umcflo:macro/m3_comp_outlined_card_outline_color = 0x7f0c00ae com.example.umcflo:attr/dynamicColorThemeOverlay = 0x7f0301a1 com.example.umcflo:attr/multiChoiceItemLayout = 0x7f030352 @@ -5493,6 +5552,7 @@ com.example.umcflo:dimen/mtrl_progress_circular_size_small = 0x7f0602de com.example.umcflo:anim/mtrl_card_lowers_interpolator = 0x7f01002b com.example.umcflo:drawable/$mtrl_checkbox_button_unchecked_checked__2 = 0x7f070020 com.example.umcflo:attr/backgroundInsetEnd = 0x7f03004a +com.example.umcflo:layout/activity_sign_up = 0x7f0b007d com.example.umcflo:attr/closeIconEndPadding = 0x7f0300ea com.example.umcflo:attr/logoAdjustViewBounds = 0x7f0302d4 com.example.umcflo:macro/m3_comp_icon_button_unselected_icon_color = 0x7f0c005a @@ -5563,6 +5623,7 @@ com.example.umcflo:style/Base.Widget.AppCompat.Spinner = 0x7f1100f7 com.example.umcflo:attr/alertDialogTheme = 0x7f03002c com.example.umcflo:attr/checkMarkCompat = 0x7f0300af com.example.umcflo:attr/fontVariationSettings = 0x7f03020e +com.example.umcflo:id/login_apple_login_iv = 0x7f0802c4 com.example.umcflo:style/Widget.Material3.TextInputEditText.OutlinedBox = 0x7f1103db com.example.umcflo:dimen/mtrl_progress_circular_inset_small = 0x7f0602d9 com.example.umcflo:attr/carousel_touchUp_dampeningFactor = 0x7f0300ab @@ -5574,6 +5635,7 @@ com.example.umcflo:attr/carousel_firstView = 0x7f0300a5 com.example.umcflo:style/ThemeOverlay.Material3.FloatingActionButton.Primary = 0x7f1102a3 com.example.umcflo:attr/carousel_backwardTransition = 0x7f0300a3 com.example.umcflo:attr/listChoiceBackgroundIndicator = 0x7f0302c4 +com.example.umcflo:id/login_at_sign_tv = 0x7f0802c5 com.example.umcflo:macro/m3_comp_search_view_header_trailing_icon_color = 0x7f0c00f9 com.example.umcflo:attr/colorPrimarySurface = 0x7f030122 com.example.umcflo:attr/deltaPolarRadius = 0x7f03017f @@ -5708,6 +5770,7 @@ com.example.umcflo:style/Widget.MaterialComponents.Button.OutlinedButton.Icon = com.example.umcflo:dimen/mtrl_snackbar_message_margin_horizontal = 0x7f0602f6 com.example.umcflo:anim/m3_motion_fade_enter = 0x7f010023 com.example.umcflo:attr/badgeWithTextHeight = 0x7f03005e +com.example.umcflo:id/sign_up_hide_password_check_iv = 0x7f0802de com.example.umcflo:style/ThemeOverlay.MaterialComponents.Dialog = 0x7f1102cf com.example.umcflo:attr/flow_lastVerticalBias = 0x7f0301fb com.example.umcflo:dimen/notification_top_pad = 0x7f06031b @@ -5865,6 +5928,7 @@ com.example.umcflo:attr/thumbStrokeWidth = 0x7f030481 com.example.umcflo:style/ThemeOverlay.Material3.Dark.ActionBar = 0x7f110296 com.example.umcflo:attr/actionModeWebSearchDrawable = 0x7f030020 com.example.umcflo:color/m3_sys_color_light_on_primary = 0x7f0501dd +com.example.umcflo:drawable/btn_editbar_delete = 0x7f07015f com.example.umcflo:dimen/abc_action_button_min_width_overflow_material = 0x7f06000f com.example.umcflo:attr/layout_constraintGuide_end = 0x7f03028d com.example.umcflo:attr/colorOnPrimaryFixedVariant = 0x7f03010d @@ -5935,6 +5999,7 @@ com.example.umcflo:string/searchview_navigation_content_description = 0x7f1000a8 com.example.umcflo:attr/badgeShapeAppearanceOverlay = 0x7f030056 com.example.umcflo:macro/m3_comp_radio_button_disabled_selected_icon_color = 0x7f0c00d6 com.example.umcflo:drawable/m3_tabs_background = 0x7f070104 +com.example.umcflo:id/login_address_underscore_view = 0x7f0802c3 com.example.umcflo:animator/mtrl_fab_show_motion_spec = 0x7f02001f com.example.umcflo:dimen/abc_dialog_fixed_width_major = 0x7f06001e com.example.umcflo:style/Widget.MaterialComponents.AutoCompleteTextView.OutlinedBox.Dense = 0x7f1103f4 diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/symbol_list_with_package_name/debug/processDebugResources/package-aware-r.txt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/symbol_list_with_package_name/debug/processDebugResources/package-aware-r.txt" index 75019fa..5eda739 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/symbol_list_with_package_name/debug/processDebugResources/package-aware-r.txt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/intermediates/symbol_list_with_package_name/debug/processDebugResources/package-aware-r.txt" @@ -3033,6 +3033,11 @@ drawable btn_checkbox_checked_mtrl drawable btn_checkbox_checked_to_unchecked_mtrl_animation drawable btn_checkbox_unchecked_mtrl drawable btn_checkbox_unchecked_to_checked_mtrl_animation +drawable btn_editbar_addplaylist +drawable btn_editbar_delete +drawable btn_editbar_download +drawable btn_editbar_mylist +drawable btn_editbar_play drawable btn_input_password drawable btn_input_password_off drawable btn_main_arrow_more @@ -3575,11 +3580,33 @@ id locker_login_tv id locker_music_album_rv id locker_play_all_img_iv id locker_play_all_tv +id locker_savedSong_recyclerView id locker_select_all_img_iv id locker_select_all_tv id locker_title_tv +id login_address_underscore_view +id login_apple_login_iv +id login_at_sign_tv +id login_close_iv +id login_direct_input_et +id login_division_tv +id login_email_list_iv +id login_find_id_tv +id login_find_password_tv +id login_flo_logo_iv +id login_hide_password_iv +id login_id_et +id login_id_underscore_view +id login_kakako_login_iv +id login_naver_login_iv +id login_password_et +id login_password_underscore_view +id login_phone_number_login_layout +id login_sign_in_btn +id login_sign_up_tv +id login_social_login_layout +id login_t_world_login_layout id lookFragment -id lower_ib id lyrics_01_iv id m3_side_sheet id mainMiniplayerSingerTv @@ -3649,7 +3676,6 @@ id mtrl_picker_text_input_range_start id mtrl_picker_title_text id mtrl_view_tag_bottom_padding id multiply -id music_title_tv id navigation_bar_item_active_indicator_view id navigation_bar_item_icon_container id navigation_bar_item_icon_view @@ -3701,7 +3727,6 @@ id pathRelative id peekHeight id percent id pin -id player_like_iv id player_like_iv_layout id player_unlike_iv id plus_ib @@ -3754,8 +3779,25 @@ id shortcut id showCustom id showHome id showTitle +id sign_up_address_underscore_view +id sign_up_at_sign_tv +id sign_up_direct_input_et +id sign_up_email_error_tv +id sign_up_email_list_iv +id sign_up_hide_password_check_iv +id sign_up_hide_password_iv +id sign_up_id_et +id sign_up_id_underscore_view +id sign_up_loading_pb +id sign_up_name_et +id sign_up_name_underscore_view +id sign_up_password_check_et +id sign_up_password_check_underscore_view +id sign_up_password_et +id sign_up_password_underscore_view +id sign_up_sign_up_btn +id sign_up_sign_up_tv id sin -id singer_name_tv id skipCollapsed id skipped id slide @@ -3763,16 +3805,18 @@ id snackbar_action id snackbar_text id snap id snapMargins -id song_album_IU_iv +id song_album_iv id song_all_listen_iv id song_all_listen_tv id song_all_select_iv id song_all_select_tv id song_celebrity_layout id song_coin_layout +id song_down_ib id song_end_time_tv id song_flu_layout id song_lalac_layout +id song_like_iv id song_list_order_01_tv id song_list_order_02_tv id song_list_order_03_tv @@ -3800,6 +3844,7 @@ id song_music_title_03_tv id song_music_title_04_tv id song_music_title_05_tv id song_music_title_06_tv +id song_music_title_tv id song_next_iv id song_pause_iv id song_play_01_iv @@ -3819,6 +3864,7 @@ id song_singer_name_03_tv id song_singer_name_04_tv id song_singer_name_05_tv id song_singer_name_06_tv +id song_singer_name_tv id song_singer_plus_iv id song_spring_layout id song_start_time_tv @@ -3846,6 +3892,7 @@ id stretch id submenuarrow id submit_area id supportScrollUp +id switchRV id tabMode id tag_accessibility_actions id tag_accessibility_clickable_spans @@ -4046,7 +4093,9 @@ layout abc_search_dropdown_item_icons_2line layout abc_search_view layout abc_select_dialog_material layout abc_tooltip +layout activity_login layout activity_main +layout activity_sign_up layout activity_song layout activity_splash layout custom_dialog @@ -4073,6 +4122,7 @@ layout fragment_locker layout fragment_locker_savedalbum layout fragment_locker_savedsong layout fragment_look +layout fragment_music_file layout fragment_pannel layout fragment_search layout fragment_song @@ -4146,7 +4196,17 @@ menu bottom_nav_menu mipmap ic_launcher mipmap ic_launcher_round plurals mtrl_badge_content_description +raw music_bboom +raw music_boy +raw music_butter +raw music_flu +raw music_fool raw music_lilac +raw music_lovedive +raw music_mylove +raw music_nakka +raw music_next +raw music_nextlevel string _2012_07_03 string abc_action_bar_home_description string abc_action_bar_up_description diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab" index c166c84..cacd10f 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream" index 9d9183e..fb87c7f 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len" index feee11e..98a7b60 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len" index 6a294aa..b8872cd 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at" index 9c4450e..9507ccc 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i" index 87aef7f..93baf02 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab" index 4aabc3b..ea9e6ea 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream" index e30e2fb..028adda 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len" index 49a37b3..afffdf2 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len" index b94f48d..86c9c3e 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at" index c93f69b..15b172d 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i" index 8fb0207..1851f64 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab" index 8264863..5bcef5b 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream" index e30e2fb..028adda 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len" index 49a37b3..afffdf2 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len" index b94f48d..86c9c3e 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at" index 18ea4ff..7ed8381 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i" index 8fb0207..1851f64 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab" index 82a71f6..c2214fe 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream" index 1970285..1cd19c2 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len" index b80c096..fcbfe71 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len" index 1b7c1f8..b4da131 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at" index 0fb56a3..6722a65 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i" index ff9ceec..c938e17 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab" index 17a2f00..a247c77 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream" index 1e75428..ead43b1 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream.len" index 91ce7f2..e3f1394 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.keystream.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.len" index 385642d..c14ff15 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.values.at" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.values.at" index cc82793..cfba67c 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.values.at" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.values.at" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i" index dcd4c07..aed34c8 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/java-sources-proto-map.tab_i" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab" index 755b63a..39c1b89 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream" index f532973..45cf623 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len" index 9b6aee9..a49acfa 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len" index 575d132..a123325 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at" index 8fd19b9..04d2afb 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i" index 8e919ce..58984ff 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab" index 97cb625..b48ba56 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream" index ce290e5..c4df893 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len" index 245e8b5..7a10636 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len" index b287d95..a604e7e 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at" index c8230de..4bb35c4 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i" index ab1a8c0..48fef71 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab" index 0ec9a6e..d475358 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream" index 03a9b81..e8c0b69 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len" index 330ecdf..cee4851 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len" index fa606b6..6f677df 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at" index 573bae6..e3cd3f5 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i" index 39568b6..eaa345e 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab" index d8055cb..79627c6 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream" index f3feb42..2b192cc 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len" index af1da89..622158a 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len" index b287d95..bff9925 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at" index 3433e2f..3b40049 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i" index 1c6ce6d..25c2f3a 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab" index 009ab27..4723b6f 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab" @@ -1,2 +1,2 @@ -66 +88 0 \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab" index 8dacdca..b6672da 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream" index 3598e51..8064e5e 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len" index feee11e..98a7b60 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len" index 6a294aa..b8872cd 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at" index aa43c2c..b8f062e 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i" index 88b7287..4e2d629 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab" index 5f98be1..accdb2b 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream" index 3e48931..c2ea9e6 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len" index 5f1f7d5..798082e 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len" index 96571e7..be2ce70 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at" index ae4ce0f..79d9078 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i" index 286e36b..517e009 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab" index 8b87b3e..6928650 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream" index 7383bde..e5e3464 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len" index ace9748..715e694 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len" index 070c482..b638a4a 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values" index 3b60c37..b543186 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at" index b7db30f..63ecc33 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s" index c9f0650..f9176c9 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s" @@ -1 +1 @@ -̵ߢϹʄ}^\עٹD’ș \ No newline at end of file +Ŏ݅؜\IօFԜ+6ZS@f+ߘ?Һ./ \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i" index 8720194..112635e 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin" index ac3766a..4880360 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin" index 1ff3c66..fb654ec 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/classpath-snapshot/shrunk-classpath-snapshot.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin" index 777bf29..5f46133 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/outputs/logs/manifest-merger-debug-report.txt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/outputs/logs/manifest-merger-debug-report.txt" index 42a419e..1a3cf77 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/outputs/logs/manifest-merger-debug-report.txt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/outputs/logs/manifest-merger-debug-report.txt" @@ -1,10 +1,11 @@ -- Merging decision tree log --- manifest -ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:2:1-32:12 -INJECTED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:2:1-32:12 -INJECTED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:2:1-32:12 -INJECTED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:2:1-32:12 +ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:2:1-34:12 +INJECTED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:2:1-34:12 +INJECTED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:2:1-34:12 +INJECTED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:2:1-34:12 MERGED from [androidx.databinding:viewbinding:8.3.0] C:\Users\sangj\.gradle\caches\transforms-3\d0cc2ba07cc1a51ca5e66f2701b86679\transformed\viewbinding-8.3.0\AndroidManifest.xml:2:1-7:12 +MERGED from [androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:17:1-31:12 MERGED from [com.google.android.material:material:1.12.0] C:\Users\sangj\.gradle\caches\transforms-3\8c6e71333fe2aed7ac5ef9137e285269\transformed\material-1.12.0\AndroidManifest.xml:17:1-24:12 MERGED from [androidx.constraintlayout:constraintlayout:2.1.4] C:\Users\sangj\.gradle\caches\transforms-3\ddf324b6a45754fc446fc6eab33ec636\transformed\constraintlayout-2.1.4\AndroidManifest.xml:2:1-11:12 MERGED from [androidx.appcompat:appcompat-resources:1.6.1] C:\Users\sangj\.gradle\caches\transforms-3\e0b36974138b4f555dc681ab61bd7cef\transformed\appcompat-resources-1.6.1\AndroidManifest.xml:17:1-22:12 @@ -35,6 +36,9 @@ MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.6.2] C:\Users\sangj\.g MERGED from [androidx.lifecycle:lifecycle-runtime:2.6.2] C:\Users\sangj\.gradle\caches\transforms-3\45617d0db468f8d53a3937da11d742dd\transformed\lifecycle-runtime-2.6.2\AndroidManifest.xml:2:1-7:12 MERGED from [androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2] C:\Users\sangj\.gradle\caches\transforms-3\bfecaebf84eb07da35698e85c53e0473\transformed\lifecycle-viewmodel-savedstate-2.6.2\AndroidManifest.xml:17:1-22:12 MERGED from [androidx.savedstate:savedstate:1.2.1] C:\Users\sangj\.gradle\caches\transforms-3\fa12240bf32b116bab2be3fd2087a5f7\transformed\savedstate-1.2.1\AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.arch.core:core-runtime:2.2.0] C:\Users\sangj\.gradle\caches\transforms-3\fb953d4e36c118eb086d73b35b68b69a\transformed\core-runtime-2.2.0\AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.sqlite:sqlite-framework:2.4.0] C:\Users\sangj\.gradle\caches\transforms-3\9bfec0c6661302fba0b1ec4a95ff58d8\transformed\sqlite-framework-2.4.0\AndroidManifest.xml:17:1-22:12 +MERGED from [androidx.sqlite:sqlite:2.4.0] C:\Users\sangj\.gradle\caches\transforms-3\76aa7fb7878c5ba2b61daf425809b90f\transformed\sqlite-2.4.0\AndroidManifest.xml:17:1-22:12 MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\a25d4778bdd238569299217859e2c611\transformed\cursoradapter-1.0.0\AndroidManifest.xml:17:1-22:12 MERGED from [androidx.cardview:cardview:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\44f2e44cbbbd3053723086f6aa1a7560\transformed\cardview-1.0.0\AndroidManifest.xml:17:1-22:12 MERGED from [androidx.profileinstaller:profileinstaller:1.3.0] C:\Users\sangj\.gradle\caches\transforms-3\0a1c478fb24ed85ca546b541adb89d8b\transformed\profileinstaller-1.3.0\AndroidManifest.xml:17:1-55:12 @@ -42,7 +46,6 @@ MERGED from [androidx.startup:startup-runtime:1.1.1] C:\Users\sangj\.gradle\cach MERGED from [androidx.tracing:tracing:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\d2034e131b8bae6b9ba530e5c79a500b\transformed\tracing-1.0.0\AndroidManifest.xml:17:1-24:12 MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\583c3d9eeaed8bf280fdc01cd78d45e6\transformed\interpolator-1.0.0\AndroidManifest.xml:17:1-22:12 MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] C:\Users\sangj\.gradle\caches\transforms-3\1d166331551c4fd0df57d080d76b38de\transformed\versionedparcelable-1.1.1\AndroidManifest.xml:17:1-27:12 -MERGED from [androidx.arch.core:core-runtime:2.2.0] C:\Users\sangj\.gradle\caches\transforms-3\fb953d4e36c118eb086d73b35b68b69a\transformed\core-runtime-2.2.0\AndroidManifest.xml:17:1-22:12 MERGED from [androidx.documentfile:documentfile:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\a817e83e39df36bfbaf9b5fb2cd56240\transformed\documentfile-1.0.0\AndroidManifest.xml:17:1-22:12 MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\c17d96c23a9a75bfc2cbbd51435e2b8c\transformed\localbroadcastmanager-1.0.0\AndroidManifest.xml:17:1-22:12 MERGED from [androidx.print:print:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\6962bae23e2af9a19e63c59df9040255\transformed\print-1.0.0\AndroidManifest.xml:17:1-22:12 @@ -58,8 +61,10 @@ MERGED from [androidx.annotation:annotation-experimental:1.4.0] C:\Users\sangj\. xmlns:android ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:2:11-69 application -ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:5:5-30:19 -INJECTED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:5:5-30:19 +ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:5:5-32:19 +INJECTED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:5:5-32:19 +MERGED from [androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:23:5-29:19 +MERGED from [androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:23:5-29:19 MERGED from [com.google.android.material:material:1.12.0] C:\Users\sangj\.gradle\caches\transforms-3\8c6e71333fe2aed7ac5ef9137e285269\transformed\material-1.12.0\AndroidManifest.xml:22:5-20 MERGED from [com.google.android.material:material:1.12.0] C:\Users\sangj\.gradle\caches\transforms-3\8c6e71333fe2aed7ac5ef9137e285269\transformed\material-1.12.0\AndroidManifest.xml:22:5-20 MERGED from [androidx.constraintlayout:constraintlayout:2.1.4] C:\Users\sangj\.gradle\caches\transforms-3\ddf324b6a45754fc446fc6eab33ec636\transformed\constraintlayout-2.1.4\AndroidManifest.xml:9:5-20 @@ -116,16 +121,26 @@ category#android.intent.category.LAUNCHER ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:22:17-77 android:name ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:22:27-74 +activity#com.example.umcflo.LoginActivity +ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:25:5-26:45 + android:name + ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:26:13-42 +activity#com.example.umcflo.SignUpActivity +ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:27:9-28:46 + android:name + ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:28:13-43 activity#com.example.umcflo.SongActivity -ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:27:9-28:62 +ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:30:5-31:44 android:name - ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:28:13-59 + ADDED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml:31:13-41 uses-sdk INJECTED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml reason: use-sdk injection requested INJECTED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml INJECTED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml MERGED from [androidx.databinding:viewbinding:8.3.0] C:\Users\sangj\.gradle\caches\transforms-3\d0cc2ba07cc1a51ca5e66f2701b86679\transformed\viewbinding-8.3.0\AndroidManifest.xml:5:5-44 MERGED from [androidx.databinding:viewbinding:8.3.0] C:\Users\sangj\.gradle\caches\transforms-3\d0cc2ba07cc1a51ca5e66f2701b86679\transformed\viewbinding-8.3.0\AndroidManifest.xml:5:5-44 +MERGED from [androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:21:5-44 +MERGED from [androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:21:5-44 MERGED from [com.google.android.material:material:1.12.0] C:\Users\sangj\.gradle\caches\transforms-3\8c6e71333fe2aed7ac5ef9137e285269\transformed\material-1.12.0\AndroidManifest.xml:20:5-44 MERGED from [com.google.android.material:material:1.12.0] C:\Users\sangj\.gradle\caches\transforms-3\8c6e71333fe2aed7ac5ef9137e285269\transformed\material-1.12.0\AndroidManifest.xml:20:5-44 MERGED from [androidx.constraintlayout:constraintlayout:2.1.4] C:\Users\sangj\.gradle\caches\transforms-3\ddf324b6a45754fc446fc6eab33ec636\transformed\constraintlayout-2.1.4\AndroidManifest.xml:5:5-7:41 @@ -186,6 +201,12 @@ MERGED from [androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2] C:\Users\s MERGED from [androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2] C:\Users\sangj\.gradle\caches\transforms-3\bfecaebf84eb07da35698e85c53e0473\transformed\lifecycle-viewmodel-savedstate-2.6.2\AndroidManifest.xml:20:5-44 MERGED from [androidx.savedstate:savedstate:1.2.1] C:\Users\sangj\.gradle\caches\transforms-3\fa12240bf32b116bab2be3fd2087a5f7\transformed\savedstate-1.2.1\AndroidManifest.xml:20:5-44 MERGED from [androidx.savedstate:savedstate:1.2.1] C:\Users\sangj\.gradle\caches\transforms-3\fa12240bf32b116bab2be3fd2087a5f7\transformed\savedstate-1.2.1\AndroidManifest.xml:20:5-44 +MERGED from [androidx.arch.core:core-runtime:2.2.0] C:\Users\sangj\.gradle\caches\transforms-3\fb953d4e36c118eb086d73b35b68b69a\transformed\core-runtime-2.2.0\AndroidManifest.xml:20:5-44 +MERGED from [androidx.arch.core:core-runtime:2.2.0] C:\Users\sangj\.gradle\caches\transforms-3\fb953d4e36c118eb086d73b35b68b69a\transformed\core-runtime-2.2.0\AndroidManifest.xml:20:5-44 +MERGED from [androidx.sqlite:sqlite-framework:2.4.0] C:\Users\sangj\.gradle\caches\transforms-3\9bfec0c6661302fba0b1ec4a95ff58d8\transformed\sqlite-framework-2.4.0\AndroidManifest.xml:20:5-44 +MERGED from [androidx.sqlite:sqlite-framework:2.4.0] C:\Users\sangj\.gradle\caches\transforms-3\9bfec0c6661302fba0b1ec4a95ff58d8\transformed\sqlite-framework-2.4.0\AndroidManifest.xml:20:5-44 +MERGED from [androidx.sqlite:sqlite:2.4.0] C:\Users\sangj\.gradle\caches\transforms-3\76aa7fb7878c5ba2b61daf425809b90f\transformed\sqlite-2.4.0\AndroidManifest.xml:20:5-44 +MERGED from [androidx.sqlite:sqlite:2.4.0] C:\Users\sangj\.gradle\caches\transforms-3\76aa7fb7878c5ba2b61daf425809b90f\transformed\sqlite-2.4.0\AndroidManifest.xml:20:5-44 MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\a25d4778bdd238569299217859e2c611\transformed\cursoradapter-1.0.0\AndroidManifest.xml:20:5-44 MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\a25d4778bdd238569299217859e2c611\transformed\cursoradapter-1.0.0\AndroidManifest.xml:20:5-44 MERGED from [androidx.cardview:cardview:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\44f2e44cbbbd3053723086f6aa1a7560\transformed\cardview-1.0.0\AndroidManifest.xml:20:5-44 @@ -200,8 +221,6 @@ MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\sangj\.gradle\ca MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\583c3d9eeaed8bf280fdc01cd78d45e6\transformed\interpolator-1.0.0\AndroidManifest.xml:20:5-44 MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] C:\Users\sangj\.gradle\caches\transforms-3\1d166331551c4fd0df57d080d76b38de\transformed\versionedparcelable-1.1.1\AndroidManifest.xml:20:5-22:41 MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] C:\Users\sangj\.gradle\caches\transforms-3\1d166331551c4fd0df57d080d76b38de\transformed\versionedparcelable-1.1.1\AndroidManifest.xml:20:5-22:41 -MERGED from [androidx.arch.core:core-runtime:2.2.0] C:\Users\sangj\.gradle\caches\transforms-3\fb953d4e36c118eb086d73b35b68b69a\transformed\core-runtime-2.2.0\AndroidManifest.xml:20:5-44 -MERGED from [androidx.arch.core:core-runtime:2.2.0] C:\Users\sangj\.gradle\caches\transforms-3\fb953d4e36c118eb086d73b35b68b69a\transformed\core-runtime-2.2.0\AndroidManifest.xml:20:5-44 MERGED from [androidx.documentfile:documentfile:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\a817e83e39df36bfbaf9b5fb2cd56240\transformed\documentfile-1.0.0\AndroidManifest.xml:20:5-44 MERGED from [androidx.documentfile:documentfile:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\a817e83e39df36bfbaf9b5fb2cd56240\transformed\documentfile-1.0.0\AndroidManifest.xml:20:5-44 MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] C:\Users\sangj\.gradle\caches\transforms-3\c17d96c23a9a75bfc2cbbd51435e2b8c\transformed\localbroadcastmanager-1.0.0\AndroidManifest.xml:20:5-44 @@ -214,6 +233,16 @@ MERGED from [androidx.annotation:annotation-experimental:1.4.0] C:\Users\sangj\. INJECTED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml android:minSdkVersion INJECTED from C:\Users\sangj\AndroidStudioProjects\UMCflo\app\src\main\AndroidManifest.xml +service#androidx.room.MultiInstanceInvalidationService +ADDED from [androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:24:9-28:63 + android:exported + ADDED from [androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:27:13-37 + tools:ignore + ADDED from [androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:28:13-60 + android:directBootAware + ADDED from [androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:26:13-43 + android:name + ADDED from [androidx.room:room-runtime:2.6.0] C:\Users\sangj\.gradle\caches\transforms-3\1b46a300e946dd3426a8f4ebf9281eed\transformed\room-runtime-2.6.0\AndroidManifest.xml:25:13-74 provider#androidx.startup.InitializationProvider ADDED from [androidx.emoji2:emoji2:1.2.0] C:\Users\sangj\.gradle\caches\transforms-3\1f12b346925ae0dccc052cd3dd0b71cd\transformed\emoji2-1.2.0\AndroidManifest.xml:24:9-32:20 MERGED from [androidx.lifecycle:lifecycle-process:2.6.2] C:\Users\sangj\.gradle\caches\transforms-3\1b60d9b1479e1620ea7a73a3e70cb116\transformed\lifecycle-process-2.6.2\AndroidManifest.xml:24:9-32:20 diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin" index 2b8daac..6c94224 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/AlbumFragment.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/AlbumFragment.class" index 66155c7..76110ff 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/AlbumFragment.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/AlbumFragment.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/AlbumVPAdapter.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/AlbumVPAdapter.class" index af17ea3..a2bf5a8 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/AlbumVPAdapter.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/AlbumVPAdapter.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/BannerFragment.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/BannerFragment.class" index cbdf8c1..8487546 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/BannerFragment.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/BannerFragment.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/BannerVPAdapter.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/BannerVPAdapter.class" index a29ccd2..fb1dd88 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/BannerVPAdapter.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/BannerVPAdapter.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/DetailFragment.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/DetailFragment.class" index faa5a3d..831c367 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/DetailFragment.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/DetailFragment.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/HomeFragment$autoSlide$1.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/HomeFragment$autoSlide$1.class" index c553379..7b050d7 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/HomeFragment$autoSlide$1.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/HomeFragment$autoSlide$1.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/HomeFragment.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/HomeFragment.class" index 9dd37ea..c6831da 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/HomeFragment.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/HomeFragment.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/LockerFragment.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/LockerFragment.class" index 892d684..fd5f750 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/LockerFragment.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/LockerFragment.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/LockerVPAdapter.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/LockerVPAdapter.class" index 5d1c931..ab63d3c 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/LockerVPAdapter.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/LockerVPAdapter.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/LookFragment.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/LookFragment.class" index 9101892..120083d 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/LookFragment.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/LookFragment.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/MainActivity.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/MainActivity.class" index d92ffb5..457b362 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/MainActivity.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/MainActivity.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/PannelFragment.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/PannelFragment.class" index 9d47b9a..5e6ddc6 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/PannelFragment.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/PannelFragment.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/PannelVpAdapter.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/PannelVpAdapter.class" index 6607eb1..fa8324f 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/PannelVpAdapter.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/PannelVpAdapter.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SavedAlbumFragment.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SavedAlbumFragment.class" index 5c7453f..236265c 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SavedAlbumFragment.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SavedAlbumFragment.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SavedSongFragment.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SavedSongFragment.class" index 51c9f8b..f7dbbc8 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SavedSongFragment.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SavedSongFragment.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SearchFragment.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SearchFragment.class" index 2febcbc..54f4cf2 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SearchFragment.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SearchFragment.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/Song.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/Song.class" index 1733171..3767093 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/Song.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/Song.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SongActivity$Timer.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SongActivity$Timer.class" index 4f7c099..964a01f 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SongActivity$Timer.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SongActivity$Timer.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SongActivity.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SongActivity.class" index 1c5024f..20bfab0 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SongActivity.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SongActivity.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SongFragment.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SongFragment.class" index 4a8bb7c..01a6d8b 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SongFragment.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SongFragment.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SplashActivity.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SplashActivity.class" index 054e4a7..129ffac 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SplashActivity.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/SplashActivity.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/VideoFragment.class" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/VideoFragment.class" index 494cafb..44c48c9 100644 Binary files "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/VideoFragment.class" and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/build/tmp/kotlin-classes/debug/com/example/umcflo/VideoFragment.class" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/AndroidManifest.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/AndroidManifest.xml" index 2cdaa9c..26fcc6e 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/AndroidManifest.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/AndroidManifest.xml" @@ -1,5 +1,6 @@ @@ -22,11 +23,13 @@ - - + + android:name=".ui.signup.SignUpActivity" /> + \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/Album.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/Album.kt" index d213987..73f1a2c 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/Album.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/Album.kt" @@ -1,8 +1,12 @@ package com.example.umcflo +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "AlbumTable") data class Album( - var title : String? = "", - var singer : String? = "", - var coverImage : Int? = null, - var songs: ArrayList? = null // 앨범 수록곡 -) + @PrimaryKey(autoGenerate = false) var id: Int = 0, + var title: String? = "", + var singer: String? = "", + var coverImg: Int? = null +) \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/AlbumDao.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/AlbumDao.kt" new file mode 100644 index 0000000..9bed871 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/AlbumDao.kt" @@ -0,0 +1,37 @@ +package com.example.umcflo + +import androidx.room.Dao +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Update + +@Dao +interface AlbumDao { + @Insert + fun insert(album: Album) + + @Update + fun update(album: Album) + + @Delete + fun delete(album: Album) + + @Query("SELECT * FROM AlbumTable") // 테이블의 모든 값을 가져와라 + fun getAlbums(): List + + @Query("SELECT * FROM AlbumTable WHERE id = :id") + fun getAlbum(id: Int): Album + + @Insert + fun likeAlbum(like : Like) + + @Query("select id from LikeTable where userId =:userId and albumId = :albumId") + fun isLikedAlbum(userId : Int, albumId : Int) : Int? + + @Query("delete from LikeTable where userId =:userId and albumId = :albumId") + fun dislikedAlbum(userId : Int, albumId : Int) + + @Query("select at.* from LikeTable as lt left join AlbumTable as at on lt.albumId = at.id where lt.userId = :userId") + fun getLikedAlbums(userId : Int) : List +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/AlbumFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/AlbumFragment.kt" index f272991..bf85593 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/AlbumFragment.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/AlbumFragment.kt" @@ -4,6 +4,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import com.example.umcflo.databinding.FragmentAlbumBinding import com.google.android.material.tabs.TabLayoutMediator @@ -14,6 +15,7 @@ class AlbumFragment : Fragment() { private var gson: Gson = Gson() private val information = arrayListOf("수록곡", "상세정보", "영상") //사용할 탭의 텍스트 + private var isLiked : Boolean = false override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -26,7 +28,9 @@ class AlbumFragment : Fragment() { val albumToJson = arguments?.getString("album") val album = gson.fromJson(albumToJson, Album::class.java) + isLiked = isLikedAlbum(album.id) setInit(album) + setOnClickListener(album) binding.albumBackIv.setOnClickListener { (context as MainActivity).supportFragmentManager.beginTransaction() @@ -43,9 +47,51 @@ class AlbumFragment : Fragment() { } private fun setInit(album : Album) { - binding.albumAlbumIv.setImageResource(album.coverImage!!) + binding.albumAlbumIv.setImageResource(album.coverImg!!) binding.albumMusicTitleTv.text = album.title.toString() binding.albumSingerNameTv.text = album.singer.toString() } + private fun getJwt() : Int { + val spf = requireActivity().getSharedPreferences("auth", AppCompatActivity.MODE_PRIVATE) + return spf.getInt("jwt", 0) + } + + private fun likeAlbum(userId : Int, albumId : Int) { + val songDB = SongDatabase.getInstance(requireActivity())!! + val like = Like(userId, albumId) + + songDB.albumDao().likeAlbum(like) + } + + private fun isLikedAlbum(albumId : Int) : Boolean { + val songDB = SongDatabase.getInstance(requireActivity())!! + val userId = getJwt() + + val likeId : Int? = songDB.albumDao().isLikedAlbum(userId, albumId) + return likeId != null + } + + private fun disLikeAlbum(albumId : Int) { + val songDB = SongDatabase.getInstance(requireActivity())!! + val userId = getJwt() + + songDB.albumDao().dislikedAlbum(userId, albumId) + } + + private fun setOnClickListener(album : Album) { + val userId = getJwt() + binding.albumLikeIv.setOnClickListener { + if(isLiked) { + binding.albumLikeIv.setImageResource(R.drawable.ic_my_like_off) + disLikeAlbum(album.id) + } + + else { + binding.albumLikeIv.setImageResource((R.drawable.ic_my_like_on)) + likeAlbum(userId, album.id) + } + } + + } } \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/AlbumRVAdapter.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/AlbumRVAdapter.kt" index 2375142..e3b3d78 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/AlbumRVAdapter.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/AlbumRVAdapter.kt" @@ -66,7 +66,7 @@ class AlbumRVAdapter(private val albumList: ArrayList): RecyclerView.Adap fun bind(album: Album){ binding.itemAlbumTitleTv.text = album.title binding.itemAlbumSingerTv.text = album.singer - binding.itemAlbumCoverImgIv.setImageResource(album.coverImage!!) + binding.itemAlbumCoverImgIv.setImageResource(album.coverImg!!) } } diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/CommunicationInterface.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/CommunicationInterface.kt" index 6d35338..477ab85 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/CommunicationInterface.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/CommunicationInterface.kt" @@ -1,5 +1,7 @@ package com.example.umcflo +import com.example.umcflo.data.entities.Album + interface CommunicationInterface { fun sendData(album: Album) } diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/HomeFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/HomeFragment.kt" index bf5a9c7..aea070b 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/HomeFragment.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/HomeFragment.kt" @@ -3,6 +3,7 @@ package com.example.umcflo import android.os.Bundle import android.os.Handler import android.os.Looper +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -17,9 +18,11 @@ import java.util.TimerTask class HomeFragment : Fragment(), CommunicationInterface { lateinit var binding: FragmentHomeBinding + private val timer = Timer() private val handler = Handler(Looper.getMainLooper()) private var albumDatas = ArrayList() + private lateinit var songDB: SongDatabase override fun onCreateView( inflater: LayoutInflater, @@ -28,21 +31,16 @@ class HomeFragment : Fragment(), CommunicationInterface { ): View? { binding = FragmentHomeBinding.inflate(inflater, container, false) - albumDatas.apply { - add(Album("Butter", "방탄소년단 (BTS)", R.drawable.img_album_exp)) - add(Album("Lilac", "아이유 (IU)", R.drawable.img_album_exp2)) - add(Album("Next Level", "에스파 (AESPA)", R.drawable.img_album_exp3)) - add(Album("Boy with Luv", "방탄소년단 (BTS)", R.drawable.img_album_exp4)) - add(Album("BBoom BBoom", "모모랜드 (MOMOLAND)", R.drawable.img_album_exp5)) - add(Album("Weekend", "태연 (Tae Yeon)", R.drawable.img_album_exp6)) - } + songDB = SongDatabase.getInstance(requireContext())!! + albumDatas.addAll(songDB.albumDao().getAlbums()) + Log.d("albumlist", albumDatas.toString()) val albumRVAdapter = AlbumRVAdapter(albumDatas) binding.homeTodayMusicAlbumRv.adapter = albumRVAdapter - binding.homeTodayMusicAlbumRv.layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) + binding.homeTodayMusicAlbumRv.layoutManager = LinearLayoutManager(requireActivity(), LinearLayoutManager.HORIZONTAL, false) albumRVAdapter.setItemClickListener(object : AlbumRVAdapter.OnItemClickListener { - override fun onItemClick(album: Album) { + override fun onItemClick(album : Album) { changeToAlbumFragment(album) } @@ -61,16 +59,17 @@ class HomeFragment : Fragment(), CommunicationInterface { binding.homeBannerVp.adapter = bannerAdapter binding.homeBannerVp.orientation = ViewPager2.ORIENTATION_HORIZONTAL - val pannelAdapter = PannelVpAdapter(this) - pannelAdapter.addFragment(PannelFragment(R.drawable.img_first_album_default)) - pannelAdapter.addFragment(PannelFragment(R.drawable.skplanet_musicmate_sc0_2021_03_12_16_59_19)) - pannelAdapter.addFragment(PannelFragment(R.drawable._786635_719636_923)) + val pannelAdpater = PannelVpAdapter(this) + pannelAdpater.addFragment(PannelFragment(R.drawable.img_first_album_default)) + pannelAdpater.addFragment(PannelFragment(R.drawable.skplanet_musicmate_sc0_2021_03_12_16_59_19)) + pannelAdpater.addFragment(PannelFragment(R.drawable._786635_719636_923)) - binding.homePannelBackgroundIv.adapter = pannelAdapter + binding.homePannelBackgroundIv.adapter = pannelAdpater binding.homePannelBackgroundIv.orientation = ViewPager2.ORIENTATION_HORIZONTAL binding.indicator.setViewPager(binding.homePannelBackgroundIv) - autoSlide(pannelAdapter) + + autoSlide(pannelAdpater) return binding.root } @@ -102,14 +101,73 @@ class HomeFragment : Fragment(), CommunicationInterface { }, 3000, 3000) } + override fun sendData(album: Album) { if (activity is MainActivity) { val activity = activity as MainActivity activity.updateMainPlayerCl(album) } } + private fun inputDummyAlbums(){ + val songDB = SongDatabase.getInstance(requireActivity())!! + val songs = songDB.albumDao().getAlbums() + + if (songs.isNotEmpty()) return + + songDB.albumDao().insert( + Album( + 1, + "IU 5th Album 'LILAC'", + "아이유 (IU)", + R.drawable.img_album_exp2 + ) + ) + + songDB.albumDao().insert( + Album( + 2, + "Butter", + "방탄소년단 (BTS)", + R.drawable.img_album_exp + ) + ) + + songDB.albumDao().insert( + Album( + 3, + "iScreaM Vol.10: Next Level Remixes", + "에스파 (AESPA)", + R.drawable.img_album_exp3 + ) + ) + + songDB.albumDao().insert( + Album( + 4, + "Map of the Soul Persona", + "뮤직 보이 (Music Boy)", + R.drawable.img_album_exp4, + ) + ) + + + songDB.albumDao().insert( + Album( + 5, + "Great!", + "모모랜드 (MOMOLAND)", + R.drawable.img_album_exp5 + ) + ) + + val songDBData = songDB.albumDao().getAlbums() + Log.d("DB data", songDBData.toString()) + } } + + + //리사이클러 뷰를 위해 제거(Album data class) // binding.homePannelAlbumLilacIv.setOnClickListener { // @@ -150,4 +208,4 @@ class HomeFragment : Fragment(), CommunicationInterface { // (context as MainActivity).supportFragmentManager.beginTransaction().replace( // R.id.main_frm, albumFragment).commitAllowingStateLoss() // -// } +// } \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/Like.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/Like.kt" new file mode 100644 index 0000000..5fa082b --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/Like.kt" @@ -0,0 +1,12 @@ +package com.example.umcflo + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "LikeTable") +data class Like( + var userId : Int, + var albumId : Int +) { + @PrimaryKey(autoGenerate = true) var id : Int = 0 +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LockerAlbumRVAdapte.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LockerAlbumRVAdapte.kt" index 2dc846b..0011d73 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LockerAlbumRVAdapte.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LockerAlbumRVAdapte.kt" @@ -1,11 +1,18 @@ package com.example.umcflo +import android.annotation.SuppressLint +import android.util.Log +import android.util.SparseBooleanArray import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.example.umcflo.databinding.ItemLockerAlbumBinding -class LockerAlbumRVAdapter (private val albumList: ArrayList) : RecyclerView.Adapter() { +class LockerAlbumRVAdapter () : RecyclerView.Adapter() { + + private val switchStatus = SparseBooleanArray() + private val songs = ArrayList() + override fun onCreateViewHolder( parent: ViewGroup, viewType: Int @@ -17,30 +24,28 @@ class LockerAlbumRVAdapter (private val albumList: ArrayList) : RecyclerV } override fun onBindViewHolder(holder: LockerAlbumRVAdapter.ViewHolder, position: Int) { - holder.bind(albumList[position]) + holder.bind(songs[position]) - holder.itemView.setOnClickListener { - itemClickListener.onItemClick(albumList[position]) - } holder.binding.itemLockerAlbumMoreIv.setOnClickListener { - itemClickListener.onRemoveAlbum(position) + itemClickListener.onRemoveAlbum(songs[position].id) // 좋아요 취소로 업데이트하는 메서드 + removeSong(position) // 현재 화면에서 아이템을 제거 } + } - override fun getItemCount(): Int = albumList.size + override fun getItemCount(): Int = songs.size inner class ViewHolder(val binding: ItemLockerAlbumBinding): RecyclerView.ViewHolder(binding.root){ - fun bind(album: Album){ - binding.itemLockerAlbumTitleTv.text = album.title - binding.itemLockerAlbumSingerTv.text = album.singer - binding.itemLockerAlbumCoverImgIv.setImageResource(album.coverImage!!) + fun bind(song : Song){ + binding.itemLockerAlbumTitleTv.text = song.title + binding.itemLockerAlbumSingerTv.text = song.singer + binding.itemLockerAlbumCoverImgIv.setImageResource(song.coverImg!!) } } interface OnItemClickListener { - fun onItemClick(album : Album) - fun onRemoveAlbum(position: Int) + fun onRemoveAlbum(songId: Int) } private lateinit var itemClickListener : OnItemClickListener @@ -49,14 +54,17 @@ class LockerAlbumRVAdapter (private val albumList: ArrayList) : RecyclerV this.itemClickListener = onItemClickListener } - fun addItem(album: Album){ - albumList.add(album) + @SuppressLint("NotifyDataSetChanged") // 경고 무시 어노테이션 + fun addSongs(songs: ArrayList) { + this.songs.clear() + this.songs.addAll(songs) + notifyDataSetChanged() } - fun removeItem(position: Int){ - albumList.removeAt(position) + @SuppressLint("NotifyDataSetChanged") + private fun removeSong(position: Int){ + songs.removeAt(position) notifyDataSetChanged() } - -} \ No newline at end of file +} diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LockerFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LockerFragment.kt" index 2121cc3..bc2ea4c 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LockerFragment.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LockerFragment.kt" @@ -1,9 +1,11 @@ package com.example.umcflo +import android.content.Intent import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import com.example.umcflo.databinding.FragmentLockerBinding import com.google.android.material.tabs.TabLayoutMediator @@ -11,7 +13,7 @@ import com.google.android.material.tabs.TabLayoutMediator class LockerFragment : Fragment() { lateinit var binding: FragmentLockerBinding - private val information = arrayListOf("저장한 곡", "음악파일") + private val information = arrayListOf("저장한곡", "음악파일", "저장앨범") override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -27,7 +29,44 @@ class LockerFragment : Fragment() { }.attach() + binding.lockerLoginTv.setOnClickListener { + val intent = Intent(requireActivity(), LoginActivity::class.java) + startActivity(intent) + } return binding.root } + override fun onStart() { + super.onStart() + initViews() + } + private fun getJwt() : Int { + val spf = requireActivity().getSharedPreferences("auth", AppCompatActivity.MODE_PRIVATE) + return spf!!.getInt("jwt", 0) + } + + private fun initViews() { + val jwt : Int = getJwt() + if (jwt == 0) { + binding.lockerLoginTv.text="로그인" + binding.lockerLoginTv.setOnClickListener { + startActivity(Intent(requireActivity(), LoginActivity::class.java)) + } + } + + else { + binding.lockerLoginTv.text = "로그아웃" + binding.lockerLoginTv.setOnClickListener { + logout() + startActivity(Intent(requireActivity(), MainActivity::class.java)) + } + } + } + + private fun logout() { + val spf = activity?.getSharedPreferences("auth", AppCompatActivity.MODE_PRIVATE) + val editor = spf!!.edit() + editor.remove("jwt") + editor.apply() + } } \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LockerVPAdapter.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LockerVPAdapter.kt" index 3b18eb0..f41946b 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LockerVPAdapter.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LockerVPAdapter.kt" @@ -4,11 +4,12 @@ import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter class LockerVPAdapter(fragment : Fragment) : FragmentStateAdapter(fragment){ - override fun getItemCount(): Int = 2 + override fun getItemCount(): Int = 3 override fun createFragment(position: Int): Fragment { return when(position){ 0 -> SavedSongFragment() + 1 -> MusicFileFragment() else -> SavedAlbumFragment() } } diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LoginActivity.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LoginActivity.kt" new file mode 100644 index 0000000..128b750 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LoginActivity.kt" @@ -0,0 +1,64 @@ +package com.example.umcflo + +import android.content.Intent +import android.os.Bundle +import android.util.Log +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.example.umcflo.databinding.ActivityLoginBinding + +class LoginActivity : AppCompatActivity() { + + lateinit var binding : ActivityLoginBinding + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityLoginBinding.inflate(layoutInflater) + setContentView(binding.root) + + binding.loginSignUpTv.setOnClickListener { + val intent = Intent(this, SignUpActivity::class.java) + startActivity(intent) + } + binding.loginSignInBtn.setOnClickListener { + login() + } + } + private fun login() { + if (binding.loginIdEt.text.toString().isEmpty() || binding.loginDirectInputEt.text.toString().isEmpty()) { + Toast.makeText(this, "이메일을 입력해주세요", Toast.LENGTH_SHORT).show() + return + } + + if (binding.loginPasswordEt.text.toString().isEmpty()) { + Toast.makeText(this, "비밀번호를 입력해주세요", Toast.LENGTH_SHORT).show() + return + } + + val email : String = binding.loginIdEt.text.toString() + "@" + binding.loginDirectInputEt.text.toString() + val pwd : String = binding.loginPasswordEt.text.toString() + + val songDB = SongDatabase.getInstance(this)!! + val user = songDB.userDao().getUser(email, pwd) + + if (user != null) { + Log.d("LoginActivity", user.id.toString()) + saveJwt(user.id) + startMainActivity() + } else { + Toast.makeText(this, "회원 정보가 존재하지 않습니다", Toast.LENGTH_SHORT).show() + } + } + + private fun saveJwt(jwt : Int) { + val spf = getSharedPreferences("auth", MODE_PRIVATE) + val editor = spf.edit() + + editor.putInt("jwt", jwt) + editor.apply() + } + + private fun startMainActivity() { + val intent = Intent(this, MainActivity::class.java) + startActivity(intent) + } +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LookFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LookFragment.kt" index c92b431..7f22758 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LookFragment.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/LookFragment.kt" @@ -18,6 +18,8 @@ class LookFragment : Fragment() { ): View? { binding = FragmentLookBinding.inflate(inflater, container, false) + return binding.root } + } \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/MainActivity.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/MainActivity.kt" index 9d0b6e1..7afc68a 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/MainActivity.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/MainActivity.kt" @@ -10,11 +10,13 @@ import androidx.activity.result.contract.ActivityResultContracts import com.example.umcflo.databinding.ActivityMainBinding import com.google.gson.Gson + class MainActivity : AppCompatActivity() { - lateinit var activityResultLauncher: ActivityResultLauncher - lateinit var binding: ActivityMainBinding - private var song: Song = Song() - private var gson: Gson = Gson() + lateinit var activityResultLauncher:ActivityResultLauncher + lateinit var binding: ActivityMainBinding + private var song:Song = Song() + private var gson: Gson = Gson() + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -22,12 +24,12 @@ class MainActivity : AppCompatActivity() { binding = ActivityMainBinding.inflate(layoutInflater) setContentView(binding.root) + inputDummySongs() + inputDummyAlbums() initBottomNavigation() - // ActivityResultLauncher 초기화 - activityResultLauncher = registerForActivityResult( - ActivityResultContracts.StartActivityForResult() - ) { result -> + + activityResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> if (result.resultCode == RESULT_OK) { val data = result.data if (data != null) { @@ -38,32 +40,32 @@ class MainActivity : AppCompatActivity() { } } - // 미니 플레이어 클릭 리스너 설정 binding.mainPlayerCl.setOnClickListener { - val intent = Intent(this, SongActivity::class.java) - intent.putExtra("title", song.title) - intent.putExtra("singer", song.singer) - intent.putExtra("second", song.second) - intent.putExtra("playTime", song.playTime) - intent.putExtra("isPlaying", song.isPlaying) - intent.putExtra("music", song.music) + val editor = getSharedPreferences("song", MODE_PRIVATE).edit() + editor.putInt("songId", song.id) + editor.apply() + + val intent = Intent(this,SongActivity::class.java) activityResultLauncher.launch(intent) } + } - private fun initBottomNavigation() { + private fun initBottomNavigation(){ supportFragmentManager.beginTransaction() .replace(R.id.main_frm, HomeFragment()) .commitAllowingStateLoss() - binding.mainBnv.setOnItemSelectedListener { item -> + binding.mainBnv.setOnItemSelectedListener{ item -> when (item.itemId) { + R.id.homeFragment -> { supportFragmentManager.beginTransaction() .replace(R.id.main_frm, HomeFragment()) .commitAllowingStateLoss() return@setOnItemSelectedListener true } + R.id.lookFragment -> { supportFragmentManager.beginTransaction() .replace(R.id.main_frm, LookFragment()) @@ -87,29 +89,183 @@ class MainActivity : AppCompatActivity() { } } - private fun setMiniPlayer(song: Song) { + private fun setMiniPlayer(song: Song){ binding.mainMiniplayerTitleTv.text = song.title binding.mainMiniplayerSingerTv.text = song.singer - binding.mainMiniplayerProgressSb.progress = (song.second * 100000) / song.playTime + binding.mainMiniplayerProgressSb.progress = (song.second*100000)/song.playTime } - // activity 전환이 될 때는 onCreate가 아닌 start부터 시작 + //activity 전환이 될땐 onCreate가아닌 start부터 시작 override fun onStart() { super.onStart() - val sharedPreferences = getSharedPreferences("song", MODE_PRIVATE) // song은 sharedPreferences의 이름 - val songJson = sharedPreferences.getString("songData", null) // songData는 sharedPreferences 안에 데이터 +// val sharedPreferences = getSharedPreferences("song", MODE_PRIVATE) //song은 sharedPreferences의 이름 +// val songJson = sharedPreferences.getString("songData", null) //songData는 sharedPreferences안에 데이터 +// +// song = if(songJson == null){ //데이터 저장값이 없을때 디폴트값 +// Song("라일락", "아이유(IU)", 0, 60, false, "music_lilac") +// }else{ //songJson을 자바객체로 변환 +// gson.fromJson(songJson, Song::class.java) +// } +// setMiniPlayer(song) + + val sharedPreferences = getSharedPreferences("song", MODE_PRIVATE) + // songId는 SongActivity에서 onPause가 호출되었을 때 + // 재생 중이던 노래의 id(pk)이다. + val songId = sharedPreferences.getInt("songId", 0) + + // SongDatabase의 인스턴스를 가져온다. + val songDB = SongDatabase.getInstance(this)!! - song = if (songJson == null) { // 데이터 저장값이 없을 때 디폴트값 - Song("라일락", "아이유(IU)", 0, 60, false, "music_lilac") - } else { // songJson을 자바 객체로 변환 - gson.fromJson(songJson, Song::class.java) + song = if (songId == 0){ // 재생 중이던 노래가 없었으면 + songDB.songDao().getSong(1) + } else{ // 재생 중이던 노래가 있었으면 + songDB.songDao().getSong(songId) } - setMiniPlayer(song) + + Log.d("song ID", song.id.toString()) + setMiniPlayer(song) // song의 정보로 MiniPlayer를 setting } - fun updateMainPlayerCl(album: Album) { + + fun updateMainPlayerCl(album : Album) { binding.mainMiniplayerTitleTv.text = album.title binding.mainMiniplayerSingerTv.text = album.singer binding.mainMiniplayerProgressSb.progress = 0 } + + private fun inputDummySongs(){ + val songDB = SongDatabase.getInstance(this)!! + val songs = songDB.songDao().getSongs() + + if (songs.isNotEmpty()) return + + songDB.songDao().insert( + Song( + "Lilac", + "아이유 (IU)", + 0, + 200, + false, + "music_lilac", + R.drawable.img_album_exp2, + false, + ) + ) + + songDB.songDao().insert( + Song( + "Flu", + "아이유 (IU)", + 0, + 200, + false, + "music_flu", + R.drawable.img_album_exp2, + false, + ) + ) + + songDB.songDao().insert( + Song( + "Butter", + "방탄소년단 (BTS)", + 0, + 190, + false, + "music_butter", + R.drawable.img_album_exp, + false, + ) + ) + + songDB.songDao().insert( + Song( + "Next Level", + "에스파 (AESPA)", + 0, + 210, + false, + "music_next", + R.drawable.img_album_exp3, + false, + ) + ) + + + songDB.songDao().insert( + Song( + "Boy with Luv", + "music_boy", + 0, + 230, + false, + "music_lilac", + R.drawable.img_album_exp4, + false, + ) + ) + + + songDB.songDao().insert( + Song( + "BBoom BBoom", + "모모랜드 (MOMOLAND)", + 0, + 240, + false, + "music_bboom", + R.drawable.img_album_exp5, + false, + ) + ) + + val _songs = songDB.songDao().getSongs() + Log.d("DB data", _songs.toString()) + } + + private fun inputDummyAlbums() { + val songDB = SongDatabase.getInstance(this)!! + val albums = songDB.albumDao().getAlbums() + + if (albums.isNotEmpty()) return + + songDB.albumDao().insert( + Album( + 0, + "IU 5th Album 'LILAC'", "아이유 (IU)", R.drawable.img_album_exp2 + ) + ) + + songDB.albumDao().insert( + Album( + 1, + "Butter", "방탄소년단 (BTS)", R.drawable.img_album_exp + ) + ) + + songDB.albumDao().insert( + Album( + 2, + "iScreaM Vol.10 : Next Level Remixes", "에스파 (AESPA)", R.drawable.img_album_exp3 + ) + ) + + songDB.albumDao().insert( + Album( + 3, + "MAP OF THE SOUL : PERSONA", "방탄소년단 (BTS)", R.drawable.img_album_exp4 + ) + ) + + songDB.albumDao().insert( + Album( + 4, + "GREAT!", "모모랜드 (MOMOLAND)", R.drawable.img_album_exp5 + ) + ) + + } + } + + diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/MusicFileFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/MusicFileFragment.kt" new file mode 100644 index 0000000..4b622a3 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/MusicFileFragment.kt" @@ -0,0 +1,19 @@ +package com.example.umcflo + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.umcflo.databinding.FragmentMusicFileBinding + +class MusicFileFragment: Fragment() { + + lateinit var binding: FragmentMusicFileBinding + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + binding = FragmentMusicFileBinding.inflate(inflater, container, false) + + return binding.root + } +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SavedAlbumFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SavedAlbumFragment.kt" index f3a7947..96c5159 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SavedAlbumFragment.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SavedAlbumFragment.kt" @@ -1,14 +1,18 @@ package com.example.umcflo import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.LinearLayoutManager import com.example.umcflo.databinding.FragmentLockerSavedalbumBinding -class SavedAlbumFragment: Fragment() { +class SavedAlbumFragment : Fragment() { lateinit var binding: FragmentLockerSavedalbumBinding + lateinit var albumDB: SongDatabase override fun onCreateView( inflater: LayoutInflater, @@ -17,6 +21,38 @@ class SavedAlbumFragment: Fragment() { ): View? { binding = FragmentLockerSavedalbumBinding.inflate(inflater, container, false) + albumDB = SongDatabase.getInstance(requireContext())!! + return binding.root } + + override fun onStart() { + super.onStart() + initRecyclerview() + } + + private fun initRecyclerview(){ + binding.lockerSavedSongRecyclerView.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) + + val albumRVAdapter = SavedAlbumRVAdapter() + //리스너 객체 생성 및 전달 + + albumRVAdapter.setMyItemClickListener(object : SavedAlbumRVAdapter.MyItemClickListener{ + override fun onRemoveSong(songId: Int) { + albumDB.albumDao().getLikedAlbums(getJwt()) + } + }) + + binding.lockerSavedSongRecyclerView.adapter = albumRVAdapter + + albumRVAdapter.addAlbums(albumDB.albumDao().getLikedAlbums(getJwt()) as ArrayList) + } + + private fun getJwt() : Int { + val spf = activity?.getSharedPreferences("auth" , AppCompatActivity.MODE_PRIVATE) + val jwt = spf!!.getInt("jwt", 0) + Log.d("MAIN_ACT/GET_JWT", "jwt_token: $jwt") + + return jwt + } } \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SavedAlbumRVAdapter.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SavedAlbumRVAdapter.kt" new file mode 100644 index 0000000..714f199 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SavedAlbumRVAdapter.kt" @@ -0,0 +1,59 @@ +package com.example.umcflo + +import android.annotation.SuppressLint +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import com.example.umcflo.databinding.ItemLockerAlbumBinding + +class SavedAlbumRVAdapter (): RecyclerView.Adapter() { + private val albums = ArrayList() + + interface MyItemClickListener{ + fun onRemoveSong(songId: Int) + } + + private lateinit var mItemClickListener: MyItemClickListener + + fun setMyItemClickListener(itemClickListener: MyItemClickListener){ + mItemClickListener = itemClickListener + } + + override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): SavedAlbumRVAdapter.ViewHolder { + val binding: ItemLockerAlbumBinding = ItemLockerAlbumBinding.inflate(LayoutInflater.from(viewGroup.context), viewGroup, false) + + return ViewHolder(binding) + } + + override fun onBindViewHolder(holder: SavedAlbumRVAdapter.ViewHolder, position: Int) { + holder.bind(albums[position]) + holder.binding.itemLockerAlbumMoreIv.setOnClickListener { + mItemClickListener.onRemoveSong(albums[position].id) + removeSong(position) + } + } + + override fun getItemCount(): Int = albums.size + + @SuppressLint("NotifyDataSetChanged") + fun addAlbums(albums: ArrayList) { + this.albums.clear() + this.albums.addAll(albums) + + notifyDataSetChanged() + } + + fun removeSong(position: Int){ + albums.removeAt(position) + notifyDataSetChanged() + } + + inner class ViewHolder(val binding: ItemLockerAlbumBinding) : RecyclerView.ViewHolder(binding.root){ + fun bind(album: Album){ + binding.itemLockerAlbumCoverImgIv.setImageResource(album.coverImg!!) + binding.itemLockerAlbumTitleTv.text = album.title + binding.itemLockerAlbumSingerTv.text = album.singer + } + } + +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SavedSongFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SavedSongFragment.kt" index dae87ef..46c16ae 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SavedSongFragment.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SavedSongFragment.kt" @@ -9,8 +9,9 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.example.umcflo.databinding.FragmentLockerSavedsongBinding import com.google.gson.Gson -class SavedSongFragment: Fragment() { - private var albumDatas = ArrayList() +class SavedSongFragment : Fragment() { + + lateinit var songDB: SongDatabase lateinit var binding : FragmentLockerSavedsongBinding override fun onCreate(savedInstanceState: Bundle?) { @@ -21,42 +22,30 @@ class SavedSongFragment: Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentLockerSavedsongBinding.inflate(inflater, container, false) - albumDatas.apply { - add(Album("Butter", "방탄소년단 (BTS)", R.drawable.img_album_exp)) - add(Album("Lilac", "아이유 (IU)", R.drawable.img_album_exp2)) - add(Album("Next Level", "에스파 (AESPA)", R.drawable.img_album_exp3)) - add(Album("Boy with Luv", "방탄소년단 (BTS)", R.drawable.img_album_exp4)) - add(Album("BBoom BBoom", "모모랜드 (MOMOLAND)", R.drawable.img_album_exp5)) - add(Album("Weekend", "태연 (Tae Yeon)", R.drawable.img_album_exp6)) + songDB = SongDatabase.getInstance(requireContext())!! - } + return binding.root - val lockerAlbumRVAdapter = LockerAlbumRVAdapter(albumDatas) - binding.lockerMusicAlbumRv.adapter = lockerAlbumRVAdapter + } + + override fun onStart() { + super.onStart() + initRecyclerview() + } + + private fun initRecyclerview(){ binding.lockerMusicAlbumRv.layoutManager = LinearLayoutManager(requireActivity()) + val lockerAlbumRVAdapter = LockerAlbumRVAdapter() + lockerAlbumRVAdapter.setItemClickListener(object : LockerAlbumRVAdapter.OnItemClickListener { - override fun onItemClick(album: Album) { - changeAlbumFragment(album) - } - override fun onRemoveAlbum(position: Int) { - lockerAlbumRVAdapter.removeItem(position) + override fun onRemoveAlbum(songId: Int) { + songDB.songDao().updateIsLikeById(false, songId) } }) - return binding.root - } - private fun changeAlbumFragment(album: Album) { - (context as MainActivity).supportFragmentManager.beginTransaction() - .replace(R.id.main_frm, AlbumFragment().apply { - arguments = Bundle().apply { - val gson = Gson() - val albumToJson = gson.toJson(album) - putString("album", albumToJson) - } - }) - .commitAllowingStateLoss() + binding.lockerMusicAlbumRv.adapter = lockerAlbumRVAdapter + lockerAlbumRVAdapter.addSongs(songDB.songDao().getLikedSongs(true) as ArrayList) } } \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SignUpAcitivity.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SignUpAcitivity.kt" new file mode 100644 index 0000000..981314d --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SignUpAcitivity.kt" @@ -0,0 +1,53 @@ +package com.example.umcflo + +import android.os.Bundle +import android.util.Log +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.example.umcflo.databinding.ActivitySignUpBinding + +class SignUpActivity : AppCompatActivity() { + + lateinit var binding: ActivitySignUpBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivitySignUpBinding.inflate(layoutInflater) + setContentView(binding.root) + + binding.signUpSignUpBtn.setOnClickListener { + val signUpCompletion = signUp() + if(signUpCompletion) { + finish() + } + } + } + + private fun getUser() : User { + val email : String = binding.signUpIdEt.text.toString() + "@" + binding.signUpDirectInputEt.text.toString() + val pwd : String = binding.signUpPasswordEt.text.toString() + + return User(email, pwd) + } + + private fun signUp() : Boolean { + if(binding.signUpIdEt.text.toString().isEmpty() || binding.signUpDirectInputEt.text.toString().isEmpty()) { + Toast.makeText(this, "이메일 형식이 잘못되었습니다.", Toast.LENGTH_SHORT).show() + return false + } + + if(binding.signUpPasswordEt.text.toString() != binding.signUpPasswordCheckEt.text.toString()) { + Toast.makeText(this, "비밀번호가 일치하지 않습니다.", Toast.LENGTH_SHORT).show() + return false + } + + val userDB = SongDatabase.getInstance(this)!! + userDB.userDao().insert(getUser()) + + val user = userDB.userDao().getUsers() + Log.d("sign-up", user.toString()) + + Toast.makeText(this, "회원가입이 완료되었습니다.", Toast.LENGTH_SHORT).show() + return true + } +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/Song.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/Song.kt" index b36552c..8c5f9c3 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/Song.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/Song.kt" @@ -1,16 +1,20 @@ package com.example.umcflo -data class Song ( - val title: String = "", - val singer: String = "", +import androidx.room.Entity +import androidx.room.PrimaryKey + + +@Entity(tableName = "SongTable") +data class Song( + var title: String = "", + var singer: String = "", var second: Int = 0, var playTime: Int = 0, -<<<<<<< Updated upstream var isPlaying: Boolean = false, - - //어떤음악이 재생되어야하는지 알려주는 - var music: String = "" -======= - var isPlaying: Boolean = false ->>>>>>> Stashed changes -) \ No newline at end of file + var music: String = "", + var coverImg: Int? = null, + var isLike: Boolean = false, + val albumIdx : Int = 0 +){ + @PrimaryKey(autoGenerate = true) var id: Int = 0 +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SongActivity.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SongActivity.kt" index d9d9094..11e459c 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SongActivity.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SongActivity.kt" @@ -1,231 +1,230 @@ package com.example.umcflo -import android.content.Intent -import android.media.AsyncPlayer -import android.media.Image -<<<<<<< Updated upstream import android.media.MediaPlayer -======= ->>>>>>> Stashed changes import android.os.Bundle import android.util.Log import android.view.View -import androidx.activity.enableEdgeToEdge +import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import com.example.umcflo.databinding.ActivitySongBinding -<<<<<<< Updated upstream import com.google.gson.Gson -======= ->>>>>>> Stashed changes class SongActivity : AppCompatActivity() { + //전역 변수 lateinit var binding : ActivitySongBinding - lateinit var song: Song - //전역변수로 스레드 하나를 생성하고 아래에 송객체를 초기화하며 타이머 객채를 생성 lateinit var timer: Timer -<<<<<<< Updated upstream - //미디어파일 재생 ?뜻은 null값이 들어올 수도 있다는 의미(해제용) - private var mediaPlayer: MediaPlayer? = null - private var gson: Gson = Gson() -======= ->>>>>>> Stashed changes + private var mediaPlayer: MediaPlayer? = null + private var gson: Gson = Gson() + + val songs = arrayListOf() + lateinit var songDB: SongDatabase + var nowPos = 0 override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = ActivitySongBinding.inflate(layoutInflater) setContentView(binding.root) + initPlayList() initSong() - setPlayer(song) - -// var title : String? = null -// var singer : String? = null -// -// -// if (intent.hasExtra("title") && intent.hasExtra("singer")) { -//// title = intent.getStringExtra("title") -//// singer = intent.getStringExtra("singer") -//// binding.musicTitleTv.text = title -//// binding.singerNameTv.text = singer -// binding.musicTitleTv.text = intent.getStringExtra("title")!! -// binding.singerNameTv.text = intent.getStringExtra("singer")!! -// -// } - - binding.lowerIb.setOnClickListener{ -// val intent = Intent(this, MainActivity::class.java) -// intent.putExtra("message", title + " _ " + singer) -// setResult(RESULT_OK, intent) + initClickListener() + + + } + + override fun onPause() { + super.onPause() + + + songs[nowPos].second = ((binding.songProgressSb.progress * songs[nowPos].playTime)/100)/1000 + songs[nowPos].isPlaying = false + setPlayerStatus(false) + + val sharedPreferences = getSharedPreferences("song", MODE_PRIVATE) + val editor = sharedPreferences.edit() // 에디터 + + editor.putInt("songId",songs[nowPos].id) + + editor.apply() + } + + override fun onDestroy() { + super.onDestroy() + timer.interrupt() + mediaPlayer?.release() + mediaPlayer = null + } + + private fun initPlayList(){ + songDB = SongDatabase.getInstance(this)!! + songs.addAll(songDB.songDao().getSongs()) + } + + private fun initClickListener(){ + binding.songDownIb.setOnClickListener { finish() } - binding.songMiniplayerIv.setOnClickListener{ + binding.songMiniplayerIv.setOnClickListener { setPlayerStatus(true) } + binding.songPauseIv.setOnClickListener { setPlayerStatus(false) } - //진한색의 drawable이 없음 다운받아야함 -// binding.playerRepeatInactiveIv.setOnClickListener { -// setRepeatStatus(true) -// } -// -// binding.playerRepeatActiveIv.setOnClickListener { -// setRepeatStatus(false) -// } + binding.songNextIv.setOnClickListener { + moveSong(+1) + } + + binding.songPreviousIv.setOnClickListener { + moveSong(-1) + } + + binding.songLikeIv.setOnClickListener { + setLike(songs[nowPos].isLike) + } + } + + private fun initSong(){ + val spf = getSharedPreferences("song", MODE_PRIVATE) + val songId = spf.getInt("songId",0) + + nowPos = getPlayingSongPosition(songId) + + Log.d("now Song ID",songs[nowPos].id.toString()) + + startTimer() + setPlayer(songs[nowPos]) + } + + private fun setLike(isLike: Boolean){ + songs[nowPos].isLike = !isLike + songDB.songDao().updateIsLikeById(!isLike,songs[nowPos].id) + + if (!isLike){ + binding.songLikeIv.setImageResource(R.drawable.ic_my_like_on) + } else{ + binding.songLikeIv.setImageResource(R.drawable.ic_my_like_off) + } } + private fun moveSong(direct: Int){ + if (nowPos + direct < 0){ + Toast.makeText(this,"first song",Toast.LENGTH_SHORT).show() + return + } - private fun initSong(){ - if(intent.hasExtra("title") && intent.hasExtra("singer")){ - song = Song( - intent.getStringExtra("title")!! , - intent.getStringExtra("singer")!!, - intent.getIntExtra("second", 0), - intent.getIntExtra("playTime", 0), -<<<<<<< Updated upstream - intent.getBooleanExtra("isPlaying", false), - intent.getStringExtra("music")!! -======= - intent.getBooleanExtra("isPlaying", false) ->>>>>>> Stashed changes - ) + if (nowPos + direct >= songs.size){ + Toast.makeText(this,"last song",Toast.LENGTH_SHORT).show() + return } + + nowPos += direct + + timer.interrupt() startTimer() + + mediaPlayer?.release() + mediaPlayer = null + + setPlayer(songs[nowPos]) } + private fun getPlayingSongPosition(songId: Int): Int{ + for (i in 0 until songs.size){ + if (songs[i].id == songId){ + return i + } + } + return 0 + } + + private fun setPlayer(song: Song){ - binding.musicTitleTv.text = intent.getStringExtra("title")!! - binding.singerNameTv.text = intent.getStringExtra("singer")!! - binding.songStartTimeTv.text = String.format("%02d:%02d", song.second / 60, song.second%60) - binding.songEndTimeTv.text = String.format("%02d:%02d", song.playTime / 60, song.playTime%60) - binding.songProgressSb.progress = if (song.playTime == 0) 0 else (song.second * 1000 / song.playTime) -<<<<<<< Updated upstream - //리소스 파일에서 해당 스트링 값으로 파일로 받아오기 위함 + binding.songMusicTitleTv.text = song.title + binding.songSingerNameTv.text = song.singer + binding.songStartTimeTv.text = String.format("%02d:%02d",song.second / 60, song.second % 60) + binding.songEndTimeTv.text = String.format("%02d:%02d",song.playTime / 60, song.playTime % 60) + binding.songAlbumIv.setImageResource(song.coverImg!!) + binding.songProgressSb.progress = (song.second * 1000 / song.playTime) + val music = resources.getIdentifier(song.music, "raw", this.packageName) mediaPlayer = MediaPlayer.create(this, music) -======= ->>>>>>> Stashed changes + + if (song.isLike){ + binding.songLikeIv.setImageResource(R.drawable.ic_my_like_on) + } else{ + binding.songLikeIv.setImageResource(R.drawable.ic_my_like_off) + } setPlayerStatus(song.isPlaying) + } - fun setPlayerStatus(isPlaying : Boolean){ - song.isPlaying = isPlaying + + private fun setPlayerStatus (isPlaying : Boolean){ + songs[nowPos].isPlaying = isPlaying timer.isPlaying = isPlaying if(isPlaying){ - binding.songPauseIv.visibility = View.VISIBLE binding.songMiniplayerIv.visibility = View.GONE -<<<<<<< Updated upstream + binding.songPauseIv.visibility = View.VISIBLE mediaPlayer?.start() -======= ->>>>>>> Stashed changes - } - else{ + } else { binding.songMiniplayerIv.visibility = View.VISIBLE binding.songPauseIv.visibility = View.GONE -<<<<<<< Updated upstream - if(mediaPlayer?.isPlaying == true){ //미디어플레이가 재생중이 아닐때 오류발생 방지 + if(mediaPlayer?.isPlaying == true){ mediaPlayer?.pause() } -======= ->>>>>>> Stashed changes } - } -// private fun setRepeatStatus(isRepeat: Boolean) { -// if (isRepeat) { // 전체 반복이 아닐 경우 -// binding.playerRepeatInactiveIv.visibility = View.GONE -// binding.playerRepeatActiveIv.visibility = View.VISIBLE -// } else { // 전체 반복일 경우 -// binding.playerRepeatInactiveIv.visibility = View.VISIBLE -// binding.playerRepeatActiveIv.visibility = View.GONE -// } -// } - - private fun startTimer(){ - timer = Timer(song.playTime, song.isPlaying) - timer.start() } - override fun onDestroy() { - super.onDestroy() - timer.interrupt() -<<<<<<< Updated upstream - mediaPlayer?.release() // 미디어 플레이어가 갖고있던 리소스 해제 - mediaPlayer = null // 미디어 플레이어 해제 - + private fun startTimer(){ + timer = Timer(songs[nowPos].playTime,songs[nowPos].isPlaying) + timer.start() } + inner class Timer(private val playTime: Int,var isPlaying: Boolean = true):Thread(){ -======= - } - ->>>>>>> Stashed changes - inner class Timer(private val playTime: Int, var isPlaying: Boolean = true) : Thread() { private var second : Int = 0 - private var mills : Float = 0F + private var mills: Float = 0f override fun run() { super.run() - try { - while(true) { - if(second >= playTime) { - break - } + while (true){ - while (!isPlaying) { - sleep(200) // 0.2초 대기 + if (second >= playTime){ + break } - if(isPlaying) { + if (isPlaying){ sleep(50) mills += 50 runOnUiThread { - // binding.songProgressSb.progress = ((mills/playTime*1000) * 100).toInt() - binding.songProgressSb.progress = ((mills/playTime) * 100).toInt() + binding.songProgressSb.progress = ((mills / playTime)*100).toInt() } - if(mills % 1000 == 0F) { // 1초 + if (mills % 1000 == 0f){ runOnUiThread { - binding.songStartTimeTv.text = String.format("%02d:%02d", second / 60, second % 60) + binding.songStartTimeTv.text = String.format("%02d:%02d",second / 60, second % 60) } second++ } + } + } - } catch (e: InterruptedException) { - Log.d("SongActivity", "Thread Terminates! ${e.message}") + + }catch (e: InterruptedException){ + Log.d("Song","쓰레드가 죽었습니다. ${e.message}") } + } } -<<<<<<< Updated upstream - //사용자가 포커스를 잃었을때 음악이 중지 - override fun onPause() { - super.onPause() - setPlayerStatus(false) - //저장된 시간부터 시작 - song.second = ((binding.songProgressSb.progress * song.playTime)/100)/1000 - //어플 종료후에도 저장된 데이터를 사용하기위함(간단한데이터) - val sharedPreferences = getSharedPreferences("song", MODE_PRIVATE) - val editor = sharedPreferences.edit() //에디터 - -// editor.putString("title", song.title) -// editor.putString("title", song.singer) - // -> json(데이터 표현 표준)을 이용해 한번에 보냄 - //Gson: 자바객체<->Json - val songJson = gson.toJson(song) - editor.putString("songData", songJson) - editor.apply() //실제저장공간에 저장 - } -======= ->>>>>>> Stashed changes } \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SongDao.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SongDao.kt" new file mode 100644 index 0000000..82a9ccc --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SongDao.kt" @@ -0,0 +1,34 @@ +package com.example.umcflo + +import androidx.room.Dao +import androidx.room.Database +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Update + +@Dao +interface SongDao { + @Insert + fun insert(song: Song) + + @Update + fun update(song: Song) + + @Delete + fun delete(song: Song) + + @Query("SELECT * FROM SongTable") + fun getSongs(): List + + @Query("SELECT * FROM SongTable WHERE id = :id") + fun getSong(id: Int): Song + + @Query("UPDATE SongTable SET isLike= :isLike WHERE id = :id") + fun updateIsLikeById(isLike: Boolean,id: Int) + + @Query("SELECT * FROM SongTable WHERE isLike= :isLike") + fun getLikedSongs(isLike: Boolean): List + + +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SongDatabase.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SongDatabase.kt" new file mode 100644 index 0000000..4b9fe95 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/SongDatabase.kt" @@ -0,0 +1,33 @@ +package com.example.umcflo + +import android.content.Context +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase + +@Database(entities = [Song::class, Album::class, User::class, Like::class], version = 1) +abstract class SongDatabase: RoomDatabase() { + abstract fun albumDao(): AlbumDao + abstract fun songDao(): SongDao + abstract fun userDao() : UserDao + + + companion object { + private var instance: SongDatabase? = null + + @Synchronized + fun getInstance(context: Context): SongDatabase? { + if (instance == null) { + synchronized(SongDatabase::class){ + instance = Room.databaseBuilder( + context.applicationContext, + SongDatabase::class.java, + "song-database" // 다른 데이터 베이스랑 이름이 겹치지 않도록 주의 + ).allowMainThreadQueries().build() // 편의상 메인 쓰레드에서 처리하게 한다. + } + } + + return instance + } + } +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/User.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/User.kt" new file mode 100644 index 0000000..6460317 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/User.kt" @@ -0,0 +1,12 @@ +package com.example.umcflo + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "UserTable") +data class User( + var email : String, + var password : String +) { + @PrimaryKey(autoGenerate = true) var id : Int = 0 +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/UserDao.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/UserDao.kt" new file mode 100644 index 0000000..deddb5b --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/UserDao.kt" @@ -0,0 +1,17 @@ +package com.example.umcflo + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.Query + +@Dao +interface UserDao { + @Insert + fun insert(user : User) + + @Query("select * from UserTable") + fun getUsers() : List + + @Query("select * from UserTable where email =:email and password = :password") + fun getUser(email : String, password : String) : User? +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/data/entities/Album.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/data/entities/Album.kt" new file mode 100644 index 0000000..7665df3 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/data/entities/Album.kt" @@ -0,0 +1,12 @@ +package com.example.umcflo.data.entities + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "AlbumTable") +data class Album( + @PrimaryKey(autoGenerate = false) var id: Int = 0, + var title: String? = "", + var singer: String? = "", + var coverImg: Int? = null +) \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/data/entities/Like.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/data/entities/Like.kt" new file mode 100644 index 0000000..305ee11 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/data/entities/Like.kt" @@ -0,0 +1,12 @@ +package com.example.umcflo.data.entities + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "LikeTable") +data class Like( + var userId : Int, + var albumId : Int +) { + @PrimaryKey(autoGenerate = true) var id : Int = 0 +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/data/entities/Song.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/data/entities/Song.kt" new file mode 100644 index 0000000..f70ccf2 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/data/entities/Song.kt" @@ -0,0 +1,20 @@ +package com.example.umcflo.data.entities + +import androidx.room.Entity +import androidx.room.PrimaryKey + + +@Entity(tableName = "SongTable") +data class Song( + var title: String = "", + var singer: String = "", + var second: Int = 0, + var playTime: Int = 0, + var isPlaying: Boolean = false, + var music: String = "", + var coverImg: Int? = null, + var isLike: Boolean = false, + val albumIdx : Int = 0 +){ + @PrimaryKey(autoGenerate = true) var id: Int = 0 +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/data/entities/User.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/data/entities/User.kt" new file mode 100644 index 0000000..8dcd94b --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/data/entities/User.kt" @@ -0,0 +1,12 @@ +package com.example.umcflo.data.entities + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "UserTable") +data class User( + var email : String, + var password : String +) { + @PrimaryKey(autoGenerate = true) var id : Int = 0 +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/album/AlbumDao.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/album/AlbumDao.kt" new file mode 100644 index 0000000..1454d8a --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/album/AlbumDao.kt" @@ -0,0 +1,39 @@ +package com.example.umcflo.ui.main.album + +import androidx.room.Dao +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Update +import com.example.umcflo.data.entities.Album +import com.example.umcflo.data.entities.Like + +@Dao +interface AlbumDao { + @Insert + fun insert(album: Album) + + @Update + fun update(album: Album) + + @Delete + fun delete(album: Album) + + @Query("SELECT * FROM AlbumTable") // 테이블의 모든 값을 가져와라 + fun getAlbums(): List + + @Query("SELECT * FROM AlbumTable WHERE id = :id") + fun getAlbum(id: Int): Album + + @Insert + fun likeAlbum(like : Like) + + @Query("select id from LikeTable where userId =:userId and albumId = :albumId") + fun isLikedAlbum(userId : Int, albumId : Int) : Int? + + @Query("delete from LikeTable where userId =:userId and albumId = :albumId") + fun dislikedAlbum(userId : Int, albumId : Int) + + @Query("select at.* from LikeTable as lt left join AlbumTable as at on lt.albumId = at.id where lt.userId = :userId") + fun getLikedAlbums(userId : Int) : List +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/album/AlbumFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/album/AlbumFragment.kt" new file mode 100644 index 0000000..77d7c52 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/album/AlbumFragment.kt" @@ -0,0 +1,103 @@ +package com.example.umcflo.ui.main.album + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity +import androidx.fragment.app.Fragment +import com.example.umcflo.ui.main.home.HomeFragment +import com.example.umcflo.ui.main.search.MainActivity +import com.example.umcflo.R +import com.example.umcflo.ui.song.SongDatabase +import com.example.umcflo.data.entities.Album +import com.example.umcflo.data.entities.Like +import com.example.umcflo.databinding.FragmentAlbumBinding +import com.google.android.material.tabs.TabLayoutMediator +import com.google.gson.Gson + +class AlbumFragment : Fragment() { + lateinit var binding: FragmentAlbumBinding + private var gson: Gson = Gson() + private val information = arrayListOf("수록곡", "상세정보", "영상") + //사용할 탭의 텍스트 + private var isLiked : Boolean = false + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentAlbumBinding.inflate(inflater, container, false) + + binding.albumMusicTitleTv.text = arguments?.getString("title") + binding.albumSingerNameTv.text = arguments?.getString("singer") + + val albumToJson = arguments?.getString("album") + val album = gson.fromJson(albumToJson, Album::class.java) + isLiked = isLikedAlbum(album.id) + setInit(album) + setOnClickListener(album) + + binding.albumBackIv.setOnClickListener { + (context as MainActivity).supportFragmentManager.beginTransaction() + .replace(R.id.main_frm, HomeFragment()).commitAllowingStateLoss() + } + val albumAdapter = AlbumVPAdapter(this) + binding.albumContentVp.adapter = albumAdapter + TabLayoutMediator(binding.albumContentTb, binding.albumContentVp){//연결한 탭레이아웃, viewpager가 인자값 + tab, position -> + tab.text = information[position] + }.attach() + //taplayoutmediator는 탭과 뷰페이저를 이어줌 + return binding.root + } + + private fun setInit(album : Album) { + binding.albumAlbumIv.setImageResource(album.coverImg!!) + binding.albumMusicTitleTv.text = album.title.toString() + binding.albumSingerNameTv.text = album.singer.toString() + } + private fun getJwt() : Int { + val spf = requireActivity().getSharedPreferences("auth", AppCompatActivity.MODE_PRIVATE) + return spf.getInt("jwt", 0) + } + + private fun likeAlbum(userId : Int, albumId : Int) { + val songDB = SongDatabase.getInstance(requireActivity())!! + val like = Like(userId, albumId) + + songDB.albumDao().likeAlbum(like) + } + + private fun isLikedAlbum(albumId : Int) : Boolean { + val songDB = SongDatabase.getInstance(requireActivity())!! + val userId = getJwt() + + val likeId : Int? = songDB.albumDao().isLikedAlbum(userId, albumId) + return likeId != null + } + + private fun disLikeAlbum(albumId : Int) { + val songDB = SongDatabase.getInstance(requireActivity())!! + val userId = getJwt() + + songDB.albumDao().dislikedAlbum(userId, albumId) + } + + private fun setOnClickListener(album : Album) { + val userId = getJwt() + binding.albumLikeIv.setOnClickListener { + if(isLiked) { + binding.albumLikeIv.setImageResource(R.drawable.ic_my_like_off) + disLikeAlbum(album.id) + } + + else { + binding.albumLikeIv.setImageResource((R.drawable.ic_my_like_on)) + likeAlbum(userId, album.id) + } + } + + } + +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/album/AlbumRVAdapter.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/album/AlbumRVAdapter.kt" new file mode 100644 index 0000000..2e23348 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/album/AlbumRVAdapter.kt" @@ -0,0 +1,74 @@ +package com.example.umcflo.ui.main.album + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import com.example.umcflo.data.entities.Album +import com.example.umcflo.databinding.ItemAlbumBinding + +class AlbumRVAdapter(private val albumList: ArrayList): RecyclerView.Adapter() { + + interface OnItemClickListener { + fun onItemClick(album: Album) + fun onRemoveAlbum(position: Int) + fun onPlayAlbum(album : Album) + } + + private lateinit var itemClickListener : OnItemClickListener + + fun setItemClickListener(onItemClickListener: OnItemClickListener) { + this.itemClickListener = onItemClickListener + } + + fun addItem(album: Album){ + albumList.add(album) + notifyDataSetChanged() //리사이클은 데이터가 바뀐걸 모르기에 알려줌 + } + + fun removeItem(position: Int){ + albumList.removeAt(position) + notifyDataSetChanged() //리사이클은 데이터가 바뀐걸 모르기에 알려줌 + } + + override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder { + val binding: ItemAlbumBinding = ItemAlbumBinding.inflate(LayoutInflater.from(viewGroup.context), viewGroup, false) + return ViewHolder(binding) + // 뷰 홀더를 생성해줘야 할 때 호출되는 함수로, 아이템 뷰 객체를 만들어서 뷰홀더에 전달한다. + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + // 뷰홀더에 데이터를 바인딩해줘야 할 때마다 호출되는 함수로 자주 호출된다. + holder.bind(albumList[position]) + + //클릭리스너가 내장되있지 않기에 추가로 인터페이스를 만들어야함 + holder.itemView.setOnClickListener { + itemClickListener.onItemClick(albumList[position]) + } + + holder.binding.itemAlbumPlayImgIv.setOnClickListener { + itemClickListener.onPlayAlbum(albumList[position]) + } + + + //title누를 시 삭제하게 +// holder.binding.itemAlbumTitleTv.setOnClickListener { +// itemClickListener.onRemoveAlbum(position) +// } + + } + + override fun getItemCount(): Int = albumList.size + // 데이터 세트 크기를 알려주는 함수 => 리사이클러뷰가 마지막이 언제인지를 알게 된다. + + + + //날라가지 않도록하는 그릇 + inner class ViewHolder(val binding: ItemAlbumBinding): RecyclerView.ViewHolder(binding.root){ + fun bind(album: Album){ + binding.itemAlbumTitleTv.text = album.title + binding.itemAlbumSingerTv.text = album.singer + binding.itemAlbumCoverImgIv.setImageResource(album.coverImg!!) + } + } + +} \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/AlbumVPAdapter.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/album/AlbumVPAdapter.kt" similarity index 68% rename from "\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/AlbumVPAdapter.kt" rename to "\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/album/AlbumVPAdapter.kt" index 121ee2e..a959580 100644 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/AlbumVPAdapter.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/album/AlbumVPAdapter.kt" @@ -1,7 +1,10 @@ -package com.example.myapplication +package com.example.umcflo.ui.main.album import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter +import com.example.umcflo.ui.main.locker.DetailFragment +import com.example.umcflo.ui.song.SongFragment +import com.example.umcflo.ui.main.home.VideoFragment class AlbumVPAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) { override fun getItemCount(): Int = 3 diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/BannerFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/BannerFragment.kt" similarity index 86% rename from "\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/BannerFragment.kt" rename to "\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/BannerFragment.kt" index b893466..68fcc58 100644 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/BannerFragment.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/BannerFragment.kt" @@ -1,11 +1,11 @@ -package com.example.myapplication +package com.example.umcflo.ui.main.home import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.myapplication.databinding.FragmentBannerBinding +import com.example.umcflo.databinding.FragmentBannerBinding class BannerFragment(val imgRes: Int) : Fragment() { diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/BannerVPAdapter.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/BannerVPAdapter.kt" similarity index 96% rename from "\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/BannerVPAdapter.kt" rename to "\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/BannerVPAdapter.kt" index 801147d..abb9419 100644 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/BannerVPAdapter.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/BannerVPAdapter.kt" @@ -1,4 +1,4 @@ -package com.example.myapplication +package com.example.umcflo.ui.main.home import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/HomeFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/HomeFragment.kt" new file mode 100644 index 0000000..e988fe7 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/HomeFragment.kt" @@ -0,0 +1,218 @@ +package com.example.umcflo.ui.main.home + +import android.os.Bundle +import android.os.Handler +import android.os.Looper +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.viewpager2.widget.ViewPager2 +import com.example.umcflo.CommunicationInterface +import com.example.umcflo.ui.main.search.MainActivity +import com.example.umcflo.R +import com.example.umcflo.ui.song.SongDatabase +import com.example.umcflo.data.entities.Album +import com.example.umcflo.databinding.FragmentHomeBinding +import com.example.umcflo.ui.main.album.AlbumFragment +import com.example.umcflo.ui.main.album.AlbumRVAdapter +import com.google.gson.Gson +import java.util.Timer +import java.util.TimerTask + +class HomeFragment : Fragment(), CommunicationInterface { + + lateinit var binding: FragmentHomeBinding + + private val timer = Timer() + private val handler = Handler(Looper.getMainLooper()) + private var albumDatas = ArrayList() + private lateinit var songDB: SongDatabase + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentHomeBinding.inflate(inflater, container, false) + + songDB = SongDatabase.getInstance(requireContext())!! + albumDatas.addAll(songDB.albumDao().getAlbums()) + Log.d("albumlist", albumDatas.toString()) + + val albumRVAdapter = AlbumRVAdapter(albumDatas) + binding.homeTodayMusicAlbumRv.adapter = albumRVAdapter + binding.homeTodayMusicAlbumRv.layoutManager = LinearLayoutManager(requireActivity(), LinearLayoutManager.HORIZONTAL, false) + + albumRVAdapter.setItemClickListener(object : AlbumRVAdapter.OnItemClickListener { + override fun onItemClick(album : Album) { + changeToAlbumFragment(album) + } + + override fun onRemoveAlbum(position: Int) { + albumRVAdapter.removeItem(position) + } + + override fun onPlayAlbum(album: Album) { + sendData(album) + } + }) + + val bannerAdapter = BannerVPAdapter(this) + bannerAdapter.addFragment(BannerFragment(R.drawable.img_home_viewpager_exp)) + bannerAdapter.addFragment(BannerFragment(R.drawable.img_home_viewpager_exp2)) + binding.homeBannerVp.adapter = bannerAdapter + binding.homeBannerVp.orientation = ViewPager2.ORIENTATION_HORIZONTAL + + val pannelAdpater = PannelVpAdapter(this) + pannelAdpater.addFragment(PannelFragment(R.drawable.img_first_album_default)) + pannelAdpater.addFragment(PannelFragment(R.drawable.skplanet_musicmate_sc0_2021_03_12_16_59_19)) + pannelAdpater.addFragment(PannelFragment(R.drawable._786635_719636_923)) + + binding.homePannelBackgroundIv.adapter = pannelAdpater + binding.homePannelBackgroundIv.orientation = ViewPager2.ORIENTATION_HORIZONTAL + binding.indicator.setViewPager(binding.homePannelBackgroundIv) + + + autoSlide(pannelAdpater) + + return binding.root + } + + private fun changeToAlbumFragment(album: Album) { + (context as MainActivity).supportFragmentManager.beginTransaction() + .replace(R.id.main_frm, AlbumFragment().apply { + arguments = Bundle().apply { + val gson = Gson() + val albumToJson = gson.toJson(album) + putString("album", albumToJson) + } + }) + .commitAllowingStateLoss() + } + + private fun autoSlide(adapter: PannelVpAdapter) { + timer.scheduleAtFixedRate(object : TimerTask() { + override fun run() { + handler.post { + val nextItem = binding.homePannelBackgroundIv.currentItem + 1 + if (nextItem < adapter.itemCount) { + binding.homePannelBackgroundIv.currentItem = nextItem + } else { + binding.homePannelBackgroundIv.currentItem = 0 // 순환 + } + } + } + }, 3000, 3000) + } + + + override fun sendData(album: Album) { + if (activity is MainActivity) { + val activity = activity as MainActivity + activity.updateMainPlayerCl(album) + } + } + private fun inputDummyAlbums(){ + val songDB = SongDatabase.getInstance(requireActivity())!! + val songs = songDB.albumDao().getAlbums() + + if (songs.isNotEmpty()) return + + songDB.albumDao().insert( + Album( + 1, + "IU 5th Album 'LILAC'", + "아이유 (IU)", + R.drawable.img_album_exp2 + ) + ) + + songDB.albumDao().insert( + Album( + 2, + "Butter", + "방탄소년단 (BTS)", + R.drawable.img_album_exp + ) + ) + + songDB.albumDao().insert( + Album( + 3, + "iScreaM Vol.10: Next Level Remixes", + "에스파 (AESPA)", + R.drawable.img_album_exp3 + ) + ) + + songDB.albumDao().insert( + Album( + 4, + "Map of the Soul Persona", + "뮤직 보이 (Music Boy)", + R.drawable.img_album_exp4, + ) + ) + + + songDB.albumDao().insert( + Album( + 5, + "Great!", + "모모랜드 (MOMOLAND)", + R.drawable.img_album_exp5 + ) + ) + + val songDBData = songDB.albumDao().getAlbums() + Log.d("DB data", songDBData.toString()) + } +} + + + + +//리사이클러 뷰를 위해 제거(Album data class) +// binding.homePannelAlbumLilacIv.setOnClickListener { +// +// val bundle = Bundle() +// bundle.putString("title", binding.homePannelTodayMusicTitle1Tv.text.toString()) +// bundle.putString("singer", binding.homePannelTodayMusicSinger1Tv.text.toString()) +// +// +// val albumFragment = AlbumFragment() +// albumFragment.arguments = bundle +// +// (context as MainActivity).supportFragmentManager.beginTransaction().replace( +// R.id.main_frm, albumFragment).commitAllowingStateLoss() +// +// } +// binding.homePannelAlbumBts.setOnClickListener { +// val bundle = Bundle() +// bundle.putString("title", binding.homePannelTodayMusicTitle2Tv.text.toString()) +// bundle.putString("singer", binding.homePannelTodayMusicSinger2Tv.text.toString()) +// +// val albumFragment = AlbumFragment() +// albumFragment.arguments = bundle +// +// (context as MainActivity).supportFragmentManager.beginTransaction().replace( +// R.id.main_frm, albumFragment).commitAllowingStateLoss() +// +// } +// +// binding.homePannelAlbumBibi.setOnClickListener { +// +// val bundle = Bundle() +// bundle.putString("title", binding.homePannelTodayMusicTitle3Tv.text.toString()) +// bundle.putString("singer", binding.homePannelTodayMusicSinger3Tv.text.toString()) +// +// val albumFragment = AlbumFragment() +// albumFragment.arguments = bundle +// +// (context as MainActivity).supportFragmentManager.beginTransaction().replace( +// R.id.main_frm, albumFragment).commitAllowingStateLoss() +// +// } \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/PannelFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/PannelFragment.kt" similarity index 87% rename from "\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/PannelFragment.kt" rename to "\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/PannelFragment.kt" index 35beac1..1324ad3 100644 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/PannelFragment.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/PannelFragment.kt" @@ -1,11 +1,11 @@ -package com.example.myapplication +package com.example.umcflo.ui.main.home import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.myapplication.databinding.FragmentPannelBinding +import com.example.umcflo.databinding.FragmentPannelBinding class PannelFragment(val imgRes : Int) : Fragment() { diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/PannelVPAdapter.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/PannelVPAdapter.kt" similarity index 93% rename from "\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/PannelVPAdapter.kt" rename to "\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/PannelVPAdapter.kt" index d1f48be..f27598b 100644 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/PannelVPAdapter.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/PannelVPAdapter.kt" @@ -1,4 +1,4 @@ -package com.example.myapplication +package com.example.umcflo.ui.main.home import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/VideoFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/VideoFragment.kt" similarity index 83% rename from "\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/VideoFragment.kt" rename to "\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/VideoFragment.kt" index bbd40c5..5a1656c 100644 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/VideoFragment.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/home/VideoFragment.kt" @@ -1,11 +1,11 @@ -package com.example.myapplication +package com.example.umcflo.ui.main.home import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.myapplication.databinding.FragmentVideoBinding +import com.example.umcflo.databinding.FragmentVideoBinding class VideoFragment : Fragment() { diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/DetailFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/DetailFragment.kt" similarity index 83% rename from "\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/DetailFragment.kt" rename to "\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/DetailFragment.kt" index d1427f7..142a719 100644 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/DetailFragment.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/DetailFragment.kt" @@ -1,11 +1,11 @@ -package com.example.myapplication +package com.example.umcflo.ui.main.locker import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.myapplication.databinding.FragmentDetailBinding +import com.example.umcflo.databinding.FragmentDetailBinding class DetailFragment : Fragment() { diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/LockerAlbumRVAdapte.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/LockerAlbumRVAdapte.kt" new file mode 100644 index 0000000..e4cdb24 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/LockerAlbumRVAdapte.kt" @@ -0,0 +1,70 @@ +package com.example.umcflo.ui.main.locker + +import android.annotation.SuppressLint +import android.util.SparseBooleanArray +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import com.example.umcflo.data.entities.Song +import com.example.umcflo.databinding.ItemLockerAlbumBinding + +class LockerAlbumRVAdapter () : RecyclerView.Adapter() { + + private val switchStatus = SparseBooleanArray() + private val songs = ArrayList() + + override fun onCreateViewHolder( + parent: ViewGroup, + viewType: Int + ): ViewHolder { + val binding: ItemLockerAlbumBinding = ItemLockerAlbumBinding + .inflate(LayoutInflater.from(parent.context), parent, false) + + return ViewHolder(binding) + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + holder.bind(songs[position]) + + holder.binding.itemLockerAlbumMoreIv.setOnClickListener { + itemClickListener.onRemoveAlbum(songs[position].id) // 좋아요 취소로 업데이트하는 메서드 + removeSong(position) // 현재 화면에서 아이템을 제거 + } + + } + + override fun getItemCount(): Int = songs.size + + inner class ViewHolder(val binding: ItemLockerAlbumBinding): RecyclerView.ViewHolder(binding.root){ + + fun bind(song : Song){ + binding.itemLockerAlbumTitleTv.text = song.title + binding.itemLockerAlbumSingerTv.text = song.singer + binding.itemLockerAlbumCoverImgIv.setImageResource(song.coverImg!!) + } + } + + interface OnItemClickListener { + fun onRemoveAlbum(songId: Int) + } + + private lateinit var itemClickListener : OnItemClickListener + + fun setItemClickListener(onItemClickListener: OnItemClickListener) { + this.itemClickListener = onItemClickListener + } + + @SuppressLint("NotifyDataSetChanged") // 경고 무시 어노테이션 + fun addSongs(songs: ArrayList) { + this.songs.clear() + this.songs.addAll(songs) + + notifyDataSetChanged() + } + + @SuppressLint("NotifyDataSetChanged") + private fun removeSong(position: Int){ + songs.removeAt(position) + notifyDataSetChanged() + } +} diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/LockerFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/LockerFragment.kt" new file mode 100644 index 0000000..c20ee7f --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/LockerFragment.kt" @@ -0,0 +1,74 @@ +package com.example.umcflo.ui.main.locker + +import android.content.Intent +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity +import androidx.fragment.app.Fragment +import com.example.umcflo.ui.signin.LoginActivity +import com.example.umcflo.ui.main.search.MainActivity +import com.example.umcflo.databinding.FragmentLockerBinding +import com.google.android.material.tabs.TabLayoutMediator + +class LockerFragment : Fragment() { + + lateinit var binding: FragmentLockerBinding + private val information = arrayListOf("저장한곡", "음악파일", "저장앨범") + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentLockerBinding.inflate(inflater, container, false) + + val lockerAdapter = LockerVPAdapter(this) + binding.lockerContentVp.adapter = lockerAdapter + TabLayoutMediator(binding.lockerContentTb,binding.lockerContentVp){ + tab, position -> + tab.text = information[position] + + }.attach() + + binding.lockerLoginTv.setOnClickListener { + val intent = Intent(requireActivity(), LoginActivity::class.java) + startActivity(intent) + } + + return binding.root + } + override fun onStart() { + super.onStart() + initViews() + } + private fun getJwt() : Int { + val spf = requireActivity().getSharedPreferences("auth", AppCompatActivity.MODE_PRIVATE) + return spf!!.getInt("jwt", 0) + } + + private fun initViews() { + val jwt : Int = getJwt() + if (jwt == 0) { + binding.lockerLoginTv.text="로그인" + binding.lockerLoginTv.setOnClickListener { + startActivity(Intent(requireActivity(), LoginActivity::class.java)) + } + } + + else { + binding.lockerLoginTv.text = "로그아웃" + binding.lockerLoginTv.setOnClickListener { + logout() + startActivity(Intent(requireActivity(), MainActivity::class.java)) + } + } + } + + private fun logout() { + val spf = activity?.getSharedPreferences("auth", AppCompatActivity.MODE_PRIVATE) + val editor = spf!!.edit() + editor.remove("jwt") + editor.apply() + } +} \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/LockerVPAdapter.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/LockerVPAdapter.kt" similarity index 67% rename from "\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/LockerVPAdapter.kt" rename to "\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/LockerVPAdapter.kt" index ea88d00..fcdff65 100644 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/LockerVPAdapter.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/LockerVPAdapter.kt" @@ -1,14 +1,16 @@ -package com.example.myapplication +package com.example.umcflo.ui.main.locker import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter +import com.example.umcflo.ui.song.SavedSongFragment class LockerVPAdapter(fragment : Fragment) : FragmentStateAdapter(fragment){ - override fun getItemCount(): Int = 2 + override fun getItemCount(): Int = 3 override fun createFragment(position: Int): Fragment { return when(position){ 0 -> SavedSongFragment() + 1 -> MusicFileFragment() else -> SavedAlbumFragment() } } diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/MusicFileFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/MusicFileFragment.kt" new file mode 100644 index 0000000..38c5e63 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/MusicFileFragment.kt" @@ -0,0 +1,19 @@ +package com.example.umcflo.ui.main.locker + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.example.umcflo.databinding.FragmentMusicFileBinding + +class MusicFileFragment: Fragment() { + + lateinit var binding: FragmentMusicFileBinding + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + binding = FragmentMusicFileBinding.inflate(inflater, container, false) + + return binding.root + } +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/SavedAlbumFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/SavedAlbumFragment.kt" new file mode 100644 index 0000000..feb362d --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/SavedAlbumFragment.kt" @@ -0,0 +1,59 @@ +package com.example.umcflo.ui.main.locker + +import android.os.Bundle +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.LinearLayoutManager +import com.example.umcflo.ui.song.SongDatabase +import com.example.umcflo.databinding.FragmentLockerSavedalbumBinding + +class SavedAlbumFragment : Fragment() { + lateinit var binding: FragmentLockerSavedalbumBinding + lateinit var albumDB: SongDatabase + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentLockerSavedalbumBinding.inflate(inflater, container, false) + + albumDB = SongDatabase.getInstance(requireContext())!! + + return binding.root + } + + override fun onStart() { + super.onStart() + initRecyclerview() + } + + private fun initRecyclerview(){ + binding.lockerSavedSongRecyclerView.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) + + val albumRVAdapter = SavedAlbumRVAdapter() + //리스너 객체 생성 및 전달 + + albumRVAdapter.setMyItemClickListener(object : SavedAlbumRVAdapter.MyItemClickListener { + override fun onRemoveSong(songId: Int) { + albumDB.albumDao().getLikedAlbums(getJwt()) + } + }) + + binding.lockerSavedSongRecyclerView.adapter = albumRVAdapter + + albumRVAdapter.addAlbums(albumDB.albumDao().getLikedAlbums(getJwt()) as ArrayList) + } + + private fun getJwt() : Int { + val spf = activity?.getSharedPreferences("auth" , AppCompatActivity.MODE_PRIVATE) + val jwt = spf!!.getInt("jwt", 0) + Log.d("MAIN_ACT/GET_JWT", "jwt_token: $jwt") + + return jwt + } +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/SavedAlbumRVAdapter.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/SavedAlbumRVAdapter.kt" new file mode 100644 index 0000000..d07bcc5 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/locker/SavedAlbumRVAdapter.kt" @@ -0,0 +1,60 @@ +package com.example.umcflo.ui.main.locker + +import android.annotation.SuppressLint +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import com.example.umcflo.data.entities.Album +import com.example.umcflo.databinding.ItemLockerAlbumBinding + +class SavedAlbumRVAdapter (): RecyclerView.Adapter() { + private val albums = ArrayList() + + interface MyItemClickListener{ + fun onRemoveSong(songId: Int) + } + + private lateinit var mItemClickListener: MyItemClickListener + + fun setMyItemClickListener(itemClickListener: MyItemClickListener){ + mItemClickListener = itemClickListener + } + + override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder { + val binding: ItemLockerAlbumBinding = ItemLockerAlbumBinding.inflate(LayoutInflater.from(viewGroup.context), viewGroup, false) + + return ViewHolder(binding) + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + holder.bind(albums[position]) + holder.binding.itemLockerAlbumMoreIv.setOnClickListener { + mItemClickListener.onRemoveSong(albums[position].id) + removeSong(position) + } + } + + override fun getItemCount(): Int = albums.size + + @SuppressLint("NotifyDataSetChanged") + fun addAlbums(albums: ArrayList) { + this.albums.clear() + this.albums.addAll(albums) + + notifyDataSetChanged() + } + + fun removeSong(position: Int){ + albums.removeAt(position) + notifyDataSetChanged() + } + + inner class ViewHolder(val binding: ItemLockerAlbumBinding) : RecyclerView.ViewHolder(binding.root){ + fun bind(album: Album){ + binding.itemLockerAlbumCoverImgIv.setImageResource(album.coverImg!!) + binding.itemLockerAlbumTitleTv.text = album.title + binding.itemLockerAlbumSingerTv.text = album.singer + } + } + +} \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/LookFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/look/LookFragment.kt" similarity index 83% rename from "\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/LookFragment.kt" rename to "\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/look/LookFragment.kt" index 5adbc1a..301f361 100644 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/LookFragment.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/look/LookFragment.kt" @@ -1,11 +1,11 @@ -package com.example.myapplication +package com.example.umcflo.ui.main.look import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.myapplication.databinding.FragmentLookBinding +import com.example.umcflo.databinding.FragmentLookBinding class LookFragment : Fragment() { @@ -18,6 +18,8 @@ class LookFragment : Fragment() { ): View? { binding = FragmentLookBinding.inflate(inflater, container, false) + return binding.root } + } \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/search/MainActivity.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/search/MainActivity.kt" new file mode 100644 index 0000000..1e2c8d3 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/search/MainActivity.kt" @@ -0,0 +1,279 @@ +package com.example.umcflo.ui.main.search + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.util.Log +import android.widget.Toast +import androidx.activity.result.ActivityResultLauncher +import androidx.activity.result.contract.ActivityResultContracts +import com.example.umcflo.ui.main.look.LookFragment +import com.example.umcflo.R +import com.example.umcflo.ui.song.SongActivity +import com.example.umcflo.ui.song.SongDatabase +import com.example.umcflo.data.entities.Album +import com.example.umcflo.data.entities.Song +import com.example.umcflo.databinding.ActivityMainBinding +import com.example.umcflo.ui.main.home.HomeFragment +import com.example.umcflo.ui.main.locker.LockerFragment +import com.google.gson.Gson + + +class MainActivity : AppCompatActivity() { + lateinit var activityResultLauncher:ActivityResultLauncher + lateinit var binding: ActivityMainBinding + private var song: Song = Song() + private var gson: Gson = Gson() + + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setTheme(R.style.Theme_UMCflo) + binding = ActivityMainBinding.inflate(layoutInflater) + setContentView(binding.root) + + inputDummySongs() + inputDummyAlbums() + initBottomNavigation() + + + activityResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + if (result.resultCode == RESULT_OK) { + val data = result.data + if (data != null) { + val message = data.getStringExtra("message") + Log.d("message", message!!) + Toast.makeText(this, message, Toast.LENGTH_SHORT).show() + } + } + } + + binding.mainPlayerCl.setOnClickListener { + val editor = getSharedPreferences("song", MODE_PRIVATE).edit() + editor.putInt("songId", song.id) + editor.apply() + + val intent = Intent(this, SongActivity::class.java) + activityResultLauncher.launch(intent) + } + + } + + private fun initBottomNavigation(){ + supportFragmentManager.beginTransaction() + .replace(R.id.main_frm, HomeFragment()) + .commitAllowingStateLoss() + + binding.mainBnv.setOnItemSelectedListener{ item -> + when (item.itemId) { + + R.id.homeFragment -> { + supportFragmentManager.beginTransaction() + .replace(R.id.main_frm, HomeFragment()) + .commitAllowingStateLoss() + return@setOnItemSelectedListener true + } + + R.id.lookFragment -> { + supportFragmentManager.beginTransaction() + .replace(R.id.main_frm, LookFragment()) + .commitAllowingStateLoss() + return@setOnItemSelectedListener true + } + R.id.searchFragment -> { + supportFragmentManager.beginTransaction() + .replace(R.id.main_frm, SearchFragment()) + .commitAllowingStateLoss() + return@setOnItemSelectedListener true + } + R.id.lockerFragment -> { + supportFragmentManager.beginTransaction() + .replace(R.id.main_frm, LockerFragment()) + .commitAllowingStateLoss() + return@setOnItemSelectedListener true + } + } + false + } + } + + private fun setMiniPlayer(song: Song){ + binding.mainMiniplayerTitleTv.text = song.title + binding.mainMiniplayerSingerTv.text = song.singer + binding.mainMiniplayerProgressSb.progress = (song.second*100000)/song.playTime + } + + //activity 전환이 될땐 onCreate가아닌 start부터 시작 + override fun onStart() { + super.onStart() +// val sharedPreferences = getSharedPreferences("song", MODE_PRIVATE) //song은 sharedPreferences의 이름 +// val songJson = sharedPreferences.getString("songData", null) //songData는 sharedPreferences안에 데이터 +// +// song = if(songJson == null){ //데이터 저장값이 없을때 디폴트값 +// Song("라일락", "아이유(IU)", 0, 60, false, "music_lilac") +// }else{ //songJson을 자바객체로 변환 +// gson.fromJson(songJson, Song::class.java) +// } +// setMiniPlayer(song) + + val sharedPreferences = getSharedPreferences("song", MODE_PRIVATE) + // songId는 SongActivity에서 onPause가 호출되었을 때 + // 재생 중이던 노래의 id(pk)이다. + val songId = sharedPreferences.getInt("songId", 0) + + // SongDatabase의 인스턴스를 가져온다. + val songDB = SongDatabase.getInstance(this)!! + + song = if (songId == 0){ // 재생 중이던 노래가 없었으면 + songDB.songDao().getSong(1) + } else{ // 재생 중이던 노래가 있었으면 + songDB.songDao().getSong(songId) + } + + Log.d("song ID", song.id.toString()) + setMiniPlayer(song) // song의 정보로 MiniPlayer를 setting + } + + + fun updateMainPlayerCl(album : Album) { + binding.mainMiniplayerTitleTv.text = album.title + binding.mainMiniplayerSingerTv.text = album.singer + binding.mainMiniplayerProgressSb.progress = 0 + } + + private fun inputDummySongs(){ + val songDB = SongDatabase.getInstance(this)!! + val songs = songDB.songDao().getSongs() + + if (songs.isNotEmpty()) return + + songDB.songDao().insert( + Song( + "Lilac", + "아이유 (IU)", + 0, + 200, + false, + "music_lilac", + R.drawable.img_album_exp2, + false, + ) + ) + + songDB.songDao().insert( + Song( + "Flu", + "아이유 (IU)", + 0, + 200, + false, + "music_flu", + R.drawable.img_album_exp2, + false, + ) + ) + + songDB.songDao().insert( + Song( + "Butter", + "방탄소년단 (BTS)", + 0, + 190, + false, + "music_butter", + R.drawable.img_album_exp, + false, + ) + ) + + songDB.songDao().insert( + Song( + "Next Level", + "에스파 (AESPA)", + 0, + 210, + false, + "music_next", + R.drawable.img_album_exp3, + false, + ) + ) + + + songDB.songDao().insert( + Song( + "Boy with Luv", + "music_boy", + 0, + 230, + false, + "music_lilac", + R.drawable.img_album_exp4, + false, + ) + ) + + + songDB.songDao().insert( + Song( + "BBoom BBoom", + "모모랜드 (MOMOLAND)", + 0, + 240, + false, + "music_bboom", + R.drawable.img_album_exp5, + false, + ) + ) + + val _songs = songDB.songDao().getSongs() + Log.d("DB data", _songs.toString()) + } + + private fun inputDummyAlbums() { + val songDB = SongDatabase.getInstance(this)!! + val albums = songDB.albumDao().getAlbums() + + if (albums.isNotEmpty()) return + + songDB.albumDao().insert( + Album( + 0, + "IU 5th Album 'LILAC'", "아이유 (IU)", R.drawable.img_album_exp2 + ) + ) + + songDB.albumDao().insert( + Album( + 1, + "Butter", "방탄소년단 (BTS)", R.drawable.img_album_exp + ) + ) + + songDB.albumDao().insert( + Album( + 2, + "iScreaM Vol.10 : Next Level Remixes", "에스파 (AESPA)", R.drawable.img_album_exp3 + ) + ) + + songDB.albumDao().insert( + Album( + 3, + "MAP OF THE SOUL : PERSONA", "방탄소년단 (BTS)", R.drawable.img_album_exp4 + ) + ) + + songDB.albumDao().insert( + Album( + 4, + "GREAT!", "모모랜드 (MOMOLAND)", R.drawable.img_album_exp5 + ) + ) + + } + +} + + diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SearchFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/search/SearchFragment.kt" similarity index 83% rename from "\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SearchFragment.kt" rename to "\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/search/SearchFragment.kt" index 78a5e3e..9780432 100644 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SearchFragment.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/main/search/SearchFragment.kt" @@ -1,11 +1,11 @@ -package com.example.myapplication +package com.example.umcflo.ui.main.search import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.myapplication.databinding.FragmentSearchBinding +import com.example.umcflo.databinding.FragmentSearchBinding class SearchFragment : Fragment() { diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/signin/LoginActivity.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/signin/LoginActivity.kt" new file mode 100644 index 0000000..5b3bcff --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/signin/LoginActivity.kt" @@ -0,0 +1,67 @@ +package com.example.umcflo.ui.signin + +import android.content.Intent +import android.os.Bundle +import android.util.Log +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.example.umcflo.databinding.ActivityLoginBinding +import com.example.umcflo.ui.main.search.MainActivity +import com.example.umcflo.ui.signup.SignUpActivity +import com.example.umcflo.ui.song.SongDatabase + +class LoginActivity : AppCompatActivity() { + + lateinit var binding : ActivityLoginBinding + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityLoginBinding.inflate(layoutInflater) + setContentView(binding.root) + + binding.loginSignUpTv.setOnClickListener { + val intent = Intent(this, SignUpActivity::class.java) + startActivity(intent) + } + binding.loginSignInBtn.setOnClickListener { + login() + } + } + private fun login() { + if (binding.loginIdEt.text.toString().isEmpty() || binding.loginDirectInputEt.text.toString().isEmpty()) { + Toast.makeText(this, "이메일을 입력해주세요", Toast.LENGTH_SHORT).show() + return + } + + if (binding.loginPasswordEt.text.toString().isEmpty()) { + Toast.makeText(this, "비밀번호를 입력해주세요", Toast.LENGTH_SHORT).show() + return + } + + val email : String = binding.loginIdEt.text.toString() + "@" + binding.loginDirectInputEt.text.toString() + val pwd : String = binding.loginPasswordEt.text.toString() + + val songDB = SongDatabase.getInstance(this)!! + val user = songDB.userDao().getUser(email, pwd) + + if (user != null) { + Log.d("LoginActivity", user.id.toString()) + saveJwt(user.id) + startMainActivity() + } else { + Toast.makeText(this, "회원 정보가 존재하지 않습니다", Toast.LENGTH_SHORT).show() + } + } + + private fun saveJwt(jwt : Int) { + val spf = getSharedPreferences("auth", MODE_PRIVATE) + val editor = spf.edit() + + editor.putInt("jwt", jwt) + editor.apply() + } + + private fun startMainActivity() { + val intent = Intent(this, MainActivity::class.java) + startActivity(intent) + } +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/signup/SignUpAcitivity.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/signup/SignUpAcitivity.kt" new file mode 100644 index 0000000..428e414 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/signup/SignUpAcitivity.kt" @@ -0,0 +1,55 @@ +package com.example.umcflo.ui.signup + +import android.os.Bundle +import android.util.Log +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.example.umcflo.data.entities.User +import com.example.umcflo.databinding.ActivitySignUpBinding +import com.example.umcflo.ui.song.SongDatabase + +class SignUpActivity : AppCompatActivity() { + + lateinit var binding: ActivitySignUpBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivitySignUpBinding.inflate(layoutInflater) + setContentView(binding.root) + + binding.signUpSignUpBtn.setOnClickListener { + val signUpCompletion = signUp() + if(signUpCompletion) { + finish() + } + } + } + + private fun getUser() : User { + val email : String = binding.signUpIdEt.text.toString() + "@" + binding.signUpDirectInputEt.text.toString() + val pwd : String = binding.signUpPasswordEt.text.toString() + + return User(email, pwd) + } + + private fun signUp() : Boolean { + if(binding.signUpIdEt.text.toString().isEmpty() || binding.signUpDirectInputEt.text.toString().isEmpty()) { + Toast.makeText(this, "이메일 형식이 잘못되었습니다.", Toast.LENGTH_SHORT).show() + return false + } + + if(binding.signUpPasswordEt.text.toString() != binding.signUpPasswordCheckEt.text.toString()) { + Toast.makeText(this, "비밀번호가 일치하지 않습니다.", Toast.LENGTH_SHORT).show() + return false + } + + val userDB = SongDatabase.getInstance(this)!! + userDB.userDao().insert(getUser()) + + val user = userDB.userDao().getUsers() + Log.d("sign-up", user.toString()) + + Toast.makeText(this, "회원가입이 완료되었습니다.", Toast.LENGTH_SHORT).show() + return true + } +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/signup/UserDao.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/signup/UserDao.kt" new file mode 100644 index 0000000..a7da6cf --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/signup/UserDao.kt" @@ -0,0 +1,18 @@ +package com.example.umcflo.ui.signup + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.Query +import com.example.umcflo.data.entities.User + +@Dao +interface UserDao { + @Insert + fun insert(user : User) + + @Query("select * from UserTable") + fun getUsers() : List + + @Query("select * from UserTable where email =:email and password = :password") + fun getUser(email : String, password : String) : User? +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SavedSongFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SavedSongFragment.kt" new file mode 100644 index 0000000..66bad79 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SavedSongFragment.kt" @@ -0,0 +1,53 @@ +package com.example.umcflo.ui.song + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.LinearLayoutManager +import com.example.umcflo.data.entities.Song +import com.example.umcflo.databinding.FragmentLockerSavedsongBinding +import com.example.umcflo.ui.main.locker.LockerAlbumRVAdapter +import com.example.umcflo.ui.song.SongDatabase + +class SavedSongFragment : Fragment() { + + lateinit var songDB: SongDatabase + lateinit var binding : FragmentLockerSavedsongBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + binding = FragmentLockerSavedsongBinding.inflate(inflater, container, false) + + songDB = SongDatabase.getInstance(requireContext())!! + + return binding.root + + } + + override fun onStart() { + super.onStart() + initRecyclerview() + } + + private fun initRecyclerview(){ + binding.lockerMusicAlbumRv.layoutManager = LinearLayoutManager(requireActivity()) + val lockerAlbumRVAdapter = LockerAlbumRVAdapter() + + lockerAlbumRVAdapter.setItemClickListener(object : LockerAlbumRVAdapter.OnItemClickListener { + + override fun onRemoveAlbum(songId: Int) { + songDB.songDao().updateIsLikeById(false, songId) + } + }) + binding.lockerMusicAlbumRv.adapter = lockerAlbumRVAdapter + lockerAlbumRVAdapter.addSongs(songDB.songDao().getLikedSongs(true) as ArrayList) + } +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SongActivity.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SongActivity.kt" new file mode 100644 index 0000000..5c0f445 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SongActivity.kt" @@ -0,0 +1,232 @@ +package com.example.umcflo.ui.song + +import android.media.MediaPlayer +import android.os.Bundle +import android.util.Log +import android.view.View +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.example.umcflo.R +import com.example.umcflo.data.entities.Song +import com.example.umcflo.databinding.ActivitySongBinding +import com.google.gson.Gson + +class SongActivity : AppCompatActivity() { + + //전역 변수 + lateinit var binding : ActivitySongBinding + lateinit var timer: Timer + private var mediaPlayer: MediaPlayer? = null + private var gson: Gson = Gson() + + val songs = arrayListOf() + lateinit var songDB: SongDatabase + var nowPos = 0 + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivitySongBinding.inflate(layoutInflater) + setContentView(binding.root) + + initPlayList() + initSong() + initClickListener() + + + } + + override fun onPause() { + super.onPause() + + + songs[nowPos].second = ((binding.songProgressSb.progress * songs[nowPos].playTime)/100)/1000 + songs[nowPos].isPlaying = false + setPlayerStatus(false) + + val sharedPreferences = getSharedPreferences("song", MODE_PRIVATE) + val editor = sharedPreferences.edit() // 에디터 + + editor.putInt("songId",songs[nowPos].id) + + editor.apply() + } + + override fun onDestroy() { + super.onDestroy() + timer.interrupt() + mediaPlayer?.release() + mediaPlayer = null + } + + private fun initPlayList(){ + songDB = SongDatabase.getInstance(this)!! + songs.addAll(songDB.songDao().getSongs()) + } + + private fun initClickListener(){ + binding.songDownIb.setOnClickListener { + finish() + } + + binding.songMiniplayerIv.setOnClickListener { + setPlayerStatus(true) + } + + binding.songPauseIv.setOnClickListener { + setPlayerStatus(false) + } + + binding.songNextIv.setOnClickListener { + moveSong(+1) + } + + binding.songPreviousIv.setOnClickListener { + moveSong(-1) + } + + binding.songLikeIv.setOnClickListener { + setLike(songs[nowPos].isLike) + } + } + + private fun initSong(){ + val spf = getSharedPreferences("song", MODE_PRIVATE) + val songId = spf.getInt("songId",0) + + nowPos = getPlayingSongPosition(songId) + + Log.d("now Song ID",songs[nowPos].id.toString()) + + startTimer() + setPlayer(songs[nowPos]) + } + + private fun setLike(isLike: Boolean){ + songs[nowPos].isLike = !isLike + songDB.songDao().updateIsLikeById(!isLike,songs[nowPos].id) + + if (!isLike){ + binding.songLikeIv.setImageResource(R.drawable.ic_my_like_on) + } else{ + binding.songLikeIv.setImageResource(R.drawable.ic_my_like_off) + } + + } + + private fun moveSong(direct: Int){ + if (nowPos + direct < 0){ + Toast.makeText(this,"first song",Toast.LENGTH_SHORT).show() + return + } + + if (nowPos + direct >= songs.size){ + Toast.makeText(this,"last song",Toast.LENGTH_SHORT).show() + return + } + + nowPos += direct + + timer.interrupt() + startTimer() + + mediaPlayer?.release() + mediaPlayer = null + + setPlayer(songs[nowPos]) + } + + private fun getPlayingSongPosition(songId: Int): Int{ + for (i in 0 until songs.size){ + if (songs[i].id == songId){ + return i + } + } + return 0 + } + + + private fun setPlayer(song: Song){ + binding.songMusicTitleTv.text = song.title + binding.songSingerNameTv.text = song.singer + binding.songStartTimeTv.text = String.format("%02d:%02d",song.second / 60, song.second % 60) + binding.songEndTimeTv.text = String.format("%02d:%02d",song.playTime / 60, song.playTime % 60) + binding.songAlbumIv.setImageResource(song.coverImg!!) + binding.songProgressSb.progress = (song.second * 1000 / song.playTime) + + val music = resources.getIdentifier(song.music, "raw", this.packageName) + mediaPlayer = MediaPlayer.create(this, music) + + if (song.isLike){ + binding.songLikeIv.setImageResource(R.drawable.ic_my_like_on) + } else{ + binding.songLikeIv.setImageResource(R.drawable.ic_my_like_off) + } + + setPlayerStatus(song.isPlaying) + + } + + + private fun setPlayerStatus (isPlaying : Boolean){ + songs[nowPos].isPlaying = isPlaying + timer.isPlaying = isPlaying + + if(isPlaying){ + binding.songMiniplayerIv.visibility = View.GONE + binding.songPauseIv.visibility = View.VISIBLE + mediaPlayer?.start() + } else { + binding.songMiniplayerIv.visibility = View.VISIBLE + binding.songPauseIv.visibility = View.GONE + if(mediaPlayer?.isPlaying == true){ + mediaPlayer?.pause() + } + } + + } + + private fun startTimer(){ + timer = Timer(songs[nowPos].playTime,songs[nowPos].isPlaying) + timer.start() + } + + inner class Timer(private val playTime: Int,var isPlaying: Boolean = true):Thread(){ + + private var second : Int = 0 + private var mills: Float = 0f + + override fun run() { + super.run() + try { + while (true){ + + if (second >= playTime){ + break + } + + if (isPlaying){ + sleep(50) + mills += 50 + + runOnUiThread { + binding.songProgressSb.progress = ((mills / playTime)*100).toInt() + } + + if (mills % 1000 == 0f){ + runOnUiThread { + binding.songStartTimeTv.text = String.format("%02d:%02d",second / 60, second % 60) + } + second++ + } + + } + + } + + }catch (e: InterruptedException){ + Log.d("Song","쓰레드가 죽었습니다. ${e.message}") + } + + } + } +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SongDao.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SongDao.kt" new file mode 100644 index 0000000..37ea55b --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SongDao.kt" @@ -0,0 +1,34 @@ +package com.example.umcflo.ui.song + +import androidx.room.Dao +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Update +import com.example.umcflo.data.entities.Song + +@Dao +interface SongDao { + @Insert + fun insert(song: Song) + + @Update + fun update(song: Song) + + @Delete + fun delete(song: Song) + + @Query("SELECT * FROM SongTable") + fun getSongs(): List + + @Query("SELECT * FROM SongTable WHERE id = :id") + fun getSong(id: Int): Song + + @Query("UPDATE SongTable SET isLike= :isLike WHERE id = :id") + fun updateIsLikeById(isLike: Boolean,id: Int) + + @Query("SELECT * FROM SongTable WHERE isLike= :isLike") + fun getLikedSongs(isLike: Boolean): List + + +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SongDatabase.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SongDatabase.kt" new file mode 100644 index 0000000..68f3cf9 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SongDatabase.kt" @@ -0,0 +1,39 @@ +package com.example.umcflo.ui.song + +import android.content.Context +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import com.example.umcflo.ui.signup.UserDao +import com.example.umcflo.data.entities.Album +import com.example.umcflo.data.entities.Like +import com.example.umcflo.data.entities.Song +import com.example.umcflo.data.entities.User +import com.example.umcflo.ui.main.album.AlbumDao + +@Database(entities = [Song::class, Album::class, User::class, Like::class], version = 1) +abstract class SongDatabase: RoomDatabase() { + abstract fun albumDao(): AlbumDao + abstract fun songDao(): SongDao + abstract fun userDao() : UserDao + + + companion object { + private var instance: SongDatabase? = null + + @Synchronized + fun getInstance(context: Context): SongDatabase? { + if (instance == null) { + synchronized(SongDatabase::class){ + instance = Room.databaseBuilder( + context.applicationContext, + SongDatabase::class.java, + "song-database" // 다른 데이터 베이스랑 이름이 겹치지 않도록 주의 + ).allowMainThreadQueries().build() // 편의상 메인 쓰레드에서 처리하게 한다. + } + } + + return instance + } + } +} \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SongFragment.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SongFragment.kt" similarity index 71% rename from "\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SongFragment.kt" rename to "\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SongFragment.kt" index c1f04a8..31a3c9c 100644 --- "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/java/com/example/myapplication/SongFragment.kt" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/song/SongFragment.kt" @@ -1,11 +1,11 @@ -package com.example.myapplication +package com.example.umcflo.ui.song import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.example.myapplication.databinding.FragmentSongBinding +import com.example.umcflo.databinding.FragmentSongBinding class SongFragment : Fragment() { @@ -16,7 +16,7 @@ class SongFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View? { - binding = FragmentSongBinding.inflate(inflater,container,false) + binding = FragmentSongBinding.inflate(inflater, container, false) return binding.root } diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/splash/SplashActivity.kt" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/splash/SplashActivity.kt" new file mode 100644 index 0000000..fc193b1 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/java/com/example/umcflo/ui/splash/SplashActivity.kt" @@ -0,0 +1,22 @@ +package com.example.umcflo.ui.splash + +import android.content.Intent +import android.os.Bundle +import android.os.Handler +import android.os.Looper +import androidx.appcompat.app.AppCompatActivity +import com.example.umcflo.R +import com.example.umcflo.ui.main.search.MainActivity + +class SplashActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_splash) + + val handler = Handler(Looper.getMainLooper()) + handler.postDelayed({ + startActivity(Intent(this, MainActivity::class.java)) + finish() + }, 2000) + } +} \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_addplaylist.png" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_addplaylist.png" new file mode 100644 index 0000000..a1180c2 Binary files /dev/null and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_addplaylist.png" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_delete.png" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_delete.png" new file mode 100644 index 0000000..3417786 Binary files /dev/null and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_delete.png" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_download.png" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_download.png" new file mode 100644 index 0000000..f295699 Binary files /dev/null and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_download.png" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_mylist.png" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_mylist.png" new file mode 100644 index 0000000..fbfc620 Binary files /dev/null and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_mylist.png" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_play.png" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_play.png" new file mode 100644 index 0000000..c244c21 Binary files /dev/null and "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/btn_editbar_play.png" differ diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/textview_background_select_color_radius.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/textview_background_select_color_radius.xml" index 56a1b55..ea8dc88 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/textview_background_select_color_radius.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/drawable/textview_background_select_color_radius.xml" @@ -2,20 +2,12 @@ -<<<<<<< Updated upstream -======= - ->>>>>>> Stashed changes -======= - android:color="@color/black"/> ->>>>>>> Stashed changes diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_login.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_login.xml" new file mode 100644 index 0000000..7a3b16f --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_login.xml" @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_main.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_main.xml" index c0f5b32..003a5c6 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_main.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_main.xml" @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainActivity"> + tools:context=".ui.main.search.MainActivity"> -<<<<<<< Updated upstream -======= ->>>>>>> Stashed changes >>>>>> Stashed changes android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="13sp" @@ -65,11 +58,7 @@ android:textColor="@color/black" /> >>>>>> Stashed changes android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="12sp" diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_sign_up.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_sign_up.xml" new file mode 100644 index 0000000..e5e99f2 --- /dev/null +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_sign_up.xml" @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_song.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_song.xml" index ad84042..6429381 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_song.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_song.xml" @@ -30,7 +30,7 @@ app:layout_constraintTop_toTopOf="@+id/setting_ib" /> + app:layout_constraintEnd_toEndOf="@+id/song_down_ib" + app:layout_constraintStart_toStartOf="@+id/song_down_ib" + app:layout_constraintTop_toBottomOf="@+id/song_down_ib" /> + app:layout_constraintEnd_toEndOf="@+id/song_music_title_tv" + app:layout_constraintStart_toStartOf="@+id/song_music_title_tv" + app:layout_constraintTop_toBottomOf="@+id/song_music_title_tv" /> + app:layout_constraintBottom_toBottomOf="@+id/song_singer_name_tv" + app:layout_constraintStart_toEndOf="@+id/song_singer_name_tv" + app:layout_constraintTop_toTopOf="@+id/song_singer_name_tv" /> + app:layout_constraintEnd_toEndOf="@+id/song_album_iv" + app:layout_constraintStart_toStartOf="@+id/song_album_iv" + app:layout_constraintTop_toBottomOf="@+id/song_album_iv" /> diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_splash.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_splash.xml" index 046c613..50e621c 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_splash.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/activity_splash.xml" @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".SplashActivity"> + tools:context=".ui.splash.SplashActivity"> + tools:context=".ui.main.home.BannerFragment"> -<<<<<<< Updated upstream -======= ->>>>>>> Stashed changes @@ -30,10 +27,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent" /> -<<<<<<< Updated upstream -======= ->>>>>>> Stashed changes - + + \ No newline at end of file diff --git "a/\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_locker_savedalbum.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/fragment_music_file.xml" similarity index 100% rename from "\355\224\204\353\240\210\353\223\234_\354\235\264\354\242\205\355\233\210/app/src/main/res/layout/fragment_locker_savedalbum.xml" rename to "\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/fragment_music_file.xml" diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/item_album.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/item_album.xml" index 79aa1ca..a82dbdd 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/item_album.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/item_album.xml" @@ -1,9 +1,10 @@ + + android:layout_marginHorizontal="20dp"> diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/item_locker_album.xml" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/item_locker_album.xml" index 9f53158..06ddc84 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/item_locker_album.xml" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/app/src/main/res/layout/item_locker_album.xml" @@ -37,6 +37,15 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + >>>>>> Stashed changes kotlin = "1.9.0" coreKtx = "1.13.1" junit = "4.13.2" diff --git "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/gradle/wrapper/gradle-wrapper.properties" "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/gradle/wrapper/gradle-wrapper.properties" index 54ad693..9d5d8bd 100644 --- "a/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/gradle/wrapper/gradle-wrapper.properties" +++ "b/\355\225\264\353\246\254_\353\260\225\354\203\201\354\236\254/UMCflo/gradle/wrapper/gradle-wrapper.properties" @@ -1,10 +1,6 @@ #Mon May 06 19:43:26 KST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -<<<<<<< Updated upstream distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -======= -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip ->>>>>>> Stashed changes zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists