Skip to content
Open
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
cda17c8
apply MVVM architecture
tunaunnie Nov 12, 2024
113b9fa
api connecting
tunaunnie Nov 15, 2024
71d677f
[feat] ์œ ์ € ๋“ฑ๋ก API ์—ฐ๋™
tunaunnie Nov 15, 2024
ee9d131
feature #week4 : ํšŒ์›๊ฐ€์ž… ํ†ต์‹  ์„ฑ๊ณต
tunaunnie Dec 3, 2024
841d04e
fix #week4 : signup ํ›„ login ์ด๋™ ์‹œ navigate ๋กœ์ง ์ˆ˜์ •
tunaunnie Dec 3, 2024
72b791b
fix #week4 : ๋„ค์ด๊ฒŒ์ด์…˜ ํด๋”๋ง ๊ตฌ์กฐ ์ˆ˜์ •
tunaunnie Dec 3, 2024
5cbd2ee
feat #week4 : login Get API ๊ตฌํ˜„ ์™„๋ฃŒ
tunaunnie Dec 3, 2024
18cd80e
feat #week4 : ๋กœ๊ทธ์ธ ์„ฑ๊ณต ํ›„ ๋„ค๋น„๊ฒŒ์ด์…˜
tunaunnie Dec 3, 2024
26c22c1
feat #week4 : ์ทจ๋ฏธ ์กฐํšŒ API ์—ฐ๊ฒฐ
tunaunnie Dec 3, 2024
0512b01
fix #week4 : NavHost ์ „์ฒด innerPadding ์ œ๊ฑฐ
tunaunnie Dec 3, 2024
f6f4b09
fix #week4 : BaseUrl ์ˆจ๊ธฐ๊ธฐ
tunaunnie Dec 3, 2024
32230ce
initial commit
tunaunnie Dec 3, 2024
20ecf8f
fix #week6 : ํด๋” ๊ตฌ์กฐ ๋ณ€๊ฒฝ
tunaunnie Dec 3, 2024
c3ff78e
fix #week6 : DTO request ์ธ์ž ์ด๋ฆ„ ๋ณ€๊ฒฝ
tunaunnie Dec 3, 2024
51c3193
fix #week6 : baseurl ์ˆจ๊ธฐ๊ธฐ
tunaunnie Dec 8, 2024
4f4f579
feature #week7 : home ๋ฐ login ํ™”๋ฉด contract ๊ตฌํ˜„
tunaunnie Dec 17, 2024
539a84e
Merge branch 'week6_assignment' into week7
tunaunnie Dec 17, 2024
b365474
feat #week7 : mypage contract ๊ตฌํ˜„
tunaunnie Dec 17, 2024
2df94d5
feat #week7 : Navhost์—์„œ navigate ํ•จ์ˆ˜ ์ธ์ž ๋งค์นญ ์ˆ˜์ •
tunaunnie Dec 17, 2024
13077d8
fix #week7 : ์ฃผ์„ ์ œ๊ฑฐ ๋ฐ ์ฝ”๋“œ ์ •๋ฆฌ
tunaunnie Dec 17, 2024
6f78b7d
feat #week7 : ์ฝ”๋“œ ๋ฆฌ๋ทฐ ๋ฐ˜์˜
tunaunnie Dec 29, 2024
9c48a65
week6 : domain -data ์˜์กด์„ฑ ์ œ๊ฑฐ
tunaunnie Dec 29, 2024
4cff767
feat #week8 : ์ฝ”๋“œ ๋ฆฌํŒฉํ† ๋ง
tunaunnie Dec 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
import java.util.Properties

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.dagger.hilt)
id("org.jetbrains.kotlin.kapt")
}

val properties = Properties().apply {
load(project.rootProject.file("local.properties").inputStream())
}

android {
namespace = "org.sopt.and"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "org.sopt.and"
minSdk = 28
targetSdk = 34
targetSdk = 35
versionCode = 1
versionName = "1.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
buildConfigField("String", "BASE_URL", properties["base.url"].toString())
}

buildTypes {
Expand All @@ -37,6 +45,7 @@ android {
}
buildFeatures {
compose = true
buildConfig = true
}
}

Expand Down Expand Up @@ -65,4 +74,17 @@ dependencies {
androidTestImplementation(libs.androidx.ui.test.junit4)
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)
implementation(platform(libs.okhttp.bom))
implementation(libs.okhttp)
implementation(libs.okhttp.logging.interceptor)
implementation(libs.retrofit)
implementation(libs.retrofit.kotlin.serialization.converter)
implementation(libs.kotlinx.serialization.json)

implementation(libs.bundles.hilt)
kapt(libs.hilt.compiler)
}

hilt {
enableAggregatingTask = false
}
Comment on lines +88 to 90
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์ด ๋ถ€๋ถ„์„ ์™œ ์ถ”๊ฐ€ํ•ด์•ผ ํ•˜๋Š”์ง€, ์–ด๋–ป๊ฒŒ ํ•˜๋ฉด ์ œ๊ฑฐํ•  ์ˆ˜ ์žˆ์„์ง€ ์ฐพ์•„๋ณด์‹œ๋ฉด ์ข‹์„ ๊ฒƒ ๊ฐ™์•„์š”

24 changes: 5 additions & 19 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />

<application
android:name=".MyApp"
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
Expand All @@ -11,26 +14,9 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.ANDANDROID"
android:usesCleartextTraffic="true"
tools:targetApi="31">
<activity
android:name=".MyActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".HomeActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".SearchActivity"
android:exported="false" />

<activity
android:name=".MainActivity"
android:exported="true"
Expand Down
195 changes: 0 additions & 195 deletions app/src/main/java/org/sopt/and/LoginActivity.kt

This file was deleted.

Loading