android: fix last commit; update copyright notice to "LibrePods Contributors"

2026-01-28 22:01:50 +00:00 · 2025-05-11 19:48:28 +05:30
parent aec9c7192e
commit 8e670c2481
7 changed files with 68 additions and 40 deletions
--- a/android/app/src/main/java/me/kavishdevar/librepods/composables/ControlCenterButton.kt
+++ b/android/app/src/main/java/me/kavishdevar/librepods/composables/ControlCenterButton.kt
@@ -1,7 +1,7 @@
 /*
 * LibrePods - AirPods liberated from Apple’s ecosystem
 *
- * Copyright (C) 2025 Kavish Devar
+ * Copyright (C) 2025 LibrePods Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published
--- a/android/app/src/main/java/me/kavishdevar/librepods/composables/ControlCenterNoiseControlSegmentedButton.kt
+++ b/android/app/src/main/java/me/kavishdevar/librepods/composables/ControlCenterNoiseControlSegmentedButton.kt
@@ -1,7 +1,7 @@
 /*
 * LibrePods - AirPods liberated from Apple’s ecosystem
 *
- * Copyright (C) 2025 Kavish Devar
+ * Copyright (C) 2025 LibrePods Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published
--- a/android/app/src/main/java/me/kavishdevar/librepods/composables/VerticalVolumeSlider.kt
+++ b/android/app/src/main/java/me/kavishdevar/librepods/composables/VerticalVolumeSlider.kt
@@ -1,7 +1,7 @@
 /*
 * LibrePods - AirPods liberated from Apple’s ecosystem
 *
- * Copyright (C) 2025 Kavish Devar
+ * Copyright (C) 2025 LibrePods Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published
--- a/android/app/src/main/java/me/kavishdevar/librepods/screens/AppSettingsScreen.kt
+++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/AppSettingsScreen.kt
@@ -64,8 +64,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
@@ -78,16 +80,18 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
-import dev.chrisbanes.haze.HazeDefaults
+import dev.chrisbanes.haze.HazeEffectScope
 import dev.chrisbanes.haze.HazeState
-import dev.chrisbanes.haze.haze
-import dev.chrisbanes.haze.hazeChild
+import dev.chrisbanes.haze.hazeEffect
+import dev.chrisbanes.haze.hazeSource
+import dev.chrisbanes.haze.materials.CupertinoMaterials
+import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
 import me.kavishdevar.librepods.R
 import me.kavishdevar.librepods.composables.StyledSwitch
 import me.kavishdevar.librepods.utils.RadareOffsetFinder
 import kotlin.math.roundToInt

-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalHazeMaterialsApi::class)
@Composable
 fun AppSettingsScreen(navController: NavController) {
    val sharedPreferences = LocalContext.current.getSharedPreferences("settings", Context.MODE_PRIVATE)
@@ -115,19 +119,31 @@ fun AppSettingsScreen(navController: NavController) {
    var disconnectWhenNotWearing by remember {
        mutableStateOf(sharedPreferences.getBoolean("disconnect_when_not_wearing", false))
    }
-
+    var mDensity by remember { mutableFloatStateOf(0f) }
    Scaffold(
        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
        topBar = {
            CenterAlignedTopAppBar(
-                modifier = Modifier.hazeChild(
+                modifier = Modifier.hazeEffect(
                    state = hazeState,
-                    style = HazeDefaults.style(
-                        backgroundColor = if (isDarkTheme) Color(0xFF000000).copy(alpha = 0.7f) 
-                                          else Color(0xFFF2F2F7).copy(alpha = 0.7f),
-                        tint = Color.White.copy(alpha = 0.2f)
-                    )
-                ),
+                    style = CupertinoMaterials.thick(),
+                    block = fun HazeEffectScope.() {
+                        alpha =
+                            if (scrollState.value > 60.dp.value * mDensity) 1f else 0f
+                    })
+                    .drawBehind {
+                        mDensity = density
+                        val strokeWidth = 0.7.dp.value * density
+                        val y = size.height - strokeWidth / 2
+                        if (scrollState.value > 60.dp.value * density) {
+                            drawLine(
+                                if (isDarkTheme) Color.DarkGray else Color.LightGray,
+                                Offset(0f, y),
+                                Offset(size.width, y),
+                                strokeWidth
+                            )
+                        }
+                    },
                title = {
                    Text(
                        text = stringResource(R.string.app_settings),
@@ -177,10 +193,7 @@ fun AppSettingsScreen(navController: NavController) {
                .padding(paddingValues)
                .padding(horizontal = 16.dp)
                .verticalScroll(scrollState)
-                .haze(
-                    state = hazeState,
-                    style = HazeDefaults.style(backgroundColor = Color.Transparent)
-                )
+                .hazeSource(state = hazeState)
        ) {
            val isDarkTheme = isSystemInDarkTheme()
            val backgroundColor = if (isDarkTheme) Color(0xFF1C1C1E) else Color(0xFFFFFFFF)
@@ -200,7 +213,7 @@ fun AppSettingsScreen(navController: NavController) {
            )

            Spacer(modifier = Modifier.height(2.dp))
-            
+
            Column (
                modifier = Modifier
                    .fillMaxWidth()
@@ -468,9 +481,9 @@ fun AppSettingsScreen(navController: NavController) {
                ),
                modifier = Modifier.padding(8.dp, bottom = 2.dp, top = 24.dp)
            )
-            
+
            Spacer(modifier = Modifier.height(2.dp))
-            
+
            Column(
                modifier = Modifier
                    .fillMaxWidth()
--- a/android/app/src/main/java/me/kavishdevar/librepods/screens/HeadTrackingScreen.kt
+++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/HeadTrackingScreen.kt
@@ -72,6 +72,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.geometry.CornerRadius
 import androidx.compose.ui.geometry.Offset
@@ -101,10 +102,12 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
-import dev.chrisbanes.haze.HazeDefaults
+import dev.chrisbanes.haze.HazeEffectScope
 import dev.chrisbanes.haze.HazeState
-import dev.chrisbanes.haze.haze
-import dev.chrisbanes.haze.hazeChild
+import dev.chrisbanes.haze.hazeEffect
+import dev.chrisbanes.haze.hazeSource
+import dev.chrisbanes.haze.materials.CupertinoMaterials
+import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -117,6 +120,7 @@ import kotlin.math.cos
 import kotlin.math.sin
 import kotlin.random.Random

+@ExperimentalHazeMaterialsApi
@RequiresApi(Build.VERSION_CODES.Q)
@OptIn(ExperimentalMaterial3Api::class, ExperimentalAnimationApi::class)
@Composable
@@ -131,23 +135,36 @@ fun HeadTrackingScreen(navController: NavController) {
    val isDarkTheme = isSystemInDarkTheme()
    val backgroundColor = if (isDarkTheme) Color(0xFF1C1C1E) else Color(0xFFFFFFFF)
    val textColor = if (isDarkTheme) Color.White else Color.Black
-    
+
    val scrollState = rememberScrollState()
    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
    val hazeState = remember { HazeState() }
-    
+
+    var mDensity by remember { mutableFloatStateOf(0f) }
    Scaffold(
        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
        topBar = {
            CenterAlignedTopAppBar(
-                modifier = Modifier.hazeChild(
+                modifier = Modifier.hazeEffect(
                    state = hazeState,
-                    style = HazeDefaults.style(
-                        backgroundColor = if (isDarkTheme) Color(0xFF000000).copy(alpha = 0.7f) 
-                                          else Color(0xFFF2F2F7).copy(alpha = 0.7f),
-                        tint = Color.White.copy(alpha = 0.2f)
-                    )
-                ),
+                    style = CupertinoMaterials.thick(),
+                    block = fun HazeEffectScope.() {
+                        alpha =
+                            if (scrollState.value > 60.dp.value * mDensity) 1f else 0f
+                    })
+                    .drawBehind {
+                        mDensity = density
+                        val strokeWidth = 0.7.dp.value * density
+                        val y = size.height - strokeWidth / 2
+                        if (scrollState.value > 60.dp.value * density) {
+                            drawLine(
+                                if (isDarkTheme) Color.DarkGray else Color.LightGray,
+                                Offset(0f, y),
+                                Offset(size.width, y),
+                                strokeWidth
+                            )
+                        }
+                    },
                title = {
                    Text(
                        stringResource(R.string.head_tracking),
@@ -246,10 +263,7 @@ fun HeadTrackingScreen(navController: NavController) {
                .padding(horizontal = 16.dp)
                .padding(top = 8.dp)
                .verticalScroll(scrollState)
-                .haze(
-                    state = hazeState,
-                    style = HazeDefaults.style(backgroundColor = Color.Transparent)
-                )
+                .hazeSource(state = hazeState)
        ) {
            val sharedPreferences =
                LocalContext.current.getSharedPreferences("settings", Context.MODE_PRIVATE)
@@ -833,6 +847,7 @@ private fun AccelerationPlot() {
    }
 }

+@ExperimentalHazeMaterialsApi
@RequiresApi(Build.VERSION_CODES.Q)
@Preview
@Composable
--- a/android/app/src/main/java/me/kavishdevar/librepods/services/AirPodsQSService.kt
+++ b/android/app/src/main/java/me/kavishdevar/librepods/services/AirPodsQSService.kt
@@ -1,7 +1,7 @@
 /*
 * LibrePods - AirPods liberated from Apple’s ecosystem
 *
- * Copyright (C) 2025 Kavish Devar
+ * Copyright (C) 2025 LibrePods Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published
--- a/android/app/src/main/java/me/kavishdevar/librepods/services/AirPodsService.kt
+++ b/android/app/src/main/java/me/kavishdevar/librepods/services/AirPodsService.kt
@@ -1,7 +1,7 @@
 /*
 * LibrePods - AirPods liberated from Apple’s ecosystem
 *
- * Copyright (C) 2025 Kavish Devar
+ * Copyright (C) 2025 LibrePods Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published