diff --git a/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/Themes.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/Themes.java
deleted file mode 100644
index edc8b5b8941aeb7e19b0c3e217fa5ccb0f7391d1..0000000000000000000000000000000000000000
--- a/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/Themes.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package de.kuschku.quasseldroid_ng.ui;
-
-import android.support.annotation.StyleRes;
-
-import de.kuschku.quasseldroid_ng.R;
-
-public enum Themes {
- QUASSEL(R.style.Quassel),
- MATERIAL_DARK(R.style.Material_Dark),
- MATERIAL_LIGHT(R.style.Material_Light);
-
- public final int themeId;
-
- Themes(@StyleRes int themeId) {
- this.themeId = themeId;
- }
-}
diff --git a/QuasselDroidNG/build.gradle b/app/build.gradle
similarity index 81%
rename from QuasselDroidNG/build.gradle
rename to app/build.gradle
index 157b8001e0dceeaeba9021baf4e8cb6560bf717a..398dbe5194b7095fa958057c1ddffdeb675d64ad 100644
--- a/QuasselDroidNG/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,9 @@
-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'
}
diff --git a/QuasselDroidNG/proguard-rules.pro b/app/proguard-rules.pro
similarity index 99%
rename from QuasselDroidNG/proguard-rules.pro
rename to app/proguard-rules.pro
index 78c26c21dc92c46a29ceab489426fb18ab9511af..59129d0e12abc8d9b3558d13e31c97b42df76ee9 100644
--- a/QuasselDroidNG/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -61,4 +61,4 @@
-keepclassmembers class * extends de.greenrobot.event.util.ThrowableFailureEvent {
<init>(java.lang.Throwable);
-}
\ No newline at end of file
+}
diff --git a/QuasselDroidNG/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 81%
rename from QuasselDroidNG/src/main/AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
index d7a742c152955384023ad508d5b2259495f50b0f..fe1d777f2d4bd61d7f62ac63f50655255c8b7506 100644
--- a/QuasselDroidNG/src/main/AndroidManifest.xml
+++ b/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>
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/BusProvider.java b/app/src/main/java/de/kuschku/libquassel/BusProvider.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/BusProvider.java
rename to app/src/main/java/de/kuschku/libquassel/BusProvider.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/Client.java b/app/src/main/java/de/kuschku/libquassel/Client.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/Client.java
rename to app/src/main/java/de/kuschku/libquassel/Client.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/ClientData.java b/app/src/main/java/de/kuschku/libquassel/ClientData.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/ClientData.java
rename to app/src/main/java/de/kuschku/libquassel/ClientData.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/CoreConnection.java b/app/src/main/java/de/kuschku/libquassel/CoreConnection.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/CoreConnection.java
rename to app/src/main/java/de/kuschku/libquassel/CoreConnection.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/IProtocolHandler.java b/app/src/main/java/de/kuschku/libquassel/IProtocolHandler.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/IProtocolHandler.java
rename to app/src/main/java/de/kuschku/libquassel/IProtocolHandler.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/ProtocolHandler.java b/app/src/main/java/de/kuschku/libquassel/ProtocolHandler.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/ProtocolHandler.java
rename to app/src/main/java/de/kuschku/libquassel/ProtocolHandler.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/backlogmanagers/BacklogManager.java b/app/src/main/java/de/kuschku/libquassel/backlogmanagers/BacklogManager.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/backlogmanagers/BacklogManager.java
rename to app/src/main/java/de/kuschku/libquassel/backlogmanagers/BacklogManager.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/backlogmanagers/SimpleBacklogManager.java b/app/src/main/java/de/kuschku/libquassel/backlogmanagers/SimpleBacklogManager.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/backlogmanagers/SimpleBacklogManager.java
rename to app/src/main/java/de/kuschku/libquassel/backlogmanagers/SimpleBacklogManager.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/BacklogReceivedEvent.java b/app/src/main/java/de/kuschku/libquassel/events/BacklogReceivedEvent.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/BacklogReceivedEvent.java
rename to app/src/main/java/de/kuschku/libquassel/events/BacklogReceivedEvent.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/ConnectionChangeEvent.java b/app/src/main/java/de/kuschku/libquassel/events/ConnectionChangeEvent.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/ConnectionChangeEvent.java
rename to app/src/main/java/de/kuschku/libquassel/events/ConnectionChangeEvent.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/CoreSetupFailedEvent.java b/app/src/main/java/de/kuschku/libquassel/events/CoreSetupFailedEvent.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/CoreSetupFailedEvent.java
rename to app/src/main/java/de/kuschku/libquassel/events/CoreSetupFailedEvent.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/CoreSetupSuccessfulEvent.java b/app/src/main/java/de/kuschku/libquassel/events/CoreSetupSuccessfulEvent.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/CoreSetupSuccessfulEvent.java
rename to app/src/main/java/de/kuschku/libquassel/events/CoreSetupSuccessfulEvent.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/GeneralErrorEvent.java b/app/src/main/java/de/kuschku/libquassel/events/GeneralErrorEvent.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/GeneralErrorEvent.java
rename to app/src/main/java/de/kuschku/libquassel/events/GeneralErrorEvent.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/HandshakeFailedEvent.java b/app/src/main/java/de/kuschku/libquassel/events/HandshakeFailedEvent.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/HandshakeFailedEvent.java
rename to app/src/main/java/de/kuschku/libquassel/events/HandshakeFailedEvent.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/LoginFailedEvent.java b/app/src/main/java/de/kuschku/libquassel/events/LoginFailedEvent.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/LoginFailedEvent.java
rename to app/src/main/java/de/kuschku/libquassel/events/LoginFailedEvent.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/LoginSuccessfulEvent.java b/app/src/main/java/de/kuschku/libquassel/events/LoginSuccessfulEvent.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/LoginSuccessfulEvent.java
rename to app/src/main/java/de/kuschku/libquassel/events/LoginSuccessfulEvent.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/StatusMessageEvent.java b/app/src/main/java/de/kuschku/libquassel/events/StatusMessageEvent.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/StatusMessageEvent.java
rename to app/src/main/java/de/kuschku/libquassel/events/StatusMessageEvent.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/exceptions/SyncInvocationException.java b/app/src/main/java/de/kuschku/libquassel/exceptions/SyncInvocationException.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/exceptions/SyncInvocationException.java
rename to app/src/main/java/de/kuschku/libquassel/exceptions/SyncInvocationException.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/exceptions/UnknownTypeException.java b/app/src/main/java/de/kuschku/libquassel/exceptions/UnknownTypeException.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/exceptions/UnknownTypeException.java
rename to app/src/main/java/de/kuschku/libquassel/exceptions/UnknownTypeException.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/FunctionType.java b/app/src/main/java/de/kuschku/libquassel/functions/FunctionType.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/FunctionType.java
rename to app/src/main/java/de/kuschku/libquassel/functions/FunctionType.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/FunctionSerializer.java b/app/src/main/java/de/kuschku/libquassel/functions/serializers/FunctionSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/FunctionSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/functions/serializers/FunctionSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/InitDataFunctionSerializer.java b/app/src/main/java/de/kuschku/libquassel/functions/serializers/InitDataFunctionSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/InitDataFunctionSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/functions/serializers/InitDataFunctionSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/InitRequestFunctionSerializer.java b/app/src/main/java/de/kuschku/libquassel/functions/serializers/InitRequestFunctionSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/InitRequestFunctionSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/functions/serializers/InitRequestFunctionSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/PackedInitDataFunctionSerializer.java b/app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedInitDataFunctionSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/PackedInitDataFunctionSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedInitDataFunctionSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/PackedRpcCallFunctionSerializer.java b/app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedRpcCallFunctionSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/PackedRpcCallFunctionSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedRpcCallFunctionSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/PackedSyncFunctionSerializer.java b/app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedSyncFunctionSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/PackedSyncFunctionSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedSyncFunctionSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedInitDataFunctionSerializer.java b/app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedInitDataFunctionSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedInitDataFunctionSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedInitDataFunctionSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedRpcCallFunctionSerializer.java b/app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedRpcCallFunctionSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedRpcCallFunctionSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedRpcCallFunctionSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedSyncFunctionSerializer.java b/app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedSyncFunctionSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedSyncFunctionSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedSyncFunctionSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/HandshakeFunction.java b/app/src/main/java/de/kuschku/libquassel/functions/types/HandshakeFunction.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/HandshakeFunction.java
rename to app/src/main/java/de/kuschku/libquassel/functions/types/HandshakeFunction.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/InitDataFunction.java b/app/src/main/java/de/kuschku/libquassel/functions/types/InitDataFunction.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/InitDataFunction.java
rename to app/src/main/java/de/kuschku/libquassel/functions/types/InitDataFunction.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/InitRequestFunction.java b/app/src/main/java/de/kuschku/libquassel/functions/types/InitRequestFunction.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/InitRequestFunction.java
rename to app/src/main/java/de/kuschku/libquassel/functions/types/InitRequestFunction.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/PackedFunction.java b/app/src/main/java/de/kuschku/libquassel/functions/types/PackedFunction.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/PackedFunction.java
rename to app/src/main/java/de/kuschku/libquassel/functions/types/PackedFunction.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/PackedInitDataFunction.java b/app/src/main/java/de/kuschku/libquassel/functions/types/PackedInitDataFunction.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/PackedInitDataFunction.java
rename to app/src/main/java/de/kuschku/libquassel/functions/types/PackedInitDataFunction.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/RpcCallFunction.java b/app/src/main/java/de/kuschku/libquassel/functions/types/RpcCallFunction.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/RpcCallFunction.java
rename to app/src/main/java/de/kuschku/libquassel/functions/types/RpcCallFunction.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/SerializedFunction.java b/app/src/main/java/de/kuschku/libquassel/functions/types/SerializedFunction.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/SerializedFunction.java
rename to app/src/main/java/de/kuschku/libquassel/functions/types/SerializedFunction.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/SyncFunction.java b/app/src/main/java/de/kuschku/libquassel/functions/types/SyncFunction.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/SyncFunction.java
rename to app/src/main/java/de/kuschku/libquassel/functions/types/SyncFunction.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/UnpackedFunction.java b/app/src/main/java/de/kuschku/libquassel/functions/types/UnpackedFunction.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/UnpackedFunction.java
rename to app/src/main/java/de/kuschku/libquassel/functions/types/UnpackedFunction.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/UnpackedInitDataFunction.java b/app/src/main/java/de/kuschku/libquassel/functions/types/UnpackedInitDataFunction.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/UnpackedInitDataFunction.java
rename to app/src/main/java/de/kuschku/libquassel/functions/types/UnpackedInitDataFunction.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/Buffer.java b/app/src/main/java/de/kuschku/libquassel/localtypes/Buffer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/Buffer.java
rename to app/src/main/java/de/kuschku/libquassel/localtypes/Buffer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/Buffers.java b/app/src/main/java/de/kuschku/libquassel/localtypes/Buffers.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/Buffers.java
rename to app/src/main/java/de/kuschku/libquassel/localtypes/Buffers.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/ChannelBuffer.java b/app/src/main/java/de/kuschku/libquassel/localtypes/ChannelBuffer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/ChannelBuffer.java
rename to app/src/main/java/de/kuschku/libquassel/localtypes/ChannelBuffer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/QueryBuffer.java b/app/src/main/java/de/kuschku/libquassel/localtypes/QueryBuffer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/QueryBuffer.java
rename to app/src/main/java/de/kuschku/libquassel/localtypes/QueryBuffer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/StatusBuffer.java b/app/src/main/java/de/kuschku/libquassel/localtypes/StatusBuffer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/StatusBuffer.java
rename to app/src/main/java/de/kuschku/libquassel/localtypes/StatusBuffer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/message/Message.java b/app/src/main/java/de/kuschku/libquassel/message/Message.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/message/Message.java
rename to app/src/main/java/de/kuschku/libquassel/message/Message.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/MessageTypeRegistry.java b/app/src/main/java/de/kuschku/libquassel/objects/MessageTypeRegistry.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/MessageTypeRegistry.java
rename to app/src/main/java/de/kuschku/libquassel/objects/MessageTypeRegistry.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitAckSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitAckSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitAckSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitAckSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitRejectSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitRejectSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitRejectSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitRejectSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginAckSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginAckSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginAckSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginAckSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginRejectSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginRejectSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginRejectSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginRejectSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupAckSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupAckSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupAckSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupAckSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupDataSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupDataSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupDataSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupDataSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupRejectSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupRejectSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupRejectSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupRejectSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/NetworkServerSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/NetworkServerSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/NetworkServerSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/NetworkServerSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ObjectSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/ObjectSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ObjectSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/ObjectSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/SessionInitSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/SessionInitSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/SessionInitSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/SessionInitSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/SessionStateSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/SessionStateSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/SessionStateSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/SessionStateSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/SetupDataInitializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/SetupDataInitializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/SetupDataInitializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/SetupDataInitializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/StorageBackendSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/StorageBackendSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/StorageBackendSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/StorageBackendSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/StringObjectMapSerializer.java b/app/src/main/java/de/kuschku/libquassel/objects/serializers/StringObjectMapSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/StringObjectMapSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/serializers/StringObjectMapSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientInit.java b/app/src/main/java/de/kuschku/libquassel/objects/types/ClientInit.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientInit.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/ClientInit.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientInitAck.java b/app/src/main/java/de/kuschku/libquassel/objects/types/ClientInitAck.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientInitAck.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/ClientInitAck.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientInitReject.java b/app/src/main/java/de/kuschku/libquassel/objects/types/ClientInitReject.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientInitReject.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/ClientInitReject.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientLogin.java b/app/src/main/java/de/kuschku/libquassel/objects/types/ClientLogin.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientLogin.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/ClientLogin.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginAck.java b/app/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginAck.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginAck.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginAck.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginReject.java b/app/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginReject.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginReject.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginReject.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupAck.java b/app/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupAck.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupAck.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupAck.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupData.java b/app/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupData.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupData.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupData.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupReject.java b/app/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupReject.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupReject.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupReject.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/NetworkServer.java b/app/src/main/java/de/kuschku/libquassel/objects/types/NetworkServer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/NetworkServer.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/NetworkServer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/SessionInit.java b/app/src/main/java/de/kuschku/libquassel/objects/types/SessionInit.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/SessionInit.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/SessionInit.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/SessionState.java b/app/src/main/java/de/kuschku/libquassel/objects/types/SessionState.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/SessionState.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/SessionState.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/SetupData.java b/app/src/main/java/de/kuschku/libquassel/objects/types/SetupData.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/SetupData.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/SetupData.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/StorageBackend.java b/app/src/main/java/de/kuschku/libquassel/objects/types/StorageBackend.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/StorageBackend.java
rename to app/src/main/java/de/kuschku/libquassel/objects/types/StorageBackend.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/QMetaType.java b/app/src/main/java/de/kuschku/libquassel/primitives/QMetaType.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/QMetaType.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/QMetaType.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/QMetaTypeRegistry.java b/app/src/main/java/de/kuschku/libquassel/primitives/QMetaTypeRegistry.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/QMetaTypeRegistry.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/QMetaTypeRegistry.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/BoolSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/BoolSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/BoolSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/BoolSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/BufferInfoSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/BufferInfoSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/BufferInfoSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/BufferInfoSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteArraySerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteArraySerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteArraySerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteArraySerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/CharSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/CharSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/CharSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/CharSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/DateTimeSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/DateTimeSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/DateTimeSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/DateTimeSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/IntSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/IntSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/IntSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/IntSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/LongSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/LongSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/LongSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/LongSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/MessageSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/MessageSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/MessageSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/MessageSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/PrimitiveSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/PrimitiveSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/PrimitiveSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/PrimitiveSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ProtocolSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/ProtocolSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ProtocolSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/ProtocolSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ShortSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/ShortSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ShortSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/ShortSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/StringListSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/StringListSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/StringListSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/StringListSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/StringSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/StringSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/StringSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/StringSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/TimeSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/TimeSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/TimeSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/TimeSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/UserTypeSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/UserTypeSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/UserTypeSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/UserTypeSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantListSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantListSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantListSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantListSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantMapSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantMapSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantMapSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantMapSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantVariantListSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantVariantListSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantVariantListSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantVariantListSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VoidSerializer.java b/app/src/main/java/de/kuschku/libquassel/primitives/serializers/VoidSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VoidSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/serializers/VoidSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/types/BufferInfo.java b/app/src/main/java/de/kuschku/libquassel/primitives/types/BufferInfo.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/types/BufferInfo.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/types/BufferInfo.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/types/Protocol.java b/app/src/main/java/de/kuschku/libquassel/primitives/types/Protocol.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/types/Protocol.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/types/Protocol.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/types/QVariant.java b/app/src/main/java/de/kuschku/libquassel/primitives/types/QVariant.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/types/QVariant.java
rename to app/src/main/java/de/kuschku/libquassel/primitives/types/QVariant.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/protocols/DatastreamPeer.java b/app/src/main/java/de/kuschku/libquassel/protocols/DatastreamPeer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/protocols/DatastreamPeer.java
rename to app/src/main/java/de/kuschku/libquassel/protocols/DatastreamPeer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/protocols/LegacyPeer.java b/app/src/main/java/de/kuschku/libquassel/protocols/LegacyPeer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/protocols/LegacyPeer.java
rename to app/src/main/java/de/kuschku/libquassel/protocols/LegacyPeer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/protocols/RemotePeer.java b/app/src/main/java/de/kuschku/libquassel/protocols/RemotePeer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/protocols/RemotePeer.java
rename to app/src/main/java/de/kuschku/libquassel/protocols/RemotePeer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/Syncable.java b/app/src/main/java/de/kuschku/libquassel/syncables/Syncable.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/Syncable.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/Syncable.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/SyncableRegistry.java b/app/src/main/java/de/kuschku/libquassel/syncables/SyncableRegistry.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/SyncableRegistry.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/SyncableRegistry.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferSyncerSerializer.java b/app/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferSyncerSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferSyncerSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferSyncerSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewConfigSerializer.java b/app/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewConfigSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewConfigSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewConfigSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewManagerSerializer.java b/app/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewManagerSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewManagerSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewManagerSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/IdentitySerializer.java b/app/src/main/java/de/kuschku/libquassel/syncables/serializers/IdentitySerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/IdentitySerializer.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/serializers/IdentitySerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcChannelSerializer.java b/app/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcChannelSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcChannelSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcChannelSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcUserSerializer.java b/app/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcUserSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcUserSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcUserSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/NetworkSerializer.java b/app/src/main/java/de/kuschku/libquassel/syncables/serializers/NetworkSerializer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/NetworkSerializer.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/serializers/NetworkSerializer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/BufferSyncer.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/BufferSyncer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/BufferSyncer.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/types/BufferSyncer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewConfig.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewConfig.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewConfig.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewConfig.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewManager.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewManager.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewManager.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewManager.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/Identity.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/Identity.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/Identity.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/types/Identity.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/IrcChannel.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/IrcChannel.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/IrcChannel.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/types/IrcChannel.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/IrcUser.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/IrcUser.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/IrcUser.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/types/IrcUser.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/Network.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/Network.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/Network.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/types/Network.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/SyncableObject.java b/app/src/main/java/de/kuschku/libquassel/syncables/types/SyncableObject.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/SyncableObject.java
rename to app/src/main/java/de/kuschku/libquassel/syncables/types/SyncableObject.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/service/ClientBackgroundThread.java b/app/src/main/java/de/kuschku/quasseldroid_ng/service/ClientBackgroundThread.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/service/ClientBackgroundThread.java
rename to app/src/main/java/de/kuschku/quasseldroid_ng/service/ClientBackgroundThread.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.java b/app/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.java
rename to app/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/AppTheme.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/AppTheme.java
new file mode 100644
index 0000000000000000000000000000000000000000..12b8d76aab57301a56bcf5adf1387d049377efd5
--- /dev/null
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/AppTheme.java
@@ -0,0 +1,32 @@
+package de.kuschku.quasseldroid_ng.ui;
+
+import android.support.annotation.StyleRes;
+
+import de.kuschku.quasseldroid_ng.R;
+
+public enum AppTheme {
+ QUASSEL(R.style.Quassel),
+ MATERIAL_DARK(R.style.Material_Dark),
+ MATERIAL_LIGHT(R.style.Material_Light);
+
+ public final int themeId;
+
+ AppTheme(@StyleRes int themeId) {
+ this.themeId = themeId;
+ }
+
+ public static int resFromString(String s) {
+ return themeFromString(s).themeId;
+ }
+
+ public static AppTheme themeFromString(String s) {
+ if (s == null) s = "";
+ switch (s) {
+ case "MATERIAL_DARK": return MATERIAL_DARK;
+ case "MATERIAL_LIGHT": return MATERIAL_LIGHT;
+
+ default:
+ case "QUASSEL": return QUASSEL;
+ }
+ }
+}
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.java
similarity index 89%
rename from QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.java
rename to app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.java
index 5e8698c125f1ade3f8eb9fd35c4f5b0fa06bb767..9e55b5786f71b4751e7126d0d4fd077acc7c940e 100644
--- a/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.java
@@ -1,9 +1,7 @@
package de.kuschku.quasseldroid_ng.ui.chat;
import android.content.ComponentName;
-import android.content.Context;
import android.content.ServiceConnection;
-import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.IBinder;
import android.support.annotation.IntRange;
@@ -29,15 +27,23 @@ import com.mikepenz.fastadapter.FastAdapter;
import com.mikepenz.materialize.util.UIUtils;
import com.sothree.slidinguppanel.SlidingUpPanelLayout;
+import aspm.OnChangeListener;
+import aspm.PreferenceElement;
+import aspm.StringPreference;
+import aspm.annotations.Preference;
+import aspm.annotations.PreferenceWrapper;
import butterknife.Bind;
import butterknife.ButterKnife;
import de.kuschku.quasseldroid_ng.BuildConfig;
import de.kuschku.quasseldroid_ng.R;
import de.kuschku.quasseldroid_ng.service.ClientBackgroundThread;
import de.kuschku.quasseldroid_ng.service.QuasselService;
+import de.kuschku.quasseldroid_ng.ui.AppTheme;
+import de.kuschku.quasseldroid_ng.ui.chat.chatview.MessageAdapter;
import de.kuschku.util.DrawerUtils;
import de.kuschku.util.instancestateutil.Storable;
import de.kuschku.util.instancestateutil.Store;
+import de.kuschku.util.observables.AutoScroller;
import static de.kuschku.util.AndroidAssert.assertNotNull;
import static de.kuschku.util.AndroidAssert.assertTrue;
@@ -46,34 +52,55 @@ import static de.kuschku.util.AndroidAssert.assertTrue;
public class ChatActivity extends AppCompatActivity {
@NonNull
private final Status status = new Status();
+
@Bind(R.id.drawer_left)
DrawerLayout drawerLeft;
+
@Bind(R.id.navigation_left)
NavigationView navigationLeft;
+
@Bind(R.id.toolbar)
Toolbar toolbar;
+
@Bind(R.id.sliding_layout)
SlidingUpPanelLayout slidingLayout;
+
@Bind(R.id.chatline)
AppCompatEditText chatline;
+
@Bind(R.id.send)
AppCompatImageButton send;
+
@Bind(R.id.msg_history)
RecyclerView msgHistory;
+
@Bind(R.id.swipe_view)
SwipeRefreshLayout swipeView;
+
@Bind(R.id.messages)
RecyclerView messages;
+
@Bind(R.id.navigation_header_container)
RelativeLayout navigationHeaderContainer;
+
@Bind(R.id.buffer_view_spinner)
AppCompatSpinner bufferViewSpinner;
+
+
+ WrappedSettings settings;
+ @PreferenceWrapper(BuildConfig.APPLICATION_ID)
+ public static abstract class Settings {
+ String theme;
+ boolean fullHostmask;
+ int textSize;
+ }
+
@Nullable
private QuasselService.LocalBinder binder;
+
@Nullable
private ClientBackgroundThread backgroundThread;
- private SharedPreferences preferences;
- @Nullable
+
private ServiceConnection serviceConnection = new ServiceConnection() {
@UiThread
public void onServiceConnected(@NonNull ComponentName cn, @NonNull IBinder service) {
@@ -100,8 +127,8 @@ public class ChatActivity extends AppCompatActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
- preferences = getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE);
- setTheme(R.style.Quassel);
+ settings = new WrappedSettings(this);
+ setTheme(AppTheme.resFromString(settings.theme.get()));
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
@@ -117,7 +144,7 @@ public class ChatActivity extends AppCompatActivity {
messages.setLayoutManager(new LinearLayoutManager(this));
messages.setItemAnimator(new DefaultItemAnimator());
- messages.setAdapter(new FastAdapter<>());
+ messages.setAdapter(new MessageAdapter(this, new AutoScroller(messages)));
msgHistory.setLayoutManager(new LinearLayoutManager(this));
msgHistory.setItemAnimator(new DefaultItemAnimator());
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/ChatMessageRenderer.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/ChatMessageRenderer.java
similarity index 94%
rename from QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/ChatMessageRenderer.java
rename to app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/ChatMessageRenderer.java
index 2f227abdb475e3fb43ef6009cfa5269eb9cc127c..28b3d4c71a0e42a528e3c9012b1a7be20d51d2fc 100644
--- a/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/ChatMessageRenderer.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/ChatMessageRenderer.java
@@ -1,6 +1,7 @@
package de.kuschku.quasseldroid_ng.ui.chat.chatview;
import android.content.Context;
+import android.content.SharedPreferences;
import android.graphics.Typeface;
import android.support.annotation.ColorInt;
import android.support.annotation.NonNull;
@@ -13,7 +14,9 @@ import org.joda.time.format.DateTimeFormatter;
import de.kuschku.libquassel.Client;
import de.kuschku.libquassel.localtypes.Buffer;
import de.kuschku.libquassel.message.Message;
+import de.kuschku.quasseldroid_ng.BuildConfig;
import de.kuschku.quasseldroid_ng.R;
+import de.kuschku.quasseldroid_ng.ui.AppTheme;
import de.kuschku.util.annotationbind.AutoBinder;
import de.kuschku.util.annotationbind.AutoString;
import de.kuschku.util.irc.IrcFormatHelper;
@@ -30,23 +33,36 @@ public class ChatMessageRenderer {
private final DateTimeFormatter format;
@NonNull
private final FormatStrings strings;
- @NonNull
- private final IrcFormatHelper helper;
- @NonNull
- private final MessageStyleContainer highlightStyle;
- @NonNull
- private final MessageStyleContainer serverStyle;
- @NonNull
- private final MessageStyleContainer actionStyle;
- @NonNull
- private final MessageStyleContainer plainStyle;
+
+ private IrcFormatHelper helper;
+ private MessageStyleContainer highlightStyle;
+ private MessageStyleContainer serverStyle;
+ private MessageStyleContainer actionStyle;
+ private MessageStyleContainer plainStyle;
+
@Nullable
private Client client;
- private boolean fullHostmask = false;
+
+ //@NonNull
+ //private final SharedPreferences preferences;
+
public ChatMessageRenderer(@NonNull Context ctx) {
- ThemeUtil themeUtil = new ThemeUtil(ctx);
+ this(ctx, new ThemeUtil(ctx));
+ }
+
+ public ChatMessageRenderer(@NonNull Context ctx, @NonNull AppTheme theme) {
+ this(ctx, new ThemeUtil(ctx, theme));
+ }
+
+ public ChatMessageRenderer(@NonNull Context ctx, @NonNull ThemeUtil themeUtil) {
+ //this.preferences = ctx.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE);
+
this.format = DateFormatHelper.getTimeFormatter(ctx);
this.strings = new FormatStrings(ctx);
+ setTheme(themeUtil);
+ }
+
+ public void setTheme(ThemeUtil themeUtil) {
this.helper = new IrcFormatHelper(themeUtil.colors);
this.highlightStyle = new MessageStyleContainer(
@@ -99,7 +115,7 @@ public class ChatMessageRenderer {
@NonNull
private CharSequence formatNick(@NonNull String hostmask) {
- return formatNick(hostmask, fullHostmask);
+ return formatNick(hostmask, true);
}
@NonNull
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/MessageAdapter.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/MessageAdapter.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/MessageAdapter.java
rename to app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/MessageAdapter.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/MessageViewHolder.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/MessageViewHolder.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/MessageViewHolder.java
rename to app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/MessageViewHolder.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/drawer/BufferWrapper.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/drawer/BufferWrapper.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/drawer/BufferWrapper.java
rename to app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/drawer/BufferWrapper.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/drawer/NetworkWrapper.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/drawer/NetworkWrapper.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/drawer/NetworkWrapper.java
rename to app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/drawer/NetworkWrapper.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/AndroidAssert.java b/app/src/main/java/de/kuschku/util/AndroidAssert.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/AndroidAssert.java
rename to app/src/main/java/de/kuschku/util/AndroidAssert.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/CompatibilityUtils.java b/app/src/main/java/de/kuschku/util/CompatibilityUtils.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/CompatibilityUtils.java
rename to app/src/main/java/de/kuschku/util/CompatibilityUtils.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/DrawerUtils.java b/app/src/main/java/de/kuschku/util/DrawerUtils.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/DrawerUtils.java
rename to app/src/main/java/de/kuschku/util/DrawerUtils.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/Objects.java b/app/src/main/java/de/kuschku/util/Objects.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/Objects.java
rename to app/src/main/java/de/kuschku/util/Objects.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/ReflectionUtils.java b/app/src/main/java/de/kuschku/util/ReflectionUtils.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/ReflectionUtils.java
rename to app/src/main/java/de/kuschku/util/ReflectionUtils.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/ServerAddress.java b/app/src/main/java/de/kuschku/util/ServerAddress.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/ServerAddress.java
rename to app/src/main/java/de/kuschku/util/ServerAddress.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/annotationbind/AutoBinder.java b/app/src/main/java/de/kuschku/util/annotationbind/AutoBinder.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/annotationbind/AutoBinder.java
rename to app/src/main/java/de/kuschku/util/annotationbind/AutoBinder.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/annotationbind/AutoColor.java b/app/src/main/java/de/kuschku/util/annotationbind/AutoColor.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/annotationbind/AutoColor.java
rename to app/src/main/java/de/kuschku/util/annotationbind/AutoColor.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/annotationbind/AutoString.java b/app/src/main/java/de/kuschku/util/annotationbind/AutoString.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/annotationbind/AutoString.java
rename to app/src/main/java/de/kuschku/util/annotationbind/AutoString.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/backports/Absent.java b/app/src/main/java/de/kuschku/util/backports/Absent.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/backports/Absent.java
rename to app/src/main/java/de/kuschku/util/backports/Absent.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/backports/BinaryFunction.java b/app/src/main/java/de/kuschku/util/backports/BinaryFunction.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/backports/BinaryFunction.java
rename to app/src/main/java/de/kuschku/util/backports/BinaryFunction.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/backports/Consumer.java b/app/src/main/java/de/kuschku/util/backports/Consumer.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/backports/Consumer.java
rename to app/src/main/java/de/kuschku/util/backports/Consumer.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/backports/ICollector.java b/app/src/main/java/de/kuschku/util/backports/ICollector.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/backports/ICollector.java
rename to app/src/main/java/de/kuschku/util/backports/ICollector.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/backports/Optional.java b/app/src/main/java/de/kuschku/util/backports/Optional.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/backports/Optional.java
rename to app/src/main/java/de/kuschku/util/backports/Optional.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/backports/Optionals.java b/app/src/main/java/de/kuschku/util/backports/Optionals.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/backports/Optionals.java
rename to app/src/main/java/de/kuschku/util/backports/Optionals.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/backports/Present.java b/app/src/main/java/de/kuschku/util/backports/Present.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/backports/Present.java
rename to app/src/main/java/de/kuschku/util/backports/Present.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/backports/Stream.java b/app/src/main/java/de/kuschku/util/backports/Stream.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/backports/Stream.java
rename to app/src/main/java/de/kuschku/util/backports/Stream.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/backports/collectors/Collectors.java b/app/src/main/java/de/kuschku/util/backports/collectors/Collectors.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/backports/collectors/Collectors.java
rename to app/src/main/java/de/kuschku/util/backports/collectors/Collectors.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/backports/collectors/ListCollector.java b/app/src/main/java/de/kuschku/util/backports/collectors/ListCollector.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/backports/collectors/ListCollector.java
rename to app/src/main/java/de/kuschku/util/backports/collectors/ListCollector.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/backports/collectors/MapCollector.java b/app/src/main/java/de/kuschku/util/backports/collectors/MapCollector.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/backports/collectors/MapCollector.java
rename to app/src/main/java/de/kuschku/util/backports/collectors/MapCollector.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/instancestateutil/Storable.java b/app/src/main/java/de/kuschku/util/instancestateutil/Storable.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/instancestateutil/Storable.java
rename to app/src/main/java/de/kuschku/util/instancestateutil/Storable.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/instancestateutil/Store.java b/app/src/main/java/de/kuschku/util/instancestateutil/Store.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/instancestateutil/Store.java
rename to app/src/main/java/de/kuschku/util/instancestateutil/Store.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/irc/IrcFormatHelper.java b/app/src/main/java/de/kuschku/util/irc/IrcFormatHelper.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/irc/IrcFormatHelper.java
rename to app/src/main/java/de/kuschku/util/irc/IrcFormatHelper.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/irc/IrcUserUtils.java b/app/src/main/java/de/kuschku/util/irc/IrcUserUtils.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/irc/IrcUserUtils.java
rename to app/src/main/java/de/kuschku/util/irc/IrcUserUtils.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/niohelpers/WrappedChannel.java b/app/src/main/java/de/kuschku/util/niohelpers/WrappedChannel.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/niohelpers/WrappedChannel.java
rename to app/src/main/java/de/kuschku/util/niohelpers/WrappedChannel.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/AutoScroller.java b/app/src/main/java/de/kuschku/util/observables/AutoScroller.java
similarity index 80%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/AutoScroller.java
rename to app/src/main/java/de/kuschku/util/observables/AutoScroller.java
index 5d6171842560dcda907b2df5ac5caa736910fb87..4134952582ac1d1c732ab3c86e2345e85d4c0225 100644
--- a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/AutoScroller.java
+++ b/app/src/main/java/de/kuschku/util/observables/AutoScroller.java
@@ -7,6 +7,10 @@ public class AutoScroller {
private final RecyclerView recyclerView;
private final LinearLayoutManager manager;
+ public AutoScroller(RecyclerView recyclerView) {
+ this(recyclerView, (LinearLayoutManager) recyclerView.getLayoutManager());
+ }
+
public AutoScroller(RecyclerView recyclerView, LinearLayoutManager manager) {
this.recyclerView = recyclerView;
this.manager = manager;
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/ContentComparable.java b/app/src/main/java/de/kuschku/util/observables/ContentComparable.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/ContentComparable.java
rename to app/src/main/java/de/kuschku/util/observables/ContentComparable.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/IObservable.java b/app/src/main/java/de/kuschku/util/observables/IObservable.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/IObservable.java
rename to app/src/main/java/de/kuschku/util/observables/IObservable.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/ElementCallback.java b/app/src/main/java/de/kuschku/util/observables/callbacks/ElementCallback.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/ElementCallback.java
rename to app/src/main/java/de/kuschku/util/observables/callbacks/ElementCallback.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/UICallback.java b/app/src/main/java/de/kuschku/util/observables/callbacks/UICallback.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/UICallback.java
rename to app/src/main/java/de/kuschku/util/observables/callbacks/UICallback.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/UIChildCallback.java b/app/src/main/java/de/kuschku/util/observables/callbacks/UIChildCallback.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/UIChildCallback.java
rename to app/src/main/java/de/kuschku/util/observables/callbacks/UIChildCallback.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/UIChildParentCallback.java b/app/src/main/java/de/kuschku/util/observables/callbacks/UIChildParentCallback.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/UIChildParentCallback.java
rename to app/src/main/java/de/kuschku/util/observables/callbacks/UIChildParentCallback.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/UIParentCallback.java b/app/src/main/java/de/kuschku/util/observables/callbacks/UIParentCallback.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/UIParentCallback.java
rename to app/src/main/java/de/kuschku/util/observables/callbacks/UIParentCallback.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/AdapterUICallbackWrapper.java b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/AdapterUICallbackWrapper.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/AdapterUICallbackWrapper.java
rename to app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/AdapterUICallbackWrapper.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/ChildUICallbackWrapper.java b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/ChildUICallbackWrapper.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/ChildUICallbackWrapper.java
rename to app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/ChildUICallbackWrapper.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiElementCallbackWrapper.java b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiElementCallbackWrapper.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiElementCallbackWrapper.java
rename to app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiElementCallbackWrapper.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUICallbackWrapper.java b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUICallbackWrapper.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUICallbackWrapper.java
rename to app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUICallbackWrapper.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUIChildCallback.java b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUIChildCallback.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUIChildCallback.java
rename to app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUIChildCallback.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUIChildParentCallback.java b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUIChildParentCallback.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUIChildParentCallback.java
rename to app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/MultiUIChildParentCallback.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/ParentUICallbackWrapper.java b/app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/ParentUICallbackWrapper.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/callbacks/wrappers/ParentUICallbackWrapper.java
rename to app/src/main/java/de/kuschku/util/observables/callbacks/wrappers/ParentUICallbackWrapper.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/lists/IObservableList.java b/app/src/main/java/de/kuschku/util/observables/lists/IObservableList.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/lists/IObservableList.java
rename to app/src/main/java/de/kuschku/util/observables/lists/IObservableList.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/lists/ObservableComparableSortedList.java b/app/src/main/java/de/kuschku/util/observables/lists/ObservableComparableSortedList.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/lists/ObservableComparableSortedList.java
rename to app/src/main/java/de/kuschku/util/observables/lists/ObservableComparableSortedList.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/lists/ObservableElementList.java b/app/src/main/java/de/kuschku/util/observables/lists/ObservableElementList.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/lists/ObservableElementList.java
rename to app/src/main/java/de/kuschku/util/observables/lists/ObservableElementList.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/lists/ObservableList.java b/app/src/main/java/de/kuschku/util/observables/lists/ObservableList.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/lists/ObservableList.java
rename to app/src/main/java/de/kuschku/util/observables/lists/ObservableList.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/observables/lists/ObservableSortedList.java b/app/src/main/java/de/kuschku/util/observables/lists/ObservableSortedList.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/observables/lists/ObservableSortedList.java
rename to app/src/main/java/de/kuschku/util/observables/lists/ObservableSortedList.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/ui/Bindable.java b/app/src/main/java/de/kuschku/util/ui/Bindable.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/ui/Bindable.java
rename to app/src/main/java/de/kuschku/util/ui/Bindable.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/ui/DateFormatHelper.java b/app/src/main/java/de/kuschku/util/ui/DateFormatHelper.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/ui/DateFormatHelper.java
rename to app/src/main/java/de/kuschku/util/ui/DateFormatHelper.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/ui/MaterialActionBarDrawerToggle.java b/app/src/main/java/de/kuschku/util/ui/MaterialActionBarDrawerToggle.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/ui/MaterialActionBarDrawerToggle.java
rename to app/src/main/java/de/kuschku/util/ui/MaterialActionBarDrawerToggle.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/ui/SpanFormatter.java b/app/src/main/java/de/kuschku/util/ui/SpanFormatter.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/ui/SpanFormatter.java
rename to app/src/main/java/de/kuschku/util/ui/SpanFormatter.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/ui/ThemeUtil.java b/app/src/main/java/de/kuschku/util/ui/ThemeUtil.java
similarity index 96%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/ui/ThemeUtil.java
rename to app/src/main/java/de/kuschku/util/ui/ThemeUtil.java
index 425dd094500a56d7fc00c24d2f0b7f7ecf6baca4..fe20887ee23fb75606361b44d8990aafa1f81ccc 100644
--- a/QuasselDroidNG/src/main/java/de/kuschku/util/ui/ThemeUtil.java
+++ b/app/src/main/java/de/kuschku/util/ui/ThemeUtil.java
@@ -7,7 +7,7 @@ import android.support.annotation.UiThread;
import android.support.v7.view.ContextThemeWrapper;
import de.kuschku.quasseldroid_ng.R;
-import de.kuschku.quasseldroid_ng.ui.Themes;
+import de.kuschku.quasseldroid_ng.ui.AppTheme;
import de.kuschku.util.annotationbind.AutoBinder;
import de.kuschku.util.annotationbind.AutoColor;
@@ -19,7 +19,7 @@ public class ThemeUtil {
initColors(new ContextThemeWrapper(ctx, ctx.getTheme()));
}
- public ThemeUtil(@NonNull Context ctx, @NonNull Themes theme) {
+ public ThemeUtil(@NonNull Context ctx, @NonNull AppTheme theme) {
initColors(new ContextThemeWrapper(ctx, theme.themeId));
}
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/ui/parcelableUtil/QVariantParcelable.java b/app/src/main/java/de/kuschku/util/ui/parcelableUtil/QVariantParcelable.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/ui/parcelableUtil/QVariantParcelable.java
rename to app/src/main/java/de/kuschku/util/ui/parcelableUtil/QVariantParcelable.java
diff --git a/QuasselDroidNG/src/main/java/de/kuschku/util/ui/parcelableUtil/StorageBackendParcelable.java b/app/src/main/java/de/kuschku/util/ui/parcelableUtil/StorageBackendParcelable.java
similarity index 100%
rename from QuasselDroidNG/src/main/java/de/kuschku/util/ui/parcelableUtil/StorageBackendParcelable.java
rename to app/src/main/java/de/kuschku/util/ui/parcelableUtil/StorageBackendParcelable.java
diff --git a/QuasselDroidNG/src/main/res/drawable-hdpi/ic_send.png b/app/src/main/res/drawable-hdpi/ic_send.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-hdpi/ic_send.png
rename to app/src/main/res/drawable-hdpi/ic_send.png
diff --git a/QuasselDroidNG/src/main/res/drawable-hdpi/ic_server_dark.png b/app/src/main/res/drawable-hdpi/ic_server_dark.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-hdpi/ic_server_dark.png
rename to app/src/main/res/drawable-hdpi/ic_server_dark.png
diff --git a/QuasselDroidNG/src/main/res/drawable-hdpi/ic_server_light.png b/app/src/main/res/drawable-hdpi/ic_server_light.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-hdpi/ic_server_light.png
rename to app/src/main/res/drawable-hdpi/ic_server_light.png
diff --git a/QuasselDroidNG/src/main/res/drawable-hdpi/ic_status.png b/app/src/main/res/drawable-hdpi/ic_status.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-hdpi/ic_status.png
rename to app/src/main/res/drawable-hdpi/ic_status.png
diff --git a/QuasselDroidNG/src/main/res/drawable-hdpi/ic_status_channel.png b/app/src/main/res/drawable-hdpi/ic_status_channel.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-hdpi/ic_status_channel.png
rename to app/src/main/res/drawable-hdpi/ic_status_channel.png
diff --git a/QuasselDroidNG/src/main/res/drawable-hdpi/ic_status_channel_offline.png b/app/src/main/res/drawable-hdpi/ic_status_channel_offline.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-hdpi/ic_status_channel_offline.png
rename to app/src/main/res/drawable-hdpi/ic_status_channel_offline.png
diff --git a/QuasselDroidNG/src/main/res/drawable-hdpi/ic_status_offline.png b/app/src/main/res/drawable-hdpi/ic_status_offline.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-hdpi/ic_status_offline.png
rename to app/src/main/res/drawable-hdpi/ic_status_offline.png
diff --git a/QuasselDroidNG/src/main/res/drawable-mdpi/ic_send.png b/app/src/main/res/drawable-mdpi/ic_send.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-mdpi/ic_send.png
rename to app/src/main/res/drawable-mdpi/ic_send.png
diff --git a/QuasselDroidNG/src/main/res/drawable-mdpi/ic_server_dark.png b/app/src/main/res/drawable-mdpi/ic_server_dark.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-mdpi/ic_server_dark.png
rename to app/src/main/res/drawable-mdpi/ic_server_dark.png
diff --git a/QuasselDroidNG/src/main/res/drawable-mdpi/ic_server_light.png b/app/src/main/res/drawable-mdpi/ic_server_light.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-mdpi/ic_server_light.png
rename to app/src/main/res/drawable-mdpi/ic_server_light.png
diff --git a/QuasselDroidNG/src/main/res/drawable-mdpi/ic_status.png b/app/src/main/res/drawable-mdpi/ic_status.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-mdpi/ic_status.png
rename to app/src/main/res/drawable-mdpi/ic_status.png
diff --git a/QuasselDroidNG/src/main/res/drawable-mdpi/ic_status_channel.png b/app/src/main/res/drawable-mdpi/ic_status_channel.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-mdpi/ic_status_channel.png
rename to app/src/main/res/drawable-mdpi/ic_status_channel.png
diff --git a/QuasselDroidNG/src/main/res/drawable-mdpi/ic_status_channel_offline.png b/app/src/main/res/drawable-mdpi/ic_status_channel_offline.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-mdpi/ic_status_channel_offline.png
rename to app/src/main/res/drawable-mdpi/ic_status_channel_offline.png
diff --git a/QuasselDroidNG/src/main/res/drawable-mdpi/ic_status_offline.png b/app/src/main/res/drawable-mdpi/ic_status_offline.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-mdpi/ic_status_offline.png
rename to app/src/main/res/drawable-mdpi/ic_status_offline.png
diff --git a/QuasselDroidNG/src/main/res/drawable-nodpi/bg.png b/app/src/main/res/drawable-nodpi/bg.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-nodpi/bg.png
rename to app/src/main/res/drawable-nodpi/bg.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_send.png b/app/src/main/res/drawable-xhdpi/ic_send.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xhdpi/ic_send.png
rename to app/src/main/res/drawable-xhdpi/ic_send.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_server_dark.png b/app/src/main/res/drawable-xhdpi/ic_server_dark.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xhdpi/ic_server_dark.png
rename to app/src/main/res/drawable-xhdpi/ic_server_dark.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_server_light.png b/app/src/main/res/drawable-xhdpi/ic_server_light.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xhdpi/ic_server_light.png
rename to app/src/main/res/drawable-xhdpi/ic_server_light.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status.png b/app/src/main/res/drawable-xhdpi/ic_status.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status.png
rename to app/src/main/res/drawable-xhdpi/ic_status.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status_channel.png b/app/src/main/res/drawable-xhdpi/ic_status_channel.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status_channel.png
rename to app/src/main/res/drawable-xhdpi/ic_status_channel.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status_channel_offline.png b/app/src/main/res/drawable-xhdpi/ic_status_channel_offline.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status_channel_offline.png
rename to app/src/main/res/drawable-xhdpi/ic_status_channel_offline.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status_offline.png b/app/src/main/res/drawable-xhdpi/ic_status_offline.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status_offline.png
rename to app/src/main/res/drawable-xhdpi/ic_status_offline.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_send.png b/app/src/main/res/drawable-xxhdpi/ic_send.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_send.png
rename to app/src/main/res/drawable-xxhdpi/ic_send.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_server_dark.png b/app/src/main/res/drawable-xxhdpi/ic_server_dark.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_server_dark.png
rename to app/src/main/res/drawable-xxhdpi/ic_server_dark.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_server_light.png b/app/src/main/res/drawable-xxhdpi/ic_server_light.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_server_light.png
rename to app/src/main/res/drawable-xxhdpi/ic_server_light.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status.png b/app/src/main/res/drawable-xxhdpi/ic_status.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status.png
rename to app/src/main/res/drawable-xxhdpi/ic_status.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status_channel.png b/app/src/main/res/drawable-xxhdpi/ic_status_channel.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status_channel.png
rename to app/src/main/res/drawable-xxhdpi/ic_status_channel.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status_channel_offline.png b/app/src/main/res/drawable-xxhdpi/ic_status_channel_offline.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status_channel_offline.png
rename to app/src/main/res/drawable-xxhdpi/ic_status_channel_offline.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status_offline.png b/app/src/main/res/drawable-xxhdpi/ic_status_offline.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status_offline.png
rename to app/src/main/res/drawable-xxhdpi/ic_status_offline.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_send.png b/app/src/main/res/drawable-xxxhdpi/ic_send.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_send.png
rename to app/src/main/res/drawable-xxxhdpi/ic_send.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_server_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_server_dark.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_server_dark.png
rename to app/src/main/res/drawable-xxxhdpi/ic_server_dark.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_server_light.png b/app/src/main/res/drawable-xxxhdpi/ic_server_light.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_server_light.png
rename to app/src/main/res/drawable-xxxhdpi/ic_server_light.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status.png b/app/src/main/res/drawable-xxxhdpi/ic_status.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status.png
rename to app/src/main/res/drawable-xxxhdpi/ic_status.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status_channel.png b/app/src/main/res/drawable-xxxhdpi/ic_status_channel.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status_channel.png
rename to app/src/main/res/drawable-xxxhdpi/ic_status_channel.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status_channel_offline.png b/app/src/main/res/drawable-xxxhdpi/ic_status_channel_offline.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status_channel_offline.png
rename to app/src/main/res/drawable-xxxhdpi/ic_status_channel_offline.png
diff --git a/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status_offline.png b/app/src/main/res/drawable-xxxhdpi/ic_status_offline.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status_offline.png
rename to app/src/main/res/drawable-xxxhdpi/ic_status_offline.png
diff --git a/QuasselDroidNG/src/main/res/drawable/popup_background_material.xml b/app/src/main/res/drawable/popup_background_material.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/drawable/popup_background_material.xml
rename to app/src/main/res/drawable/popup_background_material.xml
diff --git a/QuasselDroidNG/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/activity_main.xml
diff --git a/QuasselDroidNG/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/layout/content_main.xml
rename to app/src/main/res/layout/content_main.xml
diff --git a/QuasselDroidNG/src/main/res/layout/core_dialog.xml b/app/src/main/res/layout/core_dialog.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/layout/core_dialog.xml
rename to app/src/main/res/layout/core_dialog.xml
diff --git a/QuasselDroidNG/src/main/res/layout/drawer.xml b/app/src/main/res/layout/drawer.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/layout/drawer.xml
rename to app/src/main/res/layout/drawer.xml
diff --git a/QuasselDroidNG/src/main/res/layout/login_dialog.xml b/app/src/main/res/layout/login_dialog.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/layout/login_dialog.xml
rename to app/src/main/res/layout/login_dialog.xml
diff --git a/QuasselDroidNG/src/main/res/layout/slider_main.xml b/app/src/main/res/layout/slider_main.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/layout/slider_main.xml
rename to app/src/main/res/layout/slider_main.xml
diff --git a/QuasselDroidNG/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/layout/toolbar.xml
rename to app/src/main/res/layout/toolbar.xml
diff --git a/QuasselDroidNG/src/main/res/layout/widget_chatmessage.xml b/app/src/main/res/layout/widget_chatmessage.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/layout/widget_chatmessage.xml
rename to app/src/main/res/layout/widget_chatmessage.xml
diff --git a/QuasselDroidNG/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/menu/global.xml
rename to app/src/main/res/menu/global.xml
diff --git a/QuasselDroidNG/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/QuasselDroidNG/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/QuasselDroidNG/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/QuasselDroidNG/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/QuasselDroidNG/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from QuasselDroidNG/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/QuasselDroidNG/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/values-w820dp/dimens.xml
rename to app/src/main/res/values-w820dp/dimens.xml
diff --git a/QuasselDroidNG/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/values/attrs.xml
rename to app/src/main/res/values/attrs.xml
diff --git a/QuasselDroidNG/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/QuasselDroidNG/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/values/dimens.xml
rename to app/src/main/res/values/dimens.xml
diff --git a/QuasselDroidNG/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/values/ids.xml
rename to app/src/main/res/values/ids.xml
diff --git a/QuasselDroidNG/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 98%
rename from QuasselDroidNG/src/main/res/values/strings.xml
rename to app/src/main/res/values/strings.xml
index f59cfaad95513f5003d7285f114a149f11e2b480..052fda0a1024113b61e482038440864997ca6910 100644
--- a/QuasselDroidNG/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,11 +32,11 @@
<string name="super_long_string">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat. Consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo</string>
- <string name="title_activity_core_setup">CoreSetupActivity</string>
-
- <!-- Preferences -->
- <string name="preference_theme">preference_theme</string>
<string name="open_drawer">open</string>
<string name="close_drawer">close</string>
<string name="message_placeholder">Write a message…</string>
+
+ <!-- Preferences -->
+ <string name="preference_theme">preference_theme</string>
+ <string name="preference_full_hostmask">preference_full_hostmask</string>
</resources>
diff --git a/QuasselDroidNG/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/QuasselDroidNG/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
similarity index 100%
rename from QuasselDroidNG/src/main/res/values/themes.xml
rename to app/src/main/res/values/themes.xml
diff --git a/build.gradle b/build.gradle
index 0e466c1a905e6130da24e1f3399e90b34453c066..138ed8d3ab0557917c77fef6a5cbe02f0ad1fb97 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,9 +6,8 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:2.0.0-alpha7'
-
- // NOTE: Do not place your application dependencies here; they belong
- // in the individual module build.gradle files
+ classpath 'me.tatarka:gradle-retrolambda:3.2.4'
+ classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
}
}
diff --git a/settings.gradle b/settings.gradle
index a85e224b04883ccccaa0dd681074fb199fde2db4..e7b4def49cb53d9aa04228dd3edb14c9e635e003 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':QuasselDroidNG'
+include ':app'