Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrated language settings screen from XML to Jetpack compose #254

Merged
merged 7 commits into from
Nov 29, 2024
Merged

Migrated language settings screen from XML to Jetpack compose #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba603a7
Created reusable card components
Saifuddin53 Nov 29, 2024
52d6434
Refactored SettingsScreen to use reusable components
Saifuddin53 Nov 29, 2024
04ac912
LanguageSettingsScreeen implementation
Saifuddin53 Nov 29, 2024
181e92b
Minor changes to language settings screen and fragment
Saifuddin53 Nov 29, 2024
e48e41e
State handling changes in language settings composable
Saifuddin53 Nov 29, 2024
5e85156
Linting improvements
Saifuddin53 Nov 29, 2024
24f97db
removed unused code
Saifuddin53 Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 19 additions & 156 deletions app/src/main/java/be/scri/fragments/LanguageSettingsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,24 @@
package be.scri.fragments

import android.content.Context
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Button
import androidx.activity.OnBackPressedCallback
import androidx.activity.addCallback
import androidx.appcompat.app.AppCompatDelegate
import androidx.compose.ui.platform.ComposeView
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.viewpager2.widget.ViewPager2
import be.scri.R
import be.scri.activities.MainActivity
import be.scri.databinding.FragmentLanguageSettingsBinding
import be.scri.helpers.CustomAdapter
import be.scri.helpers.PreferencesHelper
import be.scri.models.SwitchItem
import be.scri.ui.screens.LanguageSettingsScreen
import be.scri.ui.theme.ScribeTheme

@Suppress("LongMethod")
class LanguageSettingsFragment : Fragment() {
private var _binding: FragmentLanguageSettingsBinding? = null
val binding get() = _binding!!

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val viewpager = requireActivity().findViewById<ViewPager2>(R.id.view_pager)
Expand Down Expand Up @@ -76,8 +72,20 @@ class LanguageSettingsFragment : Fragment() {
}
},
)
_binding = FragmentLanguageSettingsBinding.inflate(inflater, container, false)
return binding.root

return ComposeView(requireContext()).apply {
setContent {
ScribeTheme(
useDarkTheme =
PreferencesHelper.getUserDarkModePreference(requireContext())
== AppCompatDelegate.MODE_NIGHT_YES,
) {
LanguageSettingsScreen(
language = arguments?.getString("LANGUAGE_EXTRA") ?: "",
)
}
}
}
}

override fun onViewCreated(
Expand Down Expand Up @@ -105,154 +113,9 @@ class LanguageSettingsFragment : Fragment() {
.addToBackStack(null)
.commit()
}
setupRecyclerView(language)
}

private fun setupRecyclerView(language: String) {
binding.functionalityRecyclerView.layoutManager = LinearLayoutManager(context)
binding.functionalityRecyclerView.adapter =
CustomAdapter(
getFunctionalityRecyclerViewData(language),
requireContext(),
)

binding.layoutRecyclerView.layoutManager = LinearLayoutManager(context)
binding.layoutRecyclerView.adapter = CustomAdapter(getLayoutRecyclerViewData(language), requireContext())
}

private fun getFunctionalityRecyclerViewData(language: String): List<SwitchItem> {
val sharedPref = requireActivity().getSharedPreferences("app_preferences", Context.MODE_PRIVATE)
val list = mutableListOf<SwitchItem>()
list.add(
SwitchItem(
isChecked = sharedPref.getBoolean("period_on_double_tap_$language", false),
title = getString(R.string.app_settings_keyboard_functionality_double_space_period),
description = getString(R.string.app_settings_keyboard_functionality_double_space_period_description),
action = {
PreferencesHelper.setPeriodOnSpaceBarDoubleTapPreference(requireContext(), language, true)
},
action2 = {
PreferencesHelper.setPeriodOnSpaceBarDoubleTapPreference(requireContext(), language, false)
},
),
)
list.add(
SwitchItem(
isChecked = sharedPref.getBoolean("emoji_suggestions_$language", true),
title = getString(R.string.app_settings_keyboard_functionality_auto_suggest_emoji),
description = getString(R.string.app_settings_keyboard_functionality_auto_suggest_emoji_description),
action = {
PreferencesHelper.setEmojiAutoSuggestionsPreference(requireContext(), language, true)
},
action2 = {
PreferencesHelper.setEmojiAutoSuggestionsPreference(requireContext(), language, false)
},
),
)
return list
}

private fun getLayoutRecyclerViewData(language: String): List<SwitchItem> {
val sharedPref = requireActivity().getSharedPreferences("app_preferences", Context.MODE_PRIVATE)
val list = mutableListOf<SwitchItem>()
when (language) {
"German" -> {
list.add(
SwitchItem(
isChecked =
sharedPref.getBoolean(
"disable_accent_character_$language",
false,
),
title =
getString(
R.string.app_settings_keyboard_layout_disable_accent_characters,
),
description =
getString(
R.string.app_settings_keyboard_layout_disable_accent_characters_description,
),
action = {
PreferencesHelper.setAccentCharacterPreference(requireContext(), language, true)
},
action2 = {
PreferencesHelper.setAccentCharacterPreference(requireContext(), language, false)
},
),
)
}

"Swedish" -> {
list.add(
SwitchItem(
isChecked =
sharedPref.getBoolean(
"disable_accent_character_$language",
false,
),
title =
getString(
R.string.app_settings_keyboard_layout_disable_accent_characters,
),
description =
getString(
R.string.app_settings_keyboard_layout_disable_accent_characters_description,
),
action = {
PreferencesHelper.setAccentCharacterPreference(requireContext(), language, true)
},
action2 = {
PreferencesHelper.setAccentCharacterPreference(requireContext(), language, false)
},
),
)
}

"Spanish" -> {
list.add(
SwitchItem(
isChecked =
sharedPref.getBoolean(
"disable_accent_character_$language",
false,
),
title =
getString(
R.string.app_settings_keyboard_layout_disable_accent_characters,
),
description =
getString(
R.string.app_settings_keyboard_layout_disable_accent_characters_description,
),
action = {
PreferencesHelper.setAccentCharacterPreference(requireContext(), language, true)
},
action2 = {
PreferencesHelper.setAccentCharacterPreference(requireContext(), language, false)
},
),
)
}
}

list.add(
SwitchItem(
isChecked = sharedPref.getBoolean("period_and_comma_$language", false),
title = getString(R.string.app_settings_keyboard_layout_period_and_comma),
description = getString(R.string.app_settings_keyboard_layout_period_and_comma_description),
action = { PreferencesHelper.setCommaAndPeriodPreference() },
action2 = { PreferencesHelper.setCommaAndPeriodPreference() },
),
)
return list
}

override fun onDestroyView() {
super.onDestroyView()
_binding = null
}

fun getLanguageStringFromi18n(language: String): Int {
private fun getLanguageStringFromi18n(language: String): Int {
val languageMap =
mapOf(
"German" to R.string.app__global_german,
Expand Down
83 changes: 83 additions & 0 deletions app/src/main/java/be/scri/ui/common/components/ClickableItemComp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
package be.scri.ui.common.components

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
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.Icon
import androidx.compose.material3.MaterialTheme
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.graphics.Color
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import be.scri.R

@Composable
fun ClickableItemComp(
title: String,
onClick: () -> Unit,
modifier: Modifier = Modifier,
desc: String? = null,
) {
Column(
modifier =
modifier
.fillMaxWidth()
.padding(
horizontal = 12.dp,
vertical = 10.dp,
).clip(RoundedCornerShape(12.dp))
.clickable(onClick = onClick),
) {
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
) {
Text(
text = title,
modifier = Modifier.weight(1f),
fontSize = 16.sp,
color = colorResource(R.color.app_text_color),
style = MaterialTheme.typography.bodyMedium,
)
Icon(
painter = painterResource(R.drawable.right_arrow),
modifier =
Modifier
.padding(start = 6.dp)
.size(14.dp),
contentDescription = "Right Arrow",
)
}

if (!desc.isNullOrEmpty()) {
Text(
text = desc,
fontSize = 12.sp,
color = Color.Gray,
style = MaterialTheme.typography.bodySmall,
modifier = Modifier.padding(top = 4.dp),
)
}
}
}

@PreviewLightDark
@Composable
private fun ClickableItemPreview() {
ClickableItemComp(
title = "Title",
desc = "Description",
onClick = {},
)
}
96 changes: 96 additions & 0 deletions app/src/main/java/be/scri/ui/common/components/ItemCardContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
package be.scri.ui.common.components

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.PreviewLightDark
import androidx.compose.ui.unit.dp
import be.scri.ui.models.ScribeItem
import be.scri.ui.models.ScribeItemList

@Composable
fun ItemsCardContainer(
cardItemsList: ScribeItemList,
isDivider: Boolean,
modifier: Modifier = Modifier,
) {
Surface(
modifier = modifier,
shape = RoundedCornerShape(12.dp),
color = MaterialTheme.colorScheme.surface,
) {
Column(
modifier =
Modifier
.padding(vertical = 4.dp, horizontal = 4.dp),
) {
cardItemsList.items.forEach { item ->
when (item) {
is ScribeItem.ClickableItem -> {
ClickableItemComp(
title = item.title,
desc = item.desc,
onClick = item.action,
)
}

is ScribeItem.SwitchItem -> {
SwitchableItemComp(
title = item.title,
desc = item.desc,
isChecked = item.state,
onCheckedChange = item.onToggle,
)
}

is ScribeItem.CustomItem -> {
}

is ScribeItem.ExternalLinkItem -> {
}
}

if (
isDivider &&
cardItemsList.items.indexOf(item) != cardItemsList.items.lastIndex
) {
HorizontalDivider(
color = Color.Gray.copy(alpha = 0.25f),
thickness = 1.dp,
modifier =
Modifier.padding(
vertical = 8.dp,
horizontal = 12.dp,
),
)
}
}
}
}
}

@PreviewLightDark
@Composable
private fun ItemsCardContainerPreview() {
val cardItemsList =
ScribeItemList(
listOf(
ScribeItem.ClickableItem(
"",
"",
action = {},
),
),
)

ItemsCardContainer(
cardItemsList,
true,
)
}
Loading