Update All the Things

.gitignore

@@ -68,7 +68,4 @@ gradle-app.setting
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
 
-app/src/main/java/com/thunsaker/brevos/services/BitlyPrefs.java
-app/src/main/res/values/donotsave.xml
-
-app/libs
+donotsave.xml

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "holographlibrary"]
+	path = holographlibrary
+	url = https://github.com/thunsaker/holographlibrary
+[submodule "aboutlibraries"]
+	path = aboutlibraries
+	url = https://github.com/thunsaker/aboutlibraries

app/build.gradle

@@ -1,25 +1,25 @@
 buildscript {
     repositories {
         mavenCentral()
-        maven {
-            url 'http://download.crashlytics.com/maven'
-        }
+        maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.crashlytics.tools.gradle:crashlytics-gradle:1.+'
+        classpath 'io.fabric.tools:gradle:1.21.6'
+        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     }
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'crashlytics'
+apply plugin: 'io.fabric'
+apply plugin: 'com.neenbedankt.android-apt'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 22
+        minSdkVersion 14
+        targetSdkVersion 23
         versionCode 21
         versionName "3.2"
     }
@@ -49,21 +49,31 @@ android {
 
     buildTypes {
         debug {
-            zipAlign true
+            buildConfigField("String", "BITLY_ID", getEnv("BREVOS_BIT_ID"));
+            buildConfigField("String", "BITLY_SECRET", getEnv("BREVOS_BIT_SECRET"));
+            buildConfigField("String", "BITLY_DEFAULT_USERNAME", getEnv("BREVOS_BIT_DEFAULT_USERNAME"));
+            buildConfigField("String", "BITLY_DEFAULT_KEY", getEnv("BREVOS_BIT_DEFAULT_KEY"));
+
+            zipAlignEnabled true
             debuggable true
-            runProguard false
+            minifyEnabled false
             applicationIdSuffix ".debug"
             versionNameSuffix "-debug"
-            signingConfig signingConfigs.debugSigning
+//            signingConfig signingConfigs.debugSigning
         }
 
         release {
-            zipAlign true
+            buildConfigField("String", "BITLY_ID", getEnv("BREVOS_BIT_ID"));
+            buildConfigField("String", "BITLY_SECRET", getEnv("BREVOS_BIT_SECRET"));
+            buildConfigField("String", "BITLY_DEFAULT_USERNAME", getEnv("BREVOS_BIT_DEFAULT_USERNAME"));
+            buildConfigField("String", "BITLY_DEFAULT_KEY", getEnv("BREVOS_BIT_DEFAULT_KEY"));
+
+            zipAlignEnabled true
             debuggable false
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
 //            signingConfig signingConfigs.proReleaseSigning
-            signingConfig signingConfigs.releaseSigning
+//            signingConfig signingConfigs.releaseSigning
         }
     }
 
@@ -76,34 +86,53 @@ android {
             applicationId "com.thunsaker.BitDroid.Donate"
         }
     }
+
+    compileOptions {
+        encoding "UTF-8"
+//        sourceCompatibility JavaVersion.VERSION_1_7
+//        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 repositories {
     mavenCentral()
-    maven { url 'http://download.crashlytics.com/maven' }
+    maven { url 'https://maven.fabric.io/public' }
+}
+
+def getEnv(key, defVal = '') {
+    "\"${System.env.containsKey(key) ? System.env.get(key) : defVal}\""
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':HoloGraphLibrary')
-    compile project(':AboutLibraries')
-
-    provided 'com.squareup.dagger:dagger-compiler:1.2.1'
-
-    compile 'com.android.support:support-v4:19.+'
-    compile 'com.android.support:appcompat-v7:19.+'
-    compile 'com.google.code.gson:gson:2.2.4'
-    compile 'com.google.android.gms:play-services:+'
-    compile 'joda-time:joda-time:+'
-    compile 'com.squareup.dagger:dagger:1.2.1'
-    compile 'com.squareup.okhttp:okhttp:1.3.0'
-    compile 'com.squareup.picasso:picasso:2.2.0'
-    compile 'com.squareup.retrofit:retrofit:1.4.1'
+    compile project(':HoloGraphLibrary:HoloGraphLibrary')
 
-    compile 'com.jakewharton:butterknife:5.1.+'
-    compile 'com.nineoldandroids:library:2.4.0'
+    provided 'com.squareup.dagger:dagger-compiler:1.2.2'
+
+    apt 'com.jakewharton:butterknife-compiler:8.0.1'
+
+    compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
+        transitive = true;
+    }
 
+    compile('com.mikepenz:aboutlibraries:5.2.2@aar') {
+        transitive = true
+    }
+    compile 'com.android.support:support-v4:23.3.0'
+    compile 'com.android.support:appcompat-v7:23.3.0'
+    compile 'com.google.code.gson:gson:2.4'
+    compile 'com.google.android.gms:play-services-ads:8.4.0'
+    compile 'joda-time:joda-time:2.8.1'
+    compile 'com.squareup.dagger:dagger:1.2.2'
+    compile 'com.squareup.picasso:picasso:2.2.0'
+    compile 'com.squareup.retrofit:retrofit:1.9.0'
+    compile 'io.reactivex:rxandroid:1.1.0'
+    compile 'io.reactivex:rxjava:1.1.3'
+    compile 'com.jakewharton.rxbinding:rxbinding:0.4.0'
+    compile 'com.jakewharton:butterknife:8.0.1'
+    compile 'com.nineoldandroids:library:2.4.0'
     compile 'de.greenrobot:eventbus:2.2.0'
     compile 'com.twitter:twitter-text:1.9.0'
-    compile 'com.crashlytics.android:crashlytics:1.+'
-}
+    compile 'com.github.talenguyen:prettysharedpreferences:1.0.2'
+    compile 'com.android.support:design:23.3.0'
+}

app/fabric.properties

@@ -0,0 +1,3 @@
+#Contains API Secret used to validate your application. Commit to internal source control; avoid making secret public.
+#Thu Apr 28 16:57:49 MST 2016
+apiSecret=43b7adcf047da85d5273467d39e5e37e457e7048f6580cb9cdb6f7e6649eb186

app/proguard-rules.txt

@@ -14,9 +14,4 @@
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
-#}
-
--dontwarn butterknife.internal.**
--dontwarn com.squareup.okhttp.**
--keep class **$$ViewInjector { *; }
--keepnames class * { @butterknife.InjectView *;}
+#}

app/src/debug/res/values/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="placeholder_url_short">https://bit.ly/1W1iChF</string>
+    <string name="placholder_title">Little Astronaut Discovers Our World in Touching Father/Son Photo Project</string>
+    <string name="placeholder_url_long">http://petapixel.com/2016/04/27/little-astronaut-discovers-world-touching-photo-project/</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -5,7 +5,6 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.NFC" />
 
@@ -29,9 +28,10 @@
         </activity>
         <activity
             android:name=".brevos.ui.BitlyAuthActivity"
-            android:label="@string/title_activity_bitly_auth" />
+            android:label="@string/title_activity_bitly_auth"
+            android:theme="@style/Theme.Brevos.Bitly" />
 
-        <service android:name=".brevos.ui.BrevosPopOverService" />
+        <!--<service android:name=".brevos.ui.BrevosPopOverService" />-->
 
         <activity
             android:name=".brevos.ui.ShortenUrlReceiver"
@@ -98,29 +98,25 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.thunsaker.brevos.ui.MainActivity" />
         </activity>
-        <activity android:name="com.tundem.aboutlibraries.ui.LibsCompatActivity" />
+        <!-- <activity android:name="com.tundem.aboutlibraries.ui.LibsCompatActivity" /> -->
 
         <activity
             android:name=".brevos.ui.LinkSearchActivity"
             android:configChanges="orientation|keyboard"
             android:label="@string/title_activity_history_search"
-            android:parentActivityName="com.thunsaker.brevos.ui.HistoryActivity"
-            tools:ignore="UnusedAttribute">
+            android:parentActivityName=".brevos.ui.HistoryActivity"
+            tools:ignore="UnusedAttribute" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.thunsaker.brevos.ui.HistoryActivity" />
 
-
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
 
-
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value=".HistorySearchActivity" />
-
-
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />

app/src/main/java/com/thunsaker/android/common/dagger/BaseActivity.java

@@ -1,11 +1,11 @@
 package com.thunsaker.android.common.dagger;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 
 import dagger.ObjectGraph;
 
-public abstract class BaseActivity extends ActionBarActivity implements Injector {
+public abstract class BaseActivity extends AppCompatActivity implements Injector {
     private ObjectGraph mActivityGraph;
 
     @Override

app/src/main/java/com/thunsaker/android/common/util/Util.java

@@ -63,4 +63,10 @@ public static float convertPixelsToDp(float px,Context context){
         float dp = px / (metrics.densityDpi / 160f);
         return dp;
     }
+
+	public static String extractParamFromUrl(String url, String paramName) {
+		String queryString = url.substring(url.indexOf("?", 0)+1,url.length());
+		QueryStringParser queryStringParser = new QueryStringParser(queryString);
+		return queryStringParser.getQueryParamValue(paramName);
+	}
 }