Merge pull request #34 from aritra-tech/develop

Made the UI/UX better
aritra-tech · Aug 10, 2023 · 94f78fe · 94f78fe
2 parents b139a5e + 714420c
commit 94f78fe
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/app/src/main/java/com/aritra/notify/components/note/GridNoteCard.kt b/app/src/main/java/com/aritra/notify/components/note/GridNoteCard.kt
@@ -24,11 +24,13 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.aritra.notify.R
@@ -64,12 +66,19 @@ fun GridNoteCard(
                 horizontalArrangement = Arrangement.SpaceBetween,
                 modifier = Modifier.fillMaxWidth()
             ) {
-                Text(
-                    modifier = Modifier.padding(top = 10.dp),
-                    text = notesModel.title,
-                    fontSize = 20.sp,
-                    fontFamily = FontFamily(Font(R.font.poppins_semibold))
-                )
+                Row(
+                    modifier = Modifier.weight(2f),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Text(
+                        modifier = Modifier.padding(top = 10.dp),
+                        text = notesModel.title,
+                        fontSize = 20.sp,
+                        fontFamily = FontFamily(Font(R.font.poppins_semibold)),
+                        maxLines = 2,
+                        overflow = TextOverflow.Ellipsis
+                    )
+                }
 
                 if (isGridView) {
                     IconButton(
@@ -114,7 +123,9 @@ fun GridNoteCard(
             Text(
                 text = notesModel.note,
                 fontSize = 18.sp,
-                fontFamily = FontFamily(Font(R.font.poppins_light))
+                fontFamily = FontFamily(Font(R.font.poppins_light)),
+                maxLines = 4,
+                overflow = TextOverflow.Ellipsis
             )
             Spacer(modifier = Modifier.height(10.dp))
             val formattedDateTime =

diff --git a/app/src/main/java/com/aritra/notify/components/note/NoteCard.kt b/app/src/main/java/com/aritra/notify/components/note/NoteCard.kt
@@ -16,6 +16,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.aritra.notify.R
@@ -46,13 +47,17 @@ fun NotesCard(
             Text(
                 text = noteModel.title,
                 fontSize = 22.sp,
-                fontFamily = FontFamily(Font(R.font.poppins_medium))
+                fontFamily = FontFamily(Font(R.font.poppins_medium)),
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis
             )
             Spacer(modifier = Modifier.height(10.dp))
             Text(
                 text = noteModel.note,
                 fontSize = 18.sp,
-                fontFamily = FontFamily(Font(R.font.poppins_light))
+                fontFamily = FontFamily(Font(R.font.poppins_light)),
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis
             )
             Spacer(modifier = Modifier.height(10.dp))
             val formattedDateTime =