Skip to content

Refactor/modules structure #29

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

Merged
stslex merged 2 commits into from
Jul 17, 2022
Merged

Refactor/modules structure #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b8582a
refactoring
stslex Jul 17, 2022
16afaf3
refactor catalogs and modules structure
stslex Jul 17, 2022
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
4 changes: 0 additions & 4 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,8 @@ dependencies {
implementation(project(":core-navigation"))
implementation(project(":core-test"))
implementation(project(":core-model"))
implementation(project(":core-resources"))
implementation(project(":core-local-data-source"))
implementation(project(":core-remote-data-source"))
implementation(project(":core-firebase"))
implementation(project(":core-firebase-auth"))
implementation(project(":core-coroutines"))
implementation(project(":feature-note-list"))
implementation(project(":feature-single-note"))
implementation(project(":feature-todo"))
Expand Down
14 changes: 5 additions & 9 deletions app/src/main/java/com/stslex/cnotes/CNoteApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package com.stslex.cnotes

import android.app.Application
import com.example.feature_auth_code.di.AuthCodeModule
import com.example.feature_auth_phonenumber.di.AuthPhoneNumberModule
import com.example.feature_note_list.di.NoteListModule
import com.stslex.feature_auth_code.di.AuthCodeModule
import com.stslex.feature_auth_phonenumber.di.AuthPhoneNumberModule
import com.stslex.feature_note_list.di.NoteListModule
import com.stslex.cnotes.di.AppComponent
import com.stslex.core_coroutines.CoroutinesModule
import com.stslex.core.CoroutinesModule
import com.stslex.core_data_source.di.RoomDatabaseModule
import com.stslex.core_firebase.FirebaseModule
import com.stslex.core_firebase_auth.di.FirebaseAuthModule
import com.stslex.core_firebase.di.FirebaseModule
import com.stslex.core_model.di.MapperModule
import com.stslex.core_remote_data_source.di.RemoteDataSourceModule
import com.stslex.feature_profile.di.ProfileModule
import com.stslex.feature_single_note.di.SingleNoteModule
import org.koin.android.ext.koin.androidContext
Expand All @@ -32,9 +30,7 @@ class CNoteApplication : Application() {
AuthPhoneNumberModule().module,
AuthCodeModule().module,
ProfileModule().module,
RemoteDataSourceModule().module,
MapperModule().module,
FirebaseAuthModule().module,
SingleNoteModule().module
)
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/stslex/cnotes/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import com.google.accompanist.systemuicontroller.SystemUiController
import com.google.accompanist.systemuicontroller.rememberSystemUiController
import com.stslex.cnotes.ui.AppCreator
import com.stslex.cnotes.utils.ShortcutBuilder
import com.stslex.core_firebase.abstraction.FirebaseAppInitialisationUtil
import com.stslex.core_firebase.utils.abstraction.FirebaseAppInitialisationUtil
import org.koin.android.ext.android.inject

class MainActivity : ComponentActivity() {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/stslex/cnotes/navigation/NavigationHost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.navigation.NavGraph.Companion.findStartDestination
import androidx.navigation.NavHostController
import com.example.feature_auth_code.navigation.authCodeGraph
import com.example.feature_auth_phonenumber.navigation.authPhoneNumberGraph
import com.example.feature_note_list.navigation.noteListGraph
import com.stslex.feature_auth_code.navigation.authCodeGraph
import com.stslex.feature_auth_phonenumber.navigation.authPhoneNumberGraph
import com.stslex.feature_note_list.navigation.noteListGraph
import com.google.accompanist.navigation.animation.AnimatedNavHost
import com.stslex.core_navigation.destinations.*
import com.stslex.feature_profile.navigation.profileGraph
Expand Down
6 changes: 1 addition & 5 deletions app/src/main/java/com/stslex/cnotes/ui/AppCreator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@ import androidx.compose.material3.Scaffold
import androidx.compose.material3.windowsizeclass.WindowSizeClass
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
import androidx.compose.runtime.Composable
import androidx.compose.runtime.SideEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.navigation.compose.currentBackStackEntryAsState
import com.example.feature_note_list.navigation.noteListTopLevelDestination
import com.stslex.feature_note_list.navigation.noteListTopLevelDestination
import com.google.accompanist.navigation.animation.rememberAnimatedNavController
import com.google.accompanist.systemuicontroller.SystemUiController
import com.google.accompanist.systemuicontroller.rememberSystemUiController
import com.stslex.cnotes.navigation.AppTopLevelNavigation
import com.stslex.cnotes.navigation.NavigationHost
import com.stslex.core_navigation.destinations.NoteListDestination
Expand Down
30 changes: 9 additions & 21 deletions app/src/main/java/com/stslex/cnotes/utils/ShortcutBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import com.stslex.cnotes.MainActivity
import com.stslex.cnotes.R.drawable
import com.stslex.core_navigation.destinations.ProfileDestination
import com.stslex.core_navigation.destinations.SingleNoteDestination
import com.stslex.core_resources.R
import com.stslex.core_ui.R

fun interface ShortcutBuilder {

Expand All @@ -30,46 +30,34 @@ fun interface ShortcutBuilder {

private val shortcutCreateNewNote: ShortcutInfoCompat by lazy {
ShortcutInfoCompat.Builder(
context,
context.getString(R.string.lb_short_shortcut_create)
context, context.getString(R.string.lb_short_shortcut_create)
).setShortLabel(context.getString(R.string.lb_short_shortcut_create))
.setLongLabel(context.getString(R.string.lb_long_shortcut_create))
.setDisabledMessage(context.getString(R.string.lb_shortcut_disabled_message))
.setIcon(
IconCompat.createWithResource(
context,
drawable.ic_baseline_add_24
context, drawable.ic_baseline_add_24
)
)
.setIntent(shortcutIntent("${SingleNoteDestination.route}/-1"))
.build()
).setIntent(shortcutIntent("${SingleNoteDestination.route}/-1")).build()
}

private val shortcutProfile: ShortcutInfoCompat by lazy {
ShortcutInfoCompat.Builder(
context,
context.getString(R.string.lb_short_shortcut_profile)
)
.setShortLabel(context.getString(R.string.lb_short_shortcut_profile))
context, context.getString(R.string.lb_short_shortcut_profile)
).setShortLabel(context.getString(R.string.lb_short_shortcut_profile))
.setLongLabel(context.getString(R.string.lb_long_shortcut_profile))
.setDisabledMessage(context.getString(R.string.lb_shortcut_disabled_message))
.setIcon(
IconCompat.createWithResource(
context,
drawable.ic_baseline_person_outline_24
context, drawable.ic_baseline_person_outline_24
)
)
.setIntent(shortcutIntent(ProfileDestination.route))
.build()
).setIntent(shortcutIntent(ProfileDestination.route)).build()
}

private val shortcutIntent: (String) -> Intent
get(): (String) -> Intent = { url ->
Intent(
Intent.ACTION_VIEW,
Uri.parse("app://$url"),
context,
MainActivity::class.java
Intent.ACTION_VIEW, Uri.parse("app://$url"), context, MainActivity::class.java
)
}
}
Expand Down
14 changes: 5 additions & 9 deletions app/src/test/java/com/stslex/cnotes/CheckModulesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package com.stslex.cnotes

import com.example.feature_auth_code.di.AuthCodeModule
import com.example.feature_auth_phonenumber.di.AuthPhoneNumberModule
import com.example.feature_note_list.di.NoteListModule
import com.stslex.feature_auth_code.di.AuthCodeModule
import com.stslex.feature_auth_phonenumber.di.AuthPhoneNumberModule
import com.stslex.feature_note_list.di.NoteListModule
import com.stslex.cnotes.di.AppComponent
import com.stslex.core_coroutines.CoroutinesModule
import com.stslex.core.CoroutinesModule
import com.stslex.core_data_source.di.RoomDatabaseModule
import com.stslex.core_firebase.FirebaseModule
import com.stslex.core_firebase_auth.di.FirebaseAuthModule
import com.stslex.core_firebase.di.FirebaseModule
import com.stslex.core_model.di.MapperModule
import com.stslex.core_remote_data_source.di.RemoteDataSourceModule
import com.stslex.feature_profile.di.ProfileModule
import com.stslex.feature_single_note.di.SingleNoteModule
import org.junit.After
Expand All @@ -36,9 +34,7 @@ class CheckModulesTest : KoinTest {
AuthPhoneNumberModule().module
AuthCodeModule().module
ProfileModule().module
RemoteDataSourceModule().module
MapperModule().module
FirebaseAuthModule().module
SingleNoteModule().module
}
}
Expand Down
1 change: 0 additions & 1 deletion core-coroutines/.gitignore
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions core-coroutines/build.gradle.kts
View file
Open in desktop

This file was deleted.

Empty file removed core-coroutines/consumer-rules.pro
View file
Open in desktop
Empty file.
21 changes: 0 additions & 21 deletions core-coroutines/proguard-rules.pro
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions core-coroutines/src/androidTest/java/com/stslex/core_coroutines/ExampleInstrumentedTest.kt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions core-coroutines/src/main/AndroidManifest.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion core-firebase-auth/.gitignore
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions core-firebase-auth/build.gradle.kts
View file
Open in desktop

This file was deleted.

Empty file removed core-firebase-auth/consumer-rules.pro
View file
Open in desktop
Empty file.
21 changes: 0 additions & 21 deletions core-firebase-auth/proguard-rules.pro
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions ...rebase-auth/src/androidTest/java/com/stslex/core_firebase_auth/ExampleInstrumentedTest.kt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions core-firebase-auth/src/main/AndroidManifest.xml
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions core-firebase-auth/src/main/java/com/stslex/core_firebase_auth/di/FirebaseAuthModule.kt
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions core-firebase-auth/src/test/java/com/stslex/core_firebase_auth/di/FirebaseAuthModuleTest.kt
View file
Open in desktop

This file was deleted.

Loading