From f357cca1695714c500f767b7242ef4aaae116c64 Mon Sep 17 00:00:00 2001 From: hyowon0204 Date: Tue, 18 Jun 2024 20:24:27 +0900 Subject: [PATCH] =?UTF-8?q?[kara/#43]=209=EC=A3=BC=EC=B0=A8=20=EA=B5=AC?= =?UTF-8?q?=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 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../app/src/main/res/values-night/themes.xml | 7 + 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 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + NotePad2/gradlew | 185 +++++ NotePad2/gradlew.bat | 89 +++ NotePad2/settings.gradle.kts | 24 + UMC_6th/app/build.gradle.kts | 11 + UMC_6th/app/src/main/AndroidManifest.xml | 1 + .../com/example/myfirstapp/ApiRepository.kt | 7 + .../java/com/example/myfirstapp/AuthApi.kt | 14 + .../com/example/myfirstapp/AuthResponse.kt | 3 + .../com/example/myfirstapp/AuthService.kt | 51 ++ .../com/example/myfirstapp/BaseResponse.kt | 10 + .../example/myfirstapp/ForegroundService.kt | 63 ++ .../com/example/myfirstapp/LoginActivity.kt | 30 +- .../java/com/example/myfirstapp/LoginView.kt | 6 + .../com/example/myfirstapp/LookFragment.kt | 51 +- .../java/com/example/myfirstapp/LookView.kt | 7 + .../com/example/myfirstapp/MainActivity.kt | 6 + .../java/com/example/myfirstapp/Result.kt | 8 + .../example/myfirstapp/RetrofitInstance.kt | 17 + .../com/example/myfirstapp/SignUpActivity.kt | 47 +- .../java/com/example/myfirstapp/SignUpView.kt | 6 + .../java/com/example/myfirstapp/SongApi.kt | 9 + .../com/example/myfirstapp/SongRVAdapter.kt | 56 ++ .../com/example/myfirstapp/SongResponse.kt | 21 + .../com/example/myfirstapp/SongService.kt | 40 + .../main/java/com/example/myfirstapp/User.kt | 9 +- .../app/src/main/res/layout/fragment_look.xml | 711 ++++++++++++------ UMC_6th/app/src/main/res/layout/item_song.xml | 71 ++ 76 files changed, 2149 insertions(+), 283 deletions(-) create mode 100644 NotePad2/.gitignore create mode 100644 NotePad2/.idea/.gitignore create mode 100644 NotePad2/.idea/.name create mode 100644 NotePad2/.idea/compiler.xml create mode 100644 NotePad2/.idea/deploymentTargetDropDown.xml create mode 100644 NotePad2/.idea/gradle.xml create mode 100644 NotePad2/.idea/kotlinc.xml create mode 100644 NotePad2/.idea/migrations.xml create mode 100644 NotePad2/.idea/misc.xml create mode 160000 NotePad2/Android_A create mode 100644 NotePad2/app/.gitignore create mode 100644 NotePad2/app/build.gradle.kts create mode 100644 NotePad2/app/proguard-rules.pro create mode 100644 NotePad2/app/src/androidTest/java/com/example/notepad/ExampleInstrumentedTest.kt create mode 100644 NotePad2/app/src/main/AndroidManifest.xml create mode 100644 NotePad2/app/src/main/java/com/example/notepad/MainActivity.kt create mode 100644 NotePad2/app/src/main/java/com/example/notepad/MemoActivity.kt create mode 100644 NotePad2/app/src/main/java/com/example/notepad/MemoCheckActivity.kt create mode 100644 NotePad2/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 NotePad2/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 NotePad2/app/src/main/res/layout/activity_main.xml create mode 100644 NotePad2/app/src/main/res/layout/activity_memo.xml create mode 100644 NotePad2/app/src/main/res/layout/activity_memocheck.xml create mode 100644 NotePad2/app/src/main/res/layout/dialog.xml create mode 100644 NotePad2/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 NotePad2/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 NotePad2/app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 NotePad2/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 NotePad2/app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 NotePad2/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 NotePad2/app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 NotePad2/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 NotePad2/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 NotePad2/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 NotePad2/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 NotePad2/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 NotePad2/app/src/main/res/values-night/themes.xml create mode 100644 NotePad2/app/src/main/res/values/colors.xml create mode 100644 NotePad2/app/src/main/res/values/strings.xml create mode 100644 NotePad2/app/src/main/res/values/themes.xml create mode 100644 NotePad2/app/src/main/res/xml/backup_rules.xml create mode 100644 NotePad2/app/src/main/res/xml/data_extraction_rules.xml create mode 100644 NotePad2/app/src/test/java/com/example/notepad/ExampleUnitTest.kt create mode 100644 NotePad2/build.gradle.kts create mode 100644 NotePad2/gradle.properties create mode 100644 NotePad2/gradle/libs.versions.toml create mode 100644 NotePad2/gradle/wrapper/gradle-wrapper.jar create mode 100644 NotePad2/gradle/wrapper/gradle-wrapper.properties create mode 100644 NotePad2/gradlew create mode 100644 NotePad2/gradlew.bat create mode 100644 NotePad2/settings.gradle.kts create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/ApiRepository.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/AuthApi.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/AuthResponse.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/AuthService.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/BaseResponse.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/ForegroundService.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/LoginView.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/LookView.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/Result.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/RetrofitInstance.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/SignUpView.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/SongApi.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/SongRVAdapter.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/SongResponse.kt create mode 100644 UMC_6th/app/src/main/java/com/example/myfirstapp/SongService.kt create mode 100644 UMC_6th/app/src/main/res/layout/item_song.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..0886210 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/NotePad2/.gitignore b/NotePad2/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/NotePad2/.gitignore @@ -0,0 +1,15 @@ +*.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 new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/NotePad2/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/NotePad2/.idea/.name b/NotePad2/.idea/.name new file mode 100644 index 0000000..6f001b6 --- /dev/null +++ b/NotePad2/.idea/.name @@ -0,0 +1 @@ +NotePad \ No newline at end of file diff --git a/NotePad2/.idea/compiler.xml b/NotePad2/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/NotePad2/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/NotePad2/.idea/deploymentTargetDropDown.xml b/NotePad2/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..0c0c338 --- /dev/null +++ b/NotePad2/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/NotePad2/.idea/gradle.xml b/NotePad2/.idea/gradle.xml new file mode 100644 index 0000000..0897082 --- /dev/null +++ b/NotePad2/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/NotePad2/.idea/kotlinc.xml b/NotePad2/.idea/kotlinc.xml new file mode 100644 index 0000000..fdf8d99 --- /dev/null +++ b/NotePad2/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/NotePad2/.idea/migrations.xml b/NotePad2/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/NotePad2/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/NotePad2/.idea/misc.xml b/NotePad2/.idea/misc.xml new file mode 100644 index 0000000..0ad17cb --- /dev/null +++ b/NotePad2/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/NotePad2/Android_A b/NotePad2/Android_A new file mode 160000 index 0000000..9b0e4df --- /dev/null +++ b/NotePad2/Android_A @@ -0,0 +1 @@ +Subproject commit 9b0e4dfd39a0d809871cce76e037daca604882d8 diff --git a/NotePad2/app/.gitignore b/NotePad2/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/NotePad2/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/NotePad2/app/build.gradle.kts b/NotePad2/app/build.gradle.kts new file mode 100644 index 0000000..bb61997 --- /dev/null +++ b/NotePad2/app/build.gradle.kts @@ -0,0 +1,58 @@ +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 new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/NotePad2/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/NotePad2/app/src/androidTest/java/com/example/notepad/ExampleInstrumentedTest.kt b/NotePad2/app/src/androidTest/java/com/example/notepad/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..d472507 --- /dev/null +++ b/NotePad2/app/src/androidTest/java/com/example/notepad/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +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 new file mode 100644 index 0000000..1cd44a1 --- /dev/null +++ b/NotePad2/app/src/main/AndroidManifest.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..b42b9fb --- /dev/null +++ b/NotePad2/app/src/main/java/com/example/notepad/MainActivity.kt @@ -0,0 +1,56 @@ +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