ADS: Move all ADS modules under the same folder

Author: malmstein

.github/CODEOWNERS

@@ -1,5 +1,6 @@
 # This is the module where the Android Design System resides
 # Any changes to the source files of this module require approval from @malmstein or @nalcalag.
-/common/common-ui/ @malmstein @nalcalag
+/android-design-system/design-system/ @malmstein @mikescamell
+/android-design-system/design-system-internal/ @malmstein @mikescamell
 /saved-sites/ @malmstein
 /example-feature/ @cdrussell

android-design-system/design-system-internal/build.gradle

@@ -42,11 +42,13 @@ dependencies {
     implementation project(path: ':app-build-config-api')
     implementation project(':internal-features-api')
     implementation project(path: ':navigation-api')
+    implementation "androidx.datastore:datastore-preferences:_"
 
     implementation AndroidX.appCompat
     implementation Google.android.material
     implementation AndroidX.constraintLayout
     implementation AndroidX.core.splashscreen
+    implementation AndroidX.fragment.ktx
     implementation AndroidX.recyclerView
     implementation AndroidX.lifecycle.viewModelKtx
     // just to get the dagger annotations

android-design-system/design-system-internal/src/main/AndroidManifest.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2021 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+
+        <activity
+            android:theme="@style/Theme.DuckDuckGo.Light"
+            android:name="com.duckduckgo.common.ui.internal.ui.AppComponentsActivity"
+            android:exported="true" />
+
+    </application>
+
+</manifest>

android-design-system/design-system-internal/src/main/java/com/duckduckgo/common/ui/internal/ThemePreviewInternalFeature.kt

@@ -18,7 +18,7 @@ package com.duckduckgo.common.ui.internal
 
 import android.content.Context
 import com.duckduckgo.anvil.annotations.PriorityKey
-import com.duckduckgo.common.ui.themepreview.ui.AppComponentsActivity
+import com.duckduckgo.common.ui.internal.ui.AppComponentsActivity
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.internal.features.api.InternalFeaturePlugin
 import com.squareup.anvil.annotations.ContributesMultibinding

design-system/src/main/java/com/duckduckgo/common/ui/themepreview/ui/ADSComposeTools.kt renamed to android-design-system/design-system-internal/src/main/java/com/duckduckgo/common/ui/internal/ui/ADSComposeTools.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.common.ui.themepreview.ui
+package com.duckduckgo.common.ui.internal.ui
 
 import android.view.View
 import androidx.compose.runtime.Composable

design-system/src/main/java/com/duckduckgo/common/ui/themepreview/ui/AppComponentsActivity.kt renamed to android-design-system/design-system-internal/src/main/java/com/duckduckgo/common/ui/internal/ui/AppComponentsActivity.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.common.ui.themepreview.ui
+package com.duckduckgo.common.ui.internal.ui
 
 import android.content.Context
 import android.content.Intent
@@ -26,12 +26,12 @@ import androidx.lifecycle.lifecycleScope
 import androidx.viewpager.widget.ViewPager
 import com.duckduckgo.common.ui.DuckDuckGoTheme
 import com.duckduckgo.common.ui.applyTheme
+import com.duckduckgo.common.ui.internal.R
+import com.duckduckgo.common.ui.internal.ui.store.AppComponentsPrefsDataStore
+import com.duckduckgo.common.ui.internal.ui.store.appComponentsDataStore
 import com.duckduckgo.common.ui.store.ThemingSharedPreferences
-import com.duckduckgo.common.ui.themepreview.ui.store.AppComponentsPrefsDataStore
-import com.duckduckgo.common.ui.themepreview.ui.store.appComponentsDataStore
 import com.duckduckgo.common.ui.view.listitem.OneLineListItem
 import com.duckduckgo.common.utils.DefaultDispatcherProvider
-import com.duckduckgo.mobile.android.R
 import com.google.android.material.tabs.TabLayout
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch

design-system/src/main/java/com/duckduckgo/common/ui/themepreview/ui/AppComponentsPagerAdapter.kt renamed to android-design-system/design-system-internal/src/main/java/com/duckduckgo/common/ui/internal/ui/AppComponentsPagerAdapter.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 DuckDuckGo
+ * Copyright (c) 2025 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.common.ui.themepreview.ui
+package com.duckduckgo.common.ui.internal.ui
 
 import android.content.Context
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
-import com.duckduckgo.common.ui.themepreview.ui.component.ComponentOtherFragment
-import com.duckduckgo.common.ui.themepreview.ui.component.buttons.ComponentButtonsFragment
-import com.duckduckgo.common.ui.themepreview.ui.component.buttons.ComponentInteractiveElementsFragment
-import com.duckduckgo.common.ui.themepreview.ui.component.cards.ComponentLayoutsFragment
-import com.duckduckgo.common.ui.themepreview.ui.component.listitems.ComponentListItemsElementsFragment
-import com.duckduckgo.common.ui.themepreview.ui.component.navigation.ComponentMessagingFragment
-import com.duckduckgo.common.ui.themepreview.ui.component.textinput.ComponentTextInputFragment
-import com.duckduckgo.common.ui.themepreview.ui.dialogs.DialogsFragment
-import com.duckduckgo.common.ui.themepreview.ui.palette.ColorPaletteFragment
-import com.duckduckgo.common.ui.themepreview.ui.typography.TypographyFragment
+import com.duckduckgo.common.ui.internal.ui.component.ComponentOtherFragment
+import com.duckduckgo.common.ui.internal.ui.component.buttons.ComponentButtonsFragment
+import com.duckduckgo.common.ui.internal.ui.component.buttons.ComponentInteractiveElementsFragment
+import com.duckduckgo.common.ui.internal.ui.component.cards.ComponentLayoutsFragment
+import com.duckduckgo.common.ui.internal.ui.component.listitems.ComponentListItemsElementsFragment
+import com.duckduckgo.common.ui.internal.ui.component.navigation.ComponentMessagingFragment
+import com.duckduckgo.common.ui.internal.ui.component.textinput.ComponentTextInputFragment
+import com.duckduckgo.common.ui.internal.ui.dialogs.DialogsFragment
+import com.duckduckgo.common.ui.internal.ui.palette.ColorPaletteFragment
+import com.duckduckgo.common.ui.internal.ui.typography.TypographyFragment
 import com.duckduckgo.mobile.android.R
 
 /** View pager to show all tabbed destinations - Instructions, Theme Summary and Components. */

design-system/src/main/java/com/duckduckgo/common/ui/themepreview/ui/AppComponentsViewModel.kt renamed to android-design-system/design-system-internal/src/main/java/com/duckduckgo/common/ui/internal/ui/AppComponentsViewModel.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.common.ui.themepreview.ui
+package com.duckduckgo.common.ui.internal.ui
 
 import androidx.lifecycle.ViewModel
 import com.duckduckgo.common.ui.DuckDuckGoTheme
-import com.duckduckgo.common.ui.themepreview.ui.store.AppComponentsPrefsDataStore
+import com.duckduckgo.common.ui.internal.ui.store.AppComponentsPrefsDataStore
 import kotlinx.coroutines.flow.Flow
 
 class AppComponentsViewModel(

design-system/src/main/java/com/duckduckgo/common/ui/themepreview/ui/AppComponentsViewModelExt.kt renamed to android-design-system/design-system-internal/src/main/java/com/duckduckgo/common/ui/internal/ui/AppComponentsViewModelExt.kt

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.common.ui.themepreview.ui
+package com.duckduckgo.common.ui.internal.ui
 
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import com.duckduckgo.common.ui.internal.ui.store.AppComponentsPrefsDataStore
+import com.duckduckgo.common.ui.internal.ui.store.appComponentsDataStore
 import com.duckduckgo.common.ui.store.ThemingSharedPreferences
-import com.duckduckgo.common.ui.themepreview.ui.store.AppComponentsPrefsDataStore
-import com.duckduckgo.common.ui.themepreview.ui.store.appComponentsDataStore
 import com.duckduckgo.common.utils.DefaultDispatcherProvider
 
 internal fun Fragment.appComponentsViewModel(): Lazy<AppComponentsViewModel> = activityViewModels {

design-system/src/main/java/com/duckduckgo/common/ui/themepreview/ui/PlatformLabelView.kt renamed to android-design-system/design-system-internal/src/main/java/com/duckduckgo/common/ui/internal/ui/PlatformLabelView.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.common.ui.themepreview.ui
+package com.duckduckgo.common.ui.internal.ui
 
 import android.content.Context
 import android.util.AttributeSet