Merge branch 'release/1.0.0'

pluscubed · Oct 11, 2015 · ce0f409 · ce0f409
2 parents 7145ab0 + 8e744da
commit ce0f409
Show file tree

Hide file tree

Showing 24 changed files with 2,439 additions and 3,200 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,20 +12,21 @@ apply plugin: 'io.fabric'
 
 repositories {
     maven { url 'https://maven.fabric.io/public' }
+    maven { url "https://jitpack.io" }
 }
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
-        applicationId "com.pluscubed.logcat"
-        minSdkVersion 14
+        applicationId "com.pluscubed.matlog"
+        minSdkVersion 16
         targetSdkVersion 22
-        versionName '1.0.0-beta'
-        versionCode 1
+        versionName '1.0.0'
+        versionCode 2
 
-        testApplicationId "com.pluscubed.logcat.test"
+        testApplicationId "com.pluscubed.matlog.test"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
 
         manifestPlaceholders = [appName: "@string/app_name"]
@@ -63,10 +64,10 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:22.+'
-    compile 'com.android.support:support-annotations:22.+'
-    compile 'com.android.support:design:22.+'
-    compile 'com.afollestad:material-dialogs:0.+'
+    compile 'com.android.support:appcompat-v7:23.+'
+    compile 'com.android.support:support-annotations:23.+'
+    compile 'com.android.support:design:23.+'
+    compile 'com.afollestad.material-dialogs:core:0.+'
     compile('com.crashlytics.sdk.android:crashlytics:2.+@aar') {
         transitive = true;
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -5,8 +5,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_LOGS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <!--  'Sup Koush: https://plus.google.com/103583939320326217147/posts/T9xnMJEnzf1 -->
     <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
 
     <application

diff --git a/app/src/main/java/com/pluscubed/logcat/ui/LogcatActivity.java b/app/src/main/java/com/pluscubed/logcat/ui/LogcatActivity.java
@@ -17,6 +17,7 @@
 import android.support.annotation.WorkerThread;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.CursorAdapter;
 import android.support.v4.widget.SimpleCursorAdapter;
@@ -584,7 +585,7 @@ public void onClick(View v) {
                                 startMainLog();
                             }
                         })
-                        .setActionTextColor(R.color.accent)
+                        .setActionTextColor(ContextCompat.getColor(this, R.color.accent))
                         .show();
                 return true;
 

diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/raw-fr/about_body.htm b/app/src/main/res/raw-fr/about_body.htm
diff --git a/app/src/main/res/raw-ja/about_body.htm b/app/src/main/res/raw-ja/about_body.htm
diff --git a/app/src/main/res/raw-sv/about_body.htm b/app/src/main/res/raw-sv/about_body.htm
diff --git a/app/src/main/res/raw/changelog.htm b/app/src/main/res/raw/changelog.htm
@@ -1,14 +1,13 @@
 <hr/>
 
 <p></p><h2>Changelog</h2>
-<i>1.0.0-beta</i>
+<i>1.0.0</i>
 <ul>
-    <li>Initial MatLog beta release! Woohoo!</li>
-    <li>Material awesomeness all the way across the sky.</li>
-    <li>That meme above is still relevant.</li>
+    <li>Initial release!</li>
+    <li>Material goodness.</li>
 </ul>
-
-<h2>CatLog Changelog</h2>
+<br/>
+<h2>Original CatLog Changelog</h2>
 <i>1.6.0</i>
 <ul>
     <li>Dutch translations by <a href='mailto:wimaen@gmail.com'>Wim N (wimaen)</a>.</li>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml