Parcourir la source

Update UI of notification screen on TV

Khubaib il y a 8 mois
Parent
commit
2612a2b385

+ 5 - 6
app/src/main/java/com/vpn/fastestvpnservice/customItems/NotificationItem.kt

@@ -29,9 +29,7 @@ fun NotificationItem(item: Notification) {
         .background(MaterialTheme.colorScheme.background)
         .fillMaxWidth()
     ) {
-        Column(
-            
-        ) {
+        Column() {
             Text(
                 text = item.title,
                 color = MaterialTheme.colorScheme.primary,
@@ -68,12 +66,14 @@ fun NotificationItemTV(item: Notification) {
             Text(
                 text = item.title,
                 color = MaterialTheme.colorScheme.primary,
-                style = MaterialTheme.typography.labelMedium,
+                style = MaterialTheme.typography.displayLarge.copy(
+                    color = MaterialTheme.colorScheme.primary,
+                    fontSize = 18.sp
+                ),
                 textAlign = TextAlign.Start,
                 modifier = Modifier
                     .padding(start = 16.dp, bottom = 5.dp, end = 4.dp)
                     .fillMaxWidth(),
-                maxLines = 2
             )
             Text(
                 text = item.html,
@@ -83,7 +83,6 @@ fun NotificationItemTV(item: Notification) {
                 modifier = Modifier
                     .padding(start = 16.dp, bottom = 0.dp, end = 4.dp)
                     .fillMaxWidth(),
-                maxLines = 2
             )
         }
     }

+ 18 - 1
app/src/main/java/com/vpn/fastestvpnservice/screensTV/NotificationScreenTV.kt

@@ -5,8 +5,10 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
@@ -21,11 +23,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import com.vpn.fastestvpnservice.R
 import com.vpn.fastestvpnservice.customItems.NotificationItemTV
+import com.vpn.fastestvpnservice.ui.theme.customTypography2
 import com.vpn.fastestvpnservice.viewmodels.NotificationViewModel
 
 @Composable
@@ -51,8 +55,21 @@ fun NotificationsTV(navHostController: NavHostController) {
         ) {
             val notifications = notificationViewModel.liveDataNotification.observeAsState().value
 
-            LazyColumn() {
+            notifications?.heading?.let {
+                Text(
+                    text = it,
+                    color = MaterialTheme.colorScheme.primary,
+                    style = MaterialTheme.typography.customTypography2.bodySmall,
+                    textAlign = TextAlign.Start,
+                    modifier = Modifier
+                        .padding(start = 16.dp, top = 5.dp, end = 4.dp)
+                        .fillMaxWidth(),
+                )
+            }
 
+            Spacer(modifier = Modifier.height(25.dp))
+
+            LazyColumn() {
                 notifications?.data?.let {
                     items(it) { item ->
                         NotificationItemTV(item = item)