Renamed project, added ASPM

QuasselDroidNG/build.gradle → app/build.gradle

-plugins {
-    id "me.tatarka.retrolambda" version "3.2.4"
-}
-
 apply plugin: 'com.android.application'
+apply plugin: 'com.neenbedankt.android-apt'
+apply plugin: 'me.tatarka.retrolambda'
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 'Google Inc.:Google APIs:23'
     buildToolsVersion "23.0.2"
 
     defaultConfig {
@@ -17,9 +15,9 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            //minifyEnabled true
+            //shrinkResources true
+            //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 
             applicationVariants.all { variant ->
                 variant.outputs.each { output ->
@@ -47,13 +45,11 @@ android {
     }
 }
 
-if (project.hasProperty("Android.signing")
-        && new File((String) project.property("Android.signing") + ".gradle").exists()) {
-    apply from: project.property("Android.signing") + ".gradle";
-}
+
 
 dependencies {
     testCompile 'junit:junit:4.12'
+
     compile('com.mikepenz:materialdrawer:5.0.0.fastAdapter.b5-SNAPSHOT@aar') {
         transitive = true
     }
@@ -66,16 +62,23 @@ dependencies {
     compile('com.github.afollestad.material-dialogs:commons:0.8.5.3@aar') {
         transitive = true
     }
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:design:23.1.1'
-    compile 'com.jakewharton:butterknife:7.0.1'
     compile 'com.google.guava:guava:19.0'
+    compile 'de.greenrobot:eventbus:2.4.0'
+
     compile 'joda-time:joda-time:2.9.1'
     compile 'org.joda:joda-convert:1.8'
-    compile 'de.greenrobot:eventbus:2.4.0'
     compile 'com.bignerdranch.android:expandablerecyclerview:2.0.4'
     compile 'com.sothree.slidinguppanel:library:3.2.1'
+
+    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:design:23.1.1'
     compile 'com.android.support:support-v4:23.1.1'
     compile 'com.android.support:recyclerview-v7:23.1.1'
     compile 'com.android.support:cardview-v7:23.1.1'
+
+    compile files('libs/aspm-annotations.jar')
+    apt files('libs/aspm-compiler.jar')
+
+    compile 'com.jakewharton:butterknife:8.0.0-SNAPSHOT'
+    apt 'com.jakewharton:butterknife-compiler:8.0.0-SNAPSHOT'
 }

QuasselDroidNG/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml

@@ -6,24 +6,24 @@
 
     <application
         android:allowBackup="true"
-        android:fullBackupContent="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppCompat.Light">
+        android:theme="@style/AppTheme.Light">
+
         <service android:name=".service.QuasselService" />
 
         <activity
             android:name=".ui.chat.ChatActivity"
             android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@style/Quassel">
+            android:launchMode="singleTask"
+            android:theme="@style/AppTheme.Light">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
     </application>
 
 </manifest>