klnusbaum · friederbluemle · Jun 23, 2016 · Jun 23, 2016 · Sep 29, 2016 · Jun 23, 2016
diff --git a/.gitignore b/.gitignore
@@ -1,31 +1,16 @@
-# Built application files
-*.apk
-*.ap_
-
-# Files for the Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-
 # Gradle files
 .gradle/
 build/
-/*/build/
 
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Proguard folder generated by Eclipse
-proguard/
+# IntelliJ project files
+*.iml
+.idea/
 
-# Log Files
-*.log
+# Android Studio captures folder
+captures/
 
-# IDEA files
-*.iml
-*.idea
+# Misc
+.DS_Store
diff --git a/LICENSE b/LICENSE
@@ -337,4 +337,3 @@ proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
-
diff --git a/app/.gitignore b/app/.gitignore
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "kurtis.rx.androidexamples"
         minSdkVersion 21
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -22,8 +22,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:recyclerview-v7:23.1.1'
-    compile 'io.reactivex:rxandroid:1.1.0'
-    compile 'io.reactivex:rxjava:1.1.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'io.reactivex:rxandroid:1.2.1'
+    compile 'io.reactivex:rxjava:1.2.7'
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in /usr/local/opt/android-sdk/tools/proguard/proguard-android.txt
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
 # directive in build.gradle.
 #

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -50,4 +50,3 @@
     </application>
 
 </manifest>
-
diff --git a/app/src/main/java/kurtis/rx/androidexamples/ExampleActivityAndName.java b/app/src/main/java/kurtis/rx/androidexamples/ExampleActivityAndName.java
@@ -17,4 +17,3 @@ public ExampleActivityAndName(
         mExampleName = exampleName;
     }
 }
-
diff --git a/app/src/main/java/kurtis/rx/androidexamples/ExampleAdapter.java b/app/src/main/java/kurtis/rx/androidexamples/ExampleAdapter.java
@@ -32,12 +32,13 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     }
 
     @Override
-    public void onBindViewHolder(final ViewHolder holder, final int position) {
+    public void onBindViewHolder(final ViewHolder holder, int position) {
         holder.mNameDisplay.setText(mExamples.get(position).mExampleName);
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent exampleIntent = new Intent(mContext, mExamples.get(position).mExampleActivityClass);
+                Intent exampleIntent = new Intent(mContext,
+                        mExamples.get(holder.getAdapterPosition()).mExampleActivityClass);
                 mContext.startActivity(exampleIntent);
             }
         });

diff --git a/app/src/main/java/kurtis/rx/androidexamples/SimpleStringAdapter.java b/app/src/main/java/kurtis/rx/androidexamples/SimpleStringAdapter.java
@@ -36,12 +36,12 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     }
 
     @Override
-    public void onBindViewHolder(ViewHolder holder, final int position) {
+    public void onBindViewHolder(final ViewHolder holder, int position) {
         holder.mColorDisplay.setText(mStrings.get(position));
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Toast.makeText(mContext, mStrings.get(position), Toast.LENGTH_SHORT).show();
+                Toast.makeText(mContext, mStrings.get(holder.getAdapterPosition()), Toast.LENGTH_SHORT).show();
             }
         });
     }

diff --git a/app/src/main/res/layout/activity_example_1.xml b/app/src/main/res/layout/activity_example_1.xml
@@ -9,4 +9,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         />
-</FrameLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/activity_example_2.xml b/app/src/main/res/layout/activity_example_2.xml
@@ -19,4 +19,4 @@
         android:visibility="gone"
         />
 
-</FrameLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/activity_example_4.xml b/app/src/main/res/layout/activity_example_4.xml
@@ -31,4 +31,4 @@
         android:textSize="18sp"
         />
 
-</RelativeLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_example_5.xml b/app/src/main/res/layout/activity_example_5.xml
@@ -13,4 +13,4 @@
         android:layout_gravity="center"
         android:textSize="20sp"
         />
-</FrameLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/activity_example_6.xml b/app/src/main/res/layout/activity_example_6.xml
@@ -37,4 +37,4 @@
             />
     </FrameLayout>
 
-</LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/example_list_item.xml b/app/src/main/res/layout/example_list_item.xml
@@ -17,4 +17,4 @@
         android:paddingTop="16dp"
         android:textSize="18sp"
         />
-</FrameLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/string_list_item.xml b/app/src/main/res/layout/string_list_item.xml
@@ -13,4 +13,4 @@
         android:padding="16dp"
         android:textSize="20sp"
         />
-</FrameLayout>
+</FrameLayout>
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle.properties b/gradle.properties
@@ -10,9 +10,9 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat May 07 13:52:22 PDT 2016
+#Tue Apr 11 18:25:53 SGT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
Original file line number	Diff line number	Diff line change
Expand Up		@@ -337,4 +337,3 @@ proprietary programs. If your program is a subroutine library, you may
		consider it more useful to permit linking proprietary applications with the
		library. If this is what you want to do, use the GNU Lesser General
		Public License instead of this License.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,3 @@ public ExampleActivityAndName(
		mExampleName = exampleName;
		}
		}