Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
4955493
[ADD] FAB
crownjoe Nov 9, 2023
a01b9d6
[ADD] FAB animation & toast
crownjoe Nov 9, 2023
ddad73b
[ADD] BottomNavigation color
crownjoe Nov 9, 2023
c51eaf1
[ADD] font
crownjoe Nov 9, 2023
95827d4
[EDIT] font
crownjoe Nov 9, 2023
d6d65e1
[EDIT] remove font
crownjoe Nov 9, 2023
373651c
[EDIT] FAB retract
crownjoe Nov 9, 2023
2736fd1
[EDIT] myprofile edit
crownjoe Nov 9, 2023
f23443e
[ADD] screencapture
crownjoe Nov 10, 2023
c391626
[ADD] login μ„ΈνŒ…
crownjoe Nov 15, 2023
c5b9e78
[ADD] login Data
crownjoe Nov 15, 2023
6334889
[ADD] login api κ΅¬ν˜„
crownjoe Nov 15, 2023
9f52b5c
[ADD] requestsignupDTO
crownjoe Nov 15, 2023
10097df
[ADD] signup authservice
crownjoe Nov 15, 2023
406bdfc
[ADD] authservice
crownjoe Nov 15, 2023
561e29a
[ADD] authservice
crownjoe Nov 15, 2023
c7cc725
Merge remote-tracking branch 'origin/feat1/week4' into feat1/week4
crownjoe Nov 15, 2023
8e2e6ab
[ADD] RequestSignupDto
crownjoe Nov 15, 2023
5feb309
[ADD] UserFragment,xml
crownjoe Nov 17, 2023
c2f2015
[ADD] UserDto, UserData
crownjoe Nov 17, 2023
ea5bd84
[ADD] UserSupport
crownjoe Nov 17, 2023
60e25a2
[ADD] UserAdapter, ViewHolder
crownjoe Nov 17, 2023
0bdc50b
[FIX] folder
crownjoe Nov 17, 2023
69c4e37
[FIX] 였λ₯˜ μˆ˜μ •
crownjoe Nov 17, 2023
7947037
[FIX] 였λ₯˜ μˆ˜μ •
crownjoe Nov 17, 2023
444db37
[feat] 둜그인 λ·°λͺ¨λΈ
crownjoe Dec 21, 2023
77385ad
[feat] νšŒμ›κ°€μž… λ·°λͺ¨λΈ
crownjoe Dec 21, 2023
f39c82d
[feat] μˆ˜μ •
crownjoe Dec 21, 2023
5bacb15
[feat] databinding μΆ”κ°€
crownjoe Dec 21, 2023
f3d92ff
[feat] νšŒμ›κ°€μž… μˆ˜μ •
crownjoe Dec 21, 2023
a1ffd1e
[feat] λ²„νŠΌ μˆ˜μ •
crownjoe Dec 22, 2023
4899ea5
[feat] loginstate μΆ”κ°€
crownjoe Dec 22, 2023
19d1871
[feat] 코루틴 μˆ˜μ •
crownjoe Dec 22, 2023
59abe17
[feat] domain entity & repository μΆ”κ°€
crownjoe Jan 1, 2024
8f1e7a3
[feat] data dto μˆ˜μ •
crownjoe Jan 1, 2024
a660457
[feat] data service & data source
crownjoe Jan 1, 2024
4a634cb
[feat] data repository impl
crownjoe Jan 1, 2024
76b558f
[feat] di module
crownjoe Jan 1, 2024
c9a0eeb
[feat] presentation UserViewHolder, UserViewModel
crownjoe Jan 1, 2024
564adc0
[feat] 폴더화
crownjoe Jan 1, 2024
869d68f
[feat] 였λ₯˜ μˆ˜μ •
crownjoe Jan 1, 2024
a765bfd
[feat] μ½”λ“œλ¦¬λ·° 반영 μˆ˜μ •
crownjoe Jan 4, 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
39 changes: 35 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.20'
id 'kotlin-kapt'
id 'com.google.dagger.hilt.android'
}

Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())

android {
namespace 'org.sopt.dosopttemplate'
compileSdk 33
Expand All @@ -13,6 +19,8 @@ android {
targetSdk 33
versionCode 1
versionName "1.0"
buildConfigField "String", "AUTH_BASE_URL", properties["auth.base.url"]
buildConfigField "String", "USER_BASE_URL", properties["user.base.url"]

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -24,27 +32,50 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '11'
jvmTarget = '17'
}
buildFeatures {
viewBinding true
buildConfig true
dataBinding true
}
}

dependencies {
implementation 'com.github.bumptech.glide:glide:4.12.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
implementation "androidx.fragment:fragment-ktx:1.6.1"
implementation 'androidx.core:core-ktx:1.8.0'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1'
implementation 'com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'

// hilt
implementation 'com.google.dagger:hilt-android:2.44'
kapt 'com.google.dagger:hilt-android-compiler:2.44'
kapt 'com.google.dagger:dagger-android-processor:2.44'

// timber
implementation "com.jakewharton.timber:timber:4.7.1"

// define a BOM and its version
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0"))

// define any required OkHttp artifacts without version
implementation("com.squareup.okhttp3:okhttp")
implementation("com.squareup.okhttp3:logging-interceptor")
}
16 changes: 12 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
Comment on lines +5 to +6
Copy link
Member

Choose a reason for hiding this comment

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

μš” μΉœκ΅¬λ“€μ΄ μΆ”κ°€λœ μ΄μœ λŠ” λ­˜κΉŒμš”?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

3μ£Όμ°¨ κ³Όμ œμ— ν”Œλ‘œνŒ… λ²„νŠΌμ— 캑쳐 λ²„νŠΌ λ„£μ—ˆμ—ˆλŠ”λ° 이 λ•Œ μ“°λ €κ³  λ„£μ—ˆμŠ΅λ‹ˆλ‹€!_!


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

<application
android:name=".MyApplication"
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
Expand All @@ -11,24 +17,26 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.DoSoptTemplate"
android:usesCleartextTraffic="true"
tools:targetApi="31">
<activity
android:name=".MainActivity"
android:name=".presentation.main.MainActivity"
android:exported="false">
</activity>
<activity android:name=".LoginActivity" android:exported="true">
<activity android:name=".presentation.login.LoginActivity"
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=".SignUpActivity"
android:name=".presentation.signup.SignUpActivity"
android:exported="false">
</activity>

<activity
android:name=".HomeActivity"
android:name=".presentation.home.HomeActivity"
android:exported="true">
</activity>

Expand Down
72 changes: 0 additions & 72 deletions app/src/main/java/org/sopt/dosopttemplate/HomeActivity.kt

This file was deleted.

64 changes: 0 additions & 64 deletions app/src/main/java/org/sopt/dosopttemplate/LoginActivity.kt

This file was deleted.

15 changes: 15 additions & 0 deletions app/src/main/java/org/sopt/dosopttemplate/MyApplication.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package org.sopt.dosopttemplate

import android.app.Application
import dagger.hilt.android.HiltAndroidApp
import timber.log.Timber

@HiltAndroidApp
class MyApplication : Application() {
override fun onCreate() {
super.onCreate()
if (BuildConfig.DEBUG) {
Timber.plant(Timber.DebugTree())
}
}
}
59 changes: 0 additions & 59 deletions app/src/main/java/org/sopt/dosopttemplate/SignUpActivity.kt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package org.sopt.dosopttemplate.data.datasource

import org.sopt.dosopttemplate.data.model.response.ResponseUserDto

interface UserDataSource {
suspend fun getUser(page : Int): ResponseUserDto
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package org.sopt.dosopttemplate.data.datasourceimpl

import org.sopt.dosopttemplate.data.service.UserService
import org.sopt.dosopttemplate.data.model.response.ResponseUserDto
import org.sopt.dosopttemplate.data.datasource.UserDataSource
import javax.inject.Inject

class UserDataSourceImpl @Inject constructor(
private val UserService: UserService
): UserDataSource {

override suspend fun getUser(page: Int): ResponseUserDto =
UserService.getUserList(page)
Comment on lines +12 to +13
Copy link
Member

Choose a reason for hiding this comment

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

μ½”ν‹€λ¦°μŠ€λŸ¬μš΄ 문법 μ’‹λ„€μš” !!!

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package org.sopt.dosopttemplate.data.model.request

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

@Serializable
data class RequestLoginDto(
@SerialName("username")
val username: String,
@SerialName("password")
val password: String,
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package org.sopt.dosopttemplate.data.model.request

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

@Serializable
data class RequestSignupDto(
@SerialName("username")
val username: String,
@SerialName("password")
val password: String,
@SerialName("major")
val major: String,
@SerialName("nickname")
val nickname: String,
)
Loading