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
19
19
import android.view.View
20
20
import androidx.fragment.app.FragmentManager
21
21
import 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
24
24
25
25
inline fun FragmentManager.inTransaction (func : FragmentTransaction .() -> FragmentTransaction ) =
26
26
beginTransaction().func().commit()
27
27
28
- fun BaseFragment .close () = fragmentManager?.popBackStack()
28
+ fun DeprecatedBaseFragment .close () = fragmentManager?.popBackStack()
29
29
30
- val BaseFragment .viewContainer: View get() = (activity as BaseActivity ).fragmentContainer()
30
+ val DeprecatedBaseFragment .viewContainer: View get() = (activity as DeprecatedBaseActivity ).fragmentContainer()
31
31
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
26
26
*
27
27
* @see AppCompatActivity
28
28
*/
29
- abstract class BaseActivity : AppCompatActivity () {
29
+ abstract class DeprecatedBaseActivity : AppCompatActivity () {
30
30
31
31
private lateinit var binding: ActivityLayoutBinding
32
32
@@ -42,7 +42,7 @@ abstract class BaseActivity : AppCompatActivity() {
42
42
43
43
@Deprecated(" Deprecated in Java" )
44
44
override fun onBackPressed () {
45
- (supportFragmentManager.findFragmentById(binding.fragmentContainer.id) as BaseFragment ).onBackPressed()
45
+ (supportFragmentManager.findFragmentById(binding.fragmentContainer.id) as DeprecatedBaseFragment ).onBackPressed()
46
46
super .onBackPressed()
47
47
}
48
48
@@ -56,5 +56,5 @@ abstract class BaseActivity : AppCompatActivity() {
56
56
add(binding.fragmentContainer.id, fragment())
57
57
}
58
58
59
- abstract fun fragment (): BaseFragment
59
+ abstract fun fragment (): DeprecatedBaseFragment
60
60
}
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ import com.google.android.material.snackbar.Snackbar
30
30
*
31
31
* @see Fragment
32
32
*/
33
- abstract class BaseFragment : Fragment () {
33
+ abstract class DeprecatedBaseFragment : Fragment () {
34
34
35
35
open fun onBackPressed () {}
36
36
@@ -41,7 +41,7 @@ abstract class BaseFragment : Fragment() {
41
41
internal fun hideProgress () = progressStatus(View .GONE )
42
42
43
43
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 }
45
45
46
46
internal fun notify (@StringRes message : Int ) =
47
47
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
17
17
18
18
import android.content.Context
19
19
import android.content.Intent
20
- import com.fernandocejas.sample.core.platform.BaseActivity
20
+ import com.fernandocejas.sample.core.platform.DeprecatedBaseActivity
21
21
22
- class LoginActivity : BaseActivity () {
22
+ class LoginActivity : DeprecatedBaseActivity () {
23
23
companion object {
24
24
fun callingIntent (context : Context ) = Intent (context, LoginActivity ::class .java)
25
25
}
Original file line number Diff line number Diff line change 15
15
*/
16
16
package com.fernandocejas.sample.features.login.ui
17
17
18
- import com.fernandocejas.sample.core.platform.BaseFragment
18
+ import com.fernandocejas.sample.core.platform.DeprecatedBaseFragment
19
19
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
17
17
18
18
import android.content.Context
19
19
import android.content.Intent
20
- import com.fernandocejas.sample.core.platform.BaseActivity
20
+ import com.fernandocejas.sample.core.platform.DeprecatedBaseActivity
21
21
22
- class MovieDetailsActivity : BaseActivity () {
22
+ class MovieDetailsActivity : DeprecatedBaseActivity () {
23
23
24
24
companion object {
25
25
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
30
30
import com.fernandocejas.sample.core.extension.loadFromUrl
31
31
import com.fernandocejas.sample.core.extension.loadUrlAndPostponeEnterTransition
32
32
import 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
35
35
import com.fernandocejas.sample.databinding.FragmentMovieDetailsBinding
36
36
import com.fernandocejas.sample.features.movies.failure.MovieFailure.NonExistentMovie
37
37
import org.koin.android.ext.android.inject
38
38
39
- class MovieDetailsFragment : BaseFragment () {
39
+ class MovieDetailsFragment : DeprecatedBaseFragment () {
40
40
41
41
companion object {
42
42
private const val PARAM_MOVIE = " param_movie"
@@ -101,7 +101,7 @@ class MovieDetailsFragment : BaseFragment() {
101
101
with (movie) {
102
102
activity?.let {
103
103
binding.moviePoster.loadUrlAndPostponeEnterTransition(poster, it)
104
- (it as BaseActivity ).toolbar().title = title
104
+ (it as DeprecatedBaseActivity ).toolbar().title = title
105
105
}
106
106
with (binding) {
107
107
movieSummary.text = summary
Original file line number Diff line number Diff line change @@ -17,9 +17,9 @@ package com.fernandocejas.sample.features.movies.ui
17
17
18
18
import android.content.Context
19
19
import android.content.Intent
20
- import com.fernandocejas.sample.core.platform.BaseActivity
20
+ import com.fernandocejas.sample.core.platform.DeprecatedBaseActivity
21
21
22
- class MoviesActivity : BaseActivity () {
22
+ class MoviesActivity : DeprecatedBaseActivity () {
23
23
24
24
companion object {
25
25
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
30
30
import com.fernandocejas.sample.core.extension.observe
31
31
import com.fernandocejas.sample.core.extension.visible
32
32
import com.fernandocejas.sample.core.navigation.Navigator
33
- import com.fernandocejas.sample.core.platform.BaseFragment
33
+ import com.fernandocejas.sample.core.platform.DeprecatedBaseFragment
34
34
import com.fernandocejas.sample.databinding.FragmentMoviesBinding
35
35
import com.fernandocejas.sample.features.movies.failure.MovieFailure.ListNotAvailable
36
36
import org.koin.android.ext.android.inject
37
37
38
- class MoviesFragment : BaseFragment () {
38
+ class MoviesFragment : DeprecatedBaseFragment () {
39
39
40
40
private val navigator: Navigator by inject()
41
41
private val moviesAdapter: MoviesAdapter by inject()
Original file line number Diff line number Diff line change @@ -4,41 +4,41 @@ compileSdk = "33"
4
4
minSdk = " 27"
5
5
targetSdk = " 33"
6
6
# kotlin ---------
7
- kotlin = " 1.8.22 "
8
- kotlinCoroutines = " 1.7.2 "
7
+ kotlin = " 1.9.20 "
8
+ kotlinCoroutines = " 1.7.3 "
9
9
# 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 "
17
17
constraintlayout = " 2.1.4"
18
- lifecycleViewmodelKtx = " 2.6.1 "
19
- lifecycleLivedataKtx = " 2.6.1 "
18
+ lifecycleViewmodelKtx = " 2.8.4 "
19
+ lifecycleLivedataKtx = " 2.8.4 "
20
20
lifecycleExtensions = " 2.2.0"
21
21
koinAndroid = " 3.4.3"
22
- recyclerview = " 1.3.1 "
22
+ recyclerview = " 1.3.2 "
23
23
cardview = " 1.0.0"
24
- materialDesignLegacy = " 1.9 .0"
25
- annotation = " 1.6.0 "
24
+ materialDesignLegacy = " 1.12 .0"
25
+ annotation = " 1.8.2 "
26
26
glide = " 4.15.1"
27
27
converterGson = " 2.9.0"
28
- fragmentKtx = " 1.6.1 "
28
+ fragmentKtx = " 1.8.2 "
29
29
# testing
30
30
kotest = " 5.6.2"
31
31
junit = " 4.13.2"
32
32
mockk = " 1.13.5"
33
33
robolectric = " 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 "
38
38
# tooling -------
39
39
leakcanaryAndroid = " 2.12"
40
40
# plugings -------
41
- androidGradlePlugin = " 8.0.2 "
41
+ androidGradlePlugin = " 8.5.1 "
42
42
43
43
44
44
[libraries ]
You can’t perform that action at this time.
0 commit comments