chore: bump libs

Author: abdallahmehiz

composeApp/build.gradle.kts

@@ -66,12 +66,11 @@ kotlin {
       implementation(libs.compose.constraintlayout)
       implementation(libs.bundles.coil)
       implementation(libs.qr.code)
-      implementation(libs.bundles.compose.settings)
+      implementation(libs.compose.preferences)
       implementation(libs.compose.calendar)
-      implementation(libs.jetlime)
+      implementation(libs.compose.jetlime)
       implementation(libs.bundles.voyager)
       implementation(libs.bundles.reveal)
-      implementation(libs.ptr)
       implementation(libs.compose.icons.simpleicons)
       implementation(libs.bundles.connectivity)
       implementation(libs.sonner)

composeApp/src/androidMain/AndroidManifest.xml

@@ -7,11 +7,11 @@
   <uses-feature android:name="android.hardware.camera" />
   <uses-feature android:name="android.hardware.camera.autofocus" android:required="true" />
   <uses-permission android:name="android.permission.CAMERA" />
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
   <!-- Remove unnecessary permissions from Firebase dependency -->
   <uses-permission android:name="android.permission.ACCESS_ADSERVICES_AD_ID" tools:node="remove" />
   <uses-permission android:name="android.permission.ACCESS_ADSERVICES_ATTRIBUTION" tools:node="remove" />
-  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
   <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE" tools:node="remove" />
   <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove" />
 

composeApp/src/androidMain/kotlin/utils/PlatformUtils.android.kt

@@ -6,12 +6,12 @@ import android.content.ClipboardManager
 import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Build
 import android.os.Environment
 import android.provider.MediaStore
 import android.widget.Toast
 import androidx.core.content.FileProvider
+import androidx.core.net.toUri
 import dev.icerock.moko.resources.PluralsResource
 import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.format
@@ -29,7 +29,7 @@ actual class PlatformUtils(private var context: Context) {
   }
 
   actual fun openURI(uri: String) {
-    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(uri))
+    val intent = Intent(Intent.ACTION_VIEW, uri.toUri())
     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
     context.startActivity(intent)
   }
@@ -69,7 +69,7 @@ actual class PlatformUtils(private var context: Context) {
       projection,
       selection,
       selectionArgs,
-      null
+      null,
     )
 
     if (cursor != null && cursor.count > 0) {
@@ -80,7 +80,7 @@ actual class PlatformUtils(private var context: Context) {
             MR.strings.photo_filename_format.resourceId,
             fileName.substringBeforeLast("."),
             counter,
-            fileName.substringAfterLast(".")
+            fileName.substringAfterLast("."),
           )
           counter++
           cursor.moveToPosition(-1)

composeApp/src/commonMain/kotlin/App.kt

@@ -47,7 +47,6 @@ fun App(onReady: () -> Unit, modifier: Modifier = Modifier) {
     ),
   )
   httpConnectivity.start()
-  val isHttpMonitoring by httpConnectivity.isMonitoring.collectAsState()
   val httpStatus by httpConnectivity.statusUpdates.collectAsState(Connectivity.Status.Connected(false))
   LaunchedEffect(state.isConnected) {
     httpConnectivity.stop()
@@ -69,7 +68,7 @@ fun App(onReady: () -> Unit, modifier: Modifier = Modifier) {
         AppStateBanners(
           newUpdate = isThereAnUpdate,
           noInternet = !state.isConnected && state.isMonitoring,
-          cantReach = httpStatus !is Connectivity.Status.Connected && isHttpMonitoring,
+          cantReach = httpStatus !is Connectivity.Status.Connected && httpConnectivity.isMonitoring,
           modifier = Modifier.fillMaxWidth(),
         )
         Navigator(screen = if (preferences.isLoggedIn.get()) HomeScreen else LoginScreen) {

composeApp/src/commonMain/kotlin/presentation/MaterialPullRefreshIndicator.kt

@@ -167,9 +167,9 @@ fun TimeTableLayout(
   endHour: LocalTime,
   days: ImmutableList<DayOfWeek>,
   events: ImmutableList<TimeTableEventData>,
-  content: @Composable () -> Unit,
   modifier: Modifier = Modifier,
   hourHeight: Dp = 60.dp,
+  content: @Composable () -> Unit,
 ) {
   Layout(
     modifier = modifier,

composeApp/src/commonMain/kotlin/presentation/TimeTable.kt

@@ -53,7 +53,7 @@ fun WheelNumberPicker(
   modifier: Modifier = Modifier,
   startIndex: Int = 0,
   size: DpSize = DpSize(128.dp, 128.dp),
-  onSelectionChanged: (index: Int) -> Unit = {},
+  onSelectionChange: (index: Int) -> Unit = {},
   backgroundContent: (@Composable (size: DpSize) -> Unit)? = {
     WheelPickerDefaults.Background(size = it)
   },
@@ -63,7 +63,7 @@ fun WheelNumberPicker(
     startIndex = startIndex,
     items = items,
     size = size,
-    onSelectionChanged = onSelectionChanged,
+    onSelectionChange = onSelectionChange,
     manualInputType = KeyboardType.Number,
     backgroundContent = backgroundContent,
   ) {
@@ -77,7 +77,7 @@ fun WheelTextPicker(
   modifier: Modifier = Modifier,
   startIndex: Int = 0,
   size: DpSize = DpSize(128.dp, 128.dp),
-  onSelectionChanged: (index: Int) -> Unit = {},
+  onSelectionChange: (index: Int) -> Unit = {},
   backgroundContent: (@Composable (size: DpSize) -> Unit)? = {
     WheelPickerDefaults.Background(size = it)
   },
@@ -87,7 +87,7 @@ fun WheelTextPicker(
     startIndex = startIndex,
     items = items,
     size = size,
-    onSelectionChanged = onSelectionChanged,
+    onSelectionChange = onSelectionChange,
     backgroundContent = backgroundContent,
   ) {
     WheelPickerDefaults.Item(text = it)
@@ -101,7 +101,7 @@ private fun <T> WheelPicker(
   modifier: Modifier = Modifier,
   startIndex: Int = 0,
   size: DpSize = DpSize(128.dp, 128.dp),
-  onSelectionChanged: (index: Int) -> Unit = {},
+  onSelectionChange: (index: Int) -> Unit = {},
   manualInputType: KeyboardType? = null,
   backgroundContent: (@Composable (size: DpSize) -> Unit)? = {
     WheelPickerDefaults.Background(size = it)
@@ -114,10 +114,10 @@ private fun <T> WheelPicker(
   var internalIndex by remember { mutableIntStateOf(startIndex) }
   val internalOnSelectionChanged: (Int) -> Unit = {
     internalIndex = it
-    onSelectionChanged(it)
+    onSelectionChange(it)
   }
 
-  LaunchedEffect(lazyListState, onSelectionChanged) {
+  LaunchedEffect(lazyListState, onSelectionChange) {
     snapshotFlow { lazyListState.firstVisibleItemScrollOffset }
       .map { calculateSnappedItemIndex(lazyListState) }
       .distinctUntilChanged()

composeApp/src/commonMain/kotlin/presentation/WheelPicker.kt

@@ -2,7 +2,8 @@ package presentation.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.ColorScheme
-import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.MaterialExpressiveTheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
@@ -89,6 +90,7 @@ private val darkScheme = darkColorScheme(
   surfaceContainerHighest = surfaceContainerHighestDark,
 )
 
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun AppTheme(content: @Composable () -> Unit) {
   val preferences = koinInject<BasePreferences>()
@@ -108,7 +110,7 @@ fun AppTheme(content: @Composable () -> Unit) {
     DarkMode.Light -> if (materialYou) MaterialYouColorScheme(false) else lightScheme
   }
 
-  MaterialTheme(
+  MaterialExpressiveTheme(
     colorScheme = colorScheme,
     content = content,
   )

composeApp/src/commonMain/kotlin/presentation/theme/Theme.kt

@@ -36,6 +36,7 @@ import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material.icons.rounded.Share
 import androidx.compose.material.icons.rounded.Title
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.FilledIconButton
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
@@ -45,6 +46,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
@@ -86,8 +88,6 @@ import com.svenjacobs.reveal.shapes.balloon.Arrow
 import com.svenjacobs.reveal.shapes.balloon.Balloon
 import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.compose.stringResource
-import dev.materii.pullrefresh.PullRefreshLayout
-import dev.materii.pullrefresh.rememberPullRefreshState
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
 import kotlinx.coroutines.launch
@@ -101,7 +101,6 @@ import org.koin.compose.koinInject
 import preferences.BasePreferences
 import presentation.BoxButton
 import presentation.ErrorScreenContent
-import presentation.MaterialPullRefreshIndicator
 import presentation.NotificationPromptTrigger
 import presentation.Pulsation
 import presentation.PulsationType
@@ -129,21 +128,6 @@ object HomeScreen : Screen {
     val screenModel = koinScreenModel<HomeScreenModel>()
     var isRefreshing by remember { mutableStateOf(false) }
     val toasterState = koinInject<ToasterState>()
-    val ptrState = rememberPullRefreshState(
-      refreshing = isRefreshing,
-      onRefresh = {
-        isRefreshing = true
-        screenModel.screenModelScope.launch(Dispatchers.IO) {
-          try {
-            screenModel.refresh()
-          } catch (e: Exception) {
-            if (!e.isNetworkError) FirebaseUtils.reportException(e)
-            toasterState.show(errorToast(e.stackTraceToString()))
-          }
-          isRefreshing = false
-        }
-      },
-    )
     LaunchedEffect(Unit) {
       screenModel.screenModelScope.launch(Dispatchers.IO) {
         try {
@@ -173,12 +157,22 @@ object HomeScreen : Screen {
     ) { paddingValues ->
       val data by screenModel.data.collectAsState()
       val nextSchedule by screenModel.nextSchedule.collectAsState()
-      PullRefreshLayout(
-        ptrState,
+      PullToRefreshBox(
+        isRefreshing = isRefreshing,
+        onRefresh = {
+          screenModel.screenModelScope.launch(Dispatchers.IO) {
+            try {
+              screenModel.refresh()
+            } catch (e: Exception) {
+              if (!e.isNetworkError) FirebaseUtils.reportException(e)
+              toasterState.show(errorToast(e.stackTraceToString()))
+            }
+            isRefreshing = false
+          }
+        },
         modifier = Modifier
           .padding(paddingValues)
           .fillMaxSize(),
-        indicator = { MaterialPullRefreshIndicator(ptrState) },
       ) {
         data.DisplayResult(
           onLoading = { HomeScreenContent(null, null) },
@@ -374,6 +368,7 @@ object HomeScreen : Screen {
     }
   }
 
+  @OptIn(ExperimentalMaterial3ExpressiveApi::class)
   @Composable
   fun ProfileTile(
     card: StudentCardModel?,

composeApp/src/commonMain/kotlin/ui/home/HomeScreen.kt

@@ -19,6 +19,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.collectAsState
@@ -46,8 +47,6 @@ import com.pushpal.jetlime.JetLimeDefaults
 import com.pushpal.jetlime.JetLimeEvent
 import com.pushpal.jetlime.JetLimeEventDefaults
 import dev.icerock.moko.resources.compose.stringResource
-import dev.materii.pullrefresh.PullRefreshLayout
-import dev.materii.pullrefresh.rememberPullRefreshState
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
@@ -56,7 +55,6 @@ import mehiz.abdallah.progres.domain.models.AccommodationModel
 import mehiz.abdallah.progres.i18n.MR
 import org.koin.compose.koinInject
 import presentation.ErrorScreenContent
-import presentation.MaterialPullRefreshIndicator
 import presentation.NoDataScreen
 import presentation.errorToast
 import utils.FirebaseUtils
@@ -74,21 +72,6 @@ object AccommodationScreen : Screen {
     val accommodation by screenModel.accommodations.collectAsState()
     var isRefreshing by remember { mutableStateOf(false) }
     val toasterState = koinInject<ToasterState>()
-    val ptrState = rememberPullRefreshState(
-      refreshing = isRefreshing,
-      onRefresh = {
-        isRefreshing = true
-        screenModel.screenModelScope.launch(Dispatchers.IO) {
-          try {
-            screenModel.refresh()
-          } catch (e: Exception) {
-            if (!e.isNetworkError) FirebaseUtils.reportException(e)
-            toasterState.show(errorToast(e.message!!))
-          }
-          isRefreshing = false
-        }
-      },
-    )
     Scaffold(
       topBar = {
         TopAppBar(
@@ -103,9 +86,20 @@ object AccommodationScreen : Screen {
         )
       },
     ) { paddingValues ->
-      PullRefreshLayout(
-        ptrState,
-        indicator = { MaterialPullRefreshIndicator(ptrState) },
+      PullToRefreshBox(
+        isRefreshing = isRefreshing,
+        onRefresh = {
+          isRefreshing = true
+          screenModel.screenModelScope.launch(Dispatchers.IO) {
+            try {
+              screenModel.refresh()
+            } catch (e: Exception) {
+              if (!e.isNetworkError) FirebaseUtils.reportException(e)
+              toasterState.show(errorToast(e.message!!))
+            }
+            isRefreshing = false
+          }
+        },
         modifier = Modifier.padding(paddingValues),
       ) {
         accommodation.DisplayResult(