generated from DO-SOPT-ANDROID/do-sopt-android-repo-template
-
Notifications
You must be signed in to change notification settings - Fork 0
Feat1/week8 #13
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weβll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
crownjoe
wants to merge
42
commits into
develop
Choose a base branch
from
feat1/week8
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Feat1/week8 #13
Changes from all commits
Commits
Show all changes
42 commits
Select commit
Hold shift + click to select a range
4955493
[ADD] FAB
crownjoe a01b9d6
[ADD] FAB animation & toast
crownjoe ddad73b
[ADD] BottomNavigation color
crownjoe c51eaf1
[ADD] font
crownjoe 95827d4
[EDIT] font
crownjoe d6d65e1
[EDIT] remove font
crownjoe 373651c
[EDIT] FAB retract
crownjoe 2736fd1
[EDIT] myprofile edit
crownjoe f23443e
[ADD] screencapture
crownjoe c391626
[ADD] login μΈν
crownjoe c5b9e78
[ADD] login Data
crownjoe 6334889
[ADD] login api ꡬν
crownjoe 9f52b5c
[ADD] requestsignupDTO
crownjoe 10097df
[ADD] signup authservice
crownjoe 406bdfc
[ADD] authservice
crownjoe 561e29a
[ADD] authservice
crownjoe c7cc725
Merge remote-tracking branch 'origin/feat1/week4' into feat1/week4
crownjoe 8e2e6ab
[ADD] RequestSignupDto
crownjoe 5feb309
[ADD] UserFragment,xml
crownjoe c2f2015
[ADD] UserDto, UserData
crownjoe ea5bd84
[ADD] UserSupport
crownjoe 60e25a2
[ADD] UserAdapter, ViewHolder
crownjoe 0bdc50b
[FIX] folder
crownjoe 69c4e37
[FIX] μ€λ₯ μμ
crownjoe 7947037
[FIX] μ€λ₯ μμ
crownjoe 444db37
[feat] λ‘κ·ΈμΈ λ·°λͺ¨λΈ
crownjoe 77385ad
[feat] νμκ°μ
λ·°λͺ¨λΈ
crownjoe f39c82d
[feat] μμ
crownjoe 5bacb15
[feat] databinding μΆκ°
crownjoe f3d92ff
[feat] νμκ°μ
μμ
crownjoe a1ffd1e
[feat] λ²νΌ μμ
crownjoe 4899ea5
[feat] loginstate μΆκ°
crownjoe 19d1871
[feat] μ½λ£¨ν΄ μμ
crownjoe 59abe17
[feat] domain entity & repository μΆκ°
crownjoe 8f1e7a3
[feat] data dto μμ
crownjoe a660457
[feat] data service & data source
crownjoe 4a634cb
[feat] data repository impl
crownjoe 76b558f
[feat] di module
crownjoe c9a0eeb
[feat] presentation UserViewHolder, UserViewModel
crownjoe 564adc0
[feat] ν΄λν
crownjoe 869d68f
[feat] μ€λ₯ μμ
crownjoe a765bfd
[feat] μ½λ리뷰 λ°μ μμ
crownjoe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
64 changes: 0 additions & 64 deletions
64
app/src/main/java/org/sopt/dosopttemplate/LoginActivity.kt
This file was deleted.
Oops, something went wrong.
15 changes: 15 additions & 0 deletions
15
app/src/main/java/org/sopt/dosopttemplate/MyApplication.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
59
app/src/main/java/org/sopt/dosopttemplate/SignUpActivity.kt
This file was deleted.
Oops, something went wrong.
7 changes: 7 additions & 0 deletions
7
app/src/main/java/org/sopt/dosopttemplate/data/datasource/UserDataSource.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } |
14 changes: 14 additions & 0 deletions
14
app/src/main/java/org/sopt/dosopttemplate/data/datasourceimpl/UserDataSourceImpl.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. μ½νλ¦°μ€λ¬μ΄ λ¬Έλ² μ’λ€μ !!! |
||
| } | ||
12 changes: 12 additions & 0 deletions
12
app/src/main/java/org/sopt/dosopttemplate/data/model/request/RequestLoginDto.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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, | ||
| ) |
16 changes: 16 additions & 0 deletions
16
app/src/main/java/org/sopt/dosopttemplate/data/model/request/RequestSignupDto.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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, | ||
| ) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
μ μΉκ΅¬λ€μ΄ μΆκ°λ μ΄μ λ λκΉμ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
3μ£Όμ°¨ κ³Όμ μ νλ‘ν λ²νΌμ μΊ‘μ³ λ²νΌ λ£μμλλ° μ΄ λ μ°λ €κ³ λ£μμ΅λλ€!_!