🐛 Optimized the code

aritra-tech · Jul 29, 2023 · c7ff4df · c7ff4df
1 parent a1bd934
commit c7ff4df
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 56 deletions.
diff --git a/app/src/main/java/com/aritra/notify/components/topbar/SettingsTopAppBar.kt b/app/src/main/java/com/aritra/notify/components/topbar/SettingsTopAppBar.kt
diff --git a/app/src/main/java/com/aritra/notify/components/topbar/TopBar.kt b/app/src/main/java/com/aritra/notify/components/topbar/TopBar.kt
@@ -2,23 +2,33 @@
 
 package com.aritra.notify.components.topbar
 
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
+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.font.FontStyle
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.aritra.notify.R
 
 @Preview
 @Composable
-fun TopBar() {
+fun TopBar(
+    title: String = stringResource(R.string.demo_text)
+) {
     TopAppBar(
         title = {
             Text(
-                text = "All Notes",
-                fontFamily = FontFamily(Font(R.font.poppins_medium))
+                modifier = Modifier.padding(top = 10.dp),
+                text = title,
+                fontSize = 28.sp,
+                fontFamily = FontFamily(Font(R.font.poppins_semibold))
             )
         },
         colors = TopAppBarDefaults.centerAlignedTopAppBarColors(

diff --git a/app/src/main/java/com/aritra/notify/ui/screens/notes/homeScreen/HomeScreen.kt b/app/src/main/java/com/aritra/notify/ui/screens/notes/homeScreen/HomeScreen.kt
@@ -56,7 +56,11 @@ fun HomeScreen(
     var isGridView by rememberSaveable { mutableStateOf(false) }
 
     Scaffold(
-        topBar = { TopBar() },
+        topBar = {
+            TopBar(
+                title = stringResource(R.string.all_notes)
+            )
+        },
         floatingActionButton = {
             FloatingActionButton(
                 onClick = { onFabClicked() }
@@ -118,7 +122,12 @@ fun HomeScreen(
                             itemsIndexed(listOfAllNotes.filter { note ->
                                 note.title.contains(searchQuery, true)
                             }) { _, notesModel ->
-                                GridNoteCard(notesModel, viewModel, navigateToUpdateNoteScreen, isGridView)
+                                GridNoteCard(
+                                    notesModel,
+                                    viewModel,
+                                    navigateToUpdateNoteScreen,
+                                    isGridView
+                                )
                             }
                         }
                     } else {

diff --git a/app/src/main/java/com/aritra/notify/utils/Const.kt b/app/src/main/java/com/aritra/notify/utils/Const.kt
@@ -11,6 +11,5 @@ object Const {
     const val DISMISS_BUTTON = "dismiss_button"
     const val GITHUB_URL = "https://github.com/aritra-tech/Notify"
     const val GITHUB_ISSUE = "https://github.com/aritra-tech/Notify/issues"
-    const val TERMS_AND_CONDITION = "https://www.freeprivacypolicy.com/live/48a09fcc-8451-4a03-acfb-29a0d8b536d5"
     const val PRIVACY_POLICY = "https://www.freeprivacypolicy.com/live/e4342ac0-aedf-4b36-9a7c-95900bf66074"
 }
diff --git a/app/src/main/res/drawable/terms_conditions.xml b/app/src/main/res/drawable/terms_conditions.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -28,4 +28,9 @@
     <string name="request_feature">Request Feature</string>
     <string name="share_notify">Share Notify</string>
     <string name="app_settings">App Settings</string>
+    <string name="terms_conditions"><![CDATA[Terms & Conditions]]></string>
+    <string name="privacy_policy">Privacy Policy</string>
+    <string name="demo_text">Demo Text</string>
+    <string name="settings">Settings</string>
+    <string name="all_notes">All Notes</string>
 </resources>