Skip to content

Commit 489e502

Browse files
committed
Rename classes
1 parent 402c696 commit 489e502

40 files changed

+71
-71
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.sample.android.tmdb.ui.feed.NavType
1111
import com.sample.android.tmdb.ui.paging.search.movie.SearchMovieActivity
1212
import com.sample.android.tmdb.ui.paging.search.tvshow.SearchTVShowActivity
1313

14-
abstract class BaseNavTypeActivity : BaseActivity() {
14+
abstract class BaseNavigationActivity : BaseActivity() {
1515

1616
protected abstract val toolbar: Toolbar
1717

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.sample.android.tmdb.ui.feed.NavType
99
import com.sample.android.tmdb.util.Constants
1010
import dagger.android.support.DaggerFragment
1111

12-
abstract class BaseNavTypeFragment : DaggerFragment() {
12+
abstract class BaseNavigationFragment : DaggerFragment() {
1313

1414
protected abstract val navType: NavType
1515

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ import androidx.appcompat.widget.Toolbar
99
import androidx.core.view.GravityCompat
1010
import com.sample.android.tmdb.R
1111
import com.sample.android.tmdb.databinding.ActivityFeedBinding
12-
import com.sample.android.tmdb.ui.base.BaseNavTypeActivity
12+
import com.sample.android.tmdb.ui.base.BaseNavigationActivity
1313
import com.sample.android.tmdb.ui.feed.movie.FeedMovieFragment
1414
import com.sample.android.tmdb.ui.feed.tvshow.FeedTVShowFragment
1515
import com.sample.android.tmdb.ui.setting.SettingFragment
1616
import com.sample.android.tmdb.util.addFragmentToActivity
1717
import com.sample.android.tmdb.util.replaceFragmentInActivity
1818
import javax.inject.Inject
1919

20-
class FeedActivity : BaseNavTypeActivity() {
20+
class FeedActivity : BaseNavigationActivity() {
2121

2222
@Inject
2323
lateinit var feedMovieFragment: FeedMovieFragment

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import android.view.LayoutInflater
55
import android.view.View
66
import android.view.ViewGroup
77
import com.sample.android.tmdb.domain.model.TmdbItem
8-
import com.sample.android.tmdb.ui.base.BaseNavTypeFragment
8+
import com.sample.android.tmdb.ui.base.BaseNavigationFragment
99
import com.sample.android.tmdb.ui.common.Content
1010
import com.sample.android.tmdb.ui.common.TmdbTheme
1111
import com.sample.android.tmdb.ui.common.composeView
1212

13-
abstract class FeedFragment<T : TmdbItem> : BaseNavTypeFragment() {
13+
abstract class FeedFragment<T : TmdbItem> : BaseNavigationFragment() {
1414

1515
protected abstract val viewModel: FeedViewModel<T>
1616

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import com.sample.android.tmdb.R
1010
import com.sample.android.tmdb.databinding.FragmentMainBinding
1111
import com.sample.android.tmdb.domain.model.TmdbItem
1212
import com.sample.android.tmdb.data.paging.Status.RUNNING
13-
import com.sample.android.tmdb.ui.base.BaseNavTypeFragment
13+
import com.sample.android.tmdb.ui.base.BaseNavigationFragment
1414
import com.sample.android.tmdb.widget.MarginDecoration
1515

16-
abstract class BaseFragment<T : TmdbItem> : BaseNavTypeFragment() {
16+
abstract class BasePagingFragment<T : TmdbItem> : BaseNavigationFragment() {
1717

1818
protected abstract val viewModel: BasePagingViewModel<T>
1919

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package com.sample.android.tmdb.ui.paging.main
22

33
import com.sample.android.tmdb.domain.model.SortType
44
import com.sample.android.tmdb.domain.model.TmdbItem
5-
import com.sample.android.tmdb.ui.paging.BaseFragment
5+
import com.sample.android.tmdb.ui.paging.BasePagingFragment
66

7-
abstract class BaseItemFragment<T : TmdbItem> : BaseFragment<T>() {
7+
abstract class BaseMainPagingFragment<T : TmdbItem> : BasePagingFragment<T>() {
88

99
protected abstract val sortType: SortType
1010
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.sample.android.tmdb.domain.model.TmdbItem
88
import com.sample.android.tmdb.data.paging.Listing
99
import com.sample.android.tmdb.data.paging.BasePageKeyRepository
1010

11-
abstract class BaseItemViewModel<T : TmdbItem>(app: Application) : BasePagingViewModel<T>(app) {
11+
abstract class BaseMainPagingViewModel<T : TmdbItem>(app: Application) : BasePagingViewModel<T>(app) {
1212

1313
protected abstract val mainRepoResult : BasePageKeyRepository<T>
1414

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import androidx.appcompat.widget.Toolbar
88
import com.sample.android.tmdb.R
99
import com.sample.android.tmdb.databinding.ActivityMainBinding
1010
import com.sample.android.tmdb.domain.model.TmdbItem
11-
import com.sample.android.tmdb.ui.base.BaseNavTypeActivity
11+
import com.sample.android.tmdb.ui.base.BaseNavigationActivity
1212
import com.sample.android.tmdb.util.addFragmentToActivity
1313
import com.sample.android.tmdb.util.setupActionBar
1414

15-
abstract class MainActivity<T : TmdbItem> : BaseNavTypeActivity() {
15+
abstract class MainPagingActivity<T : TmdbItem> : BaseNavigationActivity() {
1616

1717
private lateinit var binding: ActivityMainBinding
1818

19-
protected abstract val fragment: BaseItemFragment<T>
19+
protected abstract val fragment: BaseMainPagingFragment<T>
2020

2121
protected abstract val screenTitle: String
2222

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package com.sample.android.tmdb.ui.paging.main.movie
33
import com.sample.android.tmdb.R
44
import javax.inject.Inject
55

6-
class DiscoverMoviesActivity: MoviesActivity() {
6+
class DiscoverMoviesActivity: MoviePagingActivity() {
77

88
@Inject
99
lateinit var discoverMoviesFragment: DiscoverMoviesFragment
1010

1111
override val titleId: Int
1212
get() = R.string.discover
1313

14-
override val fragment: MovieFragment
14+
override val fragment: MoviePagingFragment
1515
get() = discoverMoviesFragment
1616
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.sample.android.tmdb.domain.model.SortType
44
import javax.inject.Inject
55

66
class DiscoverMoviesFragment @Inject
7-
constructor() : MovieFragment() {
7+
constructor() : MoviePagingFragment() {
88

99
override val sortType = SortType.DISCOVER
1010
}

0 commit comments

Comments
 (0)