Rename classes

app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeActivity.kt → app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavigationActivity.kt

@@ -11,7 +11,7 @@ import com.sample.android.tmdb.ui.feed.NavType
 import com.sample.android.tmdb.ui.paging.search.movie.SearchMovieActivity
 import com.sample.android.tmdb.ui.paging.search.tvshow.SearchTVShowActivity
 
-abstract class BaseNavTypeActivity : BaseActivity() {
+abstract class BaseNavigationActivity : BaseActivity() {
 
     protected abstract val toolbar: Toolbar
 

app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeFragment.kt → app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavigationFragment.kt

@@ -9,7 +9,7 @@ import com.sample.android.tmdb.ui.feed.NavType
 import com.sample.android.tmdb.util.Constants
 import dagger.android.support.DaggerFragment
 
-abstract class BaseNavTypeFragment : DaggerFragment()  {
+abstract class BaseNavigationFragment : DaggerFragment()  {
 
     protected abstract val navType: NavType
 

app/src/main/java/com/sample/android/tmdb/ui/feed/FeedActivity.kt

@@ -9,15 +9,15 @@ 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.base.BaseNavTypeActivity
+import com.sample.android.tmdb.ui.base.BaseNavigationActivity
 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
 import com.sample.android.tmdb.util.addFragmentToActivity
 import com.sample.android.tmdb.util.replaceFragmentInActivity
 import javax.inject.Inject
 
-class FeedActivity : BaseNavTypeActivity() {
+class FeedActivity : BaseNavigationActivity() {
 
     @Inject
     lateinit var feedMovieFragment: FeedMovieFragment

app/src/main/java/com/sample/android/tmdb/ui/feed/FeedFragment.kt

@@ -5,12 +5,12 @@ 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.base.BaseNavTypeFragment
+import com.sample.android.tmdb.ui.base.BaseNavigationFragment
 import com.sample.android.tmdb.ui.common.Content
 import com.sample.android.tmdb.ui.common.TmdbTheme
 import com.sample.android.tmdb.ui.common.composeView
 
-abstract class FeedFragment<T : TmdbItem> : BaseNavTypeFragment() {
+abstract class FeedFragment<T : TmdbItem> : BaseNavigationFragment() {
 
     protected abstract val viewModel: FeedViewModel<T>
 

app/src/main/java/com/sample/android/tmdb/ui/paging/BaseFragment.kt → app/src/main/java/com/sample/android/tmdb/ui/paging/BasePagingFragment.kt

@@ -10,10 +10,10 @@ 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.base.BaseNavTypeFragment
+import com.sample.android.tmdb.ui.base.BaseNavigationFragment
 import com.sample.android.tmdb.widget.MarginDecoration
 
-abstract class BaseFragment<T : TmdbItem> : BaseNavTypeFragment() {
+abstract class BasePagingFragment<T : TmdbItem> : BaseNavigationFragment() {
 
     protected abstract val viewModel: BasePagingViewModel<T>
 

app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseItemFragment.kt → app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseMainPagingFragment.kt

@@ -2,9 +2,9 @@ package com.sample.android.tmdb.ui.paging.main
 
 import com.sample.android.tmdb.domain.model.SortType
 import com.sample.android.tmdb.domain.model.TmdbItem
-import com.sample.android.tmdb.ui.paging.BaseFragment
+import com.sample.android.tmdb.ui.paging.BasePagingFragment
 
-abstract class BaseItemFragment<T : TmdbItem> : BaseFragment<T>() {
+abstract class BaseMainPagingFragment<T : TmdbItem> : BasePagingFragment<T>() {
 
     protected abstract val sortType: SortType
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseItemViewModel.kt → app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseMainPagingViewModel.kt

@@ -8,7 +8,7 @@ import com.sample.android.tmdb.domain.model.TmdbItem
 import com.sample.android.tmdb.data.paging.Listing
 import com.sample.android.tmdb.data.paging.BasePageKeyRepository
 
-abstract class BaseItemViewModel<T : TmdbItem>(app: Application) : BasePagingViewModel<T>(app) {
+abstract class BaseMainPagingViewModel<T : TmdbItem>(app: Application) : BasePagingViewModel<T>(app) {
 
     protected abstract val mainRepoResult : BasePageKeyRepository<T>
 

app/src/main/java/com/sample/android/tmdb/ui/paging/main/MainActivity.kt → app/src/main/java/com/sample/android/tmdb/ui/paging/main/MainPagingActivity.kt

@@ -8,15 +8,15 @@ 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.base.BaseNavTypeActivity
+import com.sample.android.tmdb.ui.base.BaseNavigationActivity
 import com.sample.android.tmdb.util.addFragmentToActivity
 import com.sample.android.tmdb.util.setupActionBar
 
-abstract class MainActivity<T : TmdbItem> : BaseNavTypeActivity() {
+abstract class MainPagingActivity<T : TmdbItem> : BaseNavigationActivity() {
 
     private lateinit var binding: ActivityMainBinding
 
-    protected abstract val fragment: BaseItemFragment<T>
+    protected abstract val fragment: BaseMainPagingFragment<T>
 
     protected abstract val screenTitle: String
 

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/DiscoverMoviesActivity.kt

@@ -3,14 +3,14 @@ package com.sample.android.tmdb.ui.paging.main.movie
 import com.sample.android.tmdb.R
 import javax.inject.Inject
 
-class DiscoverMoviesActivity: MoviesActivity() {
+class DiscoverMoviesActivity: MoviePagingActivity() {
 
     @Inject
     lateinit var discoverMoviesFragment: DiscoverMoviesFragment
 
     override val titleId: Int
         get() = R.string.discover
 
-    override val fragment: MovieFragment
+    override val fragment: MoviePagingFragment
         get() = discoverMoviesFragment
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/DiscoverMoviesFragment.kt

@@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.SortType
 import javax.inject.Inject
 
 class DiscoverMoviesFragment @Inject
-constructor() : MovieFragment() {
+constructor() : MoviePagingFragment() {
 
     override val sortType = SortType.DISCOVER
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/HighRateMoviesActivity.kt

@@ -3,14 +3,14 @@ package com.sample.android.tmdb.ui.paging.main.movie
 import com.sample.android.tmdb.R
 import javax.inject.Inject
 
-class HighRateMoviesActivity: MoviesActivity() {
+class HighRateMoviesActivity: MoviePagingActivity() {
 
     @Inject
     lateinit var highRateMoviesFragment: HighRateMoviesFragment
 
     override val titleId: Int
         get() = R.string.highest_rate
 
-    override val fragment: MovieFragment
+    override val fragment: MoviePagingFragment
         get() = highRateMoviesFragment
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/HighRateMoviesFragment.kt

@@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.SortType.HIGHEST_RATED
 import javax.inject.Inject
 
 class HighRateMoviesFragment @Inject
-constructor() : MovieFragment() {
+constructor() : MoviePagingFragment() {
 
     override val sortType = HIGHEST_RATED
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MoviesActivity.kt → app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MoviePagingActivity.kt

@@ -3,9 +3,9 @@ package com.sample.android.tmdb.ui.paging.main.movie
 import com.sample.android.tmdb.R
 import com.sample.android.tmdb.domain.model.Movie
 import com.sample.android.tmdb.ui.feed.NavType
-import com.sample.android.tmdb.ui.paging.main.MainActivity
+import com.sample.android.tmdb.ui.paging.main.MainPagingActivity
 
-abstract class MoviesActivity: MainActivity<Movie>() {
+abstract class MoviePagingActivity: MainPagingActivity<Movie>() {
 
     protected abstract val titleId: Int
 

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MovieFragment.kt → app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MoviePagingFragment.kt

@@ -5,10 +5,10 @@ import androidx.lifecycle.ViewModelProvider
 import com.sample.android.tmdb.domain.model.Movie
 import com.sample.android.tmdb.data.network.MovieService
 import com.sample.android.tmdb.ui.feed.NavType
-import com.sample.android.tmdb.ui.paging.main.BaseItemFragment
+import com.sample.android.tmdb.ui.paging.main.BaseMainPagingFragment
 import javax.inject.Inject
 
-abstract class MovieFragment : BaseItemFragment<Movie>() {
+abstract class MoviePagingFragment : BaseMainPagingFragment<Movie>() {
 
     @Inject
     lateinit var api: MovieService
@@ -17,9 +17,9 @@ abstract class MovieFragment : BaseItemFragment<Movie>() {
         ViewModelProvider(this, object : ViewModelProvider.Factory {
             override fun <T : ViewModel> create(modelClass: Class<T>): T {
                 @Suppress("UNCHECKED_CAST")
-                return MovieViewModel(api, sortType, requireNotNull(activity).application) as T
+                return MoviePagingViewModel(api, sortType, requireNotNull(activity).application) as T
             }
-        })[MovieViewModel::class.java]
+        })[MoviePagingViewModel::class.java]
     }
 
     override val navType: NavType

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MovieViewModel.kt → app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MoviePagingViewModel.kt

@@ -5,14 +5,14 @@ import com.sample.android.tmdb.domain.model.Movie
 import com.sample.android.tmdb.data.network.MovieService
 import com.sample.android.tmdb.data.paging.BasePageKeyRepository
 import com.sample.android.tmdb.data.paging.movie.MoviePageKeyRepository
-import com.sample.android.tmdb.ui.paging.main.BaseItemViewModel
+import com.sample.android.tmdb.ui.paging.main.BaseMainPagingViewModel
 import com.sample.android.tmdb.domain.model.SortType
 
-class MovieViewModel(
+class MoviePagingViewModel(
     api: MovieService,
     sortType: SortType,
     app: Application
-) : BaseItemViewModel<Movie>(app = app) {
+) : BaseMainPagingViewModel<Movie>(app = app) {
 
     override val mainRepoResult: BasePageKeyRepository<Movie> = MoviePageKeyRepository(api = api,
             sortType = sortType,

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/NowPlayingMoviesActivity.kt

@@ -3,14 +3,14 @@ package com.sample.android.tmdb.ui.paging.main.movie
 import com.sample.android.tmdb.R
 import javax.inject.Inject
 
-class NowPlayingMoviesActivity : MoviesActivity() {
+class NowPlayingMoviesActivity : MoviePagingActivity() {
 
     @Inject
     lateinit var nowPlayingMoviesFragment: NowPlayingMoviesFragment
 
     override val titleId: Int
         get() = R.string.now_playing
 
-    override val fragment: MovieFragment
+    override val fragment: MoviePagingFragment
         get() = nowPlayingMoviesFragment
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/NowPlayingMoviesFragment.kt

@@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.SortType
 import javax.inject.Inject
 
 class NowPlayingMoviesFragment @Inject
-constructor() : MovieFragment() {
+constructor() : MoviePagingFragment() {
 
     override val sortType = SortType.NOW_PLAYING
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/PopularMoviesActivity.kt

@@ -3,14 +3,14 @@ package com.sample.android.tmdb.ui.paging.main.movie
 import com.sample.android.tmdb.R
 import javax.inject.Inject
 
-class PopularMoviesActivity: MoviesActivity() {
+class PopularMoviesActivity: MoviePagingActivity() {
 
     @Inject
     lateinit var popularMoviesFragment: PopularMoviesFragment
 
     override val titleId: Int
         get() = R.string.popular
 
-    override val fragment: MovieFragment
+    override val fragment: MoviePagingFragment
         get() = popularMoviesFragment
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/PopularMoviesFragment.kt

@@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.SortType.MOST_POPULAR
 import javax.inject.Inject
 
 class PopularMoviesFragment @Inject
-constructor() : MovieFragment() {
+constructor() : MoviePagingFragment() {
 
     override val sortType = MOST_POPULAR
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/TrendingMoviesActivity.kt

@@ -3,14 +3,14 @@ package com.sample.android.tmdb.ui.paging.main.movie
 import com.sample.android.tmdb.R
 import javax.inject.Inject
 
-class TrendingMoviesActivity: MoviesActivity() {
+class TrendingMoviesActivity: MoviePagingActivity() {
 
     @Inject
     lateinit var trendingMoviesFragment: TrendingMoviesFragment
 
     override val titleId: Int
         get() = R.string.trending
 
-    override val fragment: MovieFragment
+    override val fragment: MoviePagingFragment
         get() = trendingMoviesFragment
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/TrendingMoviesFragment.kt

@@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.SortType
 import javax.inject.Inject
 
 class TrendingMoviesFragment @Inject
-constructor() : MovieFragment() {
+constructor() : MoviePagingFragment() {
 
     override val sortType = SortType.TRENDING
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/UpcomingMoviesActivity.kt

@@ -3,14 +3,14 @@ package com.sample.android.tmdb.ui.paging.main.movie
 import com.sample.android.tmdb.R
 import javax.inject.Inject
 
-class UpcomingMoviesActivity: MoviesActivity() {
+class UpcomingMoviesActivity: MoviePagingActivity() {
 
     @Inject
     lateinit var upcomingMoviesFragment: UpcomingMoviesFragment
 
     override val titleId: Int
         get() = R.string.upcoming
 
-    override val fragment: MovieFragment
+    override val fragment: MoviePagingFragment
         get() = upcomingMoviesFragment
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/UpcomingMoviesFragment.kt

@@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.SortType.UPCOMING
 import javax.inject.Inject
 
 class UpcomingMoviesFragment @Inject
-constructor() : MovieFragment() {
+constructor() : MoviePagingFragment() {
 
     override val sortType = UPCOMING
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/AiringTodayTVShowActivity.kt

@@ -3,14 +3,14 @@ package com.sample.android.tmdb.ui.paging.main.tvshow
 import com.sample.android.tmdb.R
 import javax.inject.Inject
 
-class AiringTodayTVShowActivity: TVShowActivity() {
+class AiringTodayTVShowActivity: TVShowPagingActivity() {
 
     @Inject
     lateinit var airingTodayTVShowFragment: AiringTodayTVShowsFragment
 
     override val titleId: Int
         get() = R.string.airing_today
 
-    override val fragment: TVShowFragment
+    override val fragment: TVShowPagingFragment
         get() = airingTodayTVShowFragment
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/AiringTodayTVShowsFragment.kt

@@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.SortType
 import javax.inject.Inject
 
 class AiringTodayTVShowsFragment @Inject
-constructor() : TVShowFragment() {
+constructor() : TVShowPagingFragment() {
 
     override val sortType = SortType.NOW_PLAYING
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/DiscoverTVShowsActivity.kt

@@ -3,14 +3,14 @@ package com.sample.android.tmdb.ui.paging.main.tvshow
 import com.sample.android.tmdb.R
 import javax.inject.Inject
 
-class DiscoverTVShowsActivity : TVShowActivity() {
+class DiscoverTVShowsActivity : TVShowPagingActivity() {
 
     @Inject
     lateinit var discoverTVShowFragment: DiscoverTVShowsFragment
 
     override val titleId: Int
         get() = R.string.discover
 
-    override val fragment: TVShowFragment
+    override val fragment: TVShowPagingFragment
         get() = discoverTVShowFragment
 }

app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/DiscoverTVShowsFragment.kt

@@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.SortType
 import javax.inject.Inject
 
 class DiscoverTVShowsFragment @Inject
-constructor() : TVShowFragment() {
+constructor() : TVShowPagingFragment() {
 
     override val sortType = SortType.DISCOVER
 }