arch components implementation

Author: fnberta

.gitignore

@@ -1,8 +1,53 @@
-.gradle
-/local.properties
-/.idea
+### Android template
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+keys.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
 *.iml
-.DS_Store
-/build
-/captures
-sqlite_scheme.sqs
+.idea/
+
+# Keystore files
+*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json

app/build.gradle

@@ -18,6 +18,9 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
+def keysProperties = new Properties()
+keysProperties.load(new FileInputStream(rootProject.file("keys.properties")))
+
 android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
@@ -37,50 +40,67 @@ android {
         }
     }
 
+    buildTypes.each {
+        it.buildConfigField 'String', 'MOVIE_DB_API_KEY', keysProperties['MovieDbApiKey']
+    }
+
     dataBinding {
         enabled = true
     }
 }
 
 ext {
     supportLibVersion = '25.3.1'
+    archComponentsVersion = '1.0.0-alpha1'
     daggerVersion = '2.7'
-    ankoVersion = '0.9.1'
-    rxBindingVersion = '1.0.0'
+    retrofitVersion = '2.3.0'
     paperParcelVersion = '2.0.1'
-    retrofitVersion = '2.1.0'
+    stethoVersion = '1.5.0'
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
     kapt 'com.android.databinding:compiler:2.3.0'
+
     compile "com.android.support:support-v4:${supportLibVersion}"
     compile "com.android.support:appcompat-v7:${supportLibVersion}"
     compile "com.android.support:design:${supportLibVersion}"
     compile "com.android.support:recyclerview-v7:${supportLibVersion}"
     compile "com.android.support:support-annotations:${supportLibVersion}"
-    compile 'com.facebook.stetho:stetho:1.5.0'
+    compile "android.arch.lifecycle:runtime:$archComponentsVersion"
+    compile "android.arch.lifecycle:extensions:$archComponentsVersion"
+    compile "android.arch.lifecycle:reactivestreams:$archComponentsVersion"
+    kapt "android.arch.lifecycle:compiler:$archComponentsVersion"
+    compile "android.arch.persistence.room:runtime:$archComponentsVersion"
+    compile "android.arch.persistence.room:rxjava2:$archComponentsVersion"
+    kapt "android.arch.persistence.room:compiler:$archComponentsVersion"
+
     compile "com.google.dagger:dagger:${daggerVersion}"
     kapt "com.google.dagger:dagger-compiler:${daggerVersion}"
     provided 'javax.annotation:jsr250-api:1.0'
-    compile 'io.reactivex:rxjava:1.2.4'
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'com.jakewharton.rxrelay:rxrelay:1.2.0'
-    compile "com.jakewharton.rxbinding:rxbinding-kotlin:${rxBindingVersion}"
-    compile "com.jakewharton.rxbinding:rxbinding-support-v4-kotlin:${rxBindingVersion}"
-    compile "com.jakewharton.rxbinding:rxbinding-appcompat-v7-kotlin:${rxBindingVersion}"
-    compile "com.jakewharton.rxbinding:rxbinding-design-kotlin:${rxBindingVersion}"
-    compile "org.jetbrains.anko:anko-common:${ankoVersion}"
-    compile "org.jetbrains.anko:anko-sqlite:${ankoVersion}"
+
+    compile 'io.reactivex.rxjava2:rxjava:2.1.0'
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    compile 'com.jakewharton.rxrelay2:rxrelay:2.0.0'
+
+    compile "com.facebook.stetho:stetho:${stethoVersion}"
+    compile "com.facebook.stetho:stetho-okhttp3:${stethoVersion}"
     compile 'com.jakewharton.timber:timber:4.5.1'
+
     compile "nz.bradcampbell:paperparcel:${paperParcelVersion}"
     compile "nz.bradcampbell:paperparcel-kotlin:${paperParcelVersion}"
     kapt "nz.bradcampbell:paperparcel-compiler:${paperParcelVersion}"
-    compile 'com.github.bumptech.glide:glide:3.7.0'
+
     compile "com.squareup.retrofit2:retrofit:${retrofitVersion}"
     compile "com.squareup.retrofit2:converter-gson:${retrofitVersion}"
-    compile "com.squareup.retrofit2:adapter-rxjava:${retrofitVersion}"
+    compile "com.squareup.retrofit2:adapter-rxjava2:${retrofitVersion}"
+
+    compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.vinaysshenoy:mugen:1.0.2'
 }

app/src/androidTest/java/ch/berta/fabio/popularmovies/DbTest.java

@@ -0,0 +1,26 @@
+package ch.berta.fabio.popularmovies;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("ch.berta.fabio.popularmovies", appContext.getPackageName());
+    }
+}

app/src/androidTest/java/ch/berta/fabio/popularmovies/ExampleInstrumentedTest.java

@@ -48,12 +48,6 @@
             android:theme="@style/AppTheme.DrawStatusBar.Explode"
             />
 
-        <provider
-            android:name=".data.storage.MovieProvider"
-            android:authorities="ch.berta.fabio.popularmovies"
-            android:enabled="true"
-            android:exported="false"
-            />
     </application>
 
 </manifest>

app/src/main/AndroidManifest.xml

@@ -0,0 +1,29 @@
+package ch.berta.fabio.popularmovies
+
+import android.animation.ObjectAnimator
+import android.widget.TextView
+import io.reactivex.Observable
+import java.text.DateFormat
+import java.util.*
+
+
+fun <T> Observable<T>.log(tag: String): Observable<T> = doOnNext { timber.log.Timber.d("$tag: $it") }
+
+private const val COLLAPSE_EXPAND_ANIM_TIME: Long = 300
+private const val MAX_LINES_EXPANDED = 500
+
+/**
+ * Expands or collapses a [TextView] by increasing or decreasing its maxLines setting.
+ *
+ * @param maxLinesCollapsed the number of lines in the collapsed state
+ */
+fun TextView.expandOrCollapse(maxLinesCollapsed: Int) {
+    val value = if (maxLines == maxLinesCollapsed) MAX_LINES_EXPANDED else maxLinesCollapsed
+    val anim = ObjectAnimator.ofInt(this, "maxLines", value)
+    anim.duration = COLLAPSE_EXPAND_ANIM_TIME
+    anim.start()
+}
+
+fun Date.formatLong(): String = DateFormat.getDateInstance(DateFormat.LONG, Locale.getDefault()).format(this)
+
+fun Date.formatShort(): String = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault()).format(this)