Skip to content

Multiple modules #5

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.

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
merged 8 commits into from
Sep 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
root = true

[*]
indent_size=2
end_of_line=lf
charset=utf-8
trim_trailing_whitespace=true
insert_final_newline=true

[*.{kt,kts}]
kotlin_imports_layout=ascii
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/.idea/assetWizardSettings.xml
.DS_Store
/build
buildSrc/build
/captures
.externalNativeBuild
.cxx
8 changes: 7 additions & 1 deletion .idea/codeStyles/Project.xml

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

2 changes: 1 addition & 1 deletion .idea/codeStyles/codeStyleConfig.xml

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

6 changes: 6 additions & 0 deletions .idea/encodings.xml

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

6 changes: 6 additions & 0 deletions .idea/gradle.xml

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

77 changes: 0 additions & 77 deletions app/build.gradle

This file was deleted.

61 changes: 61 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
plugins {
androidApplication
kotlinAndroid
}

android {
compileSdkVersion(appConfig.compileSdkVersion)
buildToolsVersion(appConfig.buildToolsVersion)

defaultConfig {
applicationId = appConfig.applicationId
minSdkVersion(appConfig.minSdkVersion)
targetSdkVersion(appConfig.targetSdkVersion)
versionCode = appConfig.versionCode
versionName = appConfig.versionName

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
getByName("release") {
isMinifyEnabled = true
isShrinkResources = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() }
buildFeatures { viewBinding = true }
}

dependencies {
implementation(
fileTree(
mapOf(
"dir" to "libs",
"include" to listOf("*.jar")
)
)
)

implementation(domain)
implementation(data)
implementation(core)
implementation(featureMain)
implementation(featureAdd)

implementation(deps.jetbrains.coroutinesAndroid)
implementation(deps.koin.android)

testImplementation(deps.test.junit)
androidTestImplementation(deps.test.androidxJunit)
androidTestImplementation(deps.test.androidXSspresso)
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.hoc.flowmvi

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
Expand Down
17 changes: 1 addition & 16 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,6 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">

<activity android:name=".ui.main.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity
android:name=".ui.add.AddActivity"
android:label="Add user" />

<meta-data
android:name="preloaded_fonts"
android:resource="@array/preloaded_fonts" />
</application>

</manifest>
</manifest>
21 changes: 12 additions & 9 deletions app/src/main/java/com/hoc/flowmvi/App.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.hoc.flowmvi

import android.app.Application
import com.hoc.flowmvi.koin.dataModule
import com.hoc.flowmvi.koin.domainModule
import com.hoc.flowmvi.koin.viewModelModule
import com.hoc.flowmvi.core.coreModule
import com.hoc.flowmvi.data.dataModule
import com.hoc.flowmvi.domain.domainModule
import com.hoc.flowmvi.ui.add.addModule
import com.hoc.flowmvi.ui.main.mainModule
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.FlowPreview
import org.koin.android.ext.koin.androidContext
Expand All @@ -21,14 +23,15 @@ class App : Application() {
startKoin {
androidContext(this@App)

// https://github.com/InsertKoinIO/koin/issues/847
androidLogger(level = Level.ERROR)
androidLogger(level = Level.DEBUG)

modules(
dataModule,
domainModule,
viewModelModule
coreModule,
dataModule,
domainModule,
mainModule,
addModule,
)
}
}
}
}
15 changes: 15 additions & 0 deletions app/src/main/java/com/hoc/flowmvi/core/CoreModule.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.hoc.flowmvi.core

import com.hoc.flowmvi.core.dispatchers.CoroutineDispatchers
import com.hoc.flowmvi.core.navigator.Navigator
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.FlowPreview
import org.koin.dsl.module

@FlowPreview
@ExperimentalCoroutinesApi
val coreModule = module {
single<CoroutineDispatchers> { CoroutineDispatchersImpl() }

single<Navigator> { NavigatorImpl(add = get()) }
}
10 changes: 10 additions & 0 deletions app/src/main/java/com/hoc/flowmvi/core/CoroutineDispatchersImpl.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.hoc.flowmvi.core

import com.hoc.flowmvi.core.dispatchers.CoroutineDispatchers
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Dispatchers

internal class CoroutineDispatchersImpl(
override val main: CoroutineDispatcher = Dispatchers.Main,
override val io: CoroutineDispatcher = Dispatchers.IO
) : CoroutineDispatchers
16 changes: 16 additions & 0 deletions app/src/main/java/com/hoc/flowmvi/core/NavigatorImpl.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.hoc.flowmvi.core

import android.content.Context
import com.hoc.flowmvi.core.navigator.IntentProviders
import com.hoc.flowmvi.core.navigator.Navigator
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.FlowPreview

@ExperimentalCoroutinesApi
@FlowPreview
class NavigatorImpl(
private val add: IntentProviders.Add
) : Navigator {
override fun Context.navigateToAdd() =
startActivity(add.makeIntent(this))
}

This file was deleted.

This file was deleted.

This file was deleted.

Loading