From a0acd0680ed8eec9c94ad75a5471aa0f96e4cbbf Mon Sep 17 00:00:00 2001
From: slee_fisker <slee@fiskerinc.com>
Date: Wed, 22 Nov 2023 09:16:20 -0800
Subject: [PATCH] Add base package

---
 .../java/com/sample/android/tmdb/ui/{ => base}/BaseActivity.kt  | 2 +-
 .../com/sample/android/tmdb/ui/{ => base}/BaseDetailActivity.kt | 2 +-
 .../com/sample/android/tmdb/ui/{ => base}/BaseDetailFragment.kt | 2 +-
 .../sample/android/tmdb/ui/{ => base}/BaseDetailViewModel.kt    | 2 +-
 .../sample/android/tmdb/ui/{ => base}/BaseNavTypeActivity.kt    | 2 +-
 .../sample/android/tmdb/ui/{ => base}/BaseNavTypeFragment.kt    | 2 +-
 .../java/com/sample/android/tmdb/ui/{ => base}/BaseViewModel.kt | 2 +-
 app/src/main/java/com/sample/android/tmdb/ui/common/Content.kt  | 2 +-
 .../java/com/sample/android/tmdb/ui/detail/DetailActivity.kt    | 2 +-
 .../java/com/sample/android/tmdb/ui/detail/DetailFragment.kt    | 2 +-
 .../java/com/sample/android/tmdb/ui/detail/DetailViewModel.kt   | 2 +-
 .../main/java/com/sample/android/tmdb/ui/feed/FeedActivity.kt   | 2 +-
 .../main/java/com/sample/android/tmdb/ui/feed/FeedFragment.kt   | 2 +-
 .../main/java/com/sample/android/tmdb/ui/feed/FeedViewModel.kt  | 2 +-
 .../main/java/com/sample/android/tmdb/ui/paging/BaseFragment.kt | 2 +-
 .../java/com/sample/android/tmdb/ui/paging/main/MainActivity.kt | 2 +-
 .../com/sample/android/tmdb/ui/paging/search/SearchActivity.kt  | 2 +-
 .../java/com/sample/android/tmdb/ui/person/PersonActivity.kt    | 2 +-
 .../java/com/sample/android/tmdb/ui/person/PersonFragment.kt    | 2 +-
 .../java/com/sample/android/tmdb/ui/person/PersonViewModel.kt   | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)
 rename app/src/main/java/com/sample/android/tmdb/ui/{ => base}/BaseActivity.kt (98%)
 rename app/src/main/java/com/sample/android/tmdb/ui/{ => base}/BaseDetailActivity.kt (96%)
 rename app/src/main/java/com/sample/android/tmdb/ui/{ => base}/BaseDetailFragment.kt (96%)
 rename app/src/main/java/com/sample/android/tmdb/ui/{ => base}/BaseDetailViewModel.kt (97%)
 rename app/src/main/java/com/sample/android/tmdb/ui/{ => base}/BaseNavTypeActivity.kt (97%)
 rename app/src/main/java/com/sample/android/tmdb/ui/{ => base}/BaseNavTypeFragment.kt (96%)
 rename app/src/main/java/com/sample/android/tmdb/ui/{ => base}/BaseViewModel.kt (95%)

diff --git a/app/src/main/java/com/sample/android/tmdb/ui/BaseActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseActivity.kt
similarity index 98%
rename from app/src/main/java/com/sample/android/tmdb/ui/BaseActivity.kt
rename to app/src/main/java/com/sample/android/tmdb/ui/base/BaseActivity.kt
index 3b4c5f22..abf8a6a9 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/BaseActivity.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseActivity.kt
@@ -1,4 +1,4 @@
-package com.sample.android.tmdb.ui
+package com.sample.android.tmdb.ui.base
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/BaseDetailActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseDetailActivity.kt
similarity index 96%
rename from app/src/main/java/com/sample/android/tmdb/ui/BaseDetailActivity.kt
rename to app/src/main/java/com/sample/android/tmdb/ui/base/BaseDetailActivity.kt
index 6b79c264..5664c3e6 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/BaseDetailActivity.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseDetailActivity.kt
@@ -1,4 +1,4 @@
-package com.sample.android.tmdb.ui
+package com.sample.android.tmdb.ui.base
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/BaseDetailFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseDetailFragment.kt
similarity index 96%
rename from app/src/main/java/com/sample/android/tmdb/ui/BaseDetailFragment.kt
rename to app/src/main/java/com/sample/android/tmdb/ui/base/BaseDetailFragment.kt
index 927cad59..81ce4fa9 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/BaseDetailFragment.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseDetailFragment.kt
@@ -1,4 +1,4 @@
-package com.sample.android.tmdb.ui
+package com.sample.android.tmdb.ui.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/BaseDetailViewModel.kt b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseDetailViewModel.kt
similarity index 97%
rename from app/src/main/java/com/sample/android/tmdb/ui/BaseDetailViewModel.kt
rename to app/src/main/java/com/sample/android/tmdb/ui/base/BaseDetailViewModel.kt
index abc39042..6fa035e8 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/BaseDetailViewModel.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseDetailViewModel.kt
@@ -1,4 +1,4 @@
-package com.sample.android.tmdb.ui
+package com.sample.android.tmdb.ui.base
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/BaseNavTypeActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeActivity.kt
similarity index 97%
rename from app/src/main/java/com/sample/android/tmdb/ui/BaseNavTypeActivity.kt
rename to app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeActivity.kt
index 30624984..dd7a270a 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/BaseNavTypeActivity.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeActivity.kt
@@ -1,4 +1,4 @@
-package com.sample.android.tmdb.ui
+package com.sample.android.tmdb.ui.base
 
 import android.app.ActivityOptions
 import android.content.Intent
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/BaseNavTypeFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeFragment.kt
similarity index 96%
rename from app/src/main/java/com/sample/android/tmdb/ui/BaseNavTypeFragment.kt
rename to app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeFragment.kt
index bf3c8339..0afba8da 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/BaseNavTypeFragment.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeFragment.kt
@@ -1,4 +1,4 @@
-package com.sample.android.tmdb.ui
+package com.sample.android.tmdb.ui.base
 
 import android.content.Intent
 import android.os.Bundle
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/BaseViewModel.kt b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseViewModel.kt
similarity index 95%
rename from app/src/main/java/com/sample/android/tmdb/ui/BaseViewModel.kt
rename to app/src/main/java/com/sample/android/tmdb/ui/base/BaseViewModel.kt
index a0cadbd5..7d363c19 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/BaseViewModel.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseViewModel.kt
@@ -1,4 +1,4 @@
-package com.sample.android.tmdb.ui
+package com.sample.android.tmdb.ui.base
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/common/Content.kt b/app/src/main/java/com/sample/android/tmdb/ui/common/Content.kt
index 609ddb80..d0d0e6ec 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/common/Content.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/common/Content.kt
@@ -2,7 +2,7 @@ package com.sample.android.tmdb.ui.common
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
-import com.sample.android.tmdb.ui.BaseViewModel
+import com.sample.android.tmdb.ui.base.BaseViewModel
 import com.sample.android.tmdb.util.Resource
 
 @Composable
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/detail/DetailActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/detail/DetailActivity.kt
index 5d89964b..d8b1d4de 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/detail/DetailActivity.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/detail/DetailActivity.kt
@@ -1,7 +1,7 @@
 package com.sample.android.tmdb.ui.detail
 
 import android.view.MenuItem
-import com.sample.android.tmdb.ui.BaseDetailActivity
+import com.sample.android.tmdb.ui.base.BaseDetailActivity
 
 abstract class DetailActivity : BaseDetailActivity() {
 
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/detail/DetailFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/detail/DetailFragment.kt
index 567647f8..c721abaf 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/detail/DetailFragment.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/detail/DetailFragment.kt
@@ -13,7 +13,7 @@ import com.sample.android.tmdb.R
 import com.sample.android.tmdb.databinding.FragmentDetailBinding
 import com.sample.android.tmdb.domain.model.Credit
 import com.sample.android.tmdb.domain.model.TmdbItem
-import com.sample.android.tmdb.ui.BaseDetailFragment
+import com.sample.android.tmdb.ui.base.BaseDetailFragment
 import com.sample.android.tmdb.ui.detail.credit.CreditAdapter
 import com.sample.android.tmdb.ui.detail.credit.CreditClickListener
 import com.sample.android.tmdb.util.setupActionBar
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/detail/DetailViewModel.kt b/app/src/main/java/com/sample/android/tmdb/ui/detail/DetailViewModel.kt
index eb576c86..c39b22b6 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/detail/DetailViewModel.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/detail/DetailViewModel.kt
@@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.Cast
 import com.sample.android.tmdb.domain.model.CreditWrapper
 import com.sample.android.tmdb.domain.model.Crew
 import com.sample.android.tmdb.domain.model.Video
-import com.sample.android.tmdb.ui.BaseDetailViewModel
+import com.sample.android.tmdb.ui.base.BaseDetailViewModel
 import com.sample.android.tmdb.ui.detail.DetailViewModel.DetailWrapper
 import io.reactivex.Single
 
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/feed/FeedActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/feed/FeedActivity.kt
index 58098c5d..6a3b3295 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/feed/FeedActivity.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/feed/FeedActivity.kt
@@ -9,7 +9,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.view.GravityCompat
 import com.sample.android.tmdb.R
 import com.sample.android.tmdb.databinding.ActivityFeedBinding
-import com.sample.android.tmdb.ui.BaseNavTypeActivity
+import com.sample.android.tmdb.ui.base.BaseNavTypeActivity
 import com.sample.android.tmdb.ui.feed.movie.FeedMovieFragment
 import com.sample.android.tmdb.ui.feed.tvshow.FeedTVShowFragment
 import com.sample.android.tmdb.ui.setting.SettingFragment
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/feed/FeedFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/feed/FeedFragment.kt
index af546bb3..f2636519 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/feed/FeedFragment.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/feed/FeedFragment.kt
@@ -5,7 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.sample.android.tmdb.domain.model.TmdbItem
-import com.sample.android.tmdb.ui.BaseNavTypeFragment
+import com.sample.android.tmdb.ui.base.BaseNavTypeFragment
 import com.sample.android.tmdb.ui.common.Content
 import com.sample.android.tmdb.ui.common.TmdbTheme
 import com.sample.android.tmdb.ui.common.composeView
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/feed/FeedViewModel.kt b/app/src/main/java/com/sample/android/tmdb/ui/feed/FeedViewModel.kt
index 620b93a1..35fa7d67 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/feed/FeedViewModel.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/feed/FeedViewModel.kt
@@ -3,7 +3,7 @@ package com.sample.android.tmdb.ui.feed
 import com.sample.android.tmdb.domain.model.FeedWrapper
 import com.sample.android.tmdb.domain.model.TmdbItem
 import com.sample.android.tmdb.domain.repository.BaseFeedRepository
-import com.sample.android.tmdb.ui.BaseViewModel
+import com.sample.android.tmdb.ui.base.BaseViewModel
 
 open class FeedViewModel<T : TmdbItem>(
     repository: BaseFeedRepository<T>,
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/BaseFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/BaseFragment.kt
index c8e707b3..36721229 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/paging/BaseFragment.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/BaseFragment.kt
@@ -10,7 +10,7 @@ import com.sample.android.tmdb.R
 import com.sample.android.tmdb.databinding.FragmentMainBinding
 import com.sample.android.tmdb.domain.model.TmdbItem
 import com.sample.android.tmdb.data.paging.Status.RUNNING
-import com.sample.android.tmdb.ui.BaseNavTypeFragment
+import com.sample.android.tmdb.ui.base.BaseNavTypeFragment
 import com.sample.android.tmdb.widget.MarginDecoration
 
 abstract class BaseFragment<T : TmdbItem> : BaseNavTypeFragment() {
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/MainActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/MainActivity.kt
index 45343e77..245890a2 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/MainActivity.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/MainActivity.kt
@@ -8,7 +8,7 @@ import androidx.appcompat.widget.Toolbar
 import com.sample.android.tmdb.R
 import com.sample.android.tmdb.databinding.ActivityMainBinding
 import com.sample.android.tmdb.domain.model.TmdbItem
-import com.sample.android.tmdb.ui.BaseNavTypeActivity
+import com.sample.android.tmdb.ui.base.BaseNavTypeActivity
 import com.sample.android.tmdb.util.addFragmentToActivity
 import com.sample.android.tmdb.util.setupActionBar
 
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/search/SearchActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/search/SearchActivity.kt
index a8fd37c1..b73da87c 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/paging/search/SearchActivity.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/search/SearchActivity.kt
@@ -11,7 +11,7 @@ import android.widget.TextView
 import com.sample.android.tmdb.R
 import com.sample.android.tmdb.domain.model.TmdbItem
 import com.sample.android.tmdb.databinding.ActivitySearchBinding
-import com.sample.android.tmdb.ui.BaseActivity
+import com.sample.android.tmdb.ui.base.BaseActivity
 import com.sample.android.tmdb.util.replaceFragmentInActivity
 
 abstract class SearchActivity<T: TmdbItem> : BaseActivity() {
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/person/PersonActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/person/PersonActivity.kt
index 02f38e82..5ba00767 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/person/PersonActivity.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/person/PersonActivity.kt
@@ -1,6 +1,6 @@
 package com.sample.android.tmdb.ui.person
 
-import com.sample.android.tmdb.ui.BaseDetailActivity
+import com.sample.android.tmdb.ui.base.BaseDetailActivity
 import dagger.android.support.DaggerFragment
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/person/PersonFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/person/PersonFragment.kt
index 918532e7..469be0a1 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/person/PersonFragment.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/person/PersonFragment.kt
@@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.sample.android.tmdb.R
 import com.sample.android.tmdb.databinding.FragmentPersonBinding
 import com.sample.android.tmdb.domain.model.Credit
-import com.sample.android.tmdb.ui.BaseDetailFragment
+import com.sample.android.tmdb.ui.base.BaseDetailFragment
 import com.sample.android.tmdb.util.toVisibility
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/sample/android/tmdb/ui/person/PersonViewModel.kt b/app/src/main/java/com/sample/android/tmdb/ui/person/PersonViewModel.kt
index 83e6c0c1..46fd8bd6 100644
--- a/app/src/main/java/com/sample/android/tmdb/ui/person/PersonViewModel.kt
+++ b/app/src/main/java/com/sample/android/tmdb/ui/person/PersonViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.sample.android.tmdb.domain.repository.PersonRepository
 import com.sample.android.tmdb.domain.model.Credit
 import com.sample.android.tmdb.domain.model.Person
-import com.sample.android.tmdb.ui.BaseDetailViewModel
+import com.sample.android.tmdb.ui.base.BaseDetailViewModel
 import javax.inject.Inject
 
 class PersonViewModel(