From 38c0929bc6369756779c19c8b2c69609ccbe3956 Mon Sep 17 00:00:00 2001 From: hyowon0204 Date: Tue, 21 May 2024 11:19:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[kara/#28]=20feat=20::=206=EC=A3=BC?= =?UTF-8?q?=EC=B0=A8=20=EA=B5=AC=ED=98=84=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/vcs.xml | 1 - NotePad2/.gitignore | 15 - NotePad2/.idea/.gitignore | 3 - NotePad2/.idea/.name | 1 - NotePad2/.idea/compiler.xml | 6 - NotePad2/.idea/deploymentTargetDropDown.xml | 10 - NotePad2/.idea/gradle.xml | 19 - NotePad2/.idea/kotlinc.xml | 6 - NotePad2/.idea/migrations.xml | 10 - NotePad2/.idea/misc.xml | 10 - NotePad2/Android_A | 1 - NotePad2/app/.gitignore | 1 - NotePad2/app/build.gradle.kts | 58 -- NotePad2/app/proguard-rules.pro | 21 - .../notepad/ExampleInstrumentedTest.kt | 24 - NotePad2/app/src/main/AndroidManifest.xml | 35 -- .../java/com/example/notepad/MainActivity.kt | 56 -- .../java/com/example/notepad/MemoActivity.kt | 44 -- .../com/example/notepad/MemoCheckActivity.kt | 21 - .../res/drawable/ic_launcher_background.xml | 170 ------ .../res/drawable/ic_launcher_foreground.xml | 30 - .../app/src/main/res/layout/activity_main.xml | 34 -- .../app/src/main/res/layout/activity_memo.xml | 50 -- .../main/res/layout/activity_memocheck.xml | 32 -- NotePad2/app/src/main/res/layout/dialog.xml | 76 --- .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 - .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 - .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes .../app/src/main/res/values-night/themes.xml | 7 - NotePad2/app/src/main/res/values/colors.xml | 5 - NotePad2/app/src/main/res/values/strings.xml | 3 - NotePad2/app/src/main/res/values/themes.xml | 9 - .../app/src/main/res/xml/backup_rules.xml | 13 - .../main/res/xml/data_extraction_rules.xml | 19 - .../com/example/notepad/ExampleUnitTest.kt | 17 - NotePad2/build.gradle.kts | 5 - NotePad2/gradle.properties | 23 - NotePad2/gradle/libs.versions.toml | 26 - NotePad2/gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - NotePad2/gradlew | 185 ------- NotePad2/gradlew.bat | 89 --- NotePad2/settings.gradle.kts | 24 - UMC_6th/app/src/main/AndroidManifest.xml | 1 + .../main/java/com/example/myfirstapp/Album.kt | 8 + .../com/example/myfirstapp/AlbumFragment.kt | 14 +- .../com/example/myfirstapp/AlbumRVAdapter.kt | 56 ++ .../myfirstapp/CommunicationInterface.kt | 5 + .../com/example/myfirstapp/HomeFragment.kt | 61 +- .../myfirstapp/LockerAlbumRVAdapter.kt | 75 +++ .../com/example/myfirstapp/MainActivity.kt | 5 + .../example/myfirstapp/SavedSongFragment.kt | 55 ++ .../com/example/myfirstapp/SongFragment.kt | 36 -- .../app/src/main/res/layout/fragment_home.xml | 179 +----- .../src/main/res/layout/fragment_locker.xml | 50 +- .../main/res/layout/fragment_savedsong.xml | 25 +- .../app/src/main/res/layout/fragment_song.xml | 522 +----------------- .../app/src/main/res/layout/item_album.xml | 58 ++ .../src/main/res/layout/item_locker_album.xml | 93 ++++ 68 files changed, 495 insertions(+), 1925 deletions(-) delete mode 100644 NotePad2/.gitignore delete mode 100644 NotePad2/.idea/.gitignore delete mode 100644 NotePad2/.idea/.name delete mode 100644 NotePad2/.idea/compiler.xml delete mode 100644 NotePad2/.idea/deploymentTargetDropDown.xml delete mode 100644 NotePad2/.idea/gradle.xml delete mode 100644 NotePad2/.idea/kotlinc.xml delete mode 100644 NotePad2/.idea/migrations.xml delete mode 100644 NotePad2/.idea/misc.xml delete mode 160000 NotePad2/Android_A delete mode 100644 NotePad2/app/.gitignore delete mode 100644 NotePad2/app/build.gradle.kts delete mode 100644 NotePad2/app/proguard-rules.pro delete mode 100644 NotePad2/app/src/androidTest/java/com/example/notepad/ExampleInstrumentedTest.kt delete mode 100644 NotePad2/app/src/main/AndroidManifest.xml delete mode 100644 NotePad2/app/src/main/java/com/example/notepad/MainActivity.kt delete mode 100644 NotePad2/app/src/main/java/com/example/notepad/MemoActivity.kt delete mode 100644 NotePad2/app/src/main/java/com/example/notepad/MemoCheckActivity.kt delete mode 100644 NotePad2/app/src/main/res/drawable/ic_launcher_background.xml delete mode 100644 NotePad2/app/src/main/res/drawable/ic_launcher_foreground.xml delete mode 100644 NotePad2/app/src/main/res/layout/activity_main.xml delete mode 100644 NotePad2/app/src/main/res/layout/activity_memo.xml delete mode 100644 NotePad2/app/src/main/res/layout/activity_memocheck.xml delete mode 100644 NotePad2/app/src/main/res/layout/dialog.xml delete mode 100644 NotePad2/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 NotePad2/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 NotePad2/app/src/main/res/mipmap-hdpi/ic_launcher.webp delete mode 100644 NotePad2/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp delete mode 100644 NotePad2/app/src/main/res/mipmap-mdpi/ic_launcher.webp delete mode 100644 NotePad2/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp delete mode 100644 NotePad2/app/src/main/res/mipmap-xhdpi/ic_launcher.webp delete mode 100644 NotePad2/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp delete mode 100644 NotePad2/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp delete mode 100644 NotePad2/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp delete mode 100644 NotePad2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp delete mode 100644 NotePad2/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp delete mode 100644 NotePad2/app/src/main/res/values-night/themes.xml delete mode 100644 NotePad2/app/src/main/res/values/colors.xml delete mode 100644 NotePad2/app/src/main/res/values/strings.xml delete mode 100644 NotePad2/app/src/main/res/values/themes.xml delete mode 100644 NotePad2/app/src/main/res/xml/backup_rules.xml delete mode 100644 NotePad2/app/src/main/res/xml/data_extraction_rules.xml delete mode 100644 NotePad2/app/src/test/java/com/example/notepad/ExampleUnitTest.kt delete mode 100644 NotePad2/build.gradle.kts delete mode 100644 NotePad2/gradle.properties delete mode 100644 NotePad2/gradle/libs.versions.toml delete mode 100644 NotePad2/gradle/wrapper/gradle-wrapper.jar delete mode 100644 NotePad2/gradle/wrapper/gradle-wrapper.properties delete mode 100644 NotePad2/gradlew delete mode 100644 NotePad2/gradlew.bat delete mode 100644 NotePad2/settings.gradle.kts create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/Album.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/AlbumRVAdapter.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/CommunicationInterface.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/LockerAlbumRVAdapter.kt create mode 100644 UMC_6th/app/src/main/res/layout/item_album.xml create mode 100644 UMC_6th/app/src/main/res/layout/item_locker_album.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 0886210..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/NotePad2/.gitignore b/NotePad2/.gitignore deleted file mode 100644 index aa724b7..0000000 --- a/NotePad2/.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/NotePad2/.idea/.gitignore b/NotePad2/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/NotePad2/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/NotePad2/.idea/.name b/NotePad2/.idea/.name deleted file mode 100644 index 6f001b6..0000000 --- a/NotePad2/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -NotePad \ No newline at end of file diff --git a/NotePad2/.idea/compiler.xml b/NotePad2/.idea/compiler.xml deleted file mode 100644 index b589d56..0000000 --- a/NotePad2/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/NotePad2/.idea/deploymentTargetDropDown.xml b/NotePad2/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 0c0c338..0000000 --- a/NotePad2/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/NotePad2/.idea/gradle.xml b/NotePad2/.idea/gradle.xml deleted file mode 100644 index 0897082..0000000 --- a/NotePad2/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/NotePad2/.idea/kotlinc.xml b/NotePad2/.idea/kotlinc.xml deleted file mode 100644 index fdf8d99..0000000 --- a/NotePad2/.idea/kotlinc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/NotePad2/.idea/migrations.xml b/NotePad2/.idea/migrations.xml deleted file mode 100644 index f8051a6..0000000 --- a/NotePad2/.idea/migrations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/NotePad2/.idea/misc.xml b/NotePad2/.idea/misc.xml deleted file mode 100644 index 0ad17cb..0000000 --- a/NotePad2/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/NotePad2/Android_A b/NotePad2/Android_A deleted file mode 160000 index 9b0e4df..0000000 --- a/NotePad2/Android_A +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9b0e4dfd39a0d809871cce76e037daca604882d8 diff --git a/NotePad2/app/.gitignore b/NotePad2/app/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/NotePad2/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/NotePad2/app/build.gradle.kts b/NotePad2/app/build.gradle.kts deleted file mode 100644 index bb61997..0000000 --- a/NotePad2/app/build.gradle.kts +++ /dev/null @@ -1,58 +0,0 @@ -plugins { - alias(libs.plugins.androidApplication) - alias(libs.plugins.jetbrainsKotlinAndroid) -} - -android { - namespace = "com.example.notepad" - compileSdk = 34 - - defaultConfig { - applicationId = "com.example.notepad" - minSdk = 24 - 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" - } - android { - buildFeatures { - dataBinding = true // 데이터 바인딩 - } - - buildFeatures { - viewBinding = true // 뷰 바인딩 - } - } -} - -dependencies { - - implementation(libs.androidx.core.ktx) - implementation(libs.androidx.appcompat) - implementation(libs.material) - implementation(libs.androidx.activity) - implementation(libs.androidx.constraintlayout) - testImplementation(libs.junit) - androidTestImplementation(libs.androidx.junit) - androidTestImplementation(libs.androidx.espresso.core) - -} \ No newline at end of file diff --git a/NotePad2/app/proguard-rules.pro b/NotePad2/app/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/NotePad2/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/NotePad2/app/src/androidTest/java/com/example/notepad/ExampleInstrumentedTest.kt b/NotePad2/app/src/androidTest/java/com/example/notepad/ExampleInstrumentedTest.kt deleted file mode 100644 index d472507..0000000 --- a/NotePad2/app/src/androidTest/java/com/example/notepad/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.notepad - -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.notepad", appContext.packageName) - } -} \ No newline at end of file diff --git a/NotePad2/app/src/main/AndroidManifest.xml b/NotePad2/app/src/main/AndroidManifest.xml deleted file mode 100644 index 1cd44a1..0000000 --- a/NotePad2/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/NotePad2/app/src/main/java/com/example/notepad/MainActivity.kt b/NotePad2/app/src/main/java/com/example/notepad/MainActivity.kt deleted file mode 100644 index b42b9fb..0000000 --- a/NotePad2/app/src/main/java/com/example/notepad/MainActivity.kt +++ /dev/null @@ -1,56 +0,0 @@ -package com.example.notepad - -import android.content.Intent -import android.os.Bundle -import android.view.LayoutInflater -import android.widget.Button -import androidx.appcompat.app.AlertDialog -import androidx.appcompat.app.AppCompatActivity -import com.example.notepad.databinding.ActivityMainBinding - -class MainActivity : AppCompatActivity() { - - lateinit var binding : ActivityMainBinding - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - binding = ActivityMainBinding.inflate(layoutInflater) - setContentView(binding.root) - - } - - override fun onStart() { - super.onStart() - binding.button.setOnClickListener { - val intent = Intent(this, MemoActivity::class.java) - val sharedPreferences = this.getSharedPreferences("memo", AppCompatActivity.MODE_PRIVATE) - val tempMemo = sharedPreferences.getString("tempMemo", null) - - if(tempMemo != null) { - val dialogView = LayoutInflater.from(this).inflate(R.layout.dialog, null) - val builder = AlertDialog.Builder(this) - .setView(dialogView) - .setTitle("메모 복원하기") - - val alertDialog = builder.show() - val yesBtn = alertDialog.findViewById