File tree Expand file tree Collapse file tree 11 files changed +45
-45
lines changed
app/src/main/kotlin/com/fernandocejas/sample Expand file tree Collapse file tree 11 files changed +45
-45
lines changed Original file line number Diff line number Diff line change @@ -19,14 +19,14 @@ import android.content.Context
1919import android.view.View
2020import androidx.fragment.app.FragmentManager
2121import androidx.fragment.app.FragmentTransaction
22- import com.fernandocejas.sample.core.platform.BaseActivity
23- import com.fernandocejas.sample.core.platform.BaseFragment
22+ import com.fernandocejas.sample.core.platform.DeprecatedBaseActivity
23+ import com.fernandocejas.sample.core.platform.DeprecatedBaseFragment
2424
2525inline fun FragmentManager.inTransaction (func : FragmentTransaction .() -> FragmentTransaction ) =
2626 beginTransaction().func().commit()
2727
28- fun BaseFragment .close () = fragmentManager?.popBackStack()
28+ fun DeprecatedBaseFragment .close () = fragmentManager?.popBackStack()
2929
30- val BaseFragment .viewContainer: View get() = (activity as BaseActivity ).fragmentContainer()
30+ val DeprecatedBaseFragment .viewContainer: View get() = (activity as DeprecatedBaseActivity ).fragmentContainer()
3131
32- val BaseFragment .appContext: Context get() = activity?.applicationContext!!
32+ val DeprecatedBaseFragment .appContext: Context get() = activity?.applicationContext!!
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ import com.fernandocejas.sample.databinding.ActivityLayoutBinding
2626 *
2727 * @see AppCompatActivity
2828 */
29- abstract class BaseActivity : AppCompatActivity () {
29+ abstract class DeprecatedBaseActivity : AppCompatActivity () {
3030
3131 private lateinit var binding: ActivityLayoutBinding
3232
@@ -42,7 +42,7 @@ abstract class BaseActivity : AppCompatActivity() {
4242
4343 @Deprecated(" Deprecated in Java" )
4444 override fun onBackPressed () {
45- (supportFragmentManager.findFragmentById(binding.fragmentContainer.id) as BaseFragment ).onBackPressed()
45+ (supportFragmentManager.findFragmentById(binding.fragmentContainer.id) as DeprecatedBaseFragment ).onBackPressed()
4646 super .onBackPressed()
4747 }
4848
@@ -56,5 +56,5 @@ abstract class BaseActivity : AppCompatActivity() {
5656 add(binding.fragmentContainer.id, fragment())
5757 }
5858
59- abstract fun fragment (): BaseFragment
59+ abstract fun fragment (): DeprecatedBaseFragment
6060}
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ import com.google.android.material.snackbar.Snackbar
3030 *
3131 * @see Fragment
3232 */
33- abstract class BaseFragment : Fragment () {
33+ abstract class DeprecatedBaseFragment : Fragment () {
3434
3535 open fun onBackPressed () {}
3636
@@ -41,7 +41,7 @@ abstract class BaseFragment : Fragment() {
4141 internal fun hideProgress () = progressStatus(View .GONE )
4242
4343 private fun progressStatus (viewStatus : Int ) =
44- with (activity) { if (this is BaseActivity ) this .progressBar().visibility = viewStatus }
44+ with (activity) { if (this is DeprecatedBaseActivity ) this .progressBar().visibility = viewStatus }
4545
4646 internal fun notify (@StringRes message : Int ) =
4747 Snackbar .make(viewContainer, message, Snackbar .LENGTH_SHORT ).show()
Original file line number Diff line number Diff line change @@ -17,9 +17,9 @@ package com.fernandocejas.sample.features.login.ui
1717
1818import android.content.Context
1919import android.content.Intent
20- import com.fernandocejas.sample.core.platform.BaseActivity
20+ import com.fernandocejas.sample.core.platform.DeprecatedBaseActivity
2121
22- class LoginActivity : BaseActivity () {
22+ class LoginActivity : DeprecatedBaseActivity () {
2323 companion object {
2424 fun callingIntent (context : Context ) = Intent (context, LoginActivity ::class .java)
2525 }
Original file line number Diff line number Diff line change 1515 */
1616package com.fernandocejas.sample.features.login.ui
1717
18- import com.fernandocejas.sample.core.platform.BaseFragment
18+ import com.fernandocejas.sample.core.platform.DeprecatedBaseFragment
1919
20- class LoginFragment : BaseFragment ()
20+ class LoginFragment : DeprecatedBaseFragment ()
Original file line number Diff line number Diff line change @@ -17,9 +17,9 @@ package com.fernandocejas.sample.features.movies.ui
1717
1818import android.content.Context
1919import android.content.Intent
20- import com.fernandocejas.sample.core.platform.BaseActivity
20+ import com.fernandocejas.sample.core.platform.DeprecatedBaseActivity
2121
22- class MovieDetailsActivity : BaseActivity () {
22+ class MovieDetailsActivity : DeprecatedBaseActivity () {
2323
2424 companion object {
2525 private const val INTENT_EXTRA_PARAM_MOVIE = " com.fernandocejas.INTENT_PARAM_MOVIE"
Original file line number Diff line number Diff line change @@ -30,13 +30,13 @@ import com.fernandocejas.sample.core.extension.isVisible
3030import com.fernandocejas.sample.core.extension.loadFromUrl
3131import com.fernandocejas.sample.core.extension.loadUrlAndPostponeEnterTransition
3232import com.fernandocejas.sample.core.extension.observe
33- import com.fernandocejas.sample.core.platform.BaseActivity
34- import com.fernandocejas.sample.core.platform.BaseFragment
33+ import com.fernandocejas.sample.core.platform.DeprecatedBaseActivity
34+ import com.fernandocejas.sample.core.platform.DeprecatedBaseFragment
3535import com.fernandocejas.sample.databinding.FragmentMovieDetailsBinding
3636import com.fernandocejas.sample.features.movies.failure.MovieFailure.NonExistentMovie
3737import org.koin.android.ext.android.inject
3838
39- class MovieDetailsFragment : BaseFragment () {
39+ class MovieDetailsFragment : DeprecatedBaseFragment () {
4040
4141 companion object {
4242 private const val PARAM_MOVIE = " param_movie"
@@ -101,7 +101,7 @@ class MovieDetailsFragment : BaseFragment() {
101101 with (movie) {
102102 activity?.let {
103103 binding.moviePoster.loadUrlAndPostponeEnterTransition(poster, it)
104- (it as BaseActivity ).toolbar().title = title
104+ (it as DeprecatedBaseActivity ).toolbar().title = title
105105 }
106106 with (binding) {
107107 movieSummary.text = summary
Original file line number Diff line number Diff line change @@ -17,9 +17,9 @@ package com.fernandocejas.sample.features.movies.ui
1717
1818import android.content.Context
1919import android.content.Intent
20- import com.fernandocejas.sample.core.platform.BaseActivity
20+ import com.fernandocejas.sample.core.platform.DeprecatedBaseActivity
2121
22- class MoviesActivity : BaseActivity () {
22+ class MoviesActivity : DeprecatedBaseActivity () {
2323
2424 companion object {
2525 fun callingIntent (context : Context ) = Intent (context, MoviesActivity ::class .java)
Original file line number Diff line number Diff line change @@ -30,12 +30,12 @@ import com.fernandocejas.sample.core.extension.invisible
3030import com.fernandocejas.sample.core.extension.observe
3131import com.fernandocejas.sample.core.extension.visible
3232import com.fernandocejas.sample.core.navigation.Navigator
33- import com.fernandocejas.sample.core.platform.BaseFragment
33+ import com.fernandocejas.sample.core.platform.DeprecatedBaseFragment
3434import com.fernandocejas.sample.databinding.FragmentMoviesBinding
3535import com.fernandocejas.sample.features.movies.failure.MovieFailure.ListNotAvailable
3636import org.koin.android.ext.android.inject
3737
38- class MoviesFragment : BaseFragment () {
38+ class MoviesFragment : DeprecatedBaseFragment () {
3939
4040 private val navigator: Navigator by inject()
4141 private val moviesAdapter: MoviesAdapter by inject()
Original file line number Diff line number Diff line change @@ -4,41 +4,41 @@ compileSdk = "33"
44minSdk = " 27"
55targetSdk = " 33"
66# kotlin ---------
7- kotlin = " 1.8.22 "
8- kotlinCoroutines = " 1.7.2 "
7+ kotlin = " 1.9.20 "
8+ kotlinCoroutines = " 1.7.3 "
99# android --------
10- ktx = " 1.10 .1"
11- appCompat = " 1.6.1 "
12- materialDesign = " 1.1 .1"
13- composeBom = " 2023.08 .00"
14- activityCompose = " 1.7.2 "
15- liveData = " 1.5.0 "
16- lifecycleCompiler = " 2.6.1 "
10+ ktx = " 1.13 .1"
11+ appCompat = " 1.7.0 "
12+ materialDesign = " 1.2 .1"
13+ composeBom = " 2024.06 .00"
14+ activityCompose = " 1.9.1 "
15+ liveData = " 1.6.8 "
16+ lifecycleCompiler = " 2.8.4 "
1717constraintlayout = " 2.1.4"
18- lifecycleViewmodelKtx = " 2.6.1 "
19- lifecycleLivedataKtx = " 2.6.1 "
18+ lifecycleViewmodelKtx = " 2.8.4 "
19+ lifecycleLivedataKtx = " 2.8.4 "
2020lifecycleExtensions = " 2.2.0"
2121koinAndroid = " 3.4.3"
22- recyclerview = " 1.3.1 "
22+ recyclerview = " 1.3.2 "
2323cardview = " 1.0.0"
24- materialDesignLegacy = " 1.9 .0"
25- annotation = " 1.6.0 "
24+ materialDesignLegacy = " 1.12 .0"
25+ annotation = " 1.8.2 "
2626glide = " 4.15.1"
2727converterGson = " 2.9.0"
28- fragmentKtx = " 1.6.1 "
28+ fragmentKtx = " 1.8.2 "
2929# testing
3030kotest = " 5.6.2"
3131junit = " 4.13.2"
3232mockk = " 1.13.5"
3333robolectric = " 4.10.3"
34- runner = " 1.5.2 "
35- espressoCore = " 3.5 .1"
36- junitVersion = " 1.1.5 "
37- rules = " 1.5.0 "
34+ runner = " 1.6.1 "
35+ espressoCore = " 3.6 .1"
36+ junitVersion = " 1.2.1 "
37+ rules = " 1.6.1 "
3838# tooling -------
3939leakcanaryAndroid = " 2.12"
4040# plugings -------
41- androidGradlePlugin = " 8.0.2 "
41+ androidGradlePlugin = " 8.5.1 "
4242
4343
4444[libraries ]
You can’t perform that action at this time.
0 commit comments