Skip to content

Commit 367930a

Browse files
SsamssamukjaSsamssamukja
committed
[nunu/#47] update : 파일구조화
data(Model) / ui(View, ViewModel) / utils 구분
1 parent 75287d1 commit 367930a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+175
-145
lines changed

‎UMC_6th/app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
android:theme="@style/Theme.UMC_6th"
2020
tools:targetApi="31">
2121
<service
22-
android:name=".ForegroundService"
22+
android:name=".utils.ForegroundService"
2323
android:enabled="true"
2424
android:exported="false"
2525
android:foregroundServiceType="mediaPlayback"></service>
2626

2727
<activity
28-
android:name=".SplashActivity"
28+
android:name=".ui.splash.SplashActivity"
2929
android:exported="true">
3030
<intent-filter>
3131
<action android:name="android.intent.action.MAIN" />
@@ -34,16 +34,16 @@
3434
</intent-filter>
3535
</activity>
3636
<activity
37-
android:name=".MainActivity"
37+
android:name=".ui.main.MainActivity"
3838
android:exported="true"></activity>
3939
<activity
40-
android:name=".SongActivity"
40+
android:name=".ui.song.SongActivity"
4141
android:exported="true"
4242
android:hardwareAccelerated="true"
4343
android:label="@string/title_activity_song"
4444
android:theme="@style/Theme.UMC_6th"></activity>
45-
<activity android:name=".LoginActivity"/>
46-
<activity android:name=".SignUpActivity"/>
45+
<activity android:name=".ui.login.LoginActivity"/>
46+
<activity android:name=".ui.signup.SignUpActivity"/>
4747
</application>
4848

4949
</manifest>

‎UMC_6th/app/src/main/java/com/example/umc_6th/adapter/SharedPreferencesHelper.kt

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎UMC_6th/app/src/main/java/com/example/umc_6th/Album.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/entities/Album.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.entities
22

33

44
import androidx.room.Entity

‎UMC_6th/app/src/main/java/com/example/umc_6th/Like.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/entities/Like.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.entities
22

33
import androidx.room.Entity
44
import androidx.room.PrimaryKey

‎UMC_6th/app/src/main/java/com/example/umc_6th/Song.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/entities/Song.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.entities
22

33
import androidx.room.Entity
44
import androidx.room.PrimaryKey

‎UMC_6th/app/src/main/java/com/example/umc_6th/User.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/entities/User.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.entities
22

33
import androidx.room.Entity
44
import androidx.room.PrimaryKey

‎UMC_6th/app/src/main/java/com/example/umc_6th/AlbumDao.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/local/AlbumDao.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.local
22

33
import androidx.room.*
4+
import com.example.umc_6th.data.entities.Album
5+
import com.example.umc_6th.data.entities.Like
46

57
@Dao
68
interface AlbumDao {

‎UMC_6th/app/src/main/java/com/example/umc_6th/SongDao.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/local/SongDao.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.local
22

33
import androidx.room.Dao
44
import androidx.room.Delete
55
import androidx.room.Insert
66
import androidx.room.Query
77
import androidx.room.Update
8+
import com.example.umc_6th.data.entities.Song
89

910
@Dao
1011
interface SongDao {

‎UMC_6th/app/src/main/java/com/example/umc_6th/SongDatabase.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/local/SongDatabase.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.local
22

33
import android.content.Context
44
import androidx.room.Database
55
import androidx.room.Room
66
import androidx.room.RoomDatabase
7+
import com.example.umc_6th.data.entities.Album
8+
import com.example.umc_6th.data.entities.Like
9+
import com.example.umc_6th.data.entities.Song
10+
import com.example.umc_6th.data.entities.User
711

812
@Database(entities = [Song::class, Album::class, User::class, Like::class], version = 1)
913
abstract class SongDatabase: RoomDatabase() {

‎UMC_6th/app/src/main/java/com/example/umc_6th/UserDao.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/local/UserDao.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.local
22

33
import androidx.room.Dao
44
import androidx.room.Insert
55
import androidx.room.Query
6+
import com.example.umc_6th.data.entities.User
67

78
@Dao
89
interface UserDao {

‎UMC_6th/app/src/main/java/com/example/umc_6th/ApiRepository.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/ApiRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.remote
22

33
class ApiRepository {
44
companion object {

‎UMC_6th/app/src/main/java/com/example/umc_6th/BaseResponse.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/BaseResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.remote
22

33
import com.google.gson.annotations.SerializedName
44

‎UMC_6th/app/src/main/java/com/example/umc_6th/AlbumApi.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/album/AlbumApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.remote.album
22

33
import retrofit2.Call
44
import retrofit2.http.GET

‎UMC_6th/app/src/main/java/com/example/umc_6th/AlbumResponse.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/album/AlbumResponse.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.remote.album
22

33
import com.google.gson.annotations.SerializedName
44

55
data class AlbumResponse( @SerializedName("isSuccess") val isSuccess: Boolean,
66
@SerializedName("code") val code: Int,
77
@SerializedName("message") val message: String,
8-
@SerializedName("result") val result: TodayAlbumResult)
8+
@SerializedName("result") val result: TodayAlbumResult
9+
)
910

1011

1112
data class TodayAlbumResult(

‎UMC_6th/app/src/main/java/com/example/umc_6th/AlbumService.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/album/AlbumService.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.remote.album
22

33
import android.util.Log
4+
import com.example.umc_6th.ui.main.home.HomeAlbumView
5+
import com.example.umc_6th.data.remote.auth.RetrofitInstance
46
import retrofit2.Call
57
import retrofit2.Callback
68
import retrofit2.Response

‎UMC_6th/app/src/main/java/com/example/umc_6th/AuthApi.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/auth/AuthApi.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.remote.auth
22

3+
import com.example.umc_6th.data.entities.User
4+
import com.example.umc_6th.data.remote.BaseResponse
35
import retrofit2.Call
46
import retrofit2.http.Body
57
import retrofit2.http.POST

‎UMC_6th/app/src/main/java/com/example/umc_6th/AuthService.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/auth/AuthService.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.remote.auth
22

33
import android.util.Log
4+
import com.example.umc_6th.ui.login.LoginView
5+
import com.example.umc_6th.ui.signup.SignUpView
6+
import com.example.umc_6th.data.entities.User
7+
import com.example.umc_6th.data.remote.BaseResponse
48
import retrofit2.Call
59
import retrofit2.Callback
610
import retrofit2.Response

‎UMC_6th/app/src/main/java/com/example/umc_6th/RetrofitInstance.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/auth/RetrofitInstance.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.remote.auth
22

3+
import com.example.umc_6th.data.remote.album.AlbumApi
4+
import com.example.umc_6th.data.remote.ApiRepository
5+
import com.example.umc_6th.data.remote.song.SongApi
36
import retrofit2.Retrofit
47
import retrofit2.converter.gson.GsonConverterFactory
58

‎UMC_6th/app/src/main/java/com/example/umc_6th/SongApi.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/song/SongApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.remote.song
22

33
import retrofit2.Call
44
import retrofit2.http.GET

‎UMC_6th/app/src/main/java/com/example/umc_6th/SongResponse.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/song/SongResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.remote.song
22

33
import com.google.gson.annotations.SerializedName
44

‎UMC_6th/app/src/main/java/com/example/umc_6th/SongService.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/data/remote/song/SongService.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
package com.example.umc_6th
1+
package com.example.umc_6th.data.remote.song
22

33
import android.util.Log
4+
import com.example.umc_6th.ui.main.look.LookView
5+
import com.example.umc_6th.data.remote.auth.RetrofitInstance
46
import retrofit2.Call
57
import retrofit2.Callback
68
import retrofit2.Response

‎UMC_6th/app/src/main/java/com/example/umc_6th/adapter/AlbumPagerAdapter.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/ui/adapter/AlbumPagerAdapter.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.example.umc_6th.adapter
1+
package com.example.umc_6th.ui.adapter
22

33
import androidx.fragment.app.Fragment
44
import androidx.viewpager2.adapter.FragmentStateAdapter
5-
import com.example.umc_6th.AlbumDetailFragment
6-
import com.example.umc_6th.AlbumSongsFragment
7-
import com.example.umc_6th.AlbumVideoFragment
8-
import com.example.umc_6th.HomeFragment
5+
import com.example.umc_6th.ui.main.album.AlbumDetailFragment
6+
import com.example.umc_6th.ui.main.album.AlbumSongsFragment
7+
import com.example.umc_6th.ui.main.album.AlbumVideoFragment
8+
import com.example.umc_6th.ui.main.home.HomeFragment
99

1010

1111
class AlbumPagerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {

‎UMC_6th/app/src/main/java/com/example/umc_6th/adapter/AlbumRecyclerAdapter.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/ui/adapter/AlbumRecyclerAdapter.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
package com.example.umc_6th.adapter
1+
package com.example.umc_6th.ui.adapter
22

33
import android.view.LayoutInflater
44
import android.view.ViewGroup
55
import androidx.recyclerview.widget.RecyclerView
6-
import com.example.umc_6th.Album
6+
import com.example.umc_6th.data.entities.Album
77
import com.example.umc_6th.databinding.ItemAlbumBinding
88

99
class AlbumRecyclerAdapter(private val albumList: ArrayList<Album>) : RecyclerView.Adapter<AlbumRecyclerAdapter.ViewHolder>() {
10-
override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): AlbumRecyclerAdapter.ViewHolder {
10+
override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
1111
val binding: ItemAlbumBinding = ItemAlbumBinding.inflate(LayoutInflater.from(viewGroup.context), viewGroup, false)
1212
return ViewHolder(binding)
1313
}
1414

1515

16-
override fun onBindViewHolder(holder: AlbumRecyclerAdapter.ViewHolder, position: Int) {
16+
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
1717
holder.bind(albumList[position])
1818
holder.binding.imgItemAlbumCover.setOnClickListener {
1919
itemClickListener?.onItemClick(albumList[position])

‎UMC_6th/app/src/main/java/com/example/umc_6th/adapter/HomePagerAdapter.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/ui/adapter/HomePagerAdapter.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.example.umc_6th.adapter
1+
package com.example.umc_6th.ui.adapter
22

33
import androidx.fragment.app.Fragment
44
import androidx.viewpager2.adapter.FragmentStateAdapter
5-
import com.example.umc_6th.FragmentHomeMainBanner
6-
import com.example.umc_6th.FragmentHomeMainBanner2
5+
import com.example.umc_6th.ui.main.home.FragmentHomeMainBanner
6+
import com.example.umc_6th.ui.main.home.FragmentHomeMainBanner2
77

88
class HomePagerAdapter {
99
class HomeMainViewPagerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {

‎UMC_6th/app/src/main/java/com/example/umc_6th/adapter/LockerAlbumRecyclerAdapter.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/ui/adapter/LockerAlbumRecyclerAdapter.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
package com.example.umc_6th.adapter
1+
package com.example.umc_6th.ui.adapter
22

33
import android.annotation.SuppressLint
44
import android.util.SparseBooleanArray
55
import android.view.LayoutInflater
66
import android.view.ViewGroup
77
import androidx.recyclerview.widget.RecyclerView
8-
import com.example.umc_6th.R
9-
import com.example.umc_6th.Song
10-
import com.example.umc_6th.databinding.ItemLockerAlbumBinding
8+
import com.example.umc_6th.data.entities.Song
119
import com.example.umc_6th.databinding.ItemLockerSongBinding
1210

1311
class LockerAlbumRecyclerAdapter() : RecyclerView.Adapter<LockerAlbumRecyclerAdapter.ViewHolder>() {
@@ -18,7 +16,7 @@ class LockerAlbumRecyclerAdapter() : RecyclerView.Adapter<LockerAlbumRecyclerAda
1816
override fun onCreateViewHolder(
1917
parent: ViewGroup,
2018
viewType: Int
21-
): LockerAlbumRecyclerAdapter.ViewHolder {
19+
): ViewHolder {
2220
val binding: ItemLockerSongBinding = ItemLockerSongBinding
2321
.inflate(LayoutInflater.from(parent.context), parent, false)
2422

‎UMC_6th/app/src/main/java/com/example/umc_6th/adapter/LockerPagerAdapter.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/ui/adapter/LockerPagerAdapter.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.example.umc_6th.adapter
1+
package com.example.umc_6th.ui.adapter
22

33
import androidx.fragment.app.Fragment
44
import androidx.viewpager2.adapter.FragmentStateAdapter
5-
import com.example.umc_6th.LockerMusicFileFragment
6-
import com.example.umc_6th.LockerSavedAlbumFragment
7-
import com.example.umc_6th.LockerSavedSongFragment
5+
import com.example.umc_6th.ui.main.locker.LockerMusicFileFragment
6+
import com.example.umc_6th.ui.main.locker.LockerSavedAlbumFragment
7+
import com.example.umc_6th.ui.main.locker.LockerSavedSongFragment
88

99
class LockerPagerAdapter (fragment : Fragment) : FragmentStateAdapter(fragment) {
1010
override fun getItemCount(): Int = 3

‎UMC_6th/app/src/main/java/com/example/umc_6th/adapter/LockerSavedAlbumRecyclerAdapter.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/ui/adapter/LockerSavedAlbumRecyclerAdapter.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.example.umc_6th.adapter
1+
package com.example.umc_6th.ui.adapter
22

33
import android.annotation.SuppressLint
44
import android.view.LayoutInflater
55
import android.view.ViewGroup
66
import androidx.recyclerview.widget.RecyclerView
7-
import com.example.umc_6th.Album
7+
import com.example.umc_6th.data.entities.Album
88
import com.example.umc_6th.databinding.ItemLockerAlbumBinding
99

1010
class LockerSavedAlbumRecyclerAdapter : RecyclerView.Adapter<LockerSavedAlbumRecyclerAdapter.ViewHolder>() {
@@ -20,13 +20,13 @@ class LockerSavedAlbumRecyclerAdapter : RecyclerView.Adapter<LockerSavedAlbumRec
2020
mItemClickListener = itemClickListener
2121
}
2222

23-
override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): LockerSavedAlbumRecyclerAdapter.ViewHolder {
23+
override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
2424
val binding: ItemLockerAlbumBinding = ItemLockerAlbumBinding.inflate(LayoutInflater.from(viewGroup.context), viewGroup, false)
2525

2626
return ViewHolder(binding)
2727
}
2828

29-
override fun onBindViewHolder(holder: LockerSavedAlbumRecyclerAdapter.ViewHolder, position: Int) {
29+
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
3030
holder.bind(albums[position])
3131
holder.binding.imgItemLockerAlbumMore.setOnClickListener {
3232
mItemClickListener.onRemoveSong(albums[position].id)

‎UMC_6th/app/src/main/java/com/example/umc_6th/adapter/SongRecyclerViewAdapter.kt renamed to ‎UMC_6th/app/src/main/java/com/example/umc_6th/ui/adapter/SongRecyclerViewAdapter.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.umc_6th.adapter
1+
package com.example.umc_6th.ui.adapter
22

33
import android.content.Context
44
import android.util.Log
@@ -8,19 +8,19 @@ import android.widget.ImageView
88
import android.widget.TextView
99
import androidx.recyclerview.widget.RecyclerView
1010
import com.bumptech.glide.Glide
11-
import com.example.umc_6th.FloChartResult
11+
import com.example.umc_6th.data.remote.song.FloChartResult
1212
import com.example.umc_6th.databinding.ItemSongBinding
1313

1414
class SongRecyclerViewAdapter (val context: Context, val result : FloChartResult) : RecyclerView.Adapter<SongRecyclerViewAdapter.ViewHolder>() {
1515

1616

17-
override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): SongRecyclerViewAdapter.ViewHolder {
17+
override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
1818
val binding: ItemSongBinding = ItemSongBinding.inflate(LayoutInflater.from(viewGroup.context), viewGroup, false)
1919

2020
return ViewHolder(binding)
2121
}
2222

23-
override fun onBindViewHolder(holder: SongRecyclerViewAdapter.ViewHolder, position: Int) {
23+
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
2424
//holder.bind(result.songs[position])
2525

2626
if(result.songs[position].coverImgUrl == "" || result.songs[position].coverImgUrl == null){

0 commit comments

Comments
 (0)