Skip to content

Commit 893e991

Browse files
Young-GunYoung-Gun
committed
[구조변경] 안드로이드 앱, 패키지 이름 변경
1 parent c47518d commit 893e991

29 files changed

+52
-53
lines changed

‎buildSrc/src/main/kotlin/AppConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
object AppConfig {
2-
const val NAME_SPACE = "com.gun.android_marvel_example"
2+
const val NAME_SPACE = "com.gun.mvvm_cleanarchitecture"
33
const val COMPILE_SDK = 33
44
const val MIN_SDK = 24
55
const val TARGET_SDK = 33

‎presentation/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ android {
1212
compileSdk = AppConfig.COMPILE_SDK
1313

1414
defaultConfig {
15-
applicationId = "com.gun.android_marvel_example"
15+
applicationId = "com.gun.mvvm_cleanarchitecture"
1616
minSdk = AppConfig.MIN_SDK
1717
targetSdk = AppConfig.TARGET_SDK
1818
versionCode = 1

‎presentation/src/androidTest/java/com/gun/android_marvel_example/ExampleInstrumentedTest.kt renamed to ‎presentation/src/androidTest/java/com/gun/presentation/ExampleInstrumentedTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gun.android_marvel_example
1+
package com.gun.presentation
22

33
import androidx.test.platform.app.InstrumentationRegistry
44
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
1919
fun useAppContext() {
2020
// Context of the app under test.
2121
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22-
assertEquals("com.gun.android_marvel_example", appContext.packageName)
22+
assertEquals("com.gun.mvvm_cleanarchitecture", appContext.packageName)
2323
}
2424
}

‎presentation/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
android:icon="@mipmap/ic_launcher"
1212
android:label="@string/app_name"
1313
android:supportsRtl="true"
14-
android:theme="@style/Theme.Android_Marvel_Example"
14+
android:theme="@style/Theme.MVVM_CleanArchitecture"
1515
tools:targetApi="31">
1616
<activity
17-
android:name=".ui.main.MainActivity"
17+
android:name="com.gun.presentation.ui.main.MainActivity"
1818
android:exported="true">
1919
<intent-filter>
2020
<action android:name="android.intent.action.MAIN" />

‎presentation/src/main/java/com/gun/android_marvel_example/common/BaseItemCallback.kt renamed to ‎presentation/src/main/java/com/gun/presentation/common/BaseItemCallback.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gun.android_marvel_example.common
1+
package com.gun.presentation.common
22

33
import android.annotation.SuppressLint
44
import androidx.recyclerview.widget.DiffUtil

‎presentation/src/main/java/com/gun/android_marvel_example/common/BaseListAdapter.kt renamed to ‎presentation/src/main/java/com/gun/presentation/common/BaseListAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gun.android_marvel_example.common
1+
package com.gun.presentation.common
22

33
import androidx.recyclerview.widget.ListAdapter
44

‎presentation/src/main/java/com/gun/android_marvel_example/common/BaseViewHolder.kt renamed to ‎presentation/src/main/java/com/gun/presentation/common/BaseViewHolder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gun.android_marvel_example.common
1+
package com.gun.presentation.common
22

33
import android.view.View
44
import androidx.recyclerview.widget.RecyclerView

‎presentation/src/main/java/com/gun/android_marvel_example/ui/favorite/FavoriteFragment.kt renamed to ‎presentation/src/main/java/com/gun/presentation/ui/favorite/FavoriteFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.gun.android_marvel_example.ui.favorite
1+
package com.gun.presentation.ui.favorite
22

33
import android.os.Bundle
44
import androidx.fragment.app.Fragment
55
import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup
8-
import com.gun.android_marvel_example.R
8+
import com.gun.mvvm_cleanarchitecture.R
99

1010
// TODO: Rename parameter arguments, choose names that match
1111
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER

‎presentation/src/main/java/com/gun/android_marvel_example/ui/home/HomeFragment.kt renamed to ‎presentation/src/main/java/com/gun/presentation/ui/home/HomeFragment.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gun.android_marvel_example.ui.home
1+
package com.gun.presentation.ui.home
22

33
import android.os.Bundle
44
import android.view.LayoutInflater
@@ -7,13 +7,13 @@ import android.view.ViewGroup
77
import androidx.databinding.DataBindingUtil
88
import androidx.fragment.app.Fragment
99
import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
10-
import com.gun.android_marvel_example.R
1110
import com.gun.domain.model.TestData
12-
import com.gun.android_marvel_example.databinding.FragmentHomeBinding
13-
import com.gun.android_marvel_example.ui.home.banner.HomeBannerAdapter
14-
import com.gun.android_marvel_example.ui.home.banner.HomeBannerFragment
15-
import com.gun.android_marvel_example.ui.home.banner.HomeBannerPageChangeCallback
16-
import com.gun.android_marvel_example.ui.home.list.HomeListRecyclerAdapter
11+
import com.gun.mvvm_cleanarchitecture.R
12+
import com.gun.mvvm_cleanarchitecture.databinding.FragmentHomeBinding
13+
import com.gun.presentation.ui.home.banner.HomeBannerAdapter
14+
import com.gun.presentation.ui.home.banner.HomeBannerFragment
15+
import com.gun.presentation.ui.home.banner.HomeBannerPageChangeCallback
16+
import com.gun.presentation.ui.home.list.HomeListRecyclerAdapter
1717

1818

1919
class HomeFragment : Fragment() {

‎presentation/src/main/java/com/gun/android_marvel_example/ui/home/banner/HomeBannerAdapter.kt renamed to ‎presentation/src/main/java/com/gun/presentation/ui/home/banner/HomeBannerAdapter.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gun.android_marvel_example.ui.home.banner
1+
package com.gun.presentation.ui.home.banner
22

33
import androidx.fragment.app.Fragment
44
import androidx.fragment.app.FragmentActivity
@@ -11,7 +11,6 @@ class HomeBannerAdapter(
1111
) : FragmentStateAdapter(fragmentActivity) {
1212

1313
override fun getItemCount(): Int {
14-
if (fragmentList == null) return 0
1514
return fragmentList.size
1615
}
1716

‎presentation/src/main/java/com/gun/android_marvel_example/ui/home/banner/HomeBannerFragment.kt renamed to ‎presentation/src/main/java/com/gun/presentation/ui/home/banner/HomeBannerFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.gun.android_marvel_example.ui.home.banner
1+
package com.gun.presentation.ui.home.banner
22

33
import android.os.Bundle
44
import android.view.LayoutInflater
55
import android.view.View
66
import android.view.ViewGroup
77
import androidx.fragment.app.Fragment
88
import com.bumptech.glide.Glide
9-
import com.gun.android_marvel_example.databinding.FragmentHomeBannerBinding
9+
import com.gun.mvvm_cleanarchitecture.databinding.FragmentHomeBannerBinding
1010

1111
class HomeBannerFragment : Fragment() {
1212
private lateinit var binding: FragmentHomeBannerBinding

‎presentation/src/main/java/com/gun/android_marvel_example/ui/home/banner/HomeBannerPageChangeCallback.kt renamed to ‎presentation/src/main/java/com/gun/presentation/ui/home/banner/HomeBannerPageChangeCallback.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gun.android_marvel_example.ui.home.banner
1+
package com.gun.presentation.ui.home.banner
22

33
import androidx.viewpager2.adapter.FragmentStateAdapter
44
import androidx.viewpager2.widget.ViewPager2

‎presentation/src/main/java/com/gun/android_marvel_example/ui/home/list/HomeListRecyclerAdapter.kt renamed to ‎presentation/src/main/java/com/gun/presentation/ui/home/list/HomeListRecyclerAdapter.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.gun.android_marvel_example.ui.home.list
1+
package com.gun.presentation.ui.home.list
22

33
import android.view.LayoutInflater
44
import android.view.ViewGroup
5-
import com.gun.android_marvel_example.common.BaseListAdapter
6-
import com.gun.android_marvel_example.common.BaseViewHolder
5+
import com.gun.presentation.common.BaseListAdapter
6+
import com.gun.presentation.common.BaseViewHolder
77
import com.gun.domain.model.TestData
8-
import com.gun.android_marvel_example.databinding.HolderHomeListBinding
8+
import com.gun.mvvm_cleanarchitecture.databinding.HolderHomeListBinding
99

1010
class HomeListRecyclerAdapter :
1111
BaseListAdapter<TestData, HomeListRecyclerAdapter.ViewHolder>() {

‎presentation/src/main/java/com/gun/android_marvel_example/ui/main/MainActivity.kt renamed to ‎presentation/src/main/java/com/gun/presentation/ui/main/MainActivity.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
package com.gun.android_marvel_example.ui.main
1+
package com.gun.presentation.ui.main
22

33
import android.os.Bundle
4-
import android.view.View
54
import androidx.appcompat.app.AppCompatActivity
65
import androidx.databinding.DataBindingUtil
76
import androidx.navigation.fragment.NavHostFragment
87
import androidx.navigation.fragment.findNavController
98
import androidx.navigation.ui.setupWithNavController
10-
import com.gun.android_marvel_example.R
11-
import com.gun.android_marvel_example.databinding.ActivityMainBinding
9+
import com.gun.mvvm_cleanarchitecture.R
10+
import com.gun.mvvm_cleanarchitecture.databinding.ActivityMainBinding
1211

1312
class MainActivity : AppCompatActivity() {
1413
private val binding by lazy<ActivityMainBinding> {

‎presentation/src/main/java/com/gun/android_marvel_example/ui/profile/ProfileFragment.kt renamed to ‎presentation/src/main/java/com/gun/presentation/ui/profile/ProfileFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.gun.android_marvel_example.ui.profile
1+
package com.gun.presentation.ui.profile
22

33
import android.os.Bundle
44
import androidx.fragment.app.Fragment
55
import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup
8-
import com.gun.android_marvel_example.R
8+
import com.gun.mvvm_cleanarchitecture.R
99

1010
// TODO: Rename parameter arguments, choose names that match
1111
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER

‎presentation/src/main/java/com/gun/android_marvel_example/ui/search/SearchFragment.kt renamed to ‎presentation/src/main/java/com/gun/presentation/ui/search/SearchFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.gun.android_marvel_example.ui.search
1+
package com.gun.presentation.ui.search
22

33
import android.os.Bundle
44
import androidx.fragment.app.Fragment
55
import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup
8-
import com.gun.android_marvel_example.R
8+
import com.gun.mvvm_cleanarchitecture.R
99

1010
class SearchFragment : Fragment() {
1111

‎presentation/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<layout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
5-
tools:context=".ui.main.MainActivity">
5+
tools:context="com.gun.presentation.ui.main.MainActivity">
66

77
<androidx.constraintlayout.widget.ConstraintLayout style="@style/Base.Size.Match_Match">
88

‎presentation/src/main/res/layout/fragment_favorite.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<layout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:tools="http://schemas.android.com/tools"
5-
tools:context=".ui.favorite.FavoriteFragment">
5+
tools:context="com.gun.presentation.ui.favorite.FavoriteFragment">
66

77
<FrameLayout style="@style/Base.Size.Match_Match">
88

‎presentation/src/main/res/layout/fragment_home.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<layout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
5-
tools:context=".ui.home.HomeFragment">
5+
tools:context="com.gun.presentation.ui.home.HomeFragment">
66

77
<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/Base.Size.Match_Match">
88

‎presentation/src/main/res/layout/fragment_home_banner.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<layout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
xmlns:tools="http://schemas.android.com/tools">
4+
xmlns:tools="http://schemas.android.com/tools"
5+
tools:context="com.gun.presentation.ui.home.HomeFragment">
56

67
<androidx.constraintlayout.widget.ConstraintLayout style="@style/Base.Size.Match_Match">
78

‎presentation/src/main/res/layout/fragment_profile.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<layout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:tools="http://schemas.android.com/tools"
5-
tools:context=".ui.profile.ProfileFragment">
5+
tools:context="com.gun.presentation.ui.profile.ProfileFragment">
66

77
<FrameLayout style="@style/Base.Size.Match_Match">
88

‎presentation/src/main/res/layout/fragment_search.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<layout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:tools="http://schemas.android.com/tools"
5-
tools:context=".ui.search.SearchFragment">
5+
tools:context="com.gun.presentation.ui.search.SearchFragment">
66

77
<FrameLayout style="@style/Base.Size.Match_Match">
88

‎presentation/src/main/res/layout/holder_home_list.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<layout xmlns:app="http://schemas.android.com/apk/res-auto"
3-
xmlns:android="http://schemas.android.com/apk/res/android">
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
tools:context="com.gun.presentation.ui.home.HomeFragment">
46

57
<androidx.constraintlayout.widget.ConstraintLayout style="@style/Base.Size.Match_Wrap">
68

‎presentation/src/main/res/navigation/nav_graph.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<fragment
99
android:id="@+id/homeFragment"
10-
android:name="com.gun.android_marvel_example.ui.home.HomeFragment"
10+
android:name="com.gun.presentation.ui.home.HomeFragment"
1111
android:label="fragment_home"
1212
tools:layout="@layout/fragment_home" >
1313
<action
@@ -23,19 +23,19 @@
2323

2424
<fragment
2525
android:id="@+id/searchFragment"
26-
android:name="com.gun.android_marvel_example.ui.search.SearchFragment"
26+
android:name="com.gun.presentation.ui.search.SearchFragment"
2727
android:label="fragment_search"
2828
tools:layout="@layout/fragment_search" />
2929

3030
<fragment
3131
android:id="@+id/favoriteFragment"
32-
android:name="com.gun.android_marvel_example.ui.favorite.FavoriteFragment"
32+
android:name="com.gun.presentation.ui.favorite.FavoriteFragment"
3333
android:label="fragment_favorite"
3434
tools:layout="@layout/fragment_favorite" />
3535

3636
<fragment
3737
android:id="@+id/profileFragment"
38-
android:name="com.gun.android_marvel_example.ui.profile.ProfileFragment"
38+
android:name="com.gun.presentation.ui.profile.ProfileFragment"
3939
android:label="fragment_profile"
4040
tools:layout="@layout/fragment_profile" />
4141

‎presentation/src/main/res/values-night/themes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
22
<!-- Base application theme. -->
3-
<style name="Theme.Android_Marvel_Example" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
3+
<style name="Theme.MVVM_CleanArchitecture" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
44
<!-- Primary brand color. -->
55
<item name="colorPrimary">@color/purple_200</item>
66
<item name="colorPrimaryVariant">@color/purple_700</item>

‎presentation/src/main/res/values/strings.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
<resources>
2-
<string name="app_name">Android_Marvel_Example</string>
3-
4-
<string name="hello_blank_fragment">Hello blank fragment</string>
2+
<string name="app_name">MVVM_CleanArchitecture</string>
53
</resources>

‎presentation/src/main/res/values/themes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
22
<!-- Base application theme. -->
3-
<style name="Theme.Android_Marvel_Example" parent="Theme.AppCompat.NoActionBar">
3+
<style name="Theme.MVVM_CleanArchitecture" parent="Theme.AppCompat.NoActionBar">
44
<!-- Primary brand color. -->
55
<item name="colorPrimary">@color/purple_500</item>
66
<item name="colorPrimaryVariant">@color/purple_700</item>

‎presentation/src/test/java/com/gun/android_marvel_example/ExampleUnitTest.kt renamed to ‎presentation/src/test/java/com/gun/presentation/ExampleUnitTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gun.android_marvel_example
1+
package com.gun.presentation
22

33
import org.junit.Test
44

‎settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencyResolutionManagement {
1313
}
1414
}
1515

16-
rootProject.name = "Android_Marvel_Example"
16+
rootProject.name = "Android_MVVM_CleanArchitecture"
1717

1818
include(
1919
":presentation",

0 commit comments

Comments
 (0)