Split to different modules (#91)

**Background** Now core package very huge and we want split it
flipperdevices · Nov 1, 2021 · 6965ea3 · 6965ea3
1 parent 5206c17
commit 6965ea3
Show file tree

Hide file tree

Showing 106 changed files with 258 additions and 200 deletions.
diff --git a/components/analytics/shake2report/build.gradle.kts b/components/analytics/shake2report/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 apply<com.flipperdevices.gradle.ConfigurationPlugin>()
 
 dependencies {
-    implementation(project(":components:core"))
+    implementation(project(":components:core:ktx"))
 
     implementation(Libs.ANNOTATIONS)
     implementation(Libs.APPCOMPAT)

diff --git a/...src/debug/java/com/flipperdevices/analytics/shake2report/activity/Shake2ReportActivity.kt b/...src/debug/java/com/flipperdevices/analytics/shake2report/activity/Shake2ReportActivity.kt
@@ -15,7 +15,7 @@ import com.flipperdevices.analytics.shake2report.Shake2Report
 import com.flipperdevices.analytics.shake2report.Shake2ReportApi
 import com.flipperdevices.analytics.shake2report.databinding.ActivityShake2reportBinding
 import com.flipperdevices.analytics.shake2report.helper.Shake2ReportDialog
-import com.flipperdevices.core.utils.toast
+import com.flipperdevices.core.ktx.toast
 import io.sentry.Attachment
 import io.sentry.Sentry
 import io.sentry.SentryEvent

diff --git a/components/bottombar/.gitignore → components/bottombar/api/.gitignore b/components/bottombar/.gitignore → components/bottombar/api/.gitignore
diff --git a/components/bottombar/api/build.gradle.kts b/components/bottombar/api/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+}
+apply<com.flipperdevices.gradle.ConfigurationPlugin>()
diff --git a/components/bottombar/api/src/main/AndroidManifest.xml b/components/bottombar/api/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.flipperdevices.bottombar.api" />
diff --git a/...s/core/api/BottomNavigationActivityApi.kt → ...tombar/api/BottomNavigationActivityApi.kt b/...s/core/api/BottomNavigationActivityApi.kt → ...tombar/api/BottomNavigationActivityApi.kt
@@ -1,4 +1,4 @@
-package com.flipperdevices.core.api
+package com.flipperdevices.bottombar.api
 
 /**
  * Class which provide api to bottombar module

diff --git a/components/bottombar/consumer-rules.pro b/components/bottombar/consumer-rules.pro
diff --git a/components/core/.gitignore → components/bottombar/impl/.gitignore b/components/core/.gitignore → components/bottombar/impl/.gitignore
diff --git a/components/bottombar/build.gradle.kts → components/bottombar/impl/build.gradle.kts b/components/bottombar/build.gradle.kts → components/bottombar/impl/build.gradle.kts
@@ -9,7 +9,13 @@ apply<com.flipperdevices.gradle.ConfigurationPlugin>()
 apply<com.flipperdevices.gradle.ComposerPlugin>()
 
 dependencies {
-    implementation(project(":components:core"))
+    implementation(project(":components:bottombar:api"))
+
+    implementation(project(":components:core:di"))
+    implementation(project(":components:core:navigation"))
+    implementation(project(":components:core:ui"))
+
+    implementation(project(":components:info:api"))
     implementation(project(":components:pair:api"))
     implementation(project(":components:filemanager:api"))
 
@@ -26,4 +32,6 @@ dependencies {
     implementation(Libs.LIFECYCLE_RUNTIME_KTX)
     implementation(Libs.LIFECYCLE_VIEWMODEL_KTX)
     implementation(Libs.ACTIVITY_KTX)
+
+    implementation(Libs.CICERONE)
 }
diff --git a/...ts/bottombar/src/main/AndroidManifest.xml → ...ttombar/impl/src/main/AndroidManifest.xml b/...ts/bottombar/src/main/AndroidManifest.xml → ...ttombar/impl/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.flipperdevices.bottombar">
+        package="com.flipperdevices.bottombar.impl">
 
     <application>
         <activity
-                android:launchMode="singleTop"
                 android:exported="false"
-                android:name="com.flipperdevices.bottombar.main.BottomNavigationActivity" />
+                android:launchMode="singleTop"
+                android:name=".main.BottomNavigationActivity" />
     </application>
 </manifest>
diff --git a/...ar/api/BottomNavigationActivityApiImpl.kt → ...pl/api/BottomNavigationActivityApiImpl.kt b/...ar/api/BottomNavigationActivityApiImpl.kt → ...pl/api/BottomNavigationActivityApiImpl.kt
@@ -1,19 +1,20 @@
-package com.flipperdevices.bottombar.api
+package com.flipperdevices.bottombar.impl.api
 
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
-import com.flipperdevices.bottombar.main.BottomNavigationActivity
-import com.flipperdevices.core.api.BottomNavigationActivityApi
+import com.flipperdevices.bottombar.api.BottomNavigationActivityApi
+import com.flipperdevices.bottombar.impl.main.BottomNavigationActivity
 import com.flipperdevices.core.di.AppGraph
 import com.squareup.anvil.annotations.ContributesBinding
 import javax.inject.Inject
 
 @ContributesBinding(AppGraph::class)
-class BottomNavigationActivityApiImpl @Inject constructor(private val context: Context) :
-    BottomNavigationActivityApi {
+class BottomNavigationActivityApiImpl @Inject constructor(
+    private val context: Context
+) : BottomNavigationActivityApi {
     override fun openBottomNavigationScreen() {
         context.startActivity(
             Intent(context, BottomNavigationActivity::class.java).apply {

diff --git a/...evices/bottombar/di/BottomBarComponent.kt → ...s/bottombar/impl/di/BottomBarComponent.kt b/...evices/bottombar/di/BottomBarComponent.kt → ...s/bottombar/impl/di/BottomBarComponent.kt
@@ -1,7 +1,7 @@
-package com.flipperdevices.bottombar.di
+package com.flipperdevices.bottombar.impl.di
 
-import com.flipperdevices.bottombar.main.BottomNavigationActivity
-import com.flipperdevices.bottombar.main.TabContainerFragment
+import com.flipperdevices.bottombar.impl.main.BottomNavigationActivity
+import com.flipperdevices.bottombar.impl.main.TabContainerFragment
 import com.flipperdevices.core.di.AppGraph
 import com.squareup.anvil.annotations.ContributesTo
 

diff --git a/...ottombar/main/BottomNavigationActivity.kt → ...bar/impl/main/BottomNavigationActivity.kt b/...ottombar/main/BottomNavigationActivity.kt → ...bar/impl/main/BottomNavigationActivity.kt
@@ -1,4 +1,4 @@
-package com.flipperdevices.bottombar.main
+package com.flipperdevices.bottombar.impl.main
 
 import android.os.Bundle
 import androidx.activity.viewModels
@@ -8,11 +8,11 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
-import com.flipperdevices.bottombar.R
-import com.flipperdevices.bottombar.di.BottomBarComponent
-import com.flipperdevices.bottombar.main.compose.ComposeBottomBar
-import com.flipperdevices.bottombar.main.service.BottomNavigationViewModel
-import com.flipperdevices.bottombar.model.FlipperBottomTab
+import com.flipperdevices.bottombar.impl.R
+import com.flipperdevices.bottombar.impl.di.BottomBarComponent
+import com.flipperdevices.bottombar.impl.main.compose.ComposeBottomBar
+import com.flipperdevices.bottombar.impl.main.service.BottomNavigationViewModel
+import com.flipperdevices.bottombar.impl.model.FlipperBottomTab
 import com.flipperdevices.core.di.ComponentHolder
 import com.flipperdevices.core.navigation.delegates.OnBackPressListener
 import com.github.terrakok.cicerone.Router

diff --git a/...es/bottombar/main/TabContainerFragment.kt → ...ttombar/impl/main/TabContainerFragment.kt b/...es/bottombar/main/TabContainerFragment.kt → ...ttombar/impl/main/TabContainerFragment.kt
@@ -1,14 +1,14 @@
-package com.flipperdevices.bottombar.main
+package com.flipperdevices.bottombar.impl.main
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import com.flipperdevices.bottombar.R
-import com.flipperdevices.bottombar.di.BottomBarComponent
-import com.flipperdevices.bottombar.model.FlipperBottomTab
-import com.flipperdevices.bottombar.navigate.ScreenTabProvider
+import com.flipperdevices.bottombar.impl.R
+import com.flipperdevices.bottombar.impl.di.BottomBarComponent
+import com.flipperdevices.bottombar.impl.model.FlipperBottomTab
+import com.flipperdevices.bottombar.impl.navigate.ScreenTabProvider
 import com.flipperdevices.core.di.ComponentHolder
 import com.flipperdevices.core.navigation.delegates.OnBackPressListener
 import com.github.terrakok.cicerone.Navigator

diff --git a/...perdevices/bottombar/main/TestFragment.kt → ...vices/bottombar/impl/main/TestFragment.kt b/...perdevices/bottombar/main/TestFragment.kt → ...vices/bottombar/impl/main/TestFragment.kt
@@ -1,4 +1,4 @@
-package com.flipperdevices.bottombar.main
+package com.flipperdevices.bottombar.impl.main
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -9,7 +9,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.flipperdevices.core.view.ComposeFragment
+import com.flipperdevices.core.ui.ComposeFragment
 
 class TestFragment : ComposeFragment() {
     @Composable

diff --git a/...ottombar/main/compose/ComposeBottomBar.kt → ...bar/impl/main/compose/ComposeBottomBar.kt b/...ottombar/main/compose/ComposeBottomBar.kt → ...bar/impl/main/compose/ComposeBottomBar.kt
@@ -1,4 +1,4 @@
-package com.flipperdevices.bottombar.main.compose
+package com.flipperdevices.bottombar.impl.main.compose
 
 import androidx.compose.material.BottomNavigation
 import androidx.compose.material.BottomNavigationItem
@@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import com.flipperdevices.bottombar.model.FlipperBottomTab
+import com.flipperdevices.bottombar.impl.model.FlipperBottomTab
 
 @Preview(
     showBackground = true

diff --git a/...main/service/BottomNavigationViewModel.kt → ...main/service/BottomNavigationViewModel.kt b/...main/service/BottomNavigationViewModel.kt → ...main/service/BottomNavigationViewModel.kt
@@ -1,8 +1,8 @@
-package com.flipperdevices.bottombar.main.service
+package com.flipperdevices.bottombar.impl.main.service
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.flipperdevices.bottombar.model.FlipperBottomTab
+import com.flipperdevices.bottombar.impl.model.FlipperBottomTab
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch

diff --git a/...vices/bottombar/model/FlipperBottomTab.kt → .../bottombar/impl/model/FlipperBottomTab.kt b/...vices/bottombar/model/FlipperBottomTab.kt → .../bottombar/impl/model/FlipperBottomTab.kt
@@ -1,8 +1,8 @@
-package com.flipperdevices.bottombar.model
+package com.flipperdevices.bottombar.impl.model
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import com.flipperdevices.bottombar.R
+import com.flipperdevices.bottombar.impl.R
 
 /**
  * Warning: this class is processed by Proguard

diff --git a/...s/bottombar/navigate/ScreenTabProvider.kt → ...tombar/impl/navigate/ScreenTabProvider.kt b/...s/bottombar/navigate/ScreenTabProvider.kt → ...tombar/impl/navigate/ScreenTabProvider.kt
@@ -1,6 +1,6 @@
-package com.flipperdevices.bottombar.navigate
+package com.flipperdevices.bottombar.impl.navigate
 
-import com.flipperdevices.bottombar.model.FlipperBottomTab
+import com.flipperdevices.bottombar.impl.model.FlipperBottomTab
 import com.github.terrakok.cicerone.Screen
 
 /**

diff --git a/...ttombar/navigate/ScreenTabProviderImpl.kt → ...ar/impl/navigate/ScreenTabProviderImpl.kt b/...ttombar/navigate/ScreenTabProviderImpl.kt → ...ar/impl/navigate/ScreenTabProviderImpl.kt
@@ -1,10 +1,10 @@
-package com.flipperdevices.bottombar.navigate
+package com.flipperdevices.bottombar.impl.navigate
 
-import com.flipperdevices.bottombar.main.TestFragment
-import com.flipperdevices.bottombar.model.FlipperBottomTab
+import com.flipperdevices.bottombar.impl.main.TestFragment
+import com.flipperdevices.bottombar.impl.model.FlipperBottomTab
 import com.flipperdevices.core.di.AppGraph
-import com.flipperdevices.core.navigation.screen.InfoScreenProvider
 import com.flipperdevices.filemanager.api.navigation.FileManagerScreenProvider
+import com.flipperdevices.info.api.screen.InfoScreenProvider
 import com.github.terrakok.cicerone.Screen
 import com.github.terrakok.cicerone.androidx.FragmentScreen
 import com.squareup.anvil.annotations.ContributesBinding

diff --git a/...ombar/src/main/res/drawable/ic_device.xml → .../impl/src/main/res/drawable/ic_device.xml b/...ombar/src/main/res/drawable/ic_device.xml → .../impl/src/main/res/drawable/ic_device.xml
diff --git a/...bar/src/main/res/drawable/ic_settings.xml → ...mpl/src/main/res/drawable/ic_settings.xml b/...bar/src/main/res/drawable/ic_settings.xml → ...mpl/src/main/res/drawable/ic_settings.xml
diff --git a/...mbar/src/main/res/drawable/ic_storage.xml → ...impl/src/main/res/drawable/ic_storage.xml b/...mbar/src/main/res/drawable/ic_storage.xml → ...impl/src/main/res/drawable/ic_storage.xml
diff --git a/...in/res/layout/activity_with_bottombar.xml → ...in/res/layout/activity_with_bottombar.xml b/...in/res/layout/activity_with_bottombar.xml → ...in/res/layout/activity_with_bottombar.xml
diff --git a/...ain/res/layout/fragment_tab_container.xml → ...ain/res/layout/fragment_tab_container.xml b/...ain/res/layout/fragment_tab_container.xml → ...ain/res/layout/fragment_tab_container.xml
diff --git a/...bottombar/src/main/res/values/strings.xml → ...mbar/impl/src/main/res/values/strings.xml b/...bottombar/src/main/res/values/strings.xml → ...mbar/impl/src/main/res/values/strings.xml
diff --git a/components/bottombar/proguard-rules.pro b/components/bottombar/proguard-rules.pro
diff --git a/components/bridge/api/build.gradle.kts b/components/bridge/api/build.gradle.kts
@@ -6,7 +6,6 @@ plugins {
 apply<com.flipperdevices.gradle.ConfigurationPlugin>()
 
 dependencies {
-    implementation(project(":components:core"))
     implementation(project(":components:bridge:protobuf"))
 
     implementation(Libs.KOTLIN_COROUTINES)

diff --git a/components/bridge/impl/build.gradle.kts b/components/bridge/impl/build.gradle.kts
@@ -7,7 +7,9 @@ plugins {
 apply<com.flipperdevices.gradle.ConfigurationPlugin>()
 
 dependencies {
-    implementation(project(":components:core"))
+    implementation(project(":components:core:log"))
+    implementation(project(":components:core:ktx"))
+
     implementation(project(":components:bridge:api"))
     implementation(project(":components:bridge:protobuf"))
 

diff --git a/...bridge/impl/src/main/java/com/flipperdevices/bridge/impl/manager/FlipperBleManagerImpl.kt b/...bridge/impl/src/main/java/com/flipperdevices/bridge/impl/manager/FlipperBleManagerImpl.kt
@@ -8,7 +8,7 @@ import com.flipperdevices.bridge.api.utils.Constants
 import com.flipperdevices.bridge.impl.manager.delegates.FlipperConnectionInformationApiImpl
 import com.flipperdevices.bridge.impl.manager.service.FlipperInformationApiImpl
 import com.flipperdevices.bridge.impl.manager.service.FlipperSerialApiImpl
-import com.flipperdevices.core.utils.newSingleThreadExecutor
+import com.flipperdevices.core.ktx.newSingleThreadExecutor
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.flow.filter

diff --git a/components/bridge/protobuf/build.gradle.kts b/components/bridge/protobuf/build.gradle.kts
@@ -12,7 +12,6 @@ plugins {
 apply<com.flipperdevices.gradle.ConfigurationPlugin>()
 
 dependencies {
-    implementation(project(":components:core"))
     api(Libs.PROTOBUF_JAVALITE)
     api(Libs.PROTOBUF_KOTLIN) {
         exclude(group = Libs.PROTOBUF_GROUP)

diff --git a/components/bridge/service/api/build.gradle.kts b/components/bridge/service/api/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
 apply<com.flipperdevices.gradle.ConfigurationPlugin>()
 
 dependencies {
-    implementation(project(":components:core"))
     implementation(project(":components:bridge:api"))
 
     implementation(Libs.ANNOTATIONS)

diff --git a/components/bridge/service/impl/build.gradle.kts b/components/bridge/service/impl/build.gradle.kts
@@ -7,7 +7,11 @@ plugins {
 apply<com.flipperdevices.gradle.ConfigurationPlugin>()
 
 dependencies {
-    implementation(project(":components:core"))
+    implementation(project(":components:core:di"))
+    implementation(project(":components:core:log"))
+    implementation(project(":components:core:preference"))
+
+    implementation(project(":components:bridge:api"))
     implementation(project(":components:bridge:provider"))
     implementation(project(":components:bridge:protobuf"))
     implementation(project(":components:bridge:service:api"))

diff --git a/...ervice/impl/src/main/java/com/flipperdevices/bridge/service/impl/FlipperServiceApiImpl.kt b/...ervice/impl/src/main/java/com/flipperdevices/bridge/service/impl/FlipperServiceApiImpl.kt
@@ -13,7 +13,7 @@ import com.flipperdevices.bridge.service.impl.delegate.FlipperServiceConnectDele
 import com.flipperdevices.bridge.service.impl.di.FlipperServiceComponent
 import com.flipperdevices.bridge.service.impl.provider.error.FlipperServiceErrorListener
 import com.flipperdevices.core.di.ComponentHolder
-import com.flipperdevices.core.utils.preference.FlipperSharedPreferencesKey
+import com.flipperdevices.core.preference.FlipperSharedPreferencesKey
 import javax.inject.Inject
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.launch

diff --git a/components/core/consumer-rules.pro b/components/core/consumer-rules.pro
diff --git a/components/info/.gitignore → components/core/di/.gitignore b/components/info/.gitignore → components/core/di/.gitignore
diff --git a/components/core/di/build.gradle.kts b/components/core/di/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+}
+apply<com.flipperdevices.gradle.ConfigurationPlugin>()
diff --git a/components/core/di/src/main/AndroidManifest.xml b/components/core/di/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.flipperdevices.core.di" />
diff --git a/...va/com/flipperdevices/core/di/AppGraph.kt → ...va/com/flipperdevices/core/di/AppGraph.kt b/...va/com/flipperdevices/core/di/AppGraph.kt → ...va/com/flipperdevices/core/di/AppGraph.kt
diff --git a/...flipperdevices/core/di/ComponentHolder.kt → ...flipperdevices/core/di/ComponentHolder.kt b/...flipperdevices/core/di/ComponentHolder.kt → ...flipperdevices/core/di/ComponentHolder.kt
diff --git a/components/core/ktx/.gitignore b/components/core/ktx/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/components/core/ktx/build.gradle.kts b/components/core/ktx/build.gradle.kts
@@ -0,0 +1,9 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+}
+apply<com.flipperdevices.gradle.ConfigurationPlugin>()
+
+dependencies {
+    implementation(Libs.APPCOMPAT)
+}
diff --git a/components/core/ktx/src/main/AndroidManifest.xml b/components/core/ktx/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.flipperdevices.core.ktx" />
diff --git a/.../flipperdevices/core/utils/ExecutorExt.kt → ...om/flipperdevices/core/ktx/ExecutorKtx.kt b/.../flipperdevices/core/utils/ExecutorExt.kt → ...om/flipperdevices/core/ktx/ExecutorKtx.kt
@@ -1,4 +1,4 @@
-package com.flipperdevices.core.utils
+package com.flipperdevices.core.ktx
 
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors

diff --git a/...com/flipperdevices/core/utils/Fragment.kt → ...om/flipperdevices/core/ktx/FragmentKtx.kt b/...com/flipperdevices/core/utils/Fragment.kt → ...om/flipperdevices/core/ktx/FragmentKtx.kt
@@ -1,4 +1,4 @@
-package com.flipperdevices.core.utils
+package com.flipperdevices.core.ktx
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment

diff --git a/...va/com/flipperdevices/core/utils/Toast.kt → ...a/com/flipperdevices/core/ktx/ToastKtx.kt b/...va/com/flipperdevices/core/utils/Toast.kt → ...a/com/flipperdevices/core/ktx/ToastKtx.kt
@@ -1,4 +1,4 @@
-package com.flipperdevices.core.utils
+package com.flipperdevices.core.ktx
 
 import android.content.Context
 import android.widget.Toast

diff --git a/components/core/log/.gitignore b/components/core/log/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/components/core/log/build.gradle.kts b/components/core/log/build.gradle.kts
@@ -0,0 +1,9 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+}
+apply<com.flipperdevices.gradle.ConfigurationPlugin>()
+
+dependencies {
+    api(Libs.TIMBER)
+}
diff --git a/components/core/log/src/main/AndroidManifest.xml b/components/core/log/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.flipperdevices.core.log" />
diff --git a/components/core/navigation/.gitignore b/components/core/navigation/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/components/core/navigation/build.gradle.kts b/components/core/navigation/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("com.squareup.anvil")
+    id("kotlin-kapt")
+}
+apply<com.flipperdevices.gradle.ConfigurationPlugin>()
+
+dependencies {
+    implementation(project(":components:core:di"))
+
+    implementation(Libs.CICERONE)
+
+    // Dagger deps
+    implementation(Libs.DAGGER)
+    kapt(Libs.DAGGER_COMPILER)
+}
diff --git a/components/core/navigation/src/main/AndroidManifest.xml b/components/core/navigation/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.flipperdevices.core.navigation" />
diff --git a/...vices/core/navigation/NavigationModule.kt → ...vices/core/navigation/NavigationModule.kt b/...vices/core/navigation/NavigationModule.kt → ...vices/core/navigation/NavigationModule.kt
diff --git a/...vigation/delegates/OnBackPressListener.kt → ...vigation/delegates/OnBackPressListener.kt b/...vigation/delegates/OnBackPressListener.kt → ...vigation/delegates/OnBackPressListener.kt
diff --git a/components/core/preference/.gitignore b/components/core/preference/.gitignore
@@ -0,0 +1 @@
+/build
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<manifest package="com.flipperdevices.bottombar.api" />
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<manifest package="com.flipperdevices.core.di" />