Skip to content

Commit c02ce1c

Browse files
Merge pull request #20 from valueadd-poland/feature/presenter-library
refactor: split library into presenter, android views libraries
2 parents 995df8b + fd46be1 commit c02ce1c

File tree

61 files changed

+325
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+325
-191
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ gradle/wrapper
1919
build/
2020

2121
# Local configuration file (sdk path, etc)
22+
mvi/local.properties
23+
mvi-presenter/local.properties
2224
local.properties
2325

2426
# Log Files

app/src/main/java/pl/valueadd/mvi/example/presentation/base/AbstractBackMviFragment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ package pl.valueadd.mvi.example.presentation.base
22

33
import android.os.Bundle
44
import androidx.annotation.LayoutRes
5+
import pl.valueadd.mvi.IBaseViewState
56
import pl.valueadd.mvi.example.utility.dependencyinjection.DependencyUtil
67
import pl.valueadd.mvi.fragment.back.BackMviFragment
78
import pl.valueadd.mvi.fragment.delegate.fragment.MviFragmentSaveInstanceStateDelegateImpl
8-
import pl.valueadd.mvi.fragment.mvi.BaseMviPresenter
9-
import pl.valueadd.mvi.fragment.mvi.IBaseView
10-
import pl.valueadd.mvi.fragment.mvi.IBaseViewState
9+
import pl.valueadd.mvi.presenter.BaseMviPresenter
10+
import pl.valueadd.mvi.presenter.IBaseView
1111

1212
abstract class AbstractBackMviFragment<V : IBaseView<VS, *>, VS : IBaseViewState, VI : IBaseView.IBaseIntent, P : BaseMviPresenter<VS, *, *, V>>(@LayoutRes layoutId: Int) :
1313
BackMviFragment<V, VS, VI, P>(layoutId) {

app/src/main/java/pl/valueadd/mvi/example/presentation/base/AbstractBaseMviFragment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ package pl.valueadd.mvi.example.presentation.base
22

33
import android.os.Bundle
44
import androidx.annotation.LayoutRes
5+
import pl.valueadd.mvi.IBaseViewState
56
import pl.valueadd.mvi.example.utility.dependencyinjection.DependencyUtil
67
import pl.valueadd.mvi.fragment.base.BaseMviFragment
78
import pl.valueadd.mvi.fragment.delegate.fragment.MviFragmentSaveInstanceStateDelegateImpl
8-
import pl.valueadd.mvi.fragment.mvi.BaseMviPresenter
9-
import pl.valueadd.mvi.fragment.mvi.IBaseView
10-
import pl.valueadd.mvi.fragment.mvi.IBaseViewState
9+
import pl.valueadd.mvi.presenter.BaseMviPresenter
10+
import pl.valueadd.mvi.presenter.IBaseView
1111

1212
abstract class AbstractBaseMviFragment<V : IBaseView<VS, *>, VS : IBaseViewState, VI : IBaseView.IBaseIntent, P : BaseMviPresenter<VS, *, *, V>>(@LayoutRes layoutId: Int) :
1313
BaseMviFragment<V, VS, VI, P>(layoutId) {
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package pl.valueadd.mvi.example.presentation.base
2+
3+
import io.reactivex.android.schedulers.AndroidSchedulers
4+
import pl.valueadd.mvi.IBaseViewState
5+
import pl.valueadd.mvi.presenter.BaseMviPresenter
6+
import pl.valueadd.mvi.presenter.IBasePartialState
7+
import pl.valueadd.mvi.presenter.IBaseView
8+
9+
abstract class AbstractPresenter<VS : IBaseViewState, PS : IBasePartialState, VI : IBaseView.IBaseIntent, V : IBaseView<VS, VI>> :
10+
BaseMviPresenter<VS, PS, VI, V>(AndroidSchedulers.mainThread())

app/src/main/java/pl/valueadd/mvi/example/presentation/main/about/AboutFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package pl.valueadd.mvi.example.presentation.main.about
33
import io.reactivex.Observable
44
import pl.valueadd.mvi.example.R
55
import pl.valueadd.mvi.example.presentation.base.AbstractBackMviFragment
6-
import pl.valueadd.mvi.fragment.mvi.IBaseView
6+
import pl.valueadd.mvi.presenter.IBaseView
77
import javax.inject.Inject
88

99
class AboutFragment :

app/src/main/java/pl/valueadd/mvi/example/presentation/main/about/AboutPresenter.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package pl.valueadd.mvi.example.presentation.main.about
22

33
import io.reactivex.Observable
4-
import pl.valueadd.mvi.fragment.mvi.BaseMviPresenter
5-
import pl.valueadd.mvi.fragment.mvi.IBaseView
4+
import pl.valueadd.mvi.example.presentation.base.AbstractPresenter
5+
import pl.valueadd.mvi.presenter.IBaseView
66
import javax.inject.Inject
77

88
class AboutPresenter @Inject constructor() :
9-
BaseMviPresenter<AboutViewState, AboutViewState.PartialState, IBaseView.IBaseIntent, AboutView>() {
9+
AbstractPresenter<AboutViewState, AboutViewState.PartialState, IBaseView.IBaseIntent, AboutView>() {
1010

1111
override fun reduce(
1212
previousState: AboutViewState,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package pl.valueadd.mvi.example.presentation.main.about
22

3-
import pl.valueadd.mvi.fragment.mvi.IBaseView
3+
import pl.valueadd.mvi.presenter.IBaseView
44

55
interface AboutView :
66
IBaseView<AboutViewState, IBaseView.IBaseIntent>

app/src/main/java/pl/valueadd/mvi/example/presentation/main/about/AboutViewState.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package pl.valueadd.mvi.example.presentation.main.about
22

33
import kotlinx.android.parcel.Parcelize
4-
import pl.valueadd.mvi.fragment.mvi.IBasePartialState
5-
import pl.valueadd.mvi.fragment.mvi.IBaseViewState
4+
import pl.valueadd.mvi.IBaseViewState
5+
import pl.valueadd.mvi.presenter.IBasePartialState
66

77
@Parcelize
88
class AboutViewState :

app/src/main/java/pl/valueadd/mvi/example/presentation/main/account/AccountPresenter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package pl.valueadd.mvi.example.presentation.main.account
22

33
import io.reactivex.Observable
4-
import pl.valueadd.mvi.fragment.mvi.BaseMviPresenter
4+
import pl.valueadd.mvi.example.presentation.base.AbstractPresenter
55
import javax.inject.Inject
66

77
class AccountPresenter @Inject constructor() :
8-
BaseMviPresenter<AccountViewState, AccountViewState.PartialState, AccountView.Intent, AccountView>() {
8+
AbstractPresenter<AccountViewState, AccountViewState.PartialState, AccountView.Intent, AccountView>() {
99

1010
override fun reduce(
1111
previousState: AccountViewState,

app/src/main/java/pl/valueadd/mvi/example/presentation/main/account/AccountView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package pl.valueadd.mvi.example.presentation.main.account
22

3-
import pl.valueadd.mvi.fragment.mvi.IBaseView
3+
import pl.valueadd.mvi.presenter.IBaseView
44

55
interface AccountView :
66
IBaseView<AccountViewState, AccountView.Intent> {

0 commit comments

Comments
 (0)