diff --git a/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt index 3ec5f1dd6f..ae4e6cc7c1 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt @@ -19,6 +19,9 @@ package app.lawnchair.ui.preferences import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource +import app.lawnchair.ui.preferences.components.PreferenceGroup +import app.lawnchair.ui.preferences.components.PreferenceLayout +import app.lawnchair.ui.preferences.components.SliderPreference import app.lawnchair.util.Meta import app.lawnchair.util.pageMeta import app.lawnchair.util.preferences.getAdapter diff --git a/lawnchair/src/app/lawnchair/ui/preferences/DockPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/DockPreferences.kt index 0959e4ba69..d79222dc47 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/DockPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/DockPreferences.kt @@ -19,6 +19,9 @@ package app.lawnchair.ui.preferences import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource +import app.lawnchair.ui.preferences.components.PreferenceGroup +import app.lawnchair.ui.preferences.components.PreferenceLayout +import app.lawnchair.ui.preferences.components.SliderPreference import app.lawnchair.util.Meta import app.lawnchair.util.pageMeta import app.lawnchair.util.preferences.getAdapter diff --git a/lawnchair/src/app/lawnchair/ui/preferences/FolderPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/FolderPreferences.kt index cb0052ce84..3980e64d3e 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/FolderPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/FolderPreferences.kt @@ -19,6 +19,9 @@ package app.lawnchair.ui.preferences import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource +import app.lawnchair.ui.preferences.components.PreferenceGroup +import app.lawnchair.ui.preferences.components.PreferenceLayout +import app.lawnchair.ui.preferences.components.SliderPreference import app.lawnchair.util.Meta import app.lawnchair.util.pageMeta import app.lawnchair.util.preferences.getAdapter diff --git a/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt index 4097fccb5a..d143ce0e17 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/GeneralPreferences.kt @@ -21,6 +21,12 @@ import androidx.compose.animation.* import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.navigation.NavController +import app.lawnchair.ui.preferences.components.NavigationActionPreference +import app.lawnchair.ui.preferences.components.NotificationDotsPreference +import app.lawnchair.ui.preferences.components.PreferenceGroup +import app.lawnchair.ui.preferences.components.PreferenceLayout +import app.lawnchair.ui.preferences.components.SliderPreference +import app.lawnchair.ui.preferences.components.SwitchPreference import app.lawnchair.util.Meta import app.lawnchair.util.pageMeta import app.lawnchair.util.preferences.* diff --git a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt index c4c411f6c8..43428abebf 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt @@ -19,6 +19,10 @@ package app.lawnchair.ui.preferences import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource +import app.lawnchair.ui.preferences.components.PreferenceGroup +import app.lawnchair.ui.preferences.components.PreferenceLayout +import app.lawnchair.ui.preferences.components.SliderPreference +import app.lawnchair.ui.preferences.components.SwitchPreference import app.lawnchair.util.Meta import app.lawnchair.util.pageMeta import app.lawnchair.util.preferences.getAdapter diff --git a/lawnchair/src/app/lawnchair/ui/preferences/IconPackPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/IconPackPreferences.kt index 83b2edbec5..eba63730a4 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/IconPackPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/IconPackPreferences.kt @@ -33,6 +33,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.graphics.drawable.toBitmap +import app.lawnchair.ui.preferences.components.PreferenceGroup +import app.lawnchair.ui.preferences.components.PreferenceLayout +import app.lawnchair.ui.preferences.components.PreferenceTemplate import app.lawnchair.util.Meta import app.lawnchair.util.pageMeta import app.lawnchair.util.preferences.getAdapter diff --git a/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt index 8351d1441f..69bbb3feee 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt @@ -31,6 +31,10 @@ import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController +import app.lawnchair.ui.preferences.about.About +import app.lawnchair.ui.preferences.components.PreferenceCategoryList +import app.lawnchair.ui.preferences.components.SystemUi +import app.lawnchair.ui.preferences.components.TopBar import app.lawnchair.util.Meta import app.lawnchair.util.pageMeta import app.lawnchair.util.preferences.getMajorVersion diff --git a/lawnchair/src/app/lawnchair/ui/preferences/About.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt similarity index 98% rename from lawnchair/src/app/lawnchair/ui/preferences/About.kt rename to lawnchair/src/app/lawnchair/ui/preferences/about/About.kt index 9f597030b5..6c889d5861 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/About.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/about/About.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.about import android.content.Intent import androidx.annotation.StringRes @@ -34,6 +34,8 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import app.lawnchair.ui.preferences.components.PreferenceGroup +import app.lawnchair.ui.preferences.components.ClickListenerPreference import app.lawnchair.util.Meta import app.lawnchair.util.pageMeta import app.lawnchair.util.preferences.getFormattedVersionName diff --git a/lawnchair/src/app/lawnchair/ui/preferences/ContributorCard.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/ContributorCard.kt similarity index 98% rename from lawnchair/src/app/lawnchair/ui/preferences/ContributorCard.kt rename to lawnchair/src/app/lawnchair/ui/preferences/about/ContributorCard.kt index e5dba6304a..a7ce3ad414 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/ContributorCard.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/about/ContributorCard.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.about import androidx.compose.foundation.background import androidx.compose.foundation.border diff --git a/lawnchair/src/app/lawnchair/ui/preferences/ContributorLink.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/ContributorLink.kt similarity index 98% rename from lawnchair/src/app/lawnchair/ui/preferences/ContributorLink.kt rename to lawnchair/src/app/lawnchair/ui/preferences/about/ContributorLink.kt index f8d3566f12..56fd6028e3 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/ContributorLink.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/about/ContributorLink.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.about import android.content.Intent import android.net.Uri diff --git a/lawnchair/src/app/lawnchair/ui/preferences/ContributorRow.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/ContributorRow.kt similarity index 96% rename from lawnchair/src/app/lawnchair/ui/preferences/ContributorRow.kt rename to lawnchair/src/app/lawnchair/ui/preferences/about/ContributorRow.kt index 4d010369e3..4db58dc9dc 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/ContributorRow.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/about/ContributorRow.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.about import android.content.Intent import android.net.Uri @@ -30,6 +30,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp +import app.lawnchair.ui.preferences.components.PreferenceTemplate import com.google.accompanist.glide.GlideImage @Composable diff --git a/lawnchair/src/app/lawnchair/ui/preferences/LawnchairLink.kt b/lawnchair/src/app/lawnchair/ui/preferences/about/LawnchairLink.kt similarity index 98% rename from lawnchair/src/app/lawnchair/ui/preferences/LawnchairLink.kt rename to lawnchair/src/app/lawnchair/ui/preferences/about/LawnchairLink.kt index 9861b45160..cc8b072f66 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/LawnchairLink.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/about/LawnchairLink.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.about import android.content.Intent import android.net.Uri diff --git a/lawnchair/src/app/lawnchair/ui/preferences/ClickListenerPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/ClickListenerPreference.kt similarity index 97% rename from lawnchair/src/app/lawnchair/ui/preferences/ClickListenerPreference.kt rename to lawnchair/src/app/lawnchair/ui/preferences/components/ClickListenerPreference.kt index 626560917d..fe35cb1c20 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/ClickListenerPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/ClickListenerPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* diff --git a/lawnchair/src/app/lawnchair/ui/preferences/NavigationActionPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/NavigationActionPreference.kt similarity index 97% rename from lawnchair/src/app/lawnchair/ui/preferences/NavigationActionPreference.kt rename to lawnchair/src/app/lawnchair/ui/preferences/components/NavigationActionPreference.kt index 68b635f913..f3fb6c5e12 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/NavigationActionPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/NavigationActionPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* diff --git a/lawnchair/src/app/lawnchair/ui/preferences/NotificationDotsPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt similarity index 96% rename from lawnchair/src/app/lawnchair/ui/preferences/NotificationDotsPreference.kt rename to lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt index 5e04b730d7..ed4df858ae 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/NotificationDotsPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.components import android.content.ComponentName import android.content.Intent @@ -32,6 +32,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.os.bundleOf +import app.lawnchair.ui.preferences.PreferenceInteractor import com.android.launcher3.R import com.android.launcher3.notification.NotificationListener import android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS as actionNotificationListenerSettings diff --git a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryList.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceCategoryList.kt similarity index 93% rename from lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryList.kt rename to lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceCategoryList.kt index 7d298ace13..ba5e91f215 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryList.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceCategoryList.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.components import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.lazy.LazyColumn @@ -24,6 +24,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.navigation.NavController import androidx.navigation.compose.navigate +import app.lawnchair.ui.preferences.getPreferenceCategories @Composable fun PreferenceCategoryList(navController: NavController) { diff --git a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryListItem.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceCategoryListItem.kt similarity index 97% rename from lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryListItem.kt rename to lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceCategoryListItem.kt index af556eadd5..3c66096598 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceCategoryListItem.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceCategoryListItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.components import androidx.annotation.DrawableRes import androidx.compose.foundation.Image diff --git a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceGroup.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceGroup.kt similarity index 98% rename from lawnchair/src/app/lawnchair/ui/preferences/PreferenceGroup.kt rename to lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceGroup.kt index 1cd3aff02f..c0ff817cb3 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceGroup.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceGroup.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.components import androidx.compose.animation.* import androidx.compose.foundation.layout.* diff --git a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceLayout.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceLayout.kt similarity index 92% rename from lawnchair/src/app/lawnchair/ui/preferences/PreferenceLayout.kt rename to lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceLayout.kt index 4ac77d4f78..2d16658c98 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceLayout.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceLayout.kt @@ -1,4 +1,4 @@ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.components import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxHeight diff --git a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceTemplate.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceTemplate.kt similarity index 96% rename from lawnchair/src/app/lawnchair/ui/preferences/PreferenceTemplate.kt rename to lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceTemplate.kt index ee54177fcd..4130dc96ab 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceTemplate.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/PreferenceTemplate.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.components import androidx.compose.foundation.layout.* import androidx.compose.material.Divider diff --git a/lawnchair/src/app/lawnchair/ui/preferences/SliderPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/SliderPreference.kt similarity index 98% rename from lawnchair/src/app/lawnchair/ui/preferences/SliderPreference.kt rename to lawnchair/src/app/lawnchair/ui/preferences/components/SliderPreference.kt index 131dd5effd..065c53e26d 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/SliderPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/SliderPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.components import androidx.compose.foundation.layout.* import androidx.compose.material.* diff --git a/lawnchair/src/app/lawnchair/ui/preferences/SwitchPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/SwitchPreference.kt similarity index 98% rename from lawnchair/src/app/lawnchair/ui/preferences/SwitchPreference.kt rename to lawnchair/src/app/lawnchair/ui/preferences/components/SwitchPreference.kt index a45f38fbce..60080ade21 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/SwitchPreference.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/SwitchPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* diff --git a/lawnchair/src/app/lawnchair/ui/preferences/SystemUi.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/SystemUi.kt similarity index 96% rename from lawnchair/src/app/lawnchair/ui/preferences/SystemUi.kt rename to lawnchair/src/app/lawnchair/ui/preferences/components/SystemUi.kt index 185996fed6..f4bd9aa032 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/SystemUi.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/SystemUi.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.components import android.os.Build import android.view.View diff --git a/lawnchair/src/app/lawnchair/ui/preferences/TopBar.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/TopBar.kt similarity index 97% rename from lawnchair/src/app/lawnchair/ui/preferences/TopBar.kt rename to lawnchair/src/app/lawnchair/ui/preferences/components/TopBar.kt index 391e29c29f..fd1b88430d 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/TopBar.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/components/TopBar.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package app.lawnchair.ui.preferences +package app.lawnchair.ui.preferences.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.ExperimentalAnimationApi @@ -36,6 +36,7 @@ import androidx.compose.ui.unit.dp import androidx.navigation.NavController import androidx.navigation.compose.KEY_ROUTE import androidx.navigation.compose.currentBackStackEntryAsState +import app.lawnchair.ui.preferences.Routes import app.lawnchair.util.pageMeta import com.android.launcher3.R