Merge pull request #32 from SSUMC-6th/kara/#28

[kara/#28] feat : 6주차 구현 완료
SSUMC-6th · May 21, 2024 · bdc4ab3 · bdc4ab3
2 parents c5c774d + aaa736e
commit bdc4ab3
Show file tree

Hide file tree

Showing 68 changed files with 497 additions and 1,925 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/NotePad2/.gitignore b/NotePad2/.gitignore
diff --git a/NotePad2/.idea/.gitignore b/NotePad2/.idea/.gitignore
diff --git a/NotePad2/.idea/.name b/NotePad2/.idea/.name
diff --git a/NotePad2/.idea/compiler.xml b/NotePad2/.idea/compiler.xml
diff --git a/NotePad2/.idea/deploymentTargetDropDown.xml b/NotePad2/.idea/deploymentTargetDropDown.xml
diff --git a/NotePad2/.idea/gradle.xml b/NotePad2/.idea/gradle.xml
diff --git a/NotePad2/.idea/kotlinc.xml b/NotePad2/.idea/kotlinc.xml
diff --git a/NotePad2/.idea/migrations.xml b/NotePad2/.idea/migrations.xml
diff --git a/NotePad2/.idea/misc.xml b/NotePad2/.idea/misc.xml
diff --git a/NotePad2/Android_A b/NotePad2/Android_A
diff --git a/NotePad2/app/.gitignore b/NotePad2/app/.gitignore
diff --git a/NotePad2/app/build.gradle.kts b/NotePad2/app/build.gradle.kts
diff --git a/NotePad2/app/proguard-rules.pro b/NotePad2/app/proguard-rules.pro
diff --git a/NotePad2/app/src/androidTest/java/com/example/notepad/ExampleInstrumentedTest.kt b/NotePad2/app/src/androidTest/java/com/example/notepad/ExampleInstrumentedTest.kt
diff --git a/NotePad2/app/src/main/AndroidManifest.xml b/NotePad2/app/src/main/AndroidManifest.xml
diff --git a/NotePad2/app/src/main/java/com/example/notepad/MainActivity.kt b/NotePad2/app/src/main/java/com/example/notepad/MainActivity.kt
diff --git a/NotePad2/app/src/main/java/com/example/notepad/MemoActivity.kt b/NotePad2/app/src/main/java/com/example/notepad/MemoActivity.kt
diff --git a/NotePad2/app/src/main/java/com/example/notepad/MemoCheckActivity.kt b/NotePad2/app/src/main/java/com/example/notepad/MemoCheckActivity.kt