diff --git a/.gitignore b/.gitignore index d0c4686..aa724b7 100644 --- a/.gitignore +++ b/.gitignore @@ -13,13 +13,3 @@ .externalNativeBuild .cxx local.properties - -.idea/ - -gradle/ - -gradle.properties - -gradlew - -gradlew.bat diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..bcfd775 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +DEMU-ANDROID \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7b3006b --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..148fdd2 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..74dd639 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..931b96c --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/DEMU_ANDROID/.gitignore b/DEMU_ANDROID/.gitignore deleted file mode 100644 index aa724b7..0000000 --- a/DEMU_ANDROID/.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/DEMU_ANDROID/app/.gitignore b/DEMU_ANDROID/app/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/DEMU_ANDROID/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/DEMU_ANDROID/app/build.gradle.kts b/DEMU_ANDROID/app/build.gradle.kts deleted file mode 100644 index 155d975..0000000 --- a/DEMU_ANDROID/app/build.gradle.kts +++ /dev/null @@ -1,51 +0,0 @@ -plugins { - alias(libs.plugins.android.application) - alias(libs.plugins.jetbrains.kotlin.android) -} - -android { - namespace = "com.example.demu_android" - compileSdk = 34 - - defaultConfig { - applicationId = "com.example.demu_android" - 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" - } - buildFeatures { - dataBinding = 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/DEMU_ANDROID/app/proguard-rules.pro b/DEMU_ANDROID/app/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/DEMU_ANDROID/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/DEMU_ANDROID/app/src/androidTest/java/com/example/demu_android/ExampleInstrumentedTest.kt b/DEMU_ANDROID/app/src/androidTest/java/com/example/demu_android/ExampleInstrumentedTest.kt deleted file mode 100644 index f934aa3..0000000 --- a/DEMU_ANDROID/app/src/androidTest/java/com/example/demu_android/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.demu_android - -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.demu_android", appContext.packageName) - } -} \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/AndroidManifest.xml b/DEMU_ANDROID/app/src/main/AndroidManifest.xml deleted file mode 100644 index bcb530d..0000000 --- a/DEMU_ANDROID/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/java/com/example/demu_android/SplashActivity.kt b/DEMU_ANDROID/app/src/main/java/com/example/demu_android/SplashActivity.kt deleted file mode 100644 index cbc222c..0000000 --- a/DEMU_ANDROID/app/src/main/java/com/example/demu_android/SplashActivity.kt +++ /dev/null @@ -1,29 +0,0 @@ - -package com.example.demu_android - -import android.content.Intent -import android.os.Bundle -import android.os.Handler -import android.os.Looper -import androidx.activity.enableEdgeToEdge -import androidx.appcompat.app.AppCompatActivity -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat - -class SplashActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - enableEdgeToEdge() - setContentView(R.layout.activity_splash) - - moveToMainActivity() - } - - private fun moveToMainActivity() { - val intent = Intent(this, MainActivity::class.java) - - Handler(Looper.getMainLooper()).postDelayed( { - startActivity(intent) - }, 3000) - } -} \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/java/com/example/demu_android/home/HomeActivity.kt b/DEMU_ANDROID/app/src/main/java/com/example/demu_android/home/HomeActivity.kt deleted file mode 100644 index 1d41e21..0000000 --- a/DEMU_ANDROID/app/src/main/java/com/example/demu_android/home/HomeActivity.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.demu_android.home - -import android.os.Bundle -import androidx.activity.enableEdgeToEdge -import androidx.appcompat.app.AppCompatActivity -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -import com.example.demu_android.R - -class HomeActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - enableEdgeToEdge() - setContentView(R.layout.activity_home) - - } -} \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/res/drawable/bg_button.xml b/DEMU_ANDROID/app/src/main/res/drawable/bg_button.xml deleted file mode 100644 index d670a35..0000000 --- a/DEMU_ANDROID/app/src/main/res/drawable/bg_button.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/res/drawable/bg_inputlayout.xml b/DEMU_ANDROID/app/src/main/res/drawable/bg_inputlayout.xml deleted file mode 100644 index 9d743f0..0000000 --- a/DEMU_ANDROID/app/src/main/res/drawable/bg_inputlayout.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/res/drawable/button_color_default.xml b/DEMU_ANDROID/app/src/main/res/drawable/button_color_default.xml deleted file mode 100644 index 28895e9..0000000 --- a/DEMU_ANDROID/app/src/main/res/drawable/button_color_default.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/res/drawable/gradient.png b/DEMU_ANDROID/app/src/main/res/drawable/gradient.png deleted file mode 100644 index 23c958a..0000000 Binary files a/DEMU_ANDROID/app/src/main/res/drawable/gradient.png and /dev/null differ diff --git a/DEMU_ANDROID/app/src/main/res/drawable/ic_demu.xml b/DEMU_ANDROID/app/src/main/res/drawable/ic_demu.xml deleted file mode 100644 index 0da4c18..0000000 --- a/DEMU_ANDROID/app/src/main/res/drawable/ic_demu.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/DEMU_ANDROID/app/src/main/res/drawable/ic_launcher_background.xml b/DEMU_ANDROID/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/DEMU_ANDROID/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DEMU_ANDROID/app/src/main/res/drawable/ic_launcher_foreground.xml b/DEMU_ANDROID/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/DEMU_ANDROID/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/res/drawable/password_toggle_disable.xml b/DEMU_ANDROID/app/src/main/res/drawable/password_toggle_disable.xml deleted file mode 100644 index 1b23432..0000000 --- a/DEMU_ANDROID/app/src/main/res/drawable/password_toggle_disable.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/DEMU_ANDROID/app/src/main/res/drawable/password_toggle_enabled.xml b/DEMU_ANDROID/app/src/main/res/drawable/password_toggle_enabled.xml deleted file mode 100644 index 668c299..0000000 --- a/DEMU_ANDROID/app/src/main/res/drawable/password_toggle_enabled.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/DEMU_ANDROID/app/src/main/res/drawable/password_toggle_selector.xml b/DEMU_ANDROID/app/src/main/res/drawable/password_toggle_selector.xml deleted file mode 100644 index e105893..0000000 --- a/DEMU_ANDROID/app/src/main/res/drawable/password_toggle_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/res/layout/activity_home.xml b/DEMU_ANDROID/app/src/main/res/layout/activity_home.xml deleted file mode 100644 index d27c75c..0000000 --- a/DEMU_ANDROID/app/src/main/res/layout/activity_home.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/res/layout/activity_login.xml b/DEMU_ANDROID/app/src/main/res/layout/activity_login.xml deleted file mode 100644 index a5f1562..0000000 --- a/DEMU_ANDROID/app/src/main/res/layout/activity_login.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DEMU_ANDROID/app/src/main/res/layout/activity_splash.xml b/DEMU_ANDROID/app/src/main/res/layout/activity_splash.xml deleted file mode 100644 index 6dbe162..0000000 --- a/DEMU_ANDROID/app/src/main/res/layout/activity_splash.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/DEMU_ANDROID/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 6f3b755..0000000 --- a/DEMU_ANDROID/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/DEMU_ANDROID/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 6f3b755..0000000 --- a/DEMU_ANDROID/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/DEMU_ANDROID/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 Binary files a/DEMU_ANDROID/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/DEMU_ANDROID/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/DEMU_ANDROID/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 Binary files a/DEMU_ANDROID/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/DEMU_ANDROID/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/DEMU_ANDROID/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 Binary files a/DEMU_ANDROID/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/DEMU_ANDROID/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/DEMU_ANDROID/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 Binary files a/DEMU_ANDROID/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/DEMU_ANDROID/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/DEMU_ANDROID/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 Binary files a/DEMU_ANDROID/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/DEMU_ANDROID/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/DEMU_ANDROID/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 Binary files a/DEMU_ANDROID/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/DEMU_ANDROID/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/DEMU_ANDROID/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 Binary files a/DEMU_ANDROID/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/DEMU_ANDROID/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/DEMU_ANDROID/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 Binary files a/DEMU_ANDROID/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/DEMU_ANDROID/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/DEMU_ANDROID/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 Binary files a/DEMU_ANDROID/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/DEMU_ANDROID/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/DEMU_ANDROID/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 Binary files a/DEMU_ANDROID/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/DEMU_ANDROID/app/src/main/res/values-night/themes.xml b/DEMU_ANDROID/app/src/main/res/values-night/themes.xml deleted file mode 100644 index e0a24d5..0000000 --- a/DEMU_ANDROID/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/res/values/colors.xml b/DEMU_ANDROID/app/src/main/res/values/colors.xml deleted file mode 100644 index 21511af..0000000 --- a/DEMU_ANDROID/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - #FF000000 - #FFFFFFFF - - #ff0000 - #1B69FF - #1F262C - #98A4AF - - #D2E1FD - #F9FAFB - #98A4AF - \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/res/values/strings.xml b/DEMU_ANDROID/app/src/main/res/values/strings.xml deleted file mode 100644 index c297f44..0000000 --- a/DEMU_ANDROID/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - DEMU_ANDROID - LoginActivity - 회원가입하기 - 로그인 - \ No newline at end of file diff --git a/DEMU_ANDROID/app/src/main/res/values/themes.xml b/DEMU_ANDROID/app/src/main/res/values/themes.xml deleted file mode 100644 index 6e18210..0000000 --- a/DEMU_ANDROID/app/src/main/res/values/themes.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 21511af..9898d40 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,10 +5,16 @@ #ff0000 #1B69FF - #1F262C #98A4AF #D2E1FD #F9FAFB - #98A4AF + + #98A4AF + #1F262C + #707583 + #D9D9D9 + + #707583 + #E9E9E9 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e1bd226..295519c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,4 +2,21 @@ DEMU_ANDROID LoginActivity 회원가입하기 + 로그인 + + + backend + frontend + iOS + AOS + AI + design + flutter + full stack + game + security + embedded + devops + 기타 전공 + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 6e18210..9d12366 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,10 +1,12 @@ - -