Skip to content

Commit 9dee009

Browse files
pabloogcpabloogc
authored
Merge pull request #6 from minikorp/arch
4.0
2 parents 38248cf + 73e4716 commit 9dee009

Some content is hidden

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

62 files changed

+994
-1009
lines changed

‎app/build.gradle

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,18 @@ android {
7575
dependencies {
7676
implementation fileTree(dir: 'libs', include: ['*.jar'])
7777

78-
implementation project(":mini-common")
79-
implementation project(":mini-runtime")
78+
implementation project(":mini-android")
8079
kapt project(":mini-processor")
8180

8281
//Misc
8382
implementation 'com.github.minikorp:grove:1.0.3'
8483

84+
//Reactive
85+
def coroutines = "1.3.0-RC"
86+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines"
87+
def rx = "2.2.6"
88+
implementation "io.reactivex.rxjava2:rxjava:$rx"
89+
8590
//Support
8691
implementation "androidx.core:core:1.0.1"
8792
implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
@@ -90,14 +95,7 @@ dependencies {
9095
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
9196
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
9297

93-
//Dagger
94-
implementation "com.google.dagger:dagger-android:$dagger_version"
95-
implementation "com.google.dagger:dagger-android-support:$dagger_version"
96-
kapt "com.google.dagger:dagger-compiler:$dagger_version"
97-
kapt "com.google.dagger:dagger-android-processor:$dagger_version"
98-
9998
testImplementation 'junit:junit:4.12'
100-
androidTestImplementation project(":mini-android-testing")
10199
androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
102100
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
103101
androidTestImplementation 'com.agoda.kakao:kakao:1.4.0'

‎app/src/main/java/org/sample/SampleActivity.kt

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,37 @@
11
package org.sample
22

33
import android.os.Bundle
4-
import androidx.appcompat.app.AppCompatActivity
4+
import com.mini.android.FluxActivity
55
import com.minikorp.grove.ConsoleLogTree
66
import com.minikorp.grove.Grove
77
import kotlinx.android.synthetic.main.home_activity.*
88
import mini.*
99

10-
class SampleActivity : AppCompatActivity(), SubscriptionTracker by DefaultSubscriptionTracker() {
10+
class SampleActivity : FluxActivity() {
1111

12-
private val dispatcher = Dispatcher()
12+
private val dispatcher = MiniGen.newDispatcher()
1313
private val dummyStore = DummyStore()
1414

1515
override fun onCreate(savedInstanceState: Bundle?) {
1616
super.onCreate(savedInstanceState)
1717
setContentView(R.layout.home_activity)
18-
Grove.plant(ConsoleLogTree())
18+
1919
val stores = listOf(dummyStore)
20+
MiniGen.subscribe(dispatcher, stores).track()
21+
stores.forEach { it.initialize() }
2022

21-
//MiniGen.initialize(dispatcher, stores)
22-
MiniRuntime.initialize(dispatcher, stores)
23+
dummyStore.subscribe {
24+
demo_text.text = it.text
25+
}
2326

27+
Grove.plant(ConsoleLogTree())
2428
dispatcher.addInterceptor(LoggerInterceptor(stores, { tag, msg ->
2529
Grove.tag(tag).d { msg }
2630
}))
2731

28-
dummyStore.flowable().subscribe {
29-
email.text = it.text
30-
}.track()
31-
32-
dispatcher.dispatch(ActionOne("1"))
32+
dispatcher.dispatch(ActionOne(""))
3333
dispatcher.dispatch(ActionTwo("2"))
3434
}
35-
36-
override fun onDestroy() {
37-
super.onDestroy()
38-
cancelSubscriptions()
39-
}
4035
}
4136

4237
interface ActionInterface {
@@ -53,7 +48,6 @@ data class DummyState(val text: String = "dummy")
5348
class DummyStore : Store<DummyState>() {
5449

5550
@Reducer fun onInterfaceAction(a: ActionInterface) {
56-
5751
}
5852

5953
@Reducer fun onSampleAction(a: ActionOne) {

‎app/src/main/res/drawable/ic_launcher_background.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<vector
3-
xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:height="108dp"
5-
android:width="108dp"
6-
android:viewportHeight="108"
7-
android:viewportWidth="108">
8-
<path android:fillColor="#000000"
9-
android:pathData="M0,0h108v108h-108z"/>
2+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:width="108dp"
4+
android:height="108dp"
5+
android:viewportHeight="108"
6+
android:viewportWidth="108">
7+
<path
8+
android:fillColor="#000000"
9+
android:pathData="M0,0h108v108h-108z" />
1010
</vector>

‎app/src/main/res/drawable/ic_launcher_foreground.xml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="108dp"
3-
android:height="108dp"
4-
android:viewportWidth="2000"
5-
android:viewportHeight="2000">
6-
<group android:translateX="460"
7-
android:translateY="460">
8-
<path
9-
android:pathData="M146,745c-116,-41 -175,-191 -118,-301 56,-109 171,-151 283,-103 52,23 57,32 34,64 -15,19 -16,19 -47,0 -96,-56 -228,20 -228,132 0,24 7,57 15,73 31,60 112,98 173,80 24,-6 169,-102 221,-147 3,-2 -4,-10 -15,-17 -61,-43 -67,-52 -55,-74 16,-30 25,-28 82,14l49,36 92,-68c50,-38 111,-79 136,-91 140,-71 305,36 305,197 0,123 -97,220 -221,220 -40,0 -132,-38 -132,-54 0,-6 7,-20 15,-31 15,-19 16,-19 47,0 96,56 228,-20 228,-132 0,-24 -7,-57 -15,-73 -31,-60 -112,-98 -173,-80 -24,6 -169,102 -221,147 -3,2 4,10 15,17 61,43 67,52 55,74 -16,30 -25,28 -82,-14l-49,-36 -92,68c-152,114 -209,132 -302,99z"
10-
android:fillColor="#44b74a"
11-
android:strokeColor="#00000000"/>
2+
android:width="108dp"
3+
android:height="108dp"
4+
android:viewportHeight="2000"
5+
android:viewportWidth="2000">
6+
<group
7+
android:translateX="460"
8+
android:translateY="460">
9+
<path
10+
android:fillColor="#44b74a"
11+
android:pathData="M146,745c-116,-41 -175,-191 -118,-301 56,-109 171,-151 283,-103 52,23 57,32 34,64 -15,19 -16,19 -47,0 -96,-56 -228,20 -228,132 0,24 7,57 15,73 31,60 112,98 173,80 24,-6 169,-102 221,-147 3,-2 -4,-10 -15,-17 -61,-43 -67,-52 -55,-74 16,-30 25,-28 82,14l49,36 92,-68c50,-38 111,-79 136,-91 140,-71 305,36 305,197 0,123 -97,220 -221,220 -40,0 -132,-38 -132,-54 0,-6 7,-20 15,-31 15,-19 16,-19 47,0 96,56 228,-20 228,-132 0,-24 -7,-57 -15,-73 -31,-60 -112,-98 -173,-80 -24,6 -169,102 -221,147 -3,2 4,10 15,17 61,43 67,52 55,74 -16,30 -25,28 -82,-14l-49,-36 -92,68c-152,114 -209,132 -302,99z"
12+
android:strokeColor="#00000000" />
1213
</group>
1314
</vector>

‎app/src/main/res/layout/home_activity.xml

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,25 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
tools:layout_editor_absoluteY="25dp">
88

9-
<TextView
10-
android:id="@+id/welcome"
11-
style="@style/AppTheme.Text"
12-
android:layout_width="wrap_content"
13-
android:layout_height="wrap_content"
14-
android:layout_marginEnd="8dp"
15-
android:layout_marginStart="8dp"
16-
android:layout_marginTop="200dp"
17-
android:text="Welcome! You have been successfully logged"
18-
app:layout_constraintEnd_toEndOf="parent"
19-
app:layout_constraintStart_toStartOf="parent"
20-
app:layout_constraintTop_toTopOf="parent" />
9+
<ScrollView
10+
android:layout_width="match_parent"
11+
android:layout_height="wrap_content">
2112

22-
<TextView
23-
android:id="@+id/email"
24-
style="@style/AppTheme.Text"
25-
android:layout_width="wrap_content"
26-
android:layout_height="wrap_content"
27-
android:layout_marginEnd="8dp"
28-
android:layout_marginStart="8dp"
29-
android:layout_marginTop="24dp"
30-
android:padding="32dp"
31-
app:layout_constraintEnd_toEndOf="parent"
32-
app:layout_constraintStart_toStartOf="parent"
33-
app:layout_constraintTop_toBottomOf="@+id/welcome"
34-
tools:text="Email : some@gmail.com" />
13+
<TextView
14+
android:id="@+id/demo_text"
15+
style="@style/AppTheme.Text"
16+
android:layout_width="wrap_content"
17+
android:layout_height="wrap_content"
18+
app:layout_constraintEnd_toEndOf="parent"
19+
app:layout_constraintStart_toStartOf="parent"
20+
app:layout_constraintTop_toTopOf="parent"
21+
tools:text="Demo Text" />
3522

36-
<TextView
37-
android:id="@+id/signOut"
38-
style="@style/AppTheme.Text.AppButton"
39-
android:layout_width="match_parent"
40-
android:text="Sign Out"
41-
android:textAllCaps="false"
42-
app:layout_constraintBottom_toBottomOf="parent" />
43-
</androidx.constraintlayout.widget.ConstraintLayout>
23+
</ScrollView>
24+
25+
</FrameLayout>

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@color/ic_launcher_background"/>
4-
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
3+
<background android:drawable="@color/ic_launcher_background" />
4+
<foreground android:drawable="@drawable/ic_launcher_foreground" />
55
</adaptive-icon>

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@drawable/ic_launcher_background"/>
4-
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
3+
<background android:drawable="@drawable/ic_launcher_background" />
4+
<foreground android:drawable="@drawable/ic_launcher_foreground" />
55
</adaptive-icon>

‎build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
ext {
3-
kotlin_version = '1.3.11'
4-
mini_version = '3.0.0'
3+
kotlin_version = '1.3.41'
4+
mini_version = '4.0.0'
55
}
66

77
repositories {
@@ -11,7 +11,7 @@ buildscript {
1111
}
1212

1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:3.3.2'
14+
classpath 'com.android.tools.build:gradle:3.4.2'
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1616
classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0'
1717
classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
@@ -20,7 +20,7 @@ buildscript {
2020
}
2121

2222
allprojects {
23-
version = 1.1
23+
version = mini_version
2424
group = "com.mini"
2525

2626
repositories {

‎gradle.properties

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
# Project-wide Gradle settings.
2-
32
# IDE (e.g. Android Studio) users:
43
# Gradle settings configured through the IDE *will take*
54
# any settings specified in this file.
6-
75
# For more details on how to fn your build environment visit
86
# http://www.gradle.org/docs/current/userguide/build_environment.html
9-
107
# Specifies the JVM arguments used for the daemon process.
118
# The setting is particularly useful for tweaking memory settings.
12-
139
org.gradle.jvmargs=-Xmx1536m
1410
kotlin.coroutines=enable
1511
android.useAndroidX=true
1612
android.enableJetifier=true
17-
1813
# When configured, Gradle will run in incubating parallel mode.
1914
# This option should only be used with decoupled projects. More details, visit
2015
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Jan 24 10:51:50 CET 2019
1+
#Mon Jul 22 11:10:54 CEST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

‎mini-android-testing/build.gradle

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎mini-android-testing/src/main/java/mini/test/CleanStateRule.kt

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎mini-android-testing/src/main/java/mini/test/TestDispatcherInterceptor.kt

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎mini-android-testing/src/main/java/mini/test/TestDispatcherRule.kt

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎mini-android-testing/.gitignore renamed to ‎mini-android/.gitignore

File renamed without changes.

0 commit comments

Comments
 (0)