🧠 Optimized the Settings Screen code

aritra-tech · Jul 30, 2023 · 7ef9697 · 7ef9697
1 parent 8dab9d4
commit 7ef9697
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 39 deletions.
diff --git a/app/src/main/java/com/aritra/notify/components/actions/SettingsSwitchCard.kt b/app/src/main/java/com/aritra/notify/components/actions/SettingsSwitchCard.kt
@@ -0,0 +1,69 @@
+package com.aritra.notify.components.actions
+
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.aritra.notify.R
+
+@Composable
+fun SettingsSwitchCard(
+    isDarkMode: Boolean,
+    onToggleTheme: (Boolean) -> Unit
+) {
+    Card(
+        modifier = Modifier
+            .clip(RoundedCornerShape(10.dp))
+            .fillMaxWidth()
+            .background(MaterialTheme.colorScheme.surface),
+        elevation = CardDefaults.cardElevation(5.dp)
+    ) {
+        Row(
+            modifier = Modifier
+                .padding(16.dp)
+                .fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.moon_icon),
+                contentDescription = stringResource(R.string.icon),
+                modifier = Modifier.size(30.dp),
+            )
+            Text(
+                modifier = Modifier.padding(start = 10.dp),
+                text = stringResource(R.string.dark_mode),
+                fontSize = 20.sp,
+                fontFamily = FontFamily(Font(R.font.poppins_semibold))
+            )
+            Switch(
+                modifier = Modifier
+                    .semantics { contentDescription = "Theme Switch" }
+                    .padding(start = 130.dp),
+                checked = isDarkMode,
+                onCheckedChange = onToggleTheme,
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/aritra/notify/ui/screens/settingsScreen/SettingsScreen.kt b/app/src/main/java/com/aritra/notify/ui/screens/settingsScreen/SettingsScreen.kt
@@ -5,7 +5,6 @@ import android.net.Uri
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -28,6 +27,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -40,6 +40,7 @@ import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.aritra.notify.R
 import com.aritra.notify.components.actions.SettingsComponent
+import com.aritra.notify.components.actions.SettingsSwitchCard
 import com.aritra.notify.components.topbar.TopBar
 import com.aritra.notify.viewmodel.ThemeViewModel
 import com.aritra.notify.utils.Const
@@ -89,39 +90,12 @@ fun SettingsScreen() {
                         fontFamily = FontFamily(Font(R.font.poppins_medium))
                     )
                     Spacer(modifier = Modifier.height(6.dp))
-                    Card(
-                        modifier = Modifier
-                            .clip(RoundedCornerShape(10.dp))
-                            .fillMaxWidth()
-                            .background(MaterialTheme.colorScheme.surface),
-                        elevation = CardDefaults.cardElevation(5.dp)
-                    ) {
-                        Row(
-                            modifier = Modifier
-                                .padding(16.dp)
-                                .fillMaxWidth(),
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) {
-                            Icon(
-                                painter = painterResource(id = R.drawable.moon_icon),
-                                contentDescription = stringResource(R.string.icon),
-                                modifier = Modifier.size(30.dp),
-                            )
-                            Text(
-                                modifier = Modifier.padding(start = 10.dp),
-                                text = stringResource(R.string.dark_mode),
-                                fontSize = 20.sp,
-                                fontFamily = FontFamily(Font(R.font.poppins_semibold))
-                            )
-                            Switch(
-                                modifier = Modifier
-                                    .semantics { contentDescription = "Theme Switch" }
-                                    .padding(start = 120.dp),
-                                checked = themeState.isDarkMode,
-                                onCheckedChange = { themeViewModel.toggleTheme() }
-                            )
+                    SettingsSwitchCard(
+                        isDarkMode = themeState.isDarkMode,
+                        onToggleTheme = {
+                            themeViewModel.toggleTheme()
                         }
-                    }
+                    )
                 }
 
                 /** Import & Export. **/
@@ -172,11 +146,9 @@ fun SettingsScreen() {
                         settingHeaderText = stringResource(R.string.request_feature),
                         painterResourceID = R.drawable.code
                     ) {
-                        val intent = Intent(
-                            Intent.ACTION_VIEW,
-                            Uri.parse(Const.GITHUB_ISSUE)
-                        )
-                        context.startActivity(intent)
+                        val openURL = Intent(Intent.ACTION_VIEW)
+                        openURL.data = Uri.parse(context.resources.getString(R.string.mailTo))
+                        context.startActivity(openURL)
                     }
                     SettingsComponent(
                         settingHeaderText = stringResource(R.string.privacy_policy),

diff --git a/app/src/main/java/com/aritra/notify/utils/Const.kt b/app/src/main/java/com/aritra/notify/utils/Const.kt
@@ -10,6 +10,5 @@ object Const {
     const val CONFIRM_BUTTON = "confirm_button"
     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 PRIVACY_POLICY = "https://www.freeprivacypolicy.com/live/e4342ac0-aedf-4b36-9a7c-95900bf66074"
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -33,4 +33,5 @@
     <string name="demo_text">Demo Text</string>
     <string name="settings">Settings</string>
     <string name="all_notes">All Notes</string>
+    <string name="mailTo">mailto:aritrarick2002@gmail.com?Subject=Your%20feedback%20is%20important%20to%20us%21</string>
 </resources>