diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c5f3f6b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/app/src/main/java/com/github/gezimos/inkos/ui/SettingsFragment.kt b/app/src/main/java/com/github/gezimos/inkos/ui/SettingsFragment.kt index 1ae2993..a372c72 100644 --- a/app/src/main/java/com/github/gezimos/inkos/ui/SettingsFragment.kt +++ b/app/src/main/java/com/github/gezimos/inkos/ui/SettingsFragment.kt @@ -145,8 +145,7 @@ class SettingsFragment : Fragment() { }, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else TextUnit.Unspecified ) - SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) + // (No bottomInsetDp here) } } diff --git a/app/src/main/java/com/github/gezimos/inkos/ui/settings/AdvancedFragment.kt b/app/src/main/java/com/github/gezimos/inkos/ui/settings/AdvancedFragment.kt index 9e1c581..0ee62ca 100644 --- a/app/src/main/java/com/github/gezimos/inkos/ui/settings/AdvancedFragment.kt +++ b/app/src/main/java/com/github/gezimos/inkos/ui/settings/AdvancedFragment.kt @@ -119,8 +119,7 @@ class AdvancedFragment : Fragment() { }, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else TextUnit.Unspecified ) - SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) + if (bottomInsetDp > 0.dp) { Spacer(modifier = Modifier.height(bottomInsetDp)) } @@ -196,8 +195,7 @@ class AdvancedFragment : Fragment() { }, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else TextUnit.Unspecified ) - SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) + if (bottomInsetDp > 0.dp) Spacer(modifier = Modifier.height(bottomInsetDp)) } } diff --git a/app/src/main/java/com/github/gezimos/inkos/ui/settings/DrawerFragment.kt b/app/src/main/java/com/github/gezimos/inkos/ui/settings/DrawerFragment.kt index d6cc8d7..53a3c20 100644 --- a/app/src/main/java/com/github/gezimos/inkos/ui/settings/DrawerFragment.kt +++ b/app/src/main/java/com/github/gezimos/inkos/ui/settings/DrawerFragment.kt @@ -96,8 +96,7 @@ class DrawerFragment : Fragment() { pageIndicator = {}, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else TextUnit.Unspecified ) - SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) + } } } diff --git a/app/src/main/java/com/github/gezimos/inkos/ui/settings/ExtrasFragment.kt b/app/src/main/java/com/github/gezimos/inkos/ui/settings/ExtrasFragment.kt index 97fe60e..eee69b5 100644 --- a/app/src/main/java/com/github/gezimos/inkos/ui/settings/ExtrasFragment.kt +++ b/app/src/main/java/com/github/gezimos/inkos/ui/settings/ExtrasFragment.kt @@ -93,8 +93,7 @@ class ExtrasFragment : Fragment() { }, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else TextUnit.Unspecified ) - SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) + } } } @@ -168,8 +167,7 @@ class ExtrasFragment : Fragment() { }, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else TextUnit.Unspecified ) - SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) + } } } diff --git a/app/src/main/java/com/github/gezimos/inkos/ui/settings/FeaturesFragment.kt b/app/src/main/java/com/github/gezimos/inkos/ui/settings/FeaturesFragment.kt index b2a88ef..3d41822 100644 --- a/app/src/main/java/com/github/gezimos/inkos/ui/settings/FeaturesFragment.kt +++ b/app/src/main/java/com/github/gezimos/inkos/ui/settings/FeaturesFragment.kt @@ -112,8 +112,7 @@ class FeaturesFragment : Fragment() { }, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else TextUnit.Unspecified ) - SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) + } } } @@ -179,8 +178,7 @@ class FeaturesFragment : Fragment() { }, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else TextUnit.Unspecified ) - SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) + } } } diff --git a/app/src/main/java/com/github/gezimos/inkos/ui/settings/FontsFragment.kt b/app/src/main/java/com/github/gezimos/inkos/ui/settings/FontsFragment.kt index b0c5c35..d8fc0fe 100644 --- a/app/src/main/java/com/github/gezimos/inkos/ui/settings/FontsFragment.kt +++ b/app/src/main/java/com/github/gezimos/inkos/ui/settings/FontsFragment.kt @@ -127,8 +127,7 @@ class FontsFragment : Fragment() { }, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else TextUnit.Unspecified ) - SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) + if (bottomInsetDp > 0.dp) { Spacer(modifier = Modifier.height(bottomInsetDp)) } @@ -210,8 +209,7 @@ class FontsFragment : Fragment() { }, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else TextUnit.Unspecified ) - SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) + } } } diff --git a/app/src/main/java/com/github/gezimos/inkos/ui/settings/GesturesFragment.kt b/app/src/main/java/com/github/gezimos/inkos/ui/settings/GesturesFragment.kt index 863e132..2633aaf 100644 --- a/app/src/main/java/com/github/gezimos/inkos/ui/settings/GesturesFragment.kt +++ b/app/src/main/java/com/github/gezimos/inkos/ui/settings/GesturesFragment.kt @@ -112,8 +112,7 @@ class GesturesFragment : Fragment() { }, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else TextUnit.Unspecified ) - SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) + if (bottomInsetDp > 0.dp) { Spacer(modifier = Modifier.height(bottomInsetDp)) } @@ -188,8 +187,7 @@ class GesturesFragment : Fragment() { }, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else TextUnit.Unspecified ) - SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) + if (bottomInsetDp > 0.dp) Spacer(modifier = Modifier.height(bottomInsetDp)) } } diff --git a/app/src/main/java/com/github/gezimos/inkos/ui/settings/NotificationSettingsFragment.kt b/app/src/main/java/com/github/gezimos/inkos/ui/settings/NotificationSettingsFragment.kt index 4795fbf..66085bc 100644 --- a/app/src/main/java/com/github/gezimos/inkos/ui/settings/NotificationSettingsFragment.kt +++ b/app/src/main/java/com/github/gezimos/inkos/ui/settings/NotificationSettingsFragment.kt @@ -109,8 +109,6 @@ class NotificationSettingsFragment : Fragment() { }, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else androidx.compose.ui.unit.TextUnit.Unspecified ) - SettingsComposable.SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) } } } @@ -177,8 +175,6 @@ class NotificationSettingsFragment : Fragment() { }, titleFontSize = if (settingsSize > 0) (settingsSize * 1.5).sp else androidx.compose.ui.unit.TextUnit.Unspecified ) - SettingsComposable.SolidSeparator(isDark = isDark) - Spacer(modifier = Modifier.height(SettingsTheme.color.horizontalPadding)) } } }