Merge pull request #22 from Connexions/material

Change to Material design
Connexions · Oct 26, 2016 · 3825921 · 3825921
2 parents 14ef086 + 85fd98b
commit 3825921
Show file tree

Hide file tree

Showing 233 changed files with 1,754 additions and 1,691 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,29 +1,32 @@
 apply plugin: 'com.android.application'
-apply from: '../config/quality.gradle'
+//apply from: '../config/quality.gradle'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
     project.archivesBaseName = "CNXAndroid";
 
     defaultConfig {
         applicationId "org.cnx.android"
-        minSdkVersion 14
-        targetSdkVersion 21
-        versionCode 34
-        versionName "5.1"
+        minSdkVersion 19
+        targetSdkVersion 23
+        versionCode 35
+        versionName "6.0"
     }
     dependencies{
-        compile 'com.android.support:support-v4:22.2.0'
-        compile 'com.android.support:appcompat-v7:22.2.0'
-        compile 'com.android.support:recyclerview-v7:22.2.0'
-        compile 'com.android.support:cardview-v7:22.2.0'
+        compile 'com.android.support:appcompat-v7:23.4.0'
+        compile 'com.android.support:design:23.4.0'
+        compile 'com.android.support:support-v4:23.4.0'
+        compile 'com.android.support:recyclerview-v7:23.4.0'
+        compile 'com.android.support:cardview-v7:23.4.0'
+        compile 'com.google.code.gson:gson:2.7'
     }
 
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-cnx-app.pro'
             applicationVariants.all { variant ->
                 variant.outputs.each { output ->
                     output.outputFile = new File(output.outputFile.parent, output.outputFile.name.replace(".apk", "-" + defaultConfig.versionName + ".apk"))

diff --git a/app/proguard-cnx-app.pro b/app/proguard-cnx-app.pro
@@ -0,0 +1,36 @@
+## GSON 2.2.4 specific rules ##
+
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+-keepattributes EnclosingMethod
+
+# Gson specific classes
+-keep class sun.misc.Unsafe { *; }
+-keep class com.google.gson.stream.** { *; }
+
+-keep public class android.support.v7.widget.** { *; }
+-keep public class android.support.v7.internal.widget.** { *; }
+-keep public class android.support.v7.internal.view.menu.** { *; }
+
+-keep public class * extends android.support.v4.view.ActionProvider {
+    public <init>(android.content.Context);
+}
+
+# http://stackoverflow.com/questions/29679177/cardview-shadow-not-appearing-in-lollipop-after-obfuscate-with-proguard/29698051
+-keep class android.support.v7.widget.RoundRectDrawable { *; }
+
+# support design library
+-dontwarn android.support.design.**
+-keep class android.support.design.** { *; }
+-keep interface android.support.design.** { *; }
+-keep public class android.support.design.R$* { *; }
+
+-keep class android.support.v7.** { *; }
+-keep interface android.support.v7.** { *; }
+
+-keep class org.cnx.android.** {*;}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -16,17 +16,17 @@
         <provider android:name="org.cnx.android.providers.NotesProvider" android:authorities="org.cnx.android.providers.NotesProvider" />
         <activity android:name=".activity.LandingActivity"
                   android:label="@string/app_name"
-                  android:theme="@style/Theme.LensWindow"
+                  android:theme="@style/AppTheme.NoActionBar"
                   android:windowSoftInputMode="stateUnchanged">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.WebViewActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|screenSize|orientation" />
-        <activity android:name=".activity.FileBrowserActivity" android:label="@string/app_name" android:theme="@style/Theme.FavsWindow"/>
-        <activity android:name=".activity.ViewFavsActivity" android:label="@string/app_name" android:theme="@style/Theme.LensWindow"/>
-        <activity android:name=".activity.NoteEditorActivity" android:label="@string/app_name" android:theme="@style/Theme.FavsWindow"/>
+        <activity android:name=".activity.WebViewActivity" android:theme="@style/AppTheme.NoActionBar" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|screenSize|orientation" />
+        <activity android:name=".activity.FileBrowserActivity" android:label="@string/app_name" android:theme="@style/AppTheme.NoActionBar"/>
+        <activity android:name=".activity.ViewFavsActivity" android:label="@string/app_name" android:theme="@style/AppTheme.NoActionBar"/>
+        <activity android:name=".activity.NoteEditorActivity" android:label="@string/app_name" android:theme="@style/AppTheme.NoActionBar"/>
         <service android:name=".service.DownloadService"/>
     </application>