├── app ├── .gitignore ├── src │ ├── main │ │ ├── res │ │ │ ├── values │ │ │ │ ├── strings.xml │ │ │ │ ├── colors.xml │ │ │ │ └── styles.xml │ │ │ ├── mipmap-hdpi │ │ │ │ ├── ic_launcher.png │ │ │ │ └── ic_launcher_round.png │ │ │ ├── mipmap-mdpi │ │ │ │ ├── ic_launcher.png │ │ │ │ └── ic_launcher_round.png │ │ │ ├── mipmap-xhdpi │ │ │ │ ├── ic_launcher.png │ │ │ │ └── ic_launcher_round.png │ │ │ ├── mipmap-xxhdpi │ │ │ │ ├── ic_launcher.png │ │ │ │ └── ic_launcher_round.png │ │ │ ├── mipmap-xxxhdpi │ │ │ │ ├── ic_launcher.png │ │ │ │ └── ic_launcher_round.png │ │ │ ├── mipmap-anydpi-v26 │ │ │ │ ├── ic_launcher.xml │ │ │ │ └── ic_launcher_round.xml │ │ │ ├── layout │ │ │ │ └── activity_main.xml │ │ │ ├── drawable-v24 │ │ │ │ └── ic_launcher_foreground.xml │ │ │ └── drawable │ │ │ │ └── ic_launcher_background.xml │ │ ├── java │ │ │ └── uk │ │ │ │ └── co │ │ │ │ └── mycompany │ │ │ │ ├── api │ │ │ │ ├── model │ │ │ │ │ └── IpAddress.kt │ │ │ │ └── ApiService.kt │ │ │ │ ├── di │ │ │ │ ├── ActivityBuilder.kt │ │ │ │ ├── AppComponent.kt │ │ │ │ └── AppModule.kt │ │ │ │ ├── repository │ │ │ │ └── Repository.kt │ │ │ │ ├── ui │ │ │ │ └── main │ │ │ │ │ ├── di │ │ │ │ │ └── MainActivityModule.kt │ │ │ │ │ ├── MainActivityViewModel.kt │ │ │ │ │ └── MainActivity.kt │ │ │ │ ├── AndroidApp.kt │ │ │ │ └── util │ │ │ │ └── SchedulerProvider.kt │ │ └── AndroidManifest.xml │ ├── test │ │ └── java │ │ │ └── uk │ │ │ └── co │ │ │ └── mycompany │ │ │ ├── ExampleUnitTest.java │ │ │ └── ui │ │ │ └── main │ │ │ └── MainActivityViewModelTest.kt │ └── androidTest │ │ └── java │ │ └── uk │ │ └── co │ │ └── mycompany │ │ └── ExampleInstrumentedTest.java ├── proguard-rules.pro └── build.gradle ├── settings.gradle ├── .gitignore ├── gradle └── wrapper │ ├── gradle-wrapper.jar │ └── gradle-wrapper.properties ├── README.md ├── .travis.yml ├── gradle.properties ├── gradlew.bat └── gradlew /app/.gitignore: -------------------------------------------------------------------------------- 1 | /build 2 | -------------------------------------------------------------------------------- /settings.gradle: -------------------------------------------------------------------------------- 1 | include ':app' 2 | -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- 1 | *.iml 2 | .gradle 3 | /local.properties 4 | /.idea/ 5 | .DS_Store 6 | /build 7 | /captures 8 | .externalNativeBuild 9 | -------------------------------------------------------------------------------- /app/src/main/res/values/strings.xml: -------------------------------------------------------------------------------- 1 | 2 | NewAndroidArchitecture 3 | 4 | -------------------------------------------------------------------------------- /gradle/wrapper/gradle-wrapper.jar: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rs146/NewAndroidArchitecture/HEAD/gradle/wrapper/gradle-wrapper.jar -------------------------------------------------------------------------------- /app/src/main/java/uk/co/mycompany/api/model/IpAddress.kt: -------------------------------------------------------------------------------- 1 | package uk.co.mycompany.api.model 2 | 3 | data class IpAddress(val ip: String) -------------------------------------------------------------------------------- /app/src/main/res/mipmap-hdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rs146/NewAndroidArchitecture/HEAD/app/src/main/res/mipmap-hdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-mdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rs146/NewAndroidArchitecture/HEAD/app/src/main/res/mipmap-mdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xhdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rs146/NewAndroidArchitecture/HEAD/app/src/main/res/mipmap-xhdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xxhdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rs146/NewAndroidArchitecture/HEAD/app/src/main/res/mipmap-xxhdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xxxhdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rs146/NewAndroidArchitecture/HEAD/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-hdpi/ic_launcher_round.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rs146/NewAndroidArchitecture/HEAD/app/src/main/res/mipmap-hdpi/ic_launcher_round.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-mdpi/ic_launcher_round.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rs146/NewAndroidArchitecture/HEAD/app/src/main/res/mipmap-mdpi/ic_launcher_round.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xhdpi/ic_launcher_round.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rs146/NewAndroidArchitecture/HEAD/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rs146/NewAndroidArchitecture/HEAD/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/rs146/NewAndroidArchitecture/HEAD/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png -------------------------------------------------------------------------------- /app/src/main/res/values/colors.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | #3F51B5 4 | #303F9F 5 | #FF4081 6 | 7 | -------------------------------------------------------------------------------- /gradle/wrapper/gradle-wrapper.properties: -------------------------------------------------------------------------------- 1 | #Mon Nov 20 15:12:03 GMT 2017 2 | distributionBase=GRADLE_USER_HOME 3 | distributionPath=wrapper/dists 4 | zipStoreBase=GRADLE_USER_HOME 5 | zipStorePath=wrapper/dists 6 | distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip 7 | -------------------------------------------------------------------------------- /app/src/main/java/uk/co/mycompany/api/ApiService.kt: -------------------------------------------------------------------------------- 1 | package uk.co.mycompany.api 2 | 3 | import io.reactivex.Single 4 | import retrofit2.http.GET 5 | import uk.co.mycompany.api.model.IpAddress 6 | 7 | interface ApiService { 8 | 9 | @GET(".") 10 | fun getJsonResponse(): Single 11 | } -------------------------------------------------------------------------------- /app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | -------------------------------------------------------------------------------- /app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # NewAndroidArchitecture 2 | New Android Architecture showing how to use Dagger Android libs 3 | 4 | Instead of using Scopes, as used in the previous incarnation of this project, we can use the power of the annotation `@ContributesAndroidInjector`. 5 | 6 | 7 | [![Build Status](https://travis-ci.org/rs146/NewAndroidArchitecture.svg?branch=master)](https://travis-ci.org/rs146/NewAndroidArchitecture) 8 | 9 | -------------------------------------------------------------------------------- /app/src/main/res/values/styles.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 10 | 11 | 12 | -------------------------------------------------------------------------------- /.travis.yml: -------------------------------------------------------------------------------- 1 | language: android 2 | android: 3 | components: 4 | - tools 5 | - platform-tools 6 | - build-tools-26.0.2 7 | - android-26 8 | - extra-android-m2repository 9 | jdk: 10 | - oraclejdk8 11 | script: 12 | - ./gradlew clean test build 13 | before_cache: 14 | - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock 15 | cache: 16 | directories: 17 | - $HOME/.m2 18 | - $HOME/.gradle/caches/ 19 | - $HOME/.gradle/wrapper/ 20 | -------------------------------------------------------------------------------- /app/src/main/java/uk/co/mycompany/di/ActivityBuilder.kt: -------------------------------------------------------------------------------- 1 | package uk.co.mycompany.di 2 | 3 | import dagger.Module 4 | import dagger.android.ContributesAndroidInjector 5 | import uk.co.mycompany.ui.main.MainActivity 6 | import uk.co.mycompany.ui.main.di.MainActivityModule 7 | 8 | @Module 9 | abstract class ActivityBuilder { 10 | 11 | @ContributesAndroidInjector(modules = arrayOf(MainActivityModule::class)) 12 | abstract fun bindMainActivity(): MainActivity 13 | } -------------------------------------------------------------------------------- /app/src/main/java/uk/co/mycompany/repository/Repository.kt: -------------------------------------------------------------------------------- 1 | package uk.co.mycompany.repository 2 | 3 | import io.reactivex.Single 4 | import uk.co.mycompany.api.ApiService 5 | import uk.co.mycompany.api.model.IpAddress 6 | import javax.inject.Inject 7 | import javax.inject.Singleton 8 | 9 | @Singleton 10 | class Repository @Inject constructor(private val apiService: ApiService) { 11 | 12 | fun getDataFromApi(): Single = apiService.getJsonResponse() 13 | 14 | } -------------------------------------------------------------------------------- /app/src/test/java/uk/co/mycompany/ExampleUnitTest.java: -------------------------------------------------------------------------------- 1 | package uk.co.mycompany; 2 | 3 | import org.junit.Test; 4 | 5 | import static org.junit.Assert.*; 6 | 7 | /** 8 | * Example local unit test, which will execute on the development machine (host). 9 | * 10 | * @see Testing documentation 11 | */ 12 | public class ExampleUnitTest { 13 | @Test 14 | public void addition_isCorrect() throws Exception { 15 | assertEquals(4, 2 + 2); 16 | } 17 | } -------------------------------------------------------------------------------- /app/src/main/java/uk/co/mycompany/ui/main/di/MainActivityModule.kt: -------------------------------------------------------------------------------- 1 | package uk.co.mycompany.ui.main.di 2 | 3 | import dagger.Module 4 | import dagger.Provides 5 | import uk.co.mycompany.repository.Repository 6 | import uk.co.mycompany.ui.main.MainActivityViewModel 7 | import uk.co.mycompany.util.SchedulerProvider 8 | 9 | @Module 10 | class MainActivityModule { 11 | 12 | @Provides 13 | fun provideViewModel(repository: Repository, schedulerProvider: SchedulerProvider) = MainActivityViewModel(repository, schedulerProvider) 14 | } -------------------------------------------------------------------------------- /app/src/main/java/uk/co/mycompany/ui/main/MainActivityViewModel.kt: -------------------------------------------------------------------------------- 1 | package uk.co.mycompany.ui.main 2 | 3 | import io.reactivex.Single 4 | import uk.co.mycompany.api.model.IpAddress 5 | import uk.co.mycompany.repository.Repository 6 | import uk.co.mycompany.util.SchedulerProvider 7 | 8 | class MainActivityViewModel(private val repository: Repository, private val schedulerProvider: SchedulerProvider) { 9 | 10 | fun showDataFromApi(): Single = repository.getDataFromApi() 11 | .compose(schedulerProvider.getSchedulersForSingle()) 12 | } -------------------------------------------------------------------------------- /app/src/main/java/uk/co/mycompany/di/AppComponent.kt: -------------------------------------------------------------------------------- 1 | package uk.co.mycompany.di 2 | 3 | import android.app.Application 4 | import dagger.BindsInstance 5 | import dagger.Component 6 | import dagger.android.AndroidInjectionModule 7 | import uk.co.mycompany.AndroidApp 8 | import javax.inject.Singleton 9 | 10 | @Singleton 11 | @Component(modules = arrayOf(AndroidInjectionModule::class, AppModule::class, ActivityBuilder::class)) 12 | interface AppComponent { 13 | 14 | @Component.Builder 15 | interface Builder { 16 | @BindsInstance fun application(app: Application): Builder 17 | fun build(): AppComponent 18 | } 19 | 20 | fun inject(app: AndroidApp) 21 | } -------------------------------------------------------------------------------- /gradle.properties: -------------------------------------------------------------------------------- 1 | # Project-wide Gradle settings. 2 | 3 | # IDE (e.g. Android Studio) users: 4 | # Gradle settings configured through the IDE *will override* 5 | # any settings specified in this file. 6 | 7 | # For more details on how to configure your build environment visit 8 | # http://www.gradle.org/docs/current/userguide/build_environment.html 9 | 10 | # Specifies the JVM arguments used for the daemon process. 11 | # The setting is particularly useful for tweaking memory settings. 12 | org.gradle.jvmargs=-Xmx1536m 13 | 14 | # When configured, Gradle will run in incubating parallel mode. 15 | # This option should only be used with decoupled projects. More details, visit 16 | # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects 17 | # org.gradle.parallel=true 18 | -------------------------------------------------------------------------------- /app/proguard-rules.pro: -------------------------------------------------------------------------------- 1 | # Add project specific ProGuard rules here. 2 | # You can control the set of applied configuration files using the 3 | # proguardFiles setting in build.gradle. 4 | # 5 | # For more details, see 6 | # http://developer.android.com/guide/developing/tools/proguard.html 7 | 8 | # If your project uses WebView with JS, uncomment the following 9 | # and specify the fully qualified class name to the JavaScript interface 10 | # class: 11 | #-keepclassmembers class fqcn.of.javascript.interface.for.webview { 12 | # public *; 13 | #} 14 | 15 | # Uncomment this to preserve the line number information for 16 | # debugging stack traces. 17 | #-keepattributes SourceFile,LineNumberTable 18 | 19 | # If you keep the line number information, uncomment this to 20 | # hide the original source file name. 21 | #-renamesourcefileattribute SourceFile 22 | -------------------------------------------------------------------------------- /app/src/main/java/uk/co/mycompany/AndroidApp.kt: -------------------------------------------------------------------------------- 1 | package uk.co.mycompany 2 | 3 | import android.app.Activity 4 | import android.app.Application 5 | import dagger.android.AndroidInjector 6 | import dagger.android.DispatchingAndroidInjector 7 | import dagger.android.HasActivityInjector 8 | import uk.co.mycompany.di.DaggerAppComponent 9 | import javax.inject.Inject 10 | 11 | class AndroidApp: Application(), HasActivityInjector { 12 | 13 | @Inject lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector 14 | 15 | override fun onCreate() { 16 | super.onCreate() 17 | 18 | DaggerAppComponent.builder() 19 | .application(this) 20 | .build() 21 | .inject(this) 22 | } 23 | 24 | override fun activityInjector(): AndroidInjector = activityDispatchingAndroidInjector 25 | } -------------------------------------------------------------------------------- /app/src/androidTest/java/uk/co/mycompany/ExampleInstrumentedTest.java: -------------------------------------------------------------------------------- 1 | package uk.co.mycompany; 2 | 3 | import android.content.Context; 4 | import android.support.test.InstrumentationRegistry; 5 | import android.support.test.runner.AndroidJUnit4; 6 | 7 | import org.junit.Test; 8 | import org.junit.runner.RunWith; 9 | 10 | import static org.junit.Assert.*; 11 | 12 | /** 13 | * Instrumented test, which will execute on an Android device. 14 | * 15 | * @see Testing documentation 16 | */ 17 | @RunWith(AndroidJUnit4.class) 18 | public class ExampleInstrumentedTest { 19 | @Test 20 | public void useAppContext() throws Exception { 21 | // Context of the app under test. 22 | Context appContext = InstrumentationRegistry.getTargetContext(); 23 | 24 | assertEquals("uk.co.mycompany", appContext.getPackageName()); 25 | } 26 | } 27 | -------------------------------------------------------------------------------- /app/src/main/AndroidManifest.xml: -------------------------------------------------------------------------------- 1 | 2 | 4 | 5 | 6 | 7 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | -------------------------------------------------------------------------------- /app/src/main/java/uk/co/mycompany/ui/main/MainActivity.kt: -------------------------------------------------------------------------------- 1 | package uk.co.mycompany.ui.main 2 | 3 | import android.os.Bundle 4 | import android.util.Log 5 | import dagger.android.DaggerActivity 6 | import io.reactivex.disposables.CompositeDisposable 7 | import io.reactivex.rxkotlin.subscribeBy 8 | 9 | import uk.co.mycompany.R 10 | import javax.inject.Inject 11 | 12 | class MainActivity: DaggerActivity() { 13 | 14 | private val compositeDisposable by lazy { CompositeDisposable() } 15 | 16 | @Inject lateinit var mainActivityViewModel: MainActivityViewModel 17 | 18 | override fun onCreate(savedInstanceState: Bundle?) { 19 | super.onCreate(savedInstanceState) 20 | setContentView(R.layout.activity_main) 21 | 22 | compositeDisposable.add(mainActivityViewModel.showDataFromApi() 23 | .subscribeBy(onSuccess = { 24 | Log.d("MainActivity", it.ip) 25 | }, onError = { 26 | Log.d("MainActivity", it.message) 27 | })) 28 | } 29 | 30 | override fun onDestroy() { 31 | super.onDestroy() 32 | compositeDisposable.clear() 33 | compositeDisposable.dispose() 34 | } 35 | } 36 | -------------------------------------------------------------------------------- /app/src/main/java/uk/co/mycompany/util/SchedulerProvider.kt: -------------------------------------------------------------------------------- 1 | package uk.co.mycompany.util 2 | 3 | import io.reactivex.* 4 | 5 | class SchedulerProvider(val backgroundScheduler: Scheduler, val foregroundScheduler: Scheduler) { 6 | 7 | fun getSchedulersForObservable(): (Observable) -> Observable { 8 | return { observable: Observable -> 9 | observable.subscribeOn(backgroundScheduler) 10 | .observeOn(foregroundScheduler) 11 | } 12 | } 13 | 14 | fun getSchedulersForSingle(): (Single) -> Single { 15 | return { single: Single -> 16 | single.subscribeOn(backgroundScheduler) 17 | .observeOn(foregroundScheduler) 18 | } 19 | } 20 | 21 | fun getSchedulersForCompletable(): (Completable) -> Completable { 22 | return { completable: Completable -> 23 | completable.subscribeOn(backgroundScheduler) 24 | .observeOn(foregroundScheduler) 25 | } 26 | } 27 | 28 | fun getSchedulersForFlowable(): (Flowable) -> Flowable { 29 | return { flowable: Flowable -> 30 | flowable.subscribeOn(backgroundScheduler) 31 | .observeOn(foregroundScheduler) 32 | } 33 | } 34 | } -------------------------------------------------------------------------------- /app/src/main/res/layout/activity_main.xml: -------------------------------------------------------------------------------- 1 | 2 | 8 | 9 | 18 | 19 |