Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5258869d authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

AM: Migrate to ESwitch 

- Switched from default switch to custom switch wrapper
parent 97678748

app/build.gradle.kts

+3 −0
Original line number Diff line number Diff line
@@ -259,6 +259,9 @@ dependencies { 
    implementation(libs.commons.codec)

    implementation(libs.commons.lang)



    // e-Specific dependencies - (Avoid moving into toml)

    implementation("foundation.e:elib:0.0.1-alpha11")



    // for tests

    androidTestImplementation(libs.androidx.arch.core.testing)

    androidTestImplementation(libs.androidx.test.core)

app/src/main/kotlin/at/bitfire/davdroid/ui/account/CollectionScreen.kt

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import androidx.compose.material3.MaterialTheme 
import androidx.compose.material3.MediumTopAppBar

import androidx.compose.material3.OutlinedButton

import androidx.compose.material3.Scaffold

import androidx.compose.material3.Switch

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.runtime.getValue
@@ -57,6 +56,7 @@ import at.bitfire.davdroid.sync.SyncDataType 
import at.bitfire.davdroid.ui.AppTheme

import at.bitfire.davdroid.ui.composable.ExceptionInfoDialog

import at.bitfire.davdroid.ui.composable.ProgressBar

import foundation.e.accountmanager.ui.components.ESwitch

import java.time.Instant

import java.time.ZoneId

import java.time.ZonedDateTime
@@ -203,7 +203,7 @@ fun CollectionScreen( 
                            else

                                stringResource(R.string.collection_synchronization_off),

                        control = {

                            Switch(

                            ESwitch(

                                checked = sync,

                                onCheckedChange = onSetSync

                            )
@@ -223,7 +223,7 @@ fun CollectionScreen( 
                            else -> stringResource(R.string.collection_read_write)

                        },

                        control = {

                            Switch(

                            ESwitch(

                                checked = readOnly.isReadOnly(),

                                enabled = readOnly.canUserChange(),

                                onCheckedChange = onSetForceReadOnly

app/src/main/kotlin/at/bitfire/davdroid/ui/account/CollectionsList.kt

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import androidx.compose.material3.ElevatedCard 
import androidx.compose.material3.Icon

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.OutlinedButton

import androidx.compose.material3.Switch

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment
@@ -55,6 +54,7 @@ import androidx.paging.compose.itemKey 
import at.bitfire.davdroid.R

import at.bitfire.davdroid.db.Collection

import at.bitfire.davdroid.ui.AppTheme

import foundation.e.accountmanager.ui.components.ESwitch

import okhttp3.HttpUrl.Companion.toHttpUrl



@Composable
@@ -183,7 +183,7 @@ fun CollectionsList_Item_Standard( 
        }

    ) {

        val context = LocalContext.current

        Switch(

        ESwitch(

            checked = collection.sync,

            onCheckedChange = onChangeSync,

            modifier = Modifier

app/src/main/kotlin/at/bitfire/davdroid/ui/account/WifiPermissionsScreen.kt

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import androidx.compose.material3.IconButton 
import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.OutlinedButton

import androidx.compose.material3.Scaffold

import androidx.compose.material3.Switch

import androidx.compose.material3.Text

import androidx.compose.material3.TopAppBar

import androidx.compose.runtime.Composable
@@ -44,6 +43,7 @@ import at.bitfire.davdroid.ui.ExternalUris 
import at.bitfire.davdroid.ui.ExternalUris.withStatParams

import at.bitfire.davdroid.ui.composable.PermissionSwitchRow

import at.bitfire.davdroid.util.PermissionUtils

import foundation.e.accountmanager.ui.components.ESwitch



@Composable

fun WifiPermissionsScreen(
@@ -245,7 +245,7 @@ fun LocationService( 
                style = MaterialTheme.typography.bodyMedium

            )

        }

        Switch(

        ESwitch(

            checked = locationServiceEnabled,

            onCheckedChange = onEnableLocationService

        )

app/src/main/kotlin/at/bitfire/davdroid/ui/composable/PermissionSwitchRow.kt

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ import androidx.compose.material.icons.filled.Check 
import androidx.compose.material3.Icon

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Surface

import androidx.compose.material3.Switch

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment
@@ -26,6 +25,7 @@ import androidx.compose.ui.unit.dp 
import at.bitfire.davdroid.ui.AppTheme

import com.google.accompanist.permissions.ExperimentalPermissionsApi

import com.google.accompanist.permissions.rememberMultiplePermissionsState

import foundation.e.accountmanager.ui.components.ESwitch



@Composable

fun PermissionSwitchRow(
@@ -56,7 +56,7 @@ fun PermissionSwitchRow( 
                style = MaterialTheme.typography.bodyMedium

            )

        }

        Switch(

        ESwitch(

            checked = allPermissionsGranted,

            thumbContent = if (allPermissionsGranted) {

                {