From 7eb84e9eb330277b238dac703b61ffc067e45846 Mon Sep 17 00:00:00 2001 From: Sangwook123 Date: Thu, 4 Apr 2024 01:34:16 +0900 Subject: [PATCH] [feat] #1 app --- app/build.gradle | 65 ------------------- app/build.gradle.kts | 23 +++++++ app/proguard-rules.pro | 2 +- app/src/main/AndroidManifest.xml | 7 +- .../java/com/sopt/now/compose/MainActivity.kt | 46 ------------- .../main/java/com/sopt/now/compose/SoptApp.kt | 8 +++ 6 files changed, 36 insertions(+), 115 deletions(-) delete mode 100644 app/build.gradle create mode 100644 app/build.gradle.kts delete mode 100644 app/src/main/java/com/sopt/now/compose/MainActivity.kt create mode 100644 app/src/main/java/com/sopt/now/compose/SoptApp.kt diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index f534bf6..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,65 +0,0 @@ -plugins { - id 'com.android.application' - id 'org.jetbrains.kotlin.android' -} - -android { - namespace 'com.sopt.now.compose' - compileSdk 34 - - defaultConfig { - applicationId "com.sopt.now.compose" - minSdk 28 - targetSdk 34 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - vectorDrawables { - useSupportLibrary true - } - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - kotlinOptions { - jvmTarget = '17' - } - buildFeatures { - compose true - } - composeOptions { - kotlinCompilerExtensionVersion '1.5.1' - } - packaging { - resources { - excludes += '/META-INF/{AL2.0,LGPL2.1}' - } - } -} - -dependencies { - implementation 'androidx.core:core-ktx:1.12.0' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' - implementation 'androidx.activity:activity-compose:1.8.2' - implementation platform('androidx.compose:compose-bom:2024.03.00') - implementation 'androidx.compose.ui:ui' - implementation 'androidx.compose.ui:ui-graphics' - implementation 'androidx.compose.ui:ui-tooling-preview' - implementation 'androidx.compose.material3:material3' - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - androidTestImplementation platform('androidx.compose:compose-bom:2024.03.00') - androidTestImplementation 'androidx.compose.ui:ui-test-junit4' - debugImplementation 'androidx.compose.ui:ui-tooling' - debugImplementation 'androidx.compose.ui:ui-test-manifest' -} \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..388ff39 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,23 @@ +@Suppress("DSL_SCOPE_VIOLATION") +plugins { + alias(libs.plugins.sopt.android.application) + alias(libs.plugins.sopt.android.application.compose) + alias(libs.plugins.sopt.android.hilt) +} + +android { + namespace = "org.sopt.now" + + defaultConfig { + applicationId = "com.sopt.now" + versionCode = 1 + versionName = "1.0" + } +} + +dependencies { + implementation(projects.core.ui) + implementation(projects.core.model) + implementation(projects.core.designsystem) + implementation(projects.feature.main) +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 481bb43..ff59496 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,6 +1,6 @@ # Add project specific ProGuard rules here. # You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. +# proguardFiles setting in build.gradle.kts. # # For more details, see # http://developer.android.com/guide/developing/tools/proguard.html diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9d2cd40..5fe888e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> + android:label="@string/title_activity_main" + android:theme="@style/Theme.NOWSOPTAndroid" > diff --git a/app/src/main/java/com/sopt/now/compose/MainActivity.kt b/app/src/main/java/com/sopt/now/compose/MainActivity.kt deleted file mode 100644 index 73fb148..0000000 --- a/app/src/main/java/com/sopt/now/compose/MainActivity.kt +++ /dev/null @@ -1,46 +0,0 @@ -package com.sopt.now.compose - -import android.os.Bundle -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Surface -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.tooling.preview.Preview -import com.sopt.now.compose.ui.theme.NOWSOPTAndroidTheme - -class MainActivity : ComponentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContent { - NOWSOPTAndroidTheme { - // A surface container using the 'background' color from the theme - Surface( - modifier = Modifier.fillMaxSize(), - color = MaterialTheme.colorScheme.background - ) { - Greeting("Android") - } - } - } - } -} - -@Composable -fun Greeting(name: String, modifier: Modifier = Modifier) { - Text( - text = "Hello $name!", - modifier = modifier - ) -} - -@Preview(showBackground = true) -@Composable -fun GreetingPreview() { - NOWSOPTAndroidTheme { - Greeting("Android") - } -} \ No newline at end of file diff --git a/app/src/main/java/com/sopt/now/compose/SoptApp.kt b/app/src/main/java/com/sopt/now/compose/SoptApp.kt new file mode 100644 index 0000000..508b7cf --- /dev/null +++ b/app/src/main/java/com/sopt/now/compose/SoptApp.kt @@ -0,0 +1,8 @@ +package com.sopt.now.compose + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class SoptApp : Application() { +} \ No newline at end of file