Merge pull request #265 from rectangle-dbmi/default

RecyclerView + About Page
rectangle-dbmi · Dec 8, 2015 · 1832877 · 1832877
2 parents 36b3840 + 4527c0b
commit 1832877
Show file tree

Hide file tree

Showing 23 changed files with 566 additions and 622 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ apks/
 /app/build/
 /build/
 /local.properties
+/captures
diff --git a/app/app.iml b/app/app.iml
@@ -65,9 +65,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
@@ -100,21 +98,25 @@
     <orderEntry type="library" exported="" name="play-services-location-8.3.0" level="project" />
     <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
     <orderEntry type="library" exported="" name="palette-v7-23.1.1" level="project" />
+    <orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
+    <orderEntry type="library" exported="" name="retrofit-2.0.0-beta2" level="project" />
+    <orderEntry type="library" exported="" name="adapter-rxjava-2.0.0-beta2" level="project" />
     <orderEntry type="library" exported="" name="play-services-base-8.3.0" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
     <orderEntry type="library" exported="" name="rxandroid-1.0.1" level="project" />
-    <orderEntry type="library" exported="" name="retrofit-1.9.0" level="project" />
     <orderEntry type="library" exported="" name="design-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="leakcanary-android-1.3.1" level="project" />
     <orderEntry type="library" exported="" name="leakcanary-watcher-1.3.1" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="javax.annotation-10.0-b28" level="project" />
-    <orderEntry type="library" exported="" name="rxjava-1.0.15" level="project" />
     <orderEntry type="library" exported="" name="play-services-maps-8.3.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-basement-8.3.0" level="project" />
+    <orderEntry type="library" exported="" name="rxjava-1.0.16" level="project" />
     <orderEntry type="library" exported="" name="mediarouter-v7-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="leakcanary-analyzer-1.3.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
+    <orderEntry type="library" exported="" name="converter-gson-2.0.0-beta2" level="project" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "rectangledbmi.com.pittsburghrealtimetracker"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 58
-        versionName "6.0"
+        versionCode 62
+        versionName "6.4"
     }
     buildTypes {
 
@@ -56,9 +56,11 @@ dependencies {
 
     //3rd party android libraries
     compile 'io.reactivex:rxandroid:1.0.1'
-    compile 'io.reactivex:rxjava:1.0.15'
+    compile 'io.reactivex:rxjava:1.0.16'
 
-    compile 'com.squareup.retrofit:retrofit:1.9.0'
+    compile 'com.squareup.retrofit:retrofit:2.0.0-beta2'
+    compile 'com.squareup.retrofit:converter-gson:2.0.0-beta2'
+    compile 'com.squareup.retrofit:adapter-rxjava:2.0.0-beta2'
     compile 'org.glassfish:javax.annotation:10.0-b28'
 
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
@@ -72,7 +74,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'me.tatarka:gradle-retrolambda:3.2.3' // use some java 8 syntax in the project
+        classpath 'me.tatarka:gradle-retrolambda:3.2.4' // use some java 8 syntax in the project
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.11.3' // check for updates of 3rd party libs
     }
 }

diff --git a/app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/AboutActivity.java b/app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/AboutActivity.java
@@ -5,6 +5,9 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -69,12 +72,21 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 Bundle savedInstanceState) {
             View view = inflater.inflate(R.layout.fragment_about, container, false);
             TextView version = (TextView) view.findViewById(R.id.version);
+            TextView fbLink = (TextView) view.findViewById(R.id.fb_link);
+            TextView gitLink = (TextView) view.findViewById(R.id.git_link);
+            TextView emailLink = (TextView) view.findViewById(R.id.email_link);
             try {
-                version.setText(getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0).versionName);
+                fbLink.setMovementMethod(LinkMovementMethod.getInstance());
+                gitLink.setMovementMethod(LinkMovementMethod.getInstance());
+                emailLink.setMovementMethod(LinkMovementMethod.getInstance());
+                String versionText = getString(R.string.version_prefix) + " " + getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0).versionName;
+                version.setText(versionText);
             } catch (PackageManager.NameNotFoundException e) {
                 e.printStackTrace();
             }
             return view;
         }
     }
+
+
 }