diff --git a/BCSD_Assignment_2/.idea/.name b/BCSD_Assignment_2/.idea/.name deleted file mode 100644 index 30d74d2..0000000 --- a/BCSD_Assignment_2/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -test \ No newline at end of file diff --git a/BCSD_Assignment_2/app/src/main/res/values-night/themes.xml b/BCSD_Assignment_2/app/src/main/res/values-night/themes.xml deleted file mode 100644 index 13b3609..0000000 --- a/BCSD_Assignment_2/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/BCSD_Assignment_2/app/src/main/res/values/colors.xml b/BCSD_Assignment_2/app/src/main/res/values/colors.xml deleted file mode 100644 index c8524cd..0000000 --- a/BCSD_Assignment_2/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - #FF000000 - #FFFFFFFF - \ No newline at end of file diff --git a/BCSD_Assignment_2/app/src/main/res/values/strings.xml b/BCSD_Assignment_2/app/src/main/res/values/strings.xml deleted file mode 100644 index fde7ba5..0000000 --- a/BCSD_Assignment_2/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - test - \ No newline at end of file diff --git a/BCSD_Assignment_2/app/src/main/res/values/themes.xml b/BCSD_Assignment_2/app/src/main/res/values/themes.xml deleted file mode 100644 index 3406f13..0000000 --- a/BCSD_Assignment_2/app/src/main/res/values/themes.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - + + + + + + + + + \ No newline at end of file diff --git a/assignment_week_4/app/src/main/res/values/colors.xml b/assignment_week_4/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..b2aff60 --- /dev/null +++ b/assignment_week_4/app/src/main/res/values/colors.xml @@ -0,0 +1,17 @@ + + + #F5F5F5 + #333333 + #FFFFFF + #757575 + #2196F3 + #FFFFFF + + + #121212 + #E0E0E0 + #1E1E1E + #BDBDBD + #2196F3 + #FFFFFF + \ No newline at end of file diff --git a/assignment_week_4/app/src/main/res/values/strings.xml b/assignment_week_4/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..7ed2f61 --- /dev/null +++ b/assignment_week_4/app/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ + + assignment_week_02 + 로그인 + 아이디를 입력하세요 + 비밀번호를 입력하세요 + 로그인 + \ No newline at end of file diff --git a/assignment_week_4/app/src/main/res/values/themes.xml b/assignment_week_4/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..435a9a0 --- /dev/null +++ b/assignment_week_4/app/src/main/res/values/themes.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/BCSD_Assignment_2/app/src/main/res/xml/backup_rules.xml b/assignment_week_4/app/src/main/res/xml/backup_rules.xml similarity index 100% rename from BCSD_Assignment_2/app/src/main/res/xml/backup_rules.xml rename to assignment_week_4/app/src/main/res/xml/backup_rules.xml diff --git a/BCSD_Assignment_2/app/src/main/res/xml/data_extraction_rules.xml b/assignment_week_4/app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from BCSD_Assignment_2/app/src/main/res/xml/data_extraction_rules.xml rename to assignment_week_4/app/src/main/res/xml/data_extraction_rules.xml diff --git a/BCSD_Assignment_2/app/src/test/java/com/example/test/ExampleUnitTest.kt b/assignment_week_4/app/src/test/java/com/example/assignment_week_02/ExampleUnitTest.kt similarity index 88% rename from BCSD_Assignment_2/app/src/test/java/com/example/test/ExampleUnitTest.kt rename to assignment_week_4/app/src/test/java/com/example/assignment_week_02/ExampleUnitTest.kt index 7a7bf3e..4fc2c1a 100644 --- a/BCSD_Assignment_2/app/src/test/java/com/example/test/ExampleUnitTest.kt +++ b/assignment_week_4/app/src/test/java/com/example/assignment_week_02/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.example.test +package com.example.assignment_week_02 import org.junit.Test diff --git a/BCSD_Assignment_2/build.gradle.kts b/assignment_week_4/build.gradle.kts similarity index 100% rename from BCSD_Assignment_2/build.gradle.kts rename to assignment_week_4/build.gradle.kts diff --git a/BCSD_Assignment_2/gradle.properties b/assignment_week_4/gradle.properties similarity index 100% rename from BCSD_Assignment_2/gradle.properties rename to assignment_week_4/gradle.properties diff --git a/BCSD_Assignment_2/gradle/libs.versions.toml b/assignment_week_4/gradle/libs.versions.toml similarity index 94% rename from BCSD_Assignment_2/gradle/libs.versions.toml rename to assignment_week_4/gradle/libs.versions.toml index faf6ca2..04e14fb 100644 --- a/BCSD_Assignment_2/gradle/libs.versions.toml +++ b/assignment_week_4/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] agp = "8.6.0" kotlin = "1.9.0" -coreKtx = "1.13.1" +coreKtx = "1.15.0" junit = "4.13.2" junitVersion = "1.2.1" espressoCore = "3.6.1" appcompat = "1.7.0" material = "1.12.0" -activity = "1.9.2" -constraintlayout = "2.1.4" +activity = "1.9.3" +constraintlayout = "2.2.0" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } diff --git a/BCSD_Assignment_2/gradle/wrapper/gradle-wrapper.jar b/assignment_week_4/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from BCSD_Assignment_2/gradle/wrapper/gradle-wrapper.jar rename to assignment_week_4/gradle/wrapper/gradle-wrapper.jar diff --git a/BCSD_Assignment_2/gradle/wrapper/gradle-wrapper.properties b/assignment_week_4/gradle/wrapper/gradle-wrapper.properties similarity index 86% rename from BCSD_Assignment_2/gradle/wrapper/gradle-wrapper.properties rename to assignment_week_4/gradle/wrapper/gradle-wrapper.properties index 6f40cec..7aba33c 100644 --- a/BCSD_Assignment_2/gradle/wrapper/gradle-wrapper.properties +++ b/assignment_week_4/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Mon Oct 14 23:14:57 KST 2024 +#Tue Nov 05 14:07:51 KST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip diff --git a/BCSD_Assignment_2/gradlew b/assignment_week_4/gradlew similarity index 100% rename from BCSD_Assignment_2/gradlew rename to assignment_week_4/gradlew diff --git a/BCSD_Assignment_2/gradlew.bat b/assignment_week_4/gradlew.bat similarity index 100% rename from BCSD_Assignment_2/gradlew.bat rename to assignment_week_4/gradlew.bat diff --git a/BCSD_Assignment_2/settings.gradle.kts b/assignment_week_4/settings.gradle.kts similarity index 92% rename from BCSD_Assignment_2/settings.gradle.kts rename to assignment_week_4/settings.gradle.kts index 46174f9..e5e132c 100644 --- a/BCSD_Assignment_2/settings.gradle.kts +++ b/assignment_week_4/settings.gradle.kts @@ -19,6 +19,6 @@ dependencyResolutionManagement { } } -rootProject.name = "test" +rootProject.name = "assignment_week_02" include(":app") \ No newline at end of file