Skip to content

Commit 8792e99

Browse files
committed
small ui changes
1 parent 430e1d6 commit 8792e99

File tree

4 files changed

+37
-14
lines changed

4 files changed

+37
-14
lines changed

android/app/src/main/java/me/kavishdevar/aln/composables/PressAndHoldSettings.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ fun PressAndHoldSettings(navController: NavController) {
108108
}
109109
}
110110
HorizontalDivider(
111-
thickness = 2.dp,
112-
color = Color(0xFF4D4D4D).copy(alpha = 0.4f),
111+
thickness = 1.5.dp,
112+
color = Color(0x40888888),
113113
modifier = Modifier
114114
.padding(start = 16.dp)
115115
)

android/app/src/main/java/me/kavishdevar/aln/screens/AirPodsSettingsScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ fun AirPodsSettingsScreen(dev: BluetoothDevice?, service: AirPodsService,
109109
modifier = Modifier
110110
.hazeChild(
111111
state = hazeState,
112-
style = CupertinoMaterials.regular(),
112+
style = CupertinoMaterials.thick(),
113113
block = {
114114
alpha =
115115
if (verticalScrollState.value > 55.dp.value * mDensity.floatValue) 1f else 0f

android/app/src/main/java/me/kavishdevar/aln/screens/DebugScreen.kt

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@ import androidx.compose.foundation.lazy.LazyColumn
2929
import androidx.compose.foundation.lazy.rememberLazyListState
3030
import androidx.compose.foundation.shape.RoundedCornerShape
3131
import androidx.compose.material.icons.Icons
32-
import androidx.compose.material.icons.automirrored.filled.ArrowBack
32+
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
3333
import androidx.compose.material.icons.filled.Send
3434
import androidx.compose.material3.ExperimentalMaterial3Api
3535
import androidx.compose.material3.HorizontalDivider
3636
import androidx.compose.material3.Icon
3737
import androidx.compose.material3.IconButton
3838
import androidx.compose.material3.Scaffold
3939
import androidx.compose.material3.Text
40+
import androidx.compose.material3.TextButton
4041
import androidx.compose.material3.TextField
4142
import androidx.compose.material3.TextFieldDefaults
4243
import androidx.compose.material3.TopAppBar
@@ -48,10 +49,13 @@ import androidx.compose.runtime.mutableStateOf
4849
import androidx.compose.runtime.remember
4950
import androidx.compose.ui.Alignment
5051
import androidx.compose.ui.Modifier
52+
import androidx.compose.ui.draw.scale
5153
import androidx.compose.ui.graphics.Color
5254
import androidx.compose.ui.platform.LocalContext
55+
import androidx.compose.ui.text.TextStyle
5356
import androidx.compose.ui.text.font.Font
5457
import androidx.compose.ui.text.font.FontFamily
58+
import androidx.compose.ui.text.font.FontWeight
5559
import androidx.compose.ui.text.input.TextFieldValue
5660
import androidx.compose.ui.unit.dp
5761
import androidx.compose.ui.unit.sp
@@ -61,9 +65,9 @@ import dev.chrisbanes.haze.haze
6165
import dev.chrisbanes.haze.hazeChild
6266
import dev.chrisbanes.haze.materials.CupertinoMaterials
6367
import dev.chrisbanes.haze.materials.ExperimentalHazeMaterialsApi
64-
import me.kavishdevar.aln.utils.AirPodsNotifications
65-
import me.kavishdevar.aln.services.AirPodsService
6668
import me.kavishdevar.aln.R
69+
import me.kavishdevar.aln.services.AirPodsService
70+
import me.kavishdevar.aln.utils.AirPodsNotifications
6771

6872
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
6973
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
@@ -79,16 +83,34 @@ fun DebugScreen(navController: NavController) {
7983
TopAppBar(
8084
title = { Text("Debug") },
8185
navigationIcon = {
82-
IconButton(onClick = {
83-
navController.popBackStack()
84-
}) {
85-
Icon(Icons.AutoMirrored.Filled.ArrowBack, null)
86+
TextButton(
87+
onClick = {
88+
navController.popBackStack()
89+
},
90+
shape = RoundedCornerShape(8.dp),
91+
) {
92+
val sharedPreferences = context.getSharedPreferences("settings", Context.MODE_PRIVATE)
93+
Icon(
94+
Icons.AutoMirrored.Filled.KeyboardArrowLeft,
95+
contentDescription = "Back",
96+
tint = if (isSystemInDarkTheme()) Color(0xFF007AFF) else Color(0xFF3C6DF5),
97+
modifier = Modifier.scale(1.5f)
98+
)
99+
Text(
100+
sharedPreferences.getString("name", "AirPods")!!,
101+
style = TextStyle(
102+
fontSize = 18.sp,
103+
fontWeight = FontWeight.Medium,
104+
color = if (isSystemInDarkTheme()) Color(0xFF007AFF) else Color(0xFF3C6DF5),
105+
fontFamily = FontFamily(Font(R.font.sf_pro))
106+
),
107+
)
86108
}
87109
},
88110
modifier = Modifier
89111
.hazeChild(
90112
state = hazeState,
91-
style = CupertinoMaterials.thin(),
113+
style = CupertinoMaterials.thick(),
92114
block = {
93115
alpha = if (listState.firstVisibleItemIndex > 0) {
94116
1f

android/app/src/main/java/me/kavishdevar/aln/screens/PressAndHoldSettingsScreen.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ import me.kavishdevar.aln.services.ServiceManager
5050
@Composable()
5151
fun RightDivider() {
5252
HorizontalDivider(
53-
color = Color(0xFF4D4D4D).copy(alpha = 0.4f),
54-
thickness = 2.dp,
55-
modifier = Modifier.padding(start = 72.dp)
53+
thickness = 1.5.dp,
54+
color = Color(0x40888888),
55+
modifier = Modifier
56+
.padding(start = 72.dp)
5657
)
5758
}
5859

0 commit comments

Comments
 (0)