From 489e50270162251b24ff1f0b96fce0143cc0a2d2 Mon Sep 17 00:00:00 2001 From: slee_fisker Date: Sun, 3 Dec 2023 13:07:41 -0800 Subject: [PATCH] Rename classes --- .../{BaseNavTypeActivity.kt => BaseNavigationActivity.kt} | 2 +- .../{BaseNavTypeFragment.kt => BaseNavigationFragment.kt} | 2 +- .../java/com/sample/android/tmdb/ui/feed/FeedActivity.kt | 4 ++-- .../java/com/sample/android/tmdb/ui/feed/FeedFragment.kt | 4 ++-- .../ui/paging/{BaseFragment.kt => BasePagingFragment.kt} | 4 ++-- .../{BaseItemFragment.kt => BaseMainPagingFragment.kt} | 4 ++-- .../{BaseItemViewModel.kt => BaseMainPagingViewModel.kt} | 2 +- .../main/{MainActivity.kt => MainPagingActivity.kt} | 6 +++--- .../tmdb/ui/paging/main/movie/DiscoverMoviesActivity.kt | 4 ++-- .../tmdb/ui/paging/main/movie/DiscoverMoviesFragment.kt | 2 +- .../tmdb/ui/paging/main/movie/HighRateMoviesActivity.kt | 4 ++-- .../tmdb/ui/paging/main/movie/HighRateMoviesFragment.kt | 2 +- .../movie/{MoviesActivity.kt => MoviePagingActivity.kt} | 4 ++-- .../movie/{MovieFragment.kt => MoviePagingFragment.kt} | 8 ++++---- .../movie/{MovieViewModel.kt => MoviePagingViewModel.kt} | 6 +++--- .../tmdb/ui/paging/main/movie/NowPlayingMoviesActivity.kt | 4 ++-- .../tmdb/ui/paging/main/movie/NowPlayingMoviesFragment.kt | 2 +- .../tmdb/ui/paging/main/movie/PopularMoviesActivity.kt | 4 ++-- .../tmdb/ui/paging/main/movie/PopularMoviesFragment.kt | 2 +- .../tmdb/ui/paging/main/movie/TrendingMoviesActivity.kt | 4 ++-- .../tmdb/ui/paging/main/movie/TrendingMoviesFragment.kt | 2 +- .../tmdb/ui/paging/main/movie/UpcomingMoviesActivity.kt | 4 ++-- .../tmdb/ui/paging/main/movie/UpcomingMoviesFragment.kt | 2 +- .../ui/paging/main/tvshow/AiringTodayTVShowActivity.kt | 4 ++-- .../ui/paging/main/tvshow/AiringTodayTVShowsFragment.kt | 2 +- .../tmdb/ui/paging/main/tvshow/DiscoverTVShowsActivity.kt | 4 ++-- .../tmdb/ui/paging/main/tvshow/DiscoverTVShowsFragment.kt | 2 +- .../tmdb/ui/paging/main/tvshow/HighRateTVShowActivity.kt | 4 ++-- .../tmdb/ui/paging/main/tvshow/HighRateTVShowFragment.kt | 2 +- .../tmdb/ui/paging/main/tvshow/OnTheAirTVShowActivity.kt | 4 ++-- .../tmdb/ui/paging/main/tvshow/OnTheAirTVShowFragment.kt | 2 +- .../tmdb/ui/paging/main/tvshow/PopularTVShowActivity.kt | 4 ++-- .../tmdb/ui/paging/main/tvshow/PopularTVShowFragment.kt | 2 +- .../tvshow/{TVShowActivity.kt => TVShowPagingActivity.kt} | 4 ++-- .../tvshow/{TVShowFragment.kt => TVShowPagingFragment.kt} | 8 ++++---- .../{TVShowsViewModel.kt => TVShowPagingViewModel.kt} | 6 +++--- .../tmdb/ui/paging/main/tvshow/TrendingTVShowActivity.kt | 4 ++-- .../tmdb/ui/paging/main/tvshow/TrendingTVShowFragment.kt | 2 +- .../android/tmdb/ui/paging/search/BaseSearchFragment.kt | 4 ++-- app/src/main/res/layout/fragment_main.xml | 2 +- 40 files changed, 71 insertions(+), 71 deletions(-) rename app/src/main/java/com/sample/android/tmdb/ui/base/{BaseNavTypeActivity.kt => BaseNavigationActivity.kt} (97%) rename app/src/main/java/com/sample/android/tmdb/ui/base/{BaseNavTypeFragment.kt => BaseNavigationFragment.kt} (94%) rename app/src/main/java/com/sample/android/tmdb/ui/paging/{BaseFragment.kt => BasePagingFragment.kt} (94%) rename app/src/main/java/com/sample/android/tmdb/ui/paging/main/{BaseItemFragment.kt => BaseMainPagingFragment.kt} (59%) rename app/src/main/java/com/sample/android/tmdb/ui/paging/main/{BaseItemViewModel.kt => BaseMainPagingViewModel.kt} (84%) rename app/src/main/java/com/sample/android/tmdb/ui/paging/main/{MainActivity.kt => MainPagingActivity.kt} (88%) rename app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/{MoviesActivity.kt => MoviePagingActivity.kt} (75%) rename app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/{MovieFragment.kt => MoviePagingFragment.kt} (70%) rename app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/{MovieViewModel.kt => MoviePagingViewModel.kt} (82%) rename app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/{TVShowActivity.kt => TVShowPagingActivity.kt} (75%) rename app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/{TVShowFragment.kt => TVShowPagingFragment.kt} (70%) rename app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/{TVShowsViewModel.kt => TVShowPagingViewModel.kt} (82%) diff --git a/app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavigationActivity.kt similarity index 97% rename from app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeActivity.kt rename to app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavigationActivity.kt index dd7a270..a58be2d 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeActivity.kt +++ b/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 diff --git a/app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavigationFragment.kt similarity index 94% rename from app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeFragment.kt rename to app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavigationFragment.kt index 0afba8d..b3249c5 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/base/BaseNavTypeFragment.kt +++ b/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 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 93037e8..54a8a68 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.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 @@ -17,7 +17,7 @@ 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 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 f263651..9190774 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,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 : BaseNavTypeFragment() { +abstract class FeedFragment : BaseNavigationFragment() { protected abstract val viewModel: FeedViewModel 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/BasePagingFragment.kt similarity index 94% rename from app/src/main/java/com/sample/android/tmdb/ui/paging/BaseFragment.kt rename to app/src/main/java/com/sample/android/tmdb/ui/paging/BasePagingFragment.kt index 3672122..25dc232 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/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 : BaseNavTypeFragment() { +abstract class BasePagingFragment : BaseNavigationFragment() { protected abstract val viewModel: BasePagingViewModel diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseItemFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseMainPagingFragment.kt similarity index 59% rename from app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseItemFragment.kt rename to app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseMainPagingFragment.kt index d082699..a5826f3 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseItemFragment.kt +++ b/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 : BaseFragment() { +abstract class BaseMainPagingFragment : BasePagingFragment() { protected abstract val sortType: SortType } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseItemViewModel.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseMainPagingViewModel.kt similarity index 84% rename from app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseItemViewModel.kt rename to app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseMainPagingViewModel.kt index 21c87d7..914bfe2 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/BaseItemViewModel.kt +++ b/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(app: Application) : BasePagingViewModel(app) { +abstract class BaseMainPagingViewModel(app: Application) : BasePagingViewModel(app) { protected abstract val mainRepoResult : BasePageKeyRepository 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/MainPagingActivity.kt similarity index 88% rename from app/src/main/java/com/sample/android/tmdb/ui/paging/main/MainActivity.kt rename to app/src/main/java/com/sample/android/tmdb/ui/paging/main/MainPagingActivity.kt index aed185a..b957951 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/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 : BaseNavTypeActivity() { +abstract class MainPagingActivity : BaseNavigationActivity() { private lateinit var binding: ActivityMainBinding - protected abstract val fragment: BaseItemFragment + protected abstract val fragment: BaseMainPagingFragment protected abstract val screenTitle: String diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/DiscoverMoviesActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/DiscoverMoviesActivity.kt index 1775d8e..bb6640a 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/DiscoverMoviesActivity.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/DiscoverMoviesActivity.kt @@ -3,7 +3,7 @@ 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 @@ -11,6 +11,6 @@ class DiscoverMoviesActivity: MoviesActivity() { override val titleId: Int get() = R.string.discover - override val fragment: MovieFragment + override val fragment: MoviePagingFragment get() = discoverMoviesFragment } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/DiscoverMoviesFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/DiscoverMoviesFragment.kt index cd2f69c..4acb16e 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/DiscoverMoviesFragment.kt +++ b/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 } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/HighRateMoviesActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/HighRateMoviesActivity.kt index 5237f90..524461b 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/HighRateMoviesActivity.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/HighRateMoviesActivity.kt @@ -3,7 +3,7 @@ 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 @@ -11,6 +11,6 @@ class HighRateMoviesActivity: MoviesActivity() { override val titleId: Int get() = R.string.highest_rate - override val fragment: MovieFragment + override val fragment: MoviePagingFragment get() = highRateMoviesFragment } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/HighRateMoviesFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/HighRateMoviesFragment.kt index 6f4ef0f..ce8f8e7 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/HighRateMoviesFragment.kt +++ b/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 } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MoviesActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MoviePagingActivity.kt similarity index 75% rename from app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MoviesActivity.kt rename to app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MoviePagingActivity.kt index 27eb0c2..f03da14 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MoviesActivity.kt +++ b/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() { +abstract class MoviePagingActivity: MainPagingActivity() { protected abstract val titleId: Int diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MovieFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MoviePagingFragment.kt similarity index 70% rename from app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MovieFragment.kt rename to app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MoviePagingFragment.kt index 14287fb..bca5f00 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MovieFragment.kt +++ b/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() { +abstract class MoviePagingFragment : BaseMainPagingFragment() { @Inject lateinit var api: MovieService @@ -17,9 +17,9 @@ abstract class MovieFragment : BaseItemFragment() { ViewModelProvider(this, object : ViewModelProvider.Factory { override fun create(modelClass: Class): 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 diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MovieViewModel.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MoviePagingViewModel.kt similarity index 82% rename from app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MovieViewModel.kt rename to app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MoviePagingViewModel.kt index 69e85cf..6a8c4c5 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/MovieViewModel.kt +++ b/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(app = app) { +) : BaseMainPagingViewModel(app = app) { override val mainRepoResult: BasePageKeyRepository = MoviePageKeyRepository(api = api, sortType = sortType, diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/NowPlayingMoviesActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/NowPlayingMoviesActivity.kt index 39e664f..3c0e24a 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/NowPlayingMoviesActivity.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/NowPlayingMoviesActivity.kt @@ -3,7 +3,7 @@ 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 @@ -11,6 +11,6 @@ class NowPlayingMoviesActivity : MoviesActivity() { override val titleId: Int get() = R.string.now_playing - override val fragment: MovieFragment + override val fragment: MoviePagingFragment get() = nowPlayingMoviesFragment } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/NowPlayingMoviesFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/NowPlayingMoviesFragment.kt index 29c929b..94fac44 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/NowPlayingMoviesFragment.kt +++ b/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 } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/PopularMoviesActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/PopularMoviesActivity.kt index 1142afe..5cfeedc 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/PopularMoviesActivity.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/PopularMoviesActivity.kt @@ -3,7 +3,7 @@ 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 @@ -11,6 +11,6 @@ class PopularMoviesActivity: MoviesActivity() { override val titleId: Int get() = R.string.popular - override val fragment: MovieFragment + override val fragment: MoviePagingFragment get() = popularMoviesFragment } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/PopularMoviesFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/PopularMoviesFragment.kt index faa555c..b45f367 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/PopularMoviesFragment.kt +++ b/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 } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/TrendingMoviesActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/TrendingMoviesActivity.kt index 2e8cea4..5174d84 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/TrendingMoviesActivity.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/TrendingMoviesActivity.kt @@ -3,7 +3,7 @@ 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 @@ -11,6 +11,6 @@ class TrendingMoviesActivity: MoviesActivity() { override val titleId: Int get() = R.string.trending - override val fragment: MovieFragment + override val fragment: MoviePagingFragment get() = trendingMoviesFragment } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/TrendingMoviesFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/TrendingMoviesFragment.kt index 39ca47e..918e0ba 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/TrendingMoviesFragment.kt +++ b/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 } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/UpcomingMoviesActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/UpcomingMoviesActivity.kt index 8157685..7653f25 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/UpcomingMoviesActivity.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/UpcomingMoviesActivity.kt @@ -3,7 +3,7 @@ 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 @@ -11,6 +11,6 @@ class UpcomingMoviesActivity: MoviesActivity() { override val titleId: Int get() = R.string.upcoming - override val fragment: MovieFragment + override val fragment: MoviePagingFragment get() = upcomingMoviesFragment } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/UpcomingMoviesFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/UpcomingMoviesFragment.kt index 2a5680e..4c17def 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/movie/UpcomingMoviesFragment.kt +++ b/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 } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/AiringTodayTVShowActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/AiringTodayTVShowActivity.kt index f8f97dc..3eb5f8f 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/AiringTodayTVShowActivity.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/AiringTodayTVShowActivity.kt @@ -3,7 +3,7 @@ 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 @@ -11,6 +11,6 @@ class AiringTodayTVShowActivity: TVShowActivity() { override val titleId: Int get() = R.string.airing_today - override val fragment: TVShowFragment + override val fragment: TVShowPagingFragment get() = airingTodayTVShowFragment } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/AiringTodayTVShowsFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/AiringTodayTVShowsFragment.kt index 679aada..89edd52 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/AiringTodayTVShowsFragment.kt +++ b/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 } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/DiscoverTVShowsActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/DiscoverTVShowsActivity.kt index 95c91b7..0962d76 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/DiscoverTVShowsActivity.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/DiscoverTVShowsActivity.kt @@ -3,7 +3,7 @@ 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 @@ -11,6 +11,6 @@ class DiscoverTVShowsActivity : TVShowActivity() { override val titleId: Int get() = R.string.discover - override val fragment: TVShowFragment + override val fragment: TVShowPagingFragment get() = discoverTVShowFragment } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/DiscoverTVShowsFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/DiscoverTVShowsFragment.kt index 66ec129..854eb73 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/DiscoverTVShowsFragment.kt +++ b/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 } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/HighRateTVShowActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/HighRateTVShowActivity.kt index 3c411ac..e594ea3 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/HighRateTVShowActivity.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/HighRateTVShowActivity.kt @@ -3,7 +3,7 @@ package com.sample.android.tmdb.ui.paging.main.tvshow import com.sample.android.tmdb.R import javax.inject.Inject -class HighRateTVShowActivity: TVShowActivity() { +class HighRateTVShowActivity: TVShowPagingActivity() { @Inject lateinit var highRateTVShowFragment: HighRateTVShowFragment @@ -11,6 +11,6 @@ class HighRateTVShowActivity: TVShowActivity() { override val titleId: Int get() = R.string.highest_rate - override val fragment: TVShowFragment + override val fragment: TVShowPagingFragment get() = highRateTVShowFragment } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/HighRateTVShowFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/HighRateTVShowFragment.kt index 94bcf3c..8945271 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/HighRateTVShowFragment.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/HighRateTVShowFragment.kt @@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.SortType.HIGHEST_RATED import javax.inject.Inject class HighRateTVShowFragment @Inject -constructor() : TVShowFragment() { +constructor() : TVShowPagingFragment() { override val sortType = HIGHEST_RATED } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/OnTheAirTVShowActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/OnTheAirTVShowActivity.kt index 5ea12ca..78eb31c 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/OnTheAirTVShowActivity.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/OnTheAirTVShowActivity.kt @@ -3,7 +3,7 @@ package com.sample.android.tmdb.ui.paging.main.tvshow import com.sample.android.tmdb.R import javax.inject.Inject -class OnTheAirTVShowActivity: TVShowActivity() { +class OnTheAirTVShowActivity: TVShowPagingActivity() { @Inject lateinit var onTheAirTVShowFragment: OnTheAirTVShowFragment @@ -11,6 +11,6 @@ class OnTheAirTVShowActivity: TVShowActivity() { override val titleId: Int get() = R.string.on_the_air - override val fragment: TVShowFragment + override val fragment: TVShowPagingFragment get() = onTheAirTVShowFragment } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/OnTheAirTVShowFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/OnTheAirTVShowFragment.kt index 51c00b4..33930ba 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/OnTheAirTVShowFragment.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/OnTheAirTVShowFragment.kt @@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.SortType.UPCOMING import javax.inject.Inject class OnTheAirTVShowFragment @Inject -constructor() : TVShowFragment() { +constructor() : TVShowPagingFragment() { override val sortType = UPCOMING } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/PopularTVShowActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/PopularTVShowActivity.kt index 7d793e2..c8654e8 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/PopularTVShowActivity.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/PopularTVShowActivity.kt @@ -3,7 +3,7 @@ package com.sample.android.tmdb.ui.paging.main.tvshow import com.sample.android.tmdb.R import javax.inject.Inject -class PopularTVShowActivity: TVShowActivity() { +class PopularTVShowActivity: TVShowPagingActivity() { @Inject lateinit var popularTVShowFragment: PopularTVShowFragment @@ -11,6 +11,6 @@ class PopularTVShowActivity: TVShowActivity() { override val titleId: Int get() = R.string.popular - override val fragment: TVShowFragment + override val fragment: TVShowPagingFragment get() = popularTVShowFragment } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/PopularTVShowFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/PopularTVShowFragment.kt index a0ac627..554494d 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/PopularTVShowFragment.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/PopularTVShowFragment.kt @@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.SortType.MOST_POPULAR import javax.inject.Inject class PopularTVShowFragment @Inject -constructor() : TVShowFragment() { +constructor() : TVShowPagingFragment() { override val sortType = MOST_POPULAR } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowPagingActivity.kt similarity index 75% rename from app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowActivity.kt rename to app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowPagingActivity.kt index 5c0ccf1..d68fdf6 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowActivity.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowPagingActivity.kt @@ -3,9 +3,9 @@ package com.sample.android.tmdb.ui.paging.main.tvshow import com.sample.android.tmdb.R import com.sample.android.tmdb.domain.model.TVShow 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 TVShowActivity: MainActivity() { +abstract class TVShowPagingActivity: MainPagingActivity() { protected abstract val titleId: Int diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowPagingFragment.kt similarity index 70% rename from app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowFragment.kt rename to app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowPagingFragment.kt index afdbfba..ad72161 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowFragment.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowPagingFragment.kt @@ -5,10 +5,10 @@ import androidx.lifecycle.ViewModelProvider import com.sample.android.tmdb.domain.model.TVShow import com.sample.android.tmdb.data.network.TVShowService 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 TVShowFragment : BaseItemFragment() { +abstract class TVShowPagingFragment : BaseMainPagingFragment() { @Inject lateinit var api: TVShowService @@ -17,9 +17,9 @@ abstract class TVShowFragment : BaseItemFragment() { ViewModelProvider(this, object : ViewModelProvider.Factory { override fun create(modelClass: Class): T { @Suppress("UNCHECKED_CAST") - return TVShowsViewModel(api, sortType, requireNotNull(activity).application) as T + return TVShowPagingViewModel(api, sortType, requireNotNull(activity).application) as T } - })[TVShowsViewModel::class.java] + })[TVShowPagingViewModel::class.java] } override val navType: NavType diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowsViewModel.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowPagingViewModel.kt similarity index 82% rename from app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowsViewModel.kt rename to app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowPagingViewModel.kt index 3c6869a..978599f 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowsViewModel.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TVShowPagingViewModel.kt @@ -5,14 +5,14 @@ import com.sample.android.tmdb.domain.model.TVShow import com.sample.android.tmdb.data.network.TVShowService import com.sample.android.tmdb.data.paging.BasePageKeyRepository import com.sample.android.tmdb.data.paging.tvshow.TVShowsPageKeyRepository -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 TVShowsViewModel( +class TVShowPagingViewModel( api: TVShowService, sortType: SortType, app: Application -) : BaseItemViewModel(app = app) { +) : BaseMainPagingViewModel(app = app) { override val mainRepoResult: BasePageKeyRepository = TVShowsPageKeyRepository(api = api, sortType = sortType, diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TrendingTVShowActivity.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TrendingTVShowActivity.kt index 3372a48..5741d70 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TrendingTVShowActivity.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TrendingTVShowActivity.kt @@ -3,7 +3,7 @@ package com.sample.android.tmdb.ui.paging.main.tvshow import com.sample.android.tmdb.R import javax.inject.Inject -class TrendingTVShowActivity: TVShowActivity() { +class TrendingTVShowActivity: TVShowPagingActivity() { @Inject lateinit var trendingTVShowFragment: TrendingTVShowFragment @@ -11,6 +11,6 @@ class TrendingTVShowActivity: TVShowActivity() { override val titleId: Int get() = R.string.trending - override val fragment: TVShowFragment + override val fragment: TVShowPagingFragment get() = trendingTVShowFragment } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TrendingTVShowFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TrendingTVShowFragment.kt index 5b90a62..1e3fd85 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TrendingTVShowFragment.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/main/tvshow/TrendingTVShowFragment.kt @@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.SortType import javax.inject.Inject class TrendingTVShowFragment @Inject -constructor() : TVShowFragment() { +constructor() : TVShowPagingFragment() { override val sortType = SortType.TRENDING } \ No newline at end of file diff --git a/app/src/main/java/com/sample/android/tmdb/ui/paging/search/BaseSearchFragment.kt b/app/src/main/java/com/sample/android/tmdb/ui/paging/search/BaseSearchFragment.kt index 37414ca..cc72f6c 100644 --- a/app/src/main/java/com/sample/android/tmdb/ui/paging/search/BaseSearchFragment.kt +++ b/app/src/main/java/com/sample/android/tmdb/ui/paging/search/BaseSearchFragment.kt @@ -2,10 +2,10 @@ package com.sample.android.tmdb.ui.paging.search import com.sample.android.tmdb.domain.model.TmdbItem import com.sample.android.tmdb.data.paging.Status.RUNNING -import com.sample.android.tmdb.ui.paging.BaseFragment +import com.sample.android.tmdb.ui.paging.BasePagingFragment import com.sample.android.tmdb.util.toVisibility -abstract class BaseSearchFragment : BaseFragment() { +abstract class BaseSearchFragment : BasePagingFragment() { private val searchViewModel get() = viewModel as BaseSearchViewModel diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 32778f2..b562d04 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -6,7 +6,7 @@ android:id="@+id/swipe_refresh" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.paging.BaseFragment"> + tools:context=".ui.paging.BasePagingFragment">