From ddbe694be50b5ec0e04a587ee101f650b3868f5a Mon Sep 17 00:00:00 2001 From: b1urrrr Date: Fri, 17 Nov 2023 23:41:02 +0900 Subject: [PATCH] =?UTF-8?q?[RENAME/#1]=20section00=20=EB=94=94=EB=A0=89?= =?UTF-8?q?=ED=86=A0=EB=A6=AC=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../section00}/.gitignore | 0 .../section00}/app/.gitignore | 0 .../section00}/app/build.gradle.kts | 0 .../section00}/app/proguard-rules.pro | 0 .../kotlinbasics/ExampleInstrumentedTest.kt | 0 .../app/src/main/AndroidManifest.xml | 0 .../main/java/com/ocomwan/kotlinbasics/Main.kt | 17 +++++++++++++++++ .../res/drawable/ic_launcher_background.xml | 0 .../res/drawable/ic_launcher_foreground.xml | 0 .../src/main/res/mipmap-anydpi/ic_launcher.xml | 0 .../res/mipmap-anydpi/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin .../res/mipmap-hdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin .../res/mipmap-mdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.webp | Bin .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin .../app/src/main/res/values-night/themes.xml | 0 .../app/src/main/res/values/colors.xml | 0 .../app/src/main/res/values/strings.xml | 0 .../app/src/main/res/values/themes.xml | 0 .../app/src/main/res/xml/backup_rules.xml | 0 .../src/main/res/xml/data_extraction_rules.xml | 0 .../ocomwan/kotlinbasics/ExampleUnitTest.kt | 0 .../section00}/build.gradle.kts | 0 .../section00}/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../section00}/gradlew | 0 .../section00}/gradlew.bat | 0 .../section00}/settings.gradle.kts | 0 35 files changed, 17 insertions(+) rename {WEEK01 => modern-android-compose/section00}/.gitignore (100%) rename {WEEK01 => modern-android-compose/section00}/app/.gitignore (100%) rename {WEEK01 => modern-android-compose/section00}/app/build.gradle.kts (100%) rename {WEEK01 => modern-android-compose/section00}/app/proguard-rules.pro (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/androidTest/java/com/ocomwan/kotlinbasics/ExampleInstrumentedTest.kt (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/AndroidManifest.xml (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/java/com/ocomwan/kotlinbasics/Main.kt (62%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/drawable/ic_launcher_background.xml (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/drawable/ic_launcher_foreground.xml (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/mipmap-anydpi/ic_launcher.xml (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/mipmap-hdpi/ic_launcher.webp (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/mipmap-mdpi/ic_launcher.webp (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/mipmap-xhdpi/ic_launcher.webp (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/values-night/themes.xml (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/values/colors.xml (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/values/strings.xml (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/values/themes.xml (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/xml/backup_rules.xml (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/main/res/xml/data_extraction_rules.xml (100%) rename {WEEK01 => modern-android-compose/section00}/app/src/test/java/com/ocomwan/kotlinbasics/ExampleUnitTest.kt (100%) rename {WEEK01 => modern-android-compose/section00}/build.gradle.kts (100%) rename {WEEK01 => modern-android-compose/section00}/gradle.properties (100%) rename {WEEK01 => modern-android-compose/section00}/gradle/wrapper/gradle-wrapper.jar (100%) rename {WEEK01 => modern-android-compose/section00}/gradle/wrapper/gradle-wrapper.properties (100%) rename {WEEK01 => modern-android-compose/section00}/gradlew (100%) rename {WEEK01 => modern-android-compose/section00}/gradlew.bat (100%) rename {WEEK01 => modern-android-compose/section00}/settings.gradle.kts (100%) diff --git a/WEEK01/.gitignore b/modern-android-compose/section00/.gitignore similarity index 100% rename from WEEK01/.gitignore rename to modern-android-compose/section00/.gitignore diff --git a/WEEK01/app/.gitignore b/modern-android-compose/section00/app/.gitignore similarity index 100% rename from WEEK01/app/.gitignore rename to modern-android-compose/section00/app/.gitignore diff --git a/WEEK01/app/build.gradle.kts b/modern-android-compose/section00/app/build.gradle.kts similarity index 100% rename from WEEK01/app/build.gradle.kts rename to modern-android-compose/section00/app/build.gradle.kts diff --git a/WEEK01/app/proguard-rules.pro b/modern-android-compose/section00/app/proguard-rules.pro similarity index 100% rename from WEEK01/app/proguard-rules.pro rename to modern-android-compose/section00/app/proguard-rules.pro diff --git a/WEEK01/app/src/androidTest/java/com/ocomwan/kotlinbasics/ExampleInstrumentedTest.kt b/modern-android-compose/section00/app/src/androidTest/java/com/ocomwan/kotlinbasics/ExampleInstrumentedTest.kt similarity index 100% rename from WEEK01/app/src/androidTest/java/com/ocomwan/kotlinbasics/ExampleInstrumentedTest.kt rename to modern-android-compose/section00/app/src/androidTest/java/com/ocomwan/kotlinbasics/ExampleInstrumentedTest.kt diff --git a/WEEK01/app/src/main/AndroidManifest.xml b/modern-android-compose/section00/app/src/main/AndroidManifest.xml similarity index 100% rename from WEEK01/app/src/main/AndroidManifest.xml rename to modern-android-compose/section00/app/src/main/AndroidManifest.xml diff --git a/WEEK01/app/src/main/java/com/ocomwan/kotlinbasics/Main.kt b/modern-android-compose/section00/app/src/main/java/com/ocomwan/kotlinbasics/Main.kt similarity index 62% rename from WEEK01/app/src/main/java/com/ocomwan/kotlinbasics/Main.kt rename to modern-android-compose/section00/app/src/main/java/com/ocomwan/kotlinbasics/Main.kt index 6fe6bf5..c795bb4 100644 --- a/WEEK01/app/src/main/java/com/ocomwan/kotlinbasics/Main.kt +++ b/modern-android-compose/section00/app/src/main/java/com/ocomwan/kotlinbasics/Main.kt @@ -21,4 +21,21 @@ fun main() { println(numberInput) val stringInput = reader.next() println(stringInput) + + // 조건문 + val i = 5 + if (i > 10) { + print("10보다 크다") + } else if (i > 5) { + print("5보다 크다") + } else { + print("") + } + + val result = when { + i > 10 -> "10보다 크다" + i > 5 -> "5보다 크다" + else -> "!!!" + } + println(result) } diff --git a/WEEK01/app/src/main/res/drawable/ic_launcher_background.xml b/modern-android-compose/section00/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from WEEK01/app/src/main/res/drawable/ic_launcher_background.xml rename to modern-android-compose/section00/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/WEEK01/app/src/main/res/drawable/ic_launcher_foreground.xml b/modern-android-compose/section00/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from WEEK01/app/src/main/res/drawable/ic_launcher_foreground.xml rename to modern-android-compose/section00/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/WEEK01/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/modern-android-compose/section00/app/src/main/res/mipmap-anydpi/ic_launcher.xml similarity index 100% rename from WEEK01/app/src/main/res/mipmap-anydpi/ic_launcher.xml rename to modern-android-compose/section00/app/src/main/res/mipmap-anydpi/ic_launcher.xml diff --git a/WEEK01/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/modern-android-compose/section00/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml similarity index 100% rename from WEEK01/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml rename to modern-android-compose/section00/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml diff --git a/WEEK01/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/modern-android-compose/section00/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from WEEK01/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to modern-android-compose/section00/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/WEEK01/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/modern-android-compose/section00/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from WEEK01/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to modern-android-compose/section00/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/WEEK01/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/modern-android-compose/section00/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from WEEK01/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to modern-android-compose/section00/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/WEEK01/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/modern-android-compose/section00/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from WEEK01/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to modern-android-compose/section00/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/WEEK01/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/modern-android-compose/section00/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from WEEK01/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to modern-android-compose/section00/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/WEEK01/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/modern-android-compose/section00/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from WEEK01/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to modern-android-compose/section00/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/WEEK01/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/modern-android-compose/section00/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from WEEK01/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to modern-android-compose/section00/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/WEEK01/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/modern-android-compose/section00/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from WEEK01/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to modern-android-compose/section00/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/WEEK01/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/modern-android-compose/section00/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from WEEK01/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to modern-android-compose/section00/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/WEEK01/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/modern-android-compose/section00/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from WEEK01/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to modern-android-compose/section00/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/WEEK01/app/src/main/res/values-night/themes.xml b/modern-android-compose/section00/app/src/main/res/values-night/themes.xml similarity index 100% rename from WEEK01/app/src/main/res/values-night/themes.xml rename to modern-android-compose/section00/app/src/main/res/values-night/themes.xml diff --git a/WEEK01/app/src/main/res/values/colors.xml b/modern-android-compose/section00/app/src/main/res/values/colors.xml similarity index 100% rename from WEEK01/app/src/main/res/values/colors.xml rename to modern-android-compose/section00/app/src/main/res/values/colors.xml diff --git a/WEEK01/app/src/main/res/values/strings.xml b/modern-android-compose/section00/app/src/main/res/values/strings.xml similarity index 100% rename from WEEK01/app/src/main/res/values/strings.xml rename to modern-android-compose/section00/app/src/main/res/values/strings.xml diff --git a/WEEK01/app/src/main/res/values/themes.xml b/modern-android-compose/section00/app/src/main/res/values/themes.xml similarity index 100% rename from WEEK01/app/src/main/res/values/themes.xml rename to modern-android-compose/section00/app/src/main/res/values/themes.xml diff --git a/WEEK01/app/src/main/res/xml/backup_rules.xml b/modern-android-compose/section00/app/src/main/res/xml/backup_rules.xml similarity index 100% rename from WEEK01/app/src/main/res/xml/backup_rules.xml rename to modern-android-compose/section00/app/src/main/res/xml/backup_rules.xml diff --git a/WEEK01/app/src/main/res/xml/data_extraction_rules.xml b/modern-android-compose/section00/app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from WEEK01/app/src/main/res/xml/data_extraction_rules.xml rename to modern-android-compose/section00/app/src/main/res/xml/data_extraction_rules.xml diff --git a/WEEK01/app/src/test/java/com/ocomwan/kotlinbasics/ExampleUnitTest.kt b/modern-android-compose/section00/app/src/test/java/com/ocomwan/kotlinbasics/ExampleUnitTest.kt similarity index 100% rename from WEEK01/app/src/test/java/com/ocomwan/kotlinbasics/ExampleUnitTest.kt rename to modern-android-compose/section00/app/src/test/java/com/ocomwan/kotlinbasics/ExampleUnitTest.kt diff --git a/WEEK01/build.gradle.kts b/modern-android-compose/section00/build.gradle.kts similarity index 100% rename from WEEK01/build.gradle.kts rename to modern-android-compose/section00/build.gradle.kts diff --git a/WEEK01/gradle.properties b/modern-android-compose/section00/gradle.properties similarity index 100% rename from WEEK01/gradle.properties rename to modern-android-compose/section00/gradle.properties diff --git a/WEEK01/gradle/wrapper/gradle-wrapper.jar b/modern-android-compose/section00/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from WEEK01/gradle/wrapper/gradle-wrapper.jar rename to modern-android-compose/section00/gradle/wrapper/gradle-wrapper.jar diff --git a/WEEK01/gradle/wrapper/gradle-wrapper.properties b/modern-android-compose/section00/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from WEEK01/gradle/wrapper/gradle-wrapper.properties rename to modern-android-compose/section00/gradle/wrapper/gradle-wrapper.properties diff --git a/WEEK01/gradlew b/modern-android-compose/section00/gradlew similarity index 100% rename from WEEK01/gradlew rename to modern-android-compose/section00/gradlew diff --git a/WEEK01/gradlew.bat b/modern-android-compose/section00/gradlew.bat similarity index 100% rename from WEEK01/gradlew.bat rename to modern-android-compose/section00/gradlew.bat diff --git a/WEEK01/settings.gradle.kts b/modern-android-compose/section00/settings.gradle.kts similarity index 100% rename from WEEK01/settings.gradle.kts rename to modern-android-compose/section00/settings.gradle.kts