Skip to content

Commit 8c13fcd

Browse files
committed
Enhance home UI
1 parent 0ada142 commit 8c13fcd

File tree

4 files changed

+28
-23
lines changed

4 files changed

+28
-23
lines changed

app/src/main/java/com/ismartcoding/plain/chat/discover/NearbyDiscoverManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ object NearbyDiscoverManager {
103103
}
104104

105105
private fun handleReceivedMessage(message: String, senderIP: String) {
106-
val ownIP = NetworkHelper.getDeviceIP4()
107-
if (senderIP == ownIP) return
106+
val ownIPs = NetworkHelper.getDeviceIP4s()
107+
if (ownIPs.contains(senderIP)) return
108108

109109
when {
110110
message.startsWith(NearbyMessageType.DISCOVER_REPLY.toPrefix()) -> {

app/src/main/java/com/ismartcoding/plain/ui/base/PAlert.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fun PAlert(
3535
PCard {
3636
Row(
3737
modifier = Modifier
38-
.padding(16.dp)
38+
.padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 8.dp)
3939
.fillMaxWidth(),
4040
verticalAlignment = Alignment.CenterVertically
4141
) {

app/src/main/java/com/ismartcoding/plain/ui/base/PMainSwitch.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fun PMainSwitch(
4040
modifier =
4141
Modifier
4242
.fillMaxWidth()
43-
.padding(horizontal = 24.dp, vertical = 12.dp),
43+
.padding(horizontal = 16.dp, vertical = 12.dp),
4444
verticalAlignment = Alignment.CenterVertically,
4545
) {
4646
Column(modifier = Modifier.weight(1f)) {

app/src/main/java/com/ismartcoding/plain/ui/components/WebAddress.kt

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
package com.ismartcoding.plain.ui.components
22

3+
import android.content.ClipData
34
import android.content.Context
45
import androidx.compose.foundation.ExperimentalFoundationApi
6+
import androidx.compose.foundation.background
57
import androidx.compose.foundation.layout.Column
68
import androidx.compose.foundation.layout.Row
79
import androidx.compose.foundation.layout.fillMaxWidth
810
import androidx.compose.foundation.layout.padding
911
import androidx.compose.foundation.pager.HorizontalPager
1012
import androidx.compose.foundation.pager.rememberPagerState
13+
import androidx.compose.foundation.shape.RoundedCornerShape
1114
import androidx.compose.material3.MaterialTheme
1215
import androidx.compose.material3.Text
1316
import androidx.compose.material3.TextButton
@@ -26,14 +29,20 @@ import androidx.compose.ui.unit.dp
2629
import com.ismartcoding.lib.helpers.CoroutinesHelper.withIO
2730
import com.ismartcoding.plain.R
2831
import com.ismartcoding.plain.TempData
32+
import com.ismartcoding.plain.clipboardManager
33+
import com.ismartcoding.plain.features.locale.LocaleHelper
2934
import com.ismartcoding.plain.helpers.AppHelper
3035
import com.ismartcoding.plain.preferences.HttpsPreference
3136
import com.ismartcoding.plain.preferences.MdnsHostnamePreference
37+
import com.ismartcoding.plain.ui.base.PIconButton
38+
import com.ismartcoding.plain.ui.base.PListItem
3239
import com.ismartcoding.plain.ui.base.PageIndicator
3340
import com.ismartcoding.plain.ui.base.TextFieldDialog
3441
import com.ismartcoding.plain.ui.base.Tips
3542
import com.ismartcoding.plain.ui.base.VerticalSpace
43+
import com.ismartcoding.plain.ui.helpers.DialogHelper
3644
import com.ismartcoding.plain.ui.models.MainViewModel
45+
import com.ismartcoding.plain.ui.theme.PlainTheme
3746
import kotlinx.coroutines.launch
3847

3948
// https://developer.android.com/jetpack/compose/layouts/pager
@@ -62,27 +71,23 @@ fun WebAddress(
6271
var showHostnameDialog by remember { mutableStateOf(false) }
6372
var hostname by remember { mutableStateOf(TempData.mdnsHostname) }
6473

65-
VerticalSpace(dp = 16.dp)
74+
VerticalSpace(dp = 8.dp)
6675

67-
// mDNS Hostname section
68-
Row(
69-
modifier = Modifier
76+
PListItem(
77+
Modifier
78+
.padding(horizontal = 16.dp)
7079
.fillMaxWidth()
71-
.padding(horizontal = 16.dp),
72-
verticalAlignment = Alignment.CenterVertically
73-
) {
74-
Text(
75-
text = "mDNS: $hostname",
76-
style = MaterialTheme.typography.bodyLarge,
77-
color = MaterialTheme.colorScheme.onSurface
78-
)
79-
80-
TextButton(
81-
onClick = { showHostnameDialog = true }
82-
) {
83-
Text(stringResource(id = R.string.edit))
84-
}
85-
}
80+
.background(
81+
color = MaterialTheme.colorScheme.surfaceContainerHighest,
82+
shape = RoundedCornerShape(12.dp),
83+
),
84+
title = "mDNS",
85+
subtitle = hostname,
86+
action = {
87+
PIconButton(icon = R.drawable.pen, contentDescription = stringResource(id = R.string.edit), click = {
88+
showHostnameDialog = true
89+
})
90+
})
8691

8792
VerticalSpace(dp = 8.dp)
8893

0 commit comments

Comments
 (0)