Skip to content

Commit

Permalink
Migrate to the latest libs version
Browse files Browse the repository at this point in the history
  • Loading branch information
mal7othify committed Oct 13, 2024
1 parent 91ed387 commit f50cd39
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 55 deletions.
12 changes: 0 additions & 12 deletions app/src/main/kotlin/com/eillia/ehya/helpers/Extensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ import android.content.Context
import android.content.Intent
import android.content.pm.PackageInfo
import android.content.pm.PackageManager
import androidx.compose.material.ripple.RippleAlpha
import androidx.compose.material.ripple.RippleTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import com.ehya.R

fun Context.shareApp(appId: String) {
Expand All @@ -49,11 +45,3 @@ fun Context.setupPackage(): PackageInfo {
}
return pkgInfo!!
}

object NoRippleTheme : RippleTheme {
@Composable
override fun defaultColor() = Color.Unspecified

@Composable
override fun rippleAlpha(): RippleAlpha = RippleAlpha(0.0f, 0.0f, 0.0f, 0.0f)
}
7 changes: 4 additions & 3 deletions app/src/main/kotlin/com/eillia/ehya/ui/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.LocalRippleConfiguration
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Scaffold
import androidx.compose.material.Surface
import androidx.compose.material.ripple.LocalRippleTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.getValue
Expand All @@ -38,7 +39,6 @@ import androidx.navigation.NavGraph.Companion.findStartDestination
import androidx.navigation.NavHostController
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import com.eillia.ehya.helpers.NoRippleTheme
import com.eillia.ehya.navigation.BottomNavItem
import com.eillia.ehya.navigation.BottomNavItems
import com.eillia.ehya.navigation.Navigation
Expand All @@ -51,6 +51,7 @@ import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
class MainActivity : ComponentActivity() {
@OptIn(ExperimentalMaterialApi::class)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
WindowCompat.setDecorFitsSystemWindows(window, true)
Expand All @@ -60,7 +61,7 @@ class MainActivity : ComponentActivity() {
ProvideWindowInsets {
CompositionLocalProvider(
LocalLayoutDirection provides LayoutDirection.Rtl,
LocalRippleTheme provides NoRippleTheme
LocalRippleConfiguration provides null
) {
Surface(color = MaterialTheme.colors.primary) {
val navController = rememberNavController()
Expand Down
80 changes: 40 additions & 40 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,61 +2,61 @@
accompanist = "0.34.0"
accompanistInsets = "0.30.1"
# AGP and tools should be updated together
androidGradlePlugin = "8.5.0"
androidTools = "31.4.1"
androidxActivity = "1.9.0"
androidGradlePlugin = "8.5.2"
androidTools = "31.7.0"
androidxActivity = "1.9.2"
androidxAppCompat = "1.7.0"
androidxBrowser = "1.8.0"
androidxComposeAlpha = "1.7.0-beta01"
androidxComposeUi = "1.6.8"
androidxComposeBom = "2024.06.00"
material3 = "1.2.1"
material = "1.6.8"
androidxComposeMaterial3Adaptive = "1.0.0-beta01"
androidxComposeMaterial3AdaptiveNavigationSuite = "1.3.0-beta01"
androidxComposeRuntimeTracing = "1.0.0-beta01"
androidxCore = "1.12.0"
androidxComposeAlpha = "1.7.3"
androidxComposeUi = "1.7.3"
androidxComposeBom = "2024.09.03"
material3 = "1.3.0"
material = "1.7.3"
androidxComposeMaterial3Adaptive = "1.0.0"
androidxComposeMaterial3AdaptiveNavigationSuite = "1.3.0"
androidxComposeRuntimeTracing = "1.7.3"
androidxCore = "1.13.1"
androidxCoreSplashscreen = "1.0.1"
androidxDataStore = "1.0.0"
androidxEspresso = "3.5.1"
androidxDataStore = "1.1.1"
androidxEspresso = "3.6.1"
androidxHiltNavigationCompose = "1.2.0"
androidxLifecycle = "2.8.3"
androidxMacroBenchmark = "1.2.4"
androidxMetrics = "1.0.0-alpha04"
androidxNavigation = "2.8.0-alpha06"
androidxProfileinstaller = "1.3.1"
androidxTestCore = "1.5.0"
androidxTestExt = "1.1.5"
androidxTestRules = "1.5.0"
androidxTestRunner = "1.5.2"
androidxLifecycle = "2.8.6"
androidxMacroBenchmark = "1.3.2"
androidxMetrics = "1.0.0-beta01"
androidxNavigation = "2.8.2"
androidxProfileinstaller = "1.4.1"
androidxTestCore = "1.6.1"
androidxTestExt = "1.2.1"
androidxTestRules = "1.6.1"
androidxTestRunner = "1.6.2"
androidxTracing = "1.3.0-alpha02"
androidxUiAutomator = "2.3.0"
androidxWindowManager = "1.3.0-alpha03"
androidxWork = "2.9.0"
coil = "2.6.0"
androidxWindowManager = "1.3.0"
androidxWork = "2.9.1"
coil = "2.7.0"
dependencyGuard = "0.5.0"
firebaseBom = "32.5.0"
firebaseCrashlyticsPlugin = "2.9.9"
firebaseBom = "33.4.0"
firebaseCrashlyticsPlugin = "3.0.2"
firebasePerfPlugin = "1.4.2"
gmsPlugin = "4.4.1"
googleOss = "17.0.1"
gmsPlugin = "4.4.2"
googleOss = "17.1.0"
googleOssPlugin = "0.10.6"
hilt = "2.51.1"
hiltExt = "1.1.0"
hilt = "2.52"
hiltExt = "1.2.0"
jacoco = "0.8.7"
jdkDesugar = "1.2.2"
jdkDesugar = "2.1.2"
junit4 = "4.13.2"
kotlin = "2.0.0"
kotlinxCoroutines = "1.8.0"
kotlinxDatetime = "0.5.0"
kotlinxSerializationJson = "1.6.3"
ksp = "2.0.0-1.0.21"
moduleGraph = "2.5.0"
kotlin = "2.0.20"
kotlinxCoroutines = "1.9.0"
kotlinxDatetime = "0.6.1"
kotlinxSerializationJson = "1.7.3"
ksp = "2.0.20-1.0.25"
moduleGraph = "2.7.1"
okhttp = "4.12.0"
protobuf = "4.26.1"
codeGson = "2.11.0"
protobufPlugin = "0.9.4"
retrofit = "2.9.0"
retrofit = "2.11.0"
retrofitKotlinxSerializationJson = "1.0.0"
robolectric = "4.12.2"
roborazzi = "1.7.0"
Expand Down

0 comments on commit f50cd39

Please sign in to comment.