diff --git a/app/src/androidTest/java/de/kuschku/quasseldroid_ng/ExampleInstrumentedTest.kt b/app/src/androidTest/java/de/kuschku/quasseldroid/ExampleInstrumentedTest.kt
similarity index 94%
rename from app/src/androidTest/java/de/kuschku/quasseldroid_ng/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/de/kuschku/quasseldroid/ExampleInstrumentedTest.kt
index e100dfcad4a59127519da2a9077120419680cae5..d6985543ef2c765ee9f63b19493f25dec424acba 100644
--- a/app/src/androidTest/java/de/kuschku/quasseldroid_ng/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/de/kuschku/quasseldroid/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng
+package de.kuschku.quasseldroid
import android.support.test.InstrumentationRegistry
import android.support.test.runner.AndroidJUnit4
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 54dbdd79490a9dd78bc62b296ed151d0e1a63b6c..834766b0c9d0bd54fc30a7e6b95ebcab2c500832 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="de.kuschku.quasseldroid_ng">
+ package="de.kuschku.quasseldroid">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -8,14 +8,14 @@
<!--<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />-->
<application
- android:name=".QuasseldroidNG"
+ android:name="de.kuschku.quasseldroid.QuasseldroidNG"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/Theme.SplashTheme">
<activity
- android:name=".ui.chat.ChatActivity"
+ android:name="de.kuschku.quasseldroid.ui.chat.ChatActivity"
android:exported="true"
android:label="@string/app_name"
android:launchMode="singleTask"
@@ -34,31 +34,31 @@
</activity>
<activity
- android:name=".ui.setup.accounts.AccountSetupActivity"
+ android:name="de.kuschku.quasseldroid.ui.setup.accounts.AccountSetupActivity"
android:exported="false"
android:label="@string/app_name"
- android:parentActivityName=".ui.setup.accounts.AccountSelectionActivity"
+ android:parentActivityName="de.kuschku.quasseldroid.ui.setup.accounts.AccountSelectionActivity"
android:windowSoftInputMode="adjustResize" />
<activity
- android:name=".ui.setup.accounts.AccountEditActivity"
+ android:name="de.kuschku.quasseldroid.ui.setup.accounts.AccountEditActivity"
android:exported="false"
android:label="@string/app_name"
- android:parentActivityName=".ui.setup.accounts.AccountSelectionActivity"
+ android:parentActivityName="de.kuschku.quasseldroid.ui.setup.accounts.AccountSelectionActivity"
android:windowSoftInputMode="adjustResize" />
<activity
- android:name=".ui.settings.SettingsActivity"
+ android:name="de.kuschku.quasseldroid.ui.settings.SettingsActivity"
android:exported="false"
android:label="@string/label_settings"
- android:parentActivityName=".ui.setup.accounts.AccountSelectionActivity"
+ android:parentActivityName="de.kuschku.quasseldroid.ui.setup.accounts.AccountSelectionActivity"
android:windowSoftInputMode="adjustResize" />
<activity
- android:name=".ui.setup.accounts.AccountSelectionActivity"
+ android:name="de.kuschku.quasseldroid.ui.setup.accounts.AccountSelectionActivity"
android:exported="false"
android:label="@string/app_name"
android:windowSoftInputMode="adjustResize" />
<service
- android:name=".service.QuasselService"
+ android:name="de.kuschku.quasseldroid.service.QuasselService"
android:description="@string/connection_service_description"
android:exported="false"
android:label="@string/connection_service_title" />
diff --git a/app/src/main/java/com/robobunny/SeekBarPreference.kt b/app/src/main/java/com/robobunny/SeekBarPreference.kt
index c8489446782c62174d98d60ae30a06b2565c34cb..ba5496d66f5643c2d6450347011b8307a1ae2166 100644
--- a/app/src/main/java/com/robobunny/SeekBarPreference.kt
+++ b/app/src/main/java/com/robobunny/SeekBarPreference.kt
@@ -11,7 +11,7 @@ import android.widget.SeekBar
import android.widget.TextView
import butterknife.BindView
import butterknife.ButterKnife
-import de.kuschku.quasseldroid_ng.R
+import de.kuschku.quasseldroid.R
/*
* Copyright (c) 2015 IRCCloud, Ltd.
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/Keys.kt b/app/src/main/java/de/kuschku/quasseldroid/Keys.kt
similarity index 81%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/Keys.kt
rename to app/src/main/java/de/kuschku/quasseldroid/Keys.kt
index 4fa19496ad07605d3d768b699de5522c2cb14457..060463682953c3eb51bae954c972edf6c50b833d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/Keys.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/Keys.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng
+package de.kuschku.quasseldroid
object Keys {
object Status {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/QuasseldroidNG.kt b/app/src/main/java/de/kuschku/quasseldroid/QuasseldroidNG.kt
similarity index 86%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/QuasseldroidNG.kt
rename to app/src/main/java/de/kuschku/quasseldroid/QuasseldroidNG.kt
index 6cd6dab9ab9143a16ab07ad75fc4c8ca780b8870..6c99825b813fc8d0867cf678a0a254815f7f1dd4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/QuasseldroidNG.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/QuasseldroidNG.kt
@@ -1,19 +1,15 @@
-package de.kuschku.quasseldroid_ng
+package de.kuschku.quasseldroid
import android.app.Application
-import android.content.pm.ShortcutInfo
-import android.content.pm.ShortcutManager
-import android.graphics.drawable.Icon
import android.os.Build
import android.os.StrictMode
import android.support.v7.preference.PreferenceManager
import com.squareup.leakcanary.LeakCanary
import de.kuschku.malheur.CrashHandler
-import de.kuschku.quasseldroid_ng.util.backport.AndroidThreeTenBackport
-import de.kuschku.quasseldroid_ng.util.compatibility.AndroidCompatibilityUtils
-import de.kuschku.quasseldroid_ng.util.compatibility.AndroidLoggingHandler
-import de.kuschku.quasseldroid_ng.util.compatibility.AndroidStreamChannelFactory
-import de.kuschku.quasseldroid_ng.util.helper.systemService
+import de.kuschku.quasseldroid.util.backport.AndroidThreeTenBackport
+import de.kuschku.quasseldroid.util.compatibility.AndroidCompatibilityUtils
+import de.kuschku.quasseldroid.util.compatibility.AndroidLoggingHandler
+import de.kuschku.quasseldroid.util.compatibility.AndroidStreamChannelFactory
class QuasseldroidNG : Application() {
override fun onCreate() {
@@ -41,6 +37,7 @@ class QuasseldroidNG : Application() {
// Initialize preferences unless already set
PreferenceManager.setDefaultValues(this, R.xml.preferences, false)
+ /*
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
systemService<ShortcutManager>().dynamicShortcuts = listOf(
ShortcutInfo.Builder(this, "id1")
@@ -65,6 +62,7 @@ class QuasseldroidNG : Application() {
.build()
)
}
+ */
if (BuildConfig.DEBUG) {
StrictMode.setThreadPolicy(
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/persistence/AccountDatabase.kt b/app/src/main/java/de/kuschku/quasseldroid/persistence/AccountDatabase.kt
similarity index 97%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/persistence/AccountDatabase.kt
rename to app/src/main/java/de/kuschku/quasseldroid/persistence/AccountDatabase.kt
index e62a5c189166006ac9b3a60450399189f5003b85..37de935be22c2d04be427bbe1ec308ff79aa94fa 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/persistence/AccountDatabase.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/persistence/AccountDatabase.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.persistence
+package de.kuschku.quasseldroid.persistence
import android.arch.lifecycle.LiveData
import android.arch.persistence.room.*
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/persistence/QuasselBacklogStorage.kt b/app/src/main/java/de/kuschku/quasseldroid/persistence/QuasselBacklogStorage.kt
similarity index 97%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/persistence/QuasselBacklogStorage.kt
rename to app/src/main/java/de/kuschku/quasseldroid/persistence/QuasselBacklogStorage.kt
index f3eb2a29a827d8fddf37e6617bb4784811ce2241..f058902d30ae83cbd82b0389536243fef2350562 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/persistence/QuasselBacklogStorage.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/persistence/QuasselBacklogStorage.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.persistence
+package de.kuschku.quasseldroid.persistence
import de.kuschku.libquassel.protocol.BufferId
import de.kuschku.libquassel.protocol.Message
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/persistence/QuasselDatabase.kt b/app/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
similarity index 96%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/persistence/QuasselDatabase.kt
rename to app/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
index ca926a7d040891cd7071e06ddf0098eda05694ff..9f364514211dcd676b9a8fcf2aed1cbc1165bc2d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/persistence/QuasselDatabase.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.persistence
+package de.kuschku.quasseldroid.persistence
import android.arch.lifecycle.LiveData
import android.arch.paging.DataSource
@@ -9,8 +9,8 @@ import android.content.Context
import android.support.annotation.IntRange
import de.kuschku.libquassel.protocol.Message_Flag
import de.kuschku.libquassel.protocol.Message_Type
-import de.kuschku.quasseldroid_ng.persistence.QuasselDatabase.DatabaseMessage
-import de.kuschku.quasseldroid_ng.persistence.QuasselDatabase.Filtered
+import de.kuschku.quasseldroid.persistence.QuasselDatabase.DatabaseMessage
+import de.kuschku.quasseldroid.persistence.QuasselDatabase.Filtered
import org.threeten.bp.Instant
@Database(entities = [DatabaseMessage::class, Filtered::class], version = 3)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.kt b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt
similarity index 91%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.kt
rename to app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt
index fee16389dbc7ffe988ac99cdd05026ccf5159acd..81973c6e924edb844a04cfa0f05fa5036e4ae154 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/service/QuasselService.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.service
+package de.kuschku.quasseldroid.service
import android.annotation.SuppressLint
import android.arch.lifecycle.LifecycleService
@@ -8,20 +8,20 @@ import android.net.ConnectivityManager
import android.os.Binder
import de.kuschku.libquassel.protocol.*
import de.kuschku.libquassel.session.*
-import de.kuschku.quasseldroid_ng.BuildConfig
-import de.kuschku.quasseldroid_ng.Keys
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.persistence.AccountDatabase
-import de.kuschku.quasseldroid_ng.persistence.QuasselBacklogStorage
-import de.kuschku.quasseldroid_ng.persistence.QuasselDatabase
-import de.kuschku.quasseldroid_ng.settings.ConnectionSettings
-import de.kuschku.quasseldroid_ng.settings.Settings
-import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
-import de.kuschku.quasseldroid_ng.util.QuasseldroidNotificationManager
-import de.kuschku.quasseldroid_ng.util.compatibility.AndroidHandlerService
-import de.kuschku.quasseldroid_ng.util.helper.editApply
-import de.kuschku.quasseldroid_ng.util.helper.sharedPreferences
-import de.kuschku.quasseldroid_ng.util.helper.toLiveData
+import de.kuschku.quasseldroid.BuildConfig
+import de.kuschku.quasseldroid.Keys
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.persistence.AccountDatabase
+import de.kuschku.quasseldroid.persistence.QuasselBacklogStorage
+import de.kuschku.quasseldroid.persistence.QuasselDatabase
+import de.kuschku.quasseldroid.settings.ConnectionSettings
+import de.kuschku.quasseldroid.settings.Settings
+import de.kuschku.quasseldroid.util.AndroidHandlerThread
+import de.kuschku.quasseldroid.util.QuasseldroidNotificationManager
+import de.kuschku.quasseldroid.util.compatibility.AndroidHandlerService
+import de.kuschku.quasseldroid.util.helper.editApply
+import de.kuschku.quasseldroid.util.helper.sharedPreferences
+import de.kuschku.quasseldroid.util.helper.toLiveData
import io.reactivex.Observable
import io.reactivex.functions.BiFunction
import io.reactivex.subjects.BehaviorSubject
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/settings/AppearanceSettings.kt b/app/src/main/java/de/kuschku/quasseldroid/settings/AppearanceSettings.kt
similarity index 95%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/settings/AppearanceSettings.kt
rename to app/src/main/java/de/kuschku/quasseldroid/settings/AppearanceSettings.kt
index 4facddae802851a32ee428d2c668fcb0a03fb83d..31b2c0e941e1192fcd5fcb0fcec7bd77c30f94ea 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/settings/AppearanceSettings.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/settings/AppearanceSettings.kt
@@ -1,7 +1,7 @@
-package de.kuschku.quasseldroid_ng.settings
+package de.kuschku.quasseldroid.settings
import android.support.annotation.StyleRes
-import de.kuschku.quasseldroid_ng.R
+import de.kuschku.quasseldroid.R
data class AppearanceSettings(
val showPrefix: ShowPrefixMode = ShowPrefixMode.HIGHEST,
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/settings/BacklogSettings.kt b/app/src/main/java/de/kuschku/quasseldroid/settings/BacklogSettings.kt
similarity index 74%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/settings/BacklogSettings.kt
rename to app/src/main/java/de/kuschku/quasseldroid/settings/BacklogSettings.kt
index 0287243199a02bba066102d474e800eb44ce95b8..69d7c4b7516f589e5e89b9ac9ccf69b630edb4ba 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/settings/BacklogSettings.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/settings/BacklogSettings.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.settings
+package de.kuschku.quasseldroid.settings
data class BacklogSettings(
val dynamicAmount: Int = 150
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/settings/ConnectionSettings.kt b/app/src/main/java/de/kuschku/quasseldroid/settings/ConnectionSettings.kt
similarity index 76%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/settings/ConnectionSettings.kt
rename to app/src/main/java/de/kuschku/quasseldroid/settings/ConnectionSettings.kt
index ad0e5993bd8ecbd1df53bfc23655d2dbcc680376..68b945534e370b7f0273adc5dcb8e5a93961df67 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/settings/ConnectionSettings.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/settings/ConnectionSettings.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.settings
+package de.kuschku.quasseldroid.settings
data class ConnectionSettings(
val showNotification: Boolean = true
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/settings/Settings.kt b/app/src/main/java/de/kuschku/quasseldroid/settings/Settings.kt
similarity index 92%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/settings/Settings.kt
rename to app/src/main/java/de/kuschku/quasseldroid/settings/Settings.kt
index 24de3eb0079b2791bb07e03954855a67cf8d7f3f..9158a8b5126c3992ade4172dbc2486db941bf6d3 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/settings/Settings.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/settings/Settings.kt
@@ -1,9 +1,9 @@
-package de.kuschku.quasseldroid_ng.settings
+package de.kuschku.quasseldroid.settings
import android.content.Context
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.settings.AppearanceSettings.*
-import de.kuschku.quasseldroid_ng.util.helper.sharedPreferences
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.settings.AppearanceSettings.*
+import de.kuschku.quasseldroid.util.helper.sharedPreferences
object Settings {
fun appearance(context: Context) = context.sharedPreferences {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
similarity index 91%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
index 19baffe7bbf551ee7af837b5e76acdc0b4916ce7..ed24b2b2344d076e0b7bf50afebe8bb8cc85616f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat
+package de.kuschku.quasseldroid.ui.chat
import android.annotation.TargetApi
import android.arch.lifecycle.Observer
@@ -29,23 +29,23 @@ import de.kuschku.libquassel.quassel.syncables.interfaces.IAliasManager
import de.kuschku.libquassel.session.ConnectionState
import de.kuschku.libquassel.util.and
import de.kuschku.libquassel.util.or
-import de.kuschku.quasseldroid_ng.Keys
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.persistence.QuasselDatabase
-import de.kuschku.quasseldroid_ng.settings.BacklogSettings
-import de.kuschku.quasseldroid_ng.settings.Settings
-import de.kuschku.quasseldroid_ng.ui.chat.input.Editor
-import de.kuschku.quasseldroid_ng.ui.chat.input.MessageHistoryAdapter
-import de.kuschku.quasseldroid_ng.ui.settings.SettingsActivity
-import de.kuschku.quasseldroid_ng.ui.setup.accounts.AccountSelectionActivity
-import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
-import de.kuschku.quasseldroid_ng.util.helper.editApply
-import de.kuschku.quasseldroid_ng.util.helper.invoke
-import de.kuschku.quasseldroid_ng.util.helper.sharedPreferences
-import de.kuschku.quasseldroid_ng.util.service.ServiceBoundActivity
-import de.kuschku.quasseldroid_ng.util.ui.MaterialContentLoadingProgressBar
-import de.kuschku.quasseldroid_ng.viewmodel.QuasselViewModel
-import de.kuschku.quasseldroid_ng.viewmodel.data.AutoCompleteItem
+import de.kuschku.quasseldroid.Keys
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.persistence.QuasselDatabase
+import de.kuschku.quasseldroid.settings.BacklogSettings
+import de.kuschku.quasseldroid.settings.Settings
+import de.kuschku.quasseldroid.ui.chat.input.Editor
+import de.kuschku.quasseldroid.ui.chat.input.MessageHistoryAdapter
+import de.kuschku.quasseldroid.ui.settings.SettingsActivity
+import de.kuschku.quasseldroid.ui.setup.accounts.AccountSelectionActivity
+import de.kuschku.quasseldroid.util.AndroidHandlerThread
+import de.kuschku.quasseldroid.util.helper.editApply
+import de.kuschku.quasseldroid.util.helper.invoke
+import de.kuschku.quasseldroid.util.helper.sharedPreferences
+import de.kuschku.quasseldroid.util.service.ServiceBoundActivity
+import de.kuschku.quasseldroid.util.ui.MaterialContentLoadingProgressBar
+import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
+import de.kuschku.quasseldroid.viewmodel.data.AutoCompleteItem
class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenceChangeListener {
@BindView(R.id.drawer_layout)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ToolbarFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ToolbarFragment.kt
similarity index 83%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ToolbarFragment.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/ToolbarFragment.kt
index 466ea7ba1588e273a07266ab167eb928c2940b6e..091021b73a1e5a2a7ba4e1725f48e8beba564ddd 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ToolbarFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ToolbarFragment.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat
+package de.kuschku.quasseldroid.ui.chat
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
@@ -11,15 +11,15 @@ import butterknife.BindView
import butterknife.ButterKnife
import de.kuschku.libquassel.protocol.Buffer_Type
import de.kuschku.libquassel.util.hasFlag
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.settings.AppearanceSettings
-import de.kuschku.quasseldroid_ng.settings.Settings
-import de.kuschku.quasseldroid_ng.util.helper.visibleIf
-import de.kuschku.quasseldroid_ng.util.helper.zip
-import de.kuschku.quasseldroid_ng.util.irc.format.IrcFormatDeserializer
-import de.kuschku.quasseldroid_ng.util.service.ServiceBoundFragment
-import de.kuschku.quasseldroid_ng.util.ui.SpanFormatter
-import de.kuschku.quasseldroid_ng.viewmodel.QuasselViewModel
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.settings.AppearanceSettings
+import de.kuschku.quasseldroid.settings.Settings
+import de.kuschku.quasseldroid.util.helper.visibleIf
+import de.kuschku.quasseldroid.util.helper.zip
+import de.kuschku.quasseldroid.util.irc.format.IrcFormatDeserializer
+import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
+import de.kuschku.quasseldroid.util.ui.SpanFormatter
+import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
class ToolbarFragment : ServiceBoundFragment() {
@BindView(R.id.toolbar_title)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/buffers/BufferListAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferListAdapter.kt
similarity index 96%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/buffers/BufferListAdapter.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferListAdapter.kt
index f4ae35f242b8558d475636803097751807338695..190c4ac470be3dccfc96702e20c69a90314909b3 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/buffers/BufferListAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferListAdapter.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.buffers
+package de.kuschku.quasseldroid.ui.chat.buffers
import android.arch.lifecycle.LifecycleOwner
import android.arch.lifecycle.LiveData
@@ -21,15 +21,15 @@ import de.kuschku.libquassel.protocol.Buffer_Type
import de.kuschku.libquassel.protocol.NetworkId
import de.kuschku.libquassel.quassel.BufferInfo
import de.kuschku.libquassel.util.hasFlag
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.util.helper.getCompatDrawable
-import de.kuschku.quasseldroid_ng.util.helper.styledAttributes
-import de.kuschku.quasseldroid_ng.util.helper.visibleIf
-import de.kuschku.quasseldroid_ng.util.helper.zip
-import de.kuschku.quasseldroid_ng.viewmodel.data.BufferListItem
-import de.kuschku.quasseldroid_ng.viewmodel.data.BufferProps
-import de.kuschku.quasseldroid_ng.viewmodel.data.BufferState
-import de.kuschku.quasseldroid_ng.viewmodel.data.BufferStatus
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.util.helper.getCompatDrawable
+import de.kuschku.quasseldroid.util.helper.styledAttributes
+import de.kuschku.quasseldroid.util.helper.visibleIf
+import de.kuschku.quasseldroid.util.helper.zip
+import de.kuschku.quasseldroid.viewmodel.data.BufferListItem
+import de.kuschku.quasseldroid.viewmodel.data.BufferProps
+import de.kuschku.quasseldroid.viewmodel.data.BufferState
+import de.kuschku.quasseldroid.viewmodel.data.BufferStatus
class BufferListAdapter(
lifecycleOwner: LifecycleOwner,
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/buffers/BufferViewConfigAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigAdapter.kt
similarity index 91%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/buffers/BufferViewConfigAdapter.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigAdapter.kt
index 72ff5616d1a062cdf097182b76395c15fb272a24..df415e13a457c09baafa5a5cdc2f49ffd137d61f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/buffers/BufferViewConfigAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigAdapter.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.buffers
+package de.kuschku.quasseldroid.ui.chat.buffers
import android.arch.lifecycle.LifecycleOwner
import android.arch.lifecycle.LiveData
@@ -12,9 +12,9 @@ import android.widget.TextView
import butterknife.BindView
import butterknife.ButterKnife
import de.kuschku.libquassel.quassel.syncables.BufferViewConfig
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.util.ui.ContextThemeWrapper
-import de.kuschku.quasseldroid_ng.util.ui.RecyclerSpinnerAdapter
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.util.ui.ContextThemeWrapper
+import de.kuschku.quasseldroid.util.ui.RecyclerSpinnerAdapter
class BufferViewConfigAdapter(
lifecycleOwner: LifecycleOwner,
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/buffers/BufferViewConfigFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
similarity index 94%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/buffers/BufferViewConfigFragment.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
index e491e9592905f06211a7d9f2dbb9cab4184c70a1..46176a7715c8779ccab5d23cce19e47464bb4103 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/buffers/BufferViewConfigFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.buffers
+package de.kuschku.quasseldroid.ui.chat.buffers
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
@@ -16,17 +16,17 @@ import de.kuschku.libquassel.protocol.Message_Type
import de.kuschku.libquassel.quassel.syncables.interfaces.INetwork
import de.kuschku.libquassel.util.hasFlag
import de.kuschku.libquassel.util.minus
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.persistence.QuasselDatabase
-import de.kuschku.quasseldroid_ng.settings.AppearanceSettings
-import de.kuschku.quasseldroid_ng.settings.Settings
-import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
-import de.kuschku.quasseldroid_ng.util.helper.map
-import de.kuschku.quasseldroid_ng.util.helper.zip
-import de.kuschku.quasseldroid_ng.util.irc.format.IrcFormatDeserializer
-import de.kuschku.quasseldroid_ng.util.service.ServiceBoundFragment
-import de.kuschku.quasseldroid_ng.viewmodel.QuasselViewModel
-import de.kuschku.quasseldroid_ng.viewmodel.data.BufferHiddenState
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.persistence.QuasselDatabase
+import de.kuschku.quasseldroid.settings.AppearanceSettings
+import de.kuschku.quasseldroid.settings.Settings
+import de.kuschku.quasseldroid.util.AndroidHandlerThread
+import de.kuschku.quasseldroid.util.helper.map
+import de.kuschku.quasseldroid.util.helper.zip
+import de.kuschku.quasseldroid.util.irc.format.IrcFormatDeserializer
+import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
+import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
+import de.kuschku.quasseldroid.viewmodel.data.BufferHiddenState
class BufferViewConfigFragment : ServiceBoundFragment() {
private val handlerThread = AndroidHandlerThread("ChatList")
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/input/AutoCompleteAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteAdapter.kt
similarity index 91%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/input/AutoCompleteAdapter.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteAdapter.kt
index 367406a361199527a1004ca2428839d080ee927b..b0d61f044b5e8607600913224dc834aa62c467cf 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/input/AutoCompleteAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteAdapter.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.input
+package de.kuschku.quasseldroid.ui.chat.input
import android.graphics.drawable.Drawable
import android.support.v4.graphics.drawable.DrawableCompat
@@ -12,13 +12,13 @@ import android.widget.ImageView
import android.widget.TextView
import butterknife.BindView
import butterknife.ButterKnife
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.ui.chat.nicks.NickListAdapter.Companion.VIEWTYPE_AWAY
-import de.kuschku.quasseldroid_ng.util.helper.getCompatDrawable
-import de.kuschku.quasseldroid_ng.util.helper.styledAttributes
-import de.kuschku.quasseldroid_ng.util.helper.visibleIf
-import de.kuschku.quasseldroid_ng.viewmodel.data.AutoCompleteItem
-import de.kuschku.quasseldroid_ng.viewmodel.data.BufferStatus
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.ui.chat.nicks.NickListAdapter.Companion.VIEWTYPE_AWAY
+import de.kuschku.quasseldroid.util.helper.getCompatDrawable
+import de.kuschku.quasseldroid.util.helper.styledAttributes
+import de.kuschku.quasseldroid.util.helper.visibleIf
+import de.kuschku.quasseldroid.viewmodel.data.AutoCompleteItem
+import de.kuschku.quasseldroid.viewmodel.data.BufferStatus
class AutoCompleteAdapter(
private val clickListener: ((String) -> Unit)? = null
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/input/Editor.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/Editor.kt
similarity index 93%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/input/Editor.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/Editor.kt
index 14a3c5cff9e3672832ff09e1b914c40766e67afc..121b88468bbbec59b5d619cf898d5e1275be5ac5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/input/Editor.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/Editor.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.input
+package de.kuschku.quasseldroid.ui.chat.input
import android.arch.lifecycle.LiveData
import android.arch.lifecycle.MutableLiveData
@@ -11,14 +11,14 @@ import android.text.TextWatcher
import android.view.KeyEvent
import android.view.MenuItem
import android.view.inputmethod.EditorInfo
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.settings.AppearanceSettings
-import de.kuschku.quasseldroid_ng.settings.Settings
-import de.kuschku.quasseldroid_ng.ui.chat.ChatActivity
-import de.kuschku.quasseldroid_ng.util.helper.lastWordIndices
-import de.kuschku.quasseldroid_ng.util.helper.lineSequence
-import de.kuschku.quasseldroid_ng.util.helper.retint
-import de.kuschku.quasseldroid_ng.viewmodel.data.AutoCompleteItem
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.settings.AppearanceSettings
+import de.kuschku.quasseldroid.settings.Settings
+import de.kuschku.quasseldroid.ui.chat.ChatActivity
+import de.kuschku.quasseldroid.util.helper.lastWordIndices
+import de.kuschku.quasseldroid.util.helper.lineSequence
+import de.kuschku.quasseldroid.util.helper.retint
+import de.kuschku.quasseldroid.viewmodel.data.AutoCompleteItem
import io.reactivex.Observable
import io.reactivex.subjects.BehaviorSubject
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/input/FormatHandler.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/FormatHandler.kt
similarity index 94%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/input/FormatHandler.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/FormatHandler.kt
index 71502038656472a1758b0e5cf23f3c74da95f5b0..2fcff65f9a489765c3e7314e4d157f827cb39846 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/input/FormatHandler.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/FormatHandler.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.input
+package de.kuschku.quasseldroid.ui.chat.input
import android.graphics.Typeface
import android.support.annotation.MenuRes
@@ -11,13 +11,13 @@ import android.text.style.TypefaceSpan
import android.text.style.UnderlineSpan
import android.view.MenuItem
import android.widget.EditText
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.ui.chat.ChatActivity
-import de.kuschku.quasseldroid_ng.util.helper.lastWordIndices
-import de.kuschku.quasseldroid_ng.util.helper.lineSequence
-import de.kuschku.quasseldroid_ng.util.helper.selection
-import de.kuschku.quasseldroid_ng.util.irc.format.IrcFormatSerializer
-import de.kuschku.quasseldroid_ng.util.irc.format.spans.*
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.ui.chat.ChatActivity
+import de.kuschku.quasseldroid.util.helper.lastWordIndices
+import de.kuschku.quasseldroid.util.helper.lineSequence
+import de.kuschku.quasseldroid.util.helper.selection
+import de.kuschku.quasseldroid.util.irc.format.IrcFormatSerializer
+import de.kuschku.quasseldroid.util.irc.format.spans.*
class FormatHandler(private val editText: EditText) {
private val serializer = IrcFormatSerializer(editText.context)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/input/MessageHistoryAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/MessageHistoryAdapter.kt
similarity index 95%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/input/MessageHistoryAdapter.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/MessageHistoryAdapter.kt
index 8c784e2752e116ed748e30a54f25c2e7a8f1f8f3..7163ee05e786fe27449a1fd19bd66330c36866b5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/input/MessageHistoryAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/MessageHistoryAdapter.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.input
+package de.kuschku.quasseldroid.ui.chat.input
import android.support.v7.recyclerview.extensions.ListAdapter
import android.support.v7.util.DiffUtil
@@ -9,7 +9,7 @@ import android.view.ViewGroup
import android.widget.TextView
import butterknife.BindView
import butterknife.ButterKnife
-import de.kuschku.quasseldroid_ng.R
+import de.kuschku.quasseldroid.R
class MessageHistoryAdapter(
private val clickListener: ((CharSequence) -> Unit)? = null
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/FormattedMessage.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/FormattedMessage.kt
similarity index 70%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/FormattedMessage.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/FormattedMessage.kt
index 3427ea19c5545003d179dac24057698b05c076af..8b3495d704333b43504483c1f48b289309a86901 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/FormattedMessage.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/FormattedMessage.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.messages
+package de.kuschku.quasseldroid.ui.chat.messages
class FormattedMessage(
val id: Int,
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt
similarity index 92%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageAdapter.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt
index 1eb2082c2b26fda9a7b4178d014463c5a3d889be..8728b46294f31053dccbbfd379b8d3848e323cd8 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.messages
+package de.kuschku.quasseldroid.ui.chat.messages
import android.arch.paging.PagedListAdapter
import android.content.Context
@@ -8,9 +8,9 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import de.kuschku.libquassel.protocol.*
import de.kuschku.libquassel.util.hasFlag
-import de.kuschku.quasseldroid_ng.persistence.QuasselDatabase.DatabaseMessage
-import de.kuschku.quasseldroid_ng.settings.AppearanceSettings
-import de.kuschku.quasseldroid_ng.util.helper.getOrPut
+import de.kuschku.quasseldroid.persistence.QuasselDatabase.DatabaseMessage
+import de.kuschku.quasseldroid.settings.AppearanceSettings
+import de.kuschku.quasseldroid.util.helper.getOrPut
class MessageAdapter(
context: Context,
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
similarity index 92%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageListFragment.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
index d27154b6a587e3d8c33deb339f3c1f4f639448f8..44fc8178a0ba8eed496d67c18ce8fdf003ad9bf8 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.messages
+package de.kuschku.quasseldroid.ui.chat.messages
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
@@ -16,15 +16,15 @@ import butterknife.ButterKnife
import de.kuschku.libquassel.protocol.BufferId
import de.kuschku.libquassel.protocol.MsgId
import de.kuschku.libquassel.quassel.syncables.BufferSyncer
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.persistence.QuasselDatabase
-import de.kuschku.quasseldroid_ng.settings.AppearanceSettings
-import de.kuschku.quasseldroid_ng.settings.BacklogSettings
-import de.kuschku.quasseldroid_ng.settings.Settings
-import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
-import de.kuschku.quasseldroid_ng.util.helper.*
-import de.kuschku.quasseldroid_ng.util.service.ServiceBoundFragment
-import de.kuschku.quasseldroid_ng.viewmodel.QuasselViewModel
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.persistence.QuasselDatabase
+import de.kuschku.quasseldroid.settings.AppearanceSettings
+import de.kuschku.quasseldroid.settings.BacklogSettings
+import de.kuschku.quasseldroid.settings.Settings
+import de.kuschku.quasseldroid.util.AndroidHandlerThread
+import de.kuschku.quasseldroid.util.helper.*
+import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
+import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
class MessageListFragment : ServiceBoundFragment() {
@BindView(R.id.messages)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageRenderer.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageRenderer.kt
similarity index 82%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageRenderer.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageRenderer.kt
index 9620645f6ee05993c7062c705267df3003f4692d..e3a9f169faca6d1ca16def20d53b239cae48fc31 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/MessageRenderer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageRenderer.kt
@@ -1,9 +1,9 @@
-package de.kuschku.quasseldroid_ng.ui.chat.messages
+package de.kuschku.quasseldroid.ui.chat.messages
import android.support.annotation.LayoutRes
import de.kuschku.libquassel.protocol.Message_Type
import de.kuschku.libquassel.protocol.MsgId
-import de.kuschku.quasseldroid_ng.persistence.QuasselDatabase
+import de.kuschku.quasseldroid.persistence.QuasselDatabase
interface MessageRenderer {
@LayoutRes
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/QuasselMessageRenderer.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
similarity index 95%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/QuasselMessageRenderer.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
index 74836d7b1a4a8fd31322626d983e1c60a5fcd0cf..43a38bd33a9885942051847d7a81b81d2b2cea98 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/QuasselMessageRenderer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.messages
+package de.kuschku.quasseldroid.ui.chat.messages
import android.content.Context
import android.graphics.Typeface
@@ -14,16 +14,16 @@ import de.kuschku.libquassel.protocol.Message_Flag
import de.kuschku.libquassel.protocol.Message_Type
import de.kuschku.libquassel.protocol.MsgId
import de.kuschku.libquassel.util.hasFlag
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.persistence.QuasselDatabase
-import de.kuschku.quasseldroid_ng.settings.AppearanceSettings
-import de.kuschku.quasseldroid_ng.settings.AppearanceSettings.ColorizeNicknamesMode
-import de.kuschku.quasseldroid_ng.settings.AppearanceSettings.ShowPrefixMode
-import de.kuschku.quasseldroid_ng.util.helper.styledAttributes
-import de.kuschku.quasseldroid_ng.util.helper.visibleIf
-import de.kuschku.quasseldroid_ng.util.irc.format.IrcFormatDeserializer
-import de.kuschku.quasseldroid_ng.util.quassel.IrcUserUtils
-import de.kuschku.quasseldroid_ng.util.ui.SpanFormatter
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.persistence.QuasselDatabase
+import de.kuschku.quasseldroid.settings.AppearanceSettings
+import de.kuschku.quasseldroid.settings.AppearanceSettings.ColorizeNicknamesMode
+import de.kuschku.quasseldroid.settings.AppearanceSettings.ShowPrefixMode
+import de.kuschku.quasseldroid.util.helper.styledAttributes
+import de.kuschku.quasseldroid.util.helper.visibleIf
+import de.kuschku.quasseldroid.util.irc.format.IrcFormatDeserializer
+import de.kuschku.quasseldroid.util.quassel.IrcUserUtils
+import de.kuschku.quasseldroid.util.ui.SpanFormatter
import org.intellij.lang.annotations.Language
import org.threeten.bp.ZoneId
import org.threeten.bp.format.DateTimeFormatter
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/QuasselMessageViewHolder.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageViewHolder.kt
similarity index 86%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/QuasselMessageViewHolder.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageViewHolder.kt
index cea40729c09a2e7717342bc5550e6099b7b19ef3..ec37dd3b596c1a244ab250e56ec61231dce4e233 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/messages/QuasselMessageViewHolder.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageViewHolder.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.messages
+package de.kuschku.quasseldroid.ui.chat.messages
import android.support.v7.widget.RecyclerView
import android.text.method.LinkMovementMethod
@@ -6,7 +6,7 @@ import android.view.View
import android.widget.TextView
import butterknife.BindView
import butterknife.ButterKnife
-import de.kuschku.quasseldroid_ng.R
+import de.kuschku.quasseldroid.R
class QuasselMessageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
@BindView(R.id.time)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/nicks/NickListAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListAdapter.kt
similarity index 91%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/nicks/NickListAdapter.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListAdapter.kt
index 9e21c534f8fbca74b33adaeafdbdaeab736199b2..dc9ae421479cea2c1b97660d311e1b78f972df4b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/nicks/NickListAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListAdapter.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.nicks
+package de.kuschku.quasseldroid.ui.chat.nicks
import android.support.v7.recyclerview.extensions.ListAdapter
import android.support.v7.util.DiffUtil
@@ -9,9 +9,9 @@ import android.view.ViewGroup
import android.widget.TextView
import butterknife.BindView
import butterknife.ButterKnife
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.util.helper.visibleIf
-import de.kuschku.quasseldroid_ng.viewmodel.data.IrcUserItem
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.util.helper.visibleIf
+import de.kuschku.quasseldroid.viewmodel.data.IrcUserItem
class NickListAdapter(
private val clickListener: ((String) -> Unit)? = null
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/nicks/NickListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListFragment.kt
similarity index 83%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/nicks/NickListFragment.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListFragment.kt
index 1abcaf0d8087db52672a3d091a3dad3662ce4252..8f708872b0939ce8bc7ae084c7573dfe76d64496 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/nicks/NickListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListFragment.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.chat.nicks
+package de.kuschku.quasseldroid.ui.chat.nicks
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
@@ -12,14 +12,14 @@ import android.view.ViewGroup
import butterknife.BindView
import butterknife.ButterKnife
import de.kuschku.libquassel.util.irc.IrcCaseMappers
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.settings.AppearanceSettings
-import de.kuschku.quasseldroid_ng.settings.Settings
-import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
-import de.kuschku.quasseldroid_ng.util.helper.map
-import de.kuschku.quasseldroid_ng.util.irc.format.IrcFormatDeserializer
-import de.kuschku.quasseldroid_ng.util.service.ServiceBoundFragment
-import de.kuschku.quasseldroid_ng.viewmodel.QuasselViewModel
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.settings.AppearanceSettings
+import de.kuschku.quasseldroid.settings.Settings
+import de.kuschku.quasseldroid.util.AndroidHandlerThread
+import de.kuschku.quasseldroid.util.helper.map
+import de.kuschku.quasseldroid.util.irc.format.IrcFormatDeserializer
+import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
+import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
class NickListFragment : ServiceBoundFragment() {
private lateinit var viewModel: QuasselViewModel
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/SettingsActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/settings/SettingsActivity.kt
similarity index 76%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/SettingsActivity.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/settings/SettingsActivity.kt
index c5515e7109d8908e8eef61040fe4f6ff5130b7cc..9a5526a8cb221cd16921dbfb3bae46e88c9322bf 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/settings/SettingsActivity.kt
@@ -1,11 +1,11 @@
-package de.kuschku.quasseldroid_ng.ui.settings
+package de.kuschku.quasseldroid.ui.settings
import android.os.Bundle
import android.support.v7.widget.Toolbar
import butterknife.BindView
import butterknife.ButterKnife
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.util.service.ServiceBoundActivity
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.util.service.ServiceBoundActivity
class SettingsActivity : ServiceBoundActivity() {
@BindView(R.id.toolbar)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/SettingsFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/settings/SettingsFragment.kt
similarity index 89%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/SettingsFragment.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/settings/SettingsFragment.kt
index bea6fb418264a3611b5ca04c141dca41586a0715..056f8cc8c94c7f2ffc3d9c15b96ced9cbd11d962 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/settings/SettingsFragment.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.settings
+package de.kuschku.quasseldroid.ui.settings
import android.content.SharedPreferences
import android.os.Bundle
@@ -6,9 +6,9 @@ import android.support.v7.preference.ListPreference
import android.support.v7.preference.Preference
import android.support.v7.preference.PreferenceFragmentCompat
import android.support.v7.preference.PreferenceGroup
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.settings.AppearanceSettings
-import de.kuschku.quasseldroid_ng.settings.Settings
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.settings.AppearanceSettings
+import de.kuschku.quasseldroid.settings.Settings
class SettingsFragment : PreferenceFragmentCompat(),
SharedPreferences.OnSharedPreferenceChangeListener {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/SetupActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt
similarity index 95%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/SetupActivity.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt
index 1ec6a99efbf8480a334d6353a039f8f95f02b0cf..fd3d489c937f29391f5d49435dc1ab4d906732c7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/SetupActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.setup
+package de.kuschku.quasseldroid.ui.setup
import android.arch.lifecycle.MutableLiveData
import android.arch.lifecycle.Observer
@@ -15,11 +15,11 @@ import android.util.SparseArray
import android.view.ViewGroup
import butterknife.BindView
import butterknife.ButterKnife
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.util.helper.observeSticky
-import de.kuschku.quasseldroid_ng.util.helper.or
-import de.kuschku.quasseldroid_ng.util.helper.switchMap
-import de.kuschku.quasseldroid_ng.util.helper.updateRecentsHeaderIfExisting
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.util.helper.observeSticky
+import de.kuschku.quasseldroid.util.helper.or
+import de.kuschku.quasseldroid.util.helper.switchMap
+import de.kuschku.quasseldroid.util.helper.updateRecentsHeaderIfExisting
abstract class SetupActivity : AppCompatActivity() {
@BindView(R.id.view_pager)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/SlideFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SlideFragment.kt
similarity index 96%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/SlideFragment.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/setup/SlideFragment.kt
index c12ea229705da9ef48a0db7d21f2824998a55409..7a0c00763909a8b8dc1b5a88799e6b93ce48ff11 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/SlideFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SlideFragment.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.setup
+package de.kuschku.quasseldroid.ui.setup
import android.arch.lifecycle.LifecycleOwner
import android.arch.lifecycle.MutableLiveData
@@ -11,7 +11,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
-import de.kuschku.quasseldroid_ng.R
+import de.kuschku.quasseldroid.R
abstract class SlideFragment : Fragment() {
@get:StringRes
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/ValidityChangeCallback.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ValidityChangeCallback.kt
similarity index 61%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/ValidityChangeCallback.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/setup/ValidityChangeCallback.kt
index 65778143ed4a409064550e2ddc92b0336faebb1f..216ad15ca3d91e799187ca49102cba1b694e05c6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/ValidityChangeCallback.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ValidityChangeCallback.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.setup
+package de.kuschku.quasseldroid.ui.setup
interface ValidityChangeCallback {
fun invoke(isValid: Boolean)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountAdapter.kt
similarity index 97%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountAdapter.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountAdapter.kt
index 4c6453927adf102a24eb50a1a0dfe64d3f8f23bf..272443d7a5497d455d2ac45e6481d4aef1459ef9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountAdapter.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.setup.accounts
+package de.kuschku.quasseldroid.ui.setup.accounts
import android.annotation.SuppressLint
import android.arch.lifecycle.LifecycleOwner
@@ -15,9 +15,9 @@ import android.view.ViewGroup
import android.widget.TextView
import butterknife.BindView
import butterknife.ButterKnife
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.persistence.AccountDatabase
-import de.kuschku.quasseldroid_ng.util.helper.zip
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.persistence.AccountDatabase
+import de.kuschku.quasseldroid.util.helper.zip
class AccountAdapter(
owner: LifecycleOwner,
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountEditActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountEditActivity.kt
similarity index 92%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountEditActivity.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountEditActivity.kt
index a7e2a41da8e03844828779b178266a74497981c4..8e3e1c47ab25bfdc9572257096a46052c8bfdb4f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountEditActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountEditActivity.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.setup.accounts
+package de.kuschku.quasseldroid.ui.setup.accounts
import android.app.Activity
import android.content.Context
@@ -12,13 +12,13 @@ import android.view.MenuItem
import android.widget.EditText
import butterknife.BindView
import butterknife.ButterKnife
-import de.kuschku.quasseldroid_ng.Keys
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.persistence.AccountDatabase
-import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
-import de.kuschku.quasseldroid_ng.util.Patterns
-import de.kuschku.quasseldroid_ng.util.TextValidator
-import de.kuschku.quasseldroid_ng.util.helper.editCommit
+import de.kuschku.quasseldroid.Keys
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.persistence.AccountDatabase
+import de.kuschku.quasseldroid.util.AndroidHandlerThread
+import de.kuschku.quasseldroid.util.Patterns
+import de.kuschku.quasseldroid.util.TextValidator
+import de.kuschku.quasseldroid.util.helper.editCommit
class AccountEditActivity : AppCompatActivity() {
@BindView(R.id.nameWrapper)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSelectionActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSelectionActivity.kt
similarity index 83%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSelectionActivity.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSelectionActivity.kt
index 33644c911b643b3397d69a7ac0efb927bd1af6df..5bf98c0da41105fdeffc7979b9f2198f97b7ba9d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSelectionActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSelectionActivity.kt
@@ -1,12 +1,12 @@
-package de.kuschku.quasseldroid_ng.ui.setup.accounts
+package de.kuschku.quasseldroid.ui.setup.accounts
import android.app.Activity
import android.content.Context
import android.content.SharedPreferences
import android.os.Bundle
-import de.kuschku.quasseldroid_ng.Keys
-import de.kuschku.quasseldroid_ng.ui.setup.SetupActivity
-import de.kuschku.quasseldroid_ng.util.helper.editCommit
+import de.kuschku.quasseldroid.Keys
+import de.kuschku.quasseldroid.ui.setup.SetupActivity
+import de.kuschku.quasseldroid.util.helper.editCommit
class AccountSelectionActivity : SetupActivity() {
companion object {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSelectionSlide.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSelectionSlide.kt
similarity index 87%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSelectionSlide.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSelectionSlide.kt
index 6699c44eb42a1913a541073bda093739daf36408..98ec0b7ca51355eed55daa128e5cc23dd5a70a1e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSelectionSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSelectionSlide.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.setup.accounts
+package de.kuschku.quasseldroid.ui.setup.accounts
import android.app.Activity
import android.arch.lifecycle.Observer
@@ -13,11 +13,11 @@ import android.view.View
import android.view.ViewGroup
import butterknife.BindView
import butterknife.ButterKnife
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.persistence.AccountDatabase
-import de.kuschku.quasseldroid_ng.ui.setup.SlideFragment
-import de.kuschku.quasseldroid_ng.ui.setup.accounts.AccountSelectionActivity.Companion.REQUEST_CREATE_FIRST
-import de.kuschku.quasseldroid_ng.ui.setup.accounts.AccountSelectionActivity.Companion.REQUEST_CREATE_NEW
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.persistence.AccountDatabase
+import de.kuschku.quasseldroid.ui.setup.SlideFragment
+import de.kuschku.quasseldroid.ui.setup.accounts.AccountSelectionActivity.Companion.REQUEST_CREATE_FIRST
+import de.kuschku.quasseldroid.ui.setup.accounts.AccountSelectionActivity.Companion.REQUEST_CREATE_NEW
class AccountSelectionSlide : SlideFragment() {
@BindView(R.id.account_list)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSetupActivity.kt
similarity index 81%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupActivity.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSetupActivity.kt
index 816786b5893dfe70bb03af07748abb3d4746a8e4..4bed519eb73782997fe5ae483bb18fd716db93dc 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSetupActivity.kt
@@ -1,10 +1,10 @@
-package de.kuschku.quasseldroid_ng.ui.setup.accounts
+package de.kuschku.quasseldroid.ui.setup.accounts
import android.app.Activity
import android.os.Bundle
-import de.kuschku.quasseldroid_ng.persistence.AccountDatabase
-import de.kuschku.quasseldroid_ng.ui.setup.SetupActivity
-import de.kuschku.quasseldroid_ng.util.AndroidHandlerThread
+import de.kuschku.quasseldroid.persistence.AccountDatabase
+import de.kuschku.quasseldroid.ui.setup.SetupActivity
+import de.kuschku.quasseldroid.util.AndroidHandlerThread
import org.threeten.bp.Instant
class AccountSetupActivity : SetupActivity() {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupConnectionSlide.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSetupConnectionSlide.kt
similarity index 90%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupConnectionSlide.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSetupConnectionSlide.kt
index 23a837b86ab086d0b7f41993d48d6a94dbc55115..b8732f755ddaa57eda2c80ccce3982460a9857f5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupConnectionSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSetupConnectionSlide.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.setup.accounts
+package de.kuschku.quasseldroid.ui.setup.accounts
import android.os.Bundle
import android.support.design.widget.TextInputLayout
@@ -9,10 +9,10 @@ import android.view.ViewGroup
import android.widget.EditText
import butterknife.BindView
import butterknife.ButterKnife
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.ui.setup.SlideFragment
-import de.kuschku.quasseldroid_ng.util.Patterns
-import de.kuschku.quasseldroid_ng.util.TextValidator
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.ui.setup.SlideFragment
+import de.kuschku.quasseldroid.util.Patterns
+import de.kuschku.quasseldroid.util.TextValidator
class AccountSetupConnectionSlide : SlideFragment() {
@BindView(R.id.hostWrapper)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupNameSlide.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSetupNameSlide.kt
similarity index 88%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupNameSlide.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSetupNameSlide.kt
index ab839228c781ab8bdb53e0549944d917e18fb2e2..f97f85c86ee4163fe8ce554120e616facb4699b6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupNameSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSetupNameSlide.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.setup.accounts
+package de.kuschku.quasseldroid.ui.setup.accounts
import android.os.Bundle
import android.support.design.widget.TextInputLayout
@@ -9,9 +9,9 @@ import android.view.ViewGroup
import android.widget.EditText
import butterknife.BindView
import butterknife.ButterKnife
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.ui.setup.SlideFragment
-import de.kuschku.quasseldroid_ng.util.TextValidator
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.ui.setup.SlideFragment
+import de.kuschku.quasseldroid.util.TextValidator
class AccountSetupNameSlide : SlideFragment() {
@BindView(R.id.nameWrapper)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupUserSlide.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSetupUserSlide.kt
similarity index 90%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupUserSlide.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSetupUserSlide.kt
index b9fa2556eb414646dccfe2761d8c5439ea6ef81a..30e2b2852e6093569f4c5ffe3212ddcf5daba87d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSetupUserSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountSetupUserSlide.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.ui.setup.accounts
+package de.kuschku.quasseldroid.ui.setup.accounts
import android.os.Bundle
import android.support.design.widget.TextInputLayout
@@ -9,9 +9,9 @@ import android.view.ViewGroup
import android.widget.EditText
import butterknife.BindView
import butterknife.ButterKnife
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.ui.setup.SlideFragment
-import de.kuschku.quasseldroid_ng.util.TextValidator
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.ui.setup.SlideFragment
+import de.kuschku.quasseldroid.util.TextValidator
class AccountSetupUserSlide : SlideFragment() {
@BindView(R.id.userWrapper)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountViewModel.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountViewModel.kt
similarity index 80%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountViewModel.kt
rename to app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountViewModel.kt
index 087b38577fe6b24ac5acdcddf9ced74de628ebdc..83ef1a70faa156e3df85480cbfbb420d6b4cb2ba 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountViewModel.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/AccountViewModel.kt
@@ -1,10 +1,10 @@
-package de.kuschku.quasseldroid_ng.ui.setup.accounts
+package de.kuschku.quasseldroid.ui.setup.accounts
import android.app.Application
import android.arch.lifecycle.AndroidViewModel
import android.arch.lifecycle.LiveData
import android.arch.lifecycle.MutableLiveData
-import de.kuschku.quasseldroid_ng.persistence.AccountDatabase
+import de.kuschku.quasseldroid.persistence.AccountDatabase
class AccountViewModel(application: Application) : AndroidViewModel(application) {
private val database: AccountDatabase = AccountDatabase.Creator.init(
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/widget/ChatWidgetProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/widget/ChatWidgetProvider.kt
new file mode 100644
index 0000000000000000000000000000000000000000..2580253ada1b4bf575f812131157302e36f63c73
--- /dev/null
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/widget/ChatWidgetProvider.kt
@@ -0,0 +1,7 @@
+package de.kuschku.quasseldroid.ui.widget
+
+import android.appwidget.AppWidgetProvider
+
+class ChatWidgetProvider : AppWidgetProvider() {
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/AndroidHandlerThread.kt b/app/src/main/java/de/kuschku/quasseldroid/util/AndroidHandlerThread.kt
similarity index 99%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/AndroidHandlerThread.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/AndroidHandlerThread.kt
index eda3dd352a9d199c88bfc8f4c9ec0f12958d2dcb..04e4f1198990a6b5f3bab8fe10c97e156b6be630 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/AndroidHandlerThread.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/AndroidHandlerThread.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util
+package de.kuschku.quasseldroid.util
import android.os.Handler
import android.os.HandlerThread
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/Patterns.kt b/app/src/main/java/de/kuschku/quasseldroid/util/Patterns.kt
similarity index 98%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/Patterns.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/Patterns.kt
index 52ce7acf83e340f13be5ffcf9f8e232a4677f176..d6f3e59d1964e52aea89b636addccd103a997019 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/Patterns.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/Patterns.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util
+package de.kuschku.quasseldroid.util
import org.intellij.lang.annotations.Language
import java.util.regex.Pattern
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/QuasseldroidNotificationManager.kt b/app/src/main/java/de/kuschku/quasseldroid/util/QuasseldroidNotificationManager.kt
similarity index 88%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/QuasseldroidNotificationManager.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/QuasseldroidNotificationManager.kt
index b5dca3a8f37a3376ddff3318a7353949742ea799..f62b3efd22eb469c05a36513fe95966c38aaa24c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/QuasseldroidNotificationManager.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/QuasseldroidNotificationManager.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util
+package de.kuschku.quasseldroid.util
import android.annotation.TargetApi
import android.app.NotificationChannel
@@ -9,12 +9,12 @@ import android.content.Intent
import android.os.Build
import android.support.v4.app.NotificationCompat
import android.support.v4.app.NotificationManagerCompat
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.service.QuasselService
-import de.kuschku.quasseldroid_ng.ui.chat.ChatActivity
-import de.kuschku.quasseldroid_ng.util.helper.editApply
-import de.kuschku.quasseldroid_ng.util.helper.sharedPreferences
-import de.kuschku.quasseldroid_ng.util.helper.systemService
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.service.QuasselService
+import de.kuschku.quasseldroid.ui.chat.ChatActivity
+import de.kuschku.quasseldroid.util.helper.editApply
+import de.kuschku.quasseldroid.util.helper.sharedPreferences
+import de.kuschku.quasseldroid.util.helper.systemService
class QuasseldroidNotificationManager(private val context: Context) {
fun init() {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/TextValidator.kt b/app/src/main/java/de/kuschku/quasseldroid/util/TextValidator.kt
similarity index 94%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/TextValidator.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/TextValidator.kt
index 777fe5c2c0bec9185c4c180427ec0b847aaafb72..a8381bade5c1e0a096a6f5a9387d3d9604a2e528 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/TextValidator.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/TextValidator.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util
+package de.kuschku.quasseldroid.util
import android.text.Editable
import android.text.TextWatcher
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/backport/AndroidThreeTenBackport.kt b/app/src/main/java/de/kuschku/quasseldroid/util/backport/AndroidThreeTenBackport.kt
similarity index 94%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/backport/AndroidThreeTenBackport.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/backport/AndroidThreeTenBackport.kt
index 04019a0f0942c1c90ca1305b541570f15f22514e..1e7087a50f4b0762e5180eecd8735608e1850d9d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/backport/AndroidThreeTenBackport.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/backport/AndroidThreeTenBackport.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.backport
+package de.kuschku.quasseldroid.util.backport
import android.content.Context
import org.threeten.bp.zone.TzdbZoneRulesProvider
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/backport/ReadableWrappedChannel.kt b/app/src/main/java/de/kuschku/quasseldroid/util/backport/ReadableWrappedChannel.kt
similarity index 97%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/backport/ReadableWrappedChannel.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/backport/ReadableWrappedChannel.kt
index 25921a9dadba17b0304967d50b4d17a403ab135a..92b6c78b987a2d85049a7c7426a914e981e61fb0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/backport/ReadableWrappedChannel.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/backport/ReadableWrappedChannel.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.backport
+package de.kuschku.quasseldroid.util.backport
import java.io.InputStream
import java.nio.ByteBuffer
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/backport/WritableWrappedChannel.kt b/app/src/main/java/de/kuschku/quasseldroid/util/backport/WritableWrappedChannel.kt
similarity index 96%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/backport/WritableWrappedChannel.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/backport/WritableWrappedChannel.kt
index 0f1ad0eafe40f77ba6f32d2d93430b3bb83d0b09..e326508e8532a28db5c15178fae1102739ade79e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/backport/WritableWrappedChannel.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/backport/WritableWrappedChannel.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.backport
+package de.kuschku.quasseldroid.util.backport
import java.io.OutputStream
import java.nio.ByteBuffer
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/compatibility/AndroidCompatibilityUtils.kt b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidCompatibilityUtils.kt
similarity index 95%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/compatibility/AndroidCompatibilityUtils.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidCompatibilityUtils.kt
index dcd0ac3f3c0fdc211ec288b42ae87c3bdfee789b..3de8c940014d89f388889a424519203a5c48a307 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/compatibility/AndroidCompatibilityUtils.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidCompatibilityUtils.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.compatibility
+package de.kuschku.quasseldroid.util.compatibility
import android.os.Build
import de.kuschku.libquassel.util.compatibility.CompatibilityUtils
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/compatibility/AndroidHandlerService.kt b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidHandlerService.kt
similarity index 96%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/compatibility/AndroidHandlerService.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidHandlerService.kt
index d1d341a097f5969863668e37f53b72b81a56aed2..8046286daf055d172c49e589a944dbe1a66eb787 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/compatibility/AndroidHandlerService.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidHandlerService.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.compatibility
+package de.kuschku.quasseldroid.util.compatibility
import android.os.Handler
import android.os.HandlerThread
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/compatibility/AndroidLoggingHandler.kt b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidLoggingHandler.kt
similarity index 90%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/compatibility/AndroidLoggingHandler.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidLoggingHandler.kt
index 6453d805d878689536c559f678e6043ce048efa7..b2ed4d1033f36d0f7e283c9cc9ecc2e7cbe53ec0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/compatibility/AndroidLoggingHandler.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidLoggingHandler.kt
@@ -1,8 +1,8 @@
-package de.kuschku.quasseldroid_ng.util.compatibility
+package de.kuschku.quasseldroid.util.compatibility
import android.util.Log
import de.kuschku.libquassel.util.compatibility.LoggingHandler
-import de.kuschku.quasseldroid_ng.BuildConfig
+import de.kuschku.quasseldroid.BuildConfig
object AndroidLoggingHandler : LoggingHandler() {
override fun isLoggable(logLevel: LogLevel, tag: String): Boolean {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/compatibility/AndroidStreamChannelFactory.kt b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidStreamChannelFactory.kt
similarity index 73%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/compatibility/AndroidStreamChannelFactory.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidStreamChannelFactory.kt
index 50262dba0a8634678339f1ae9b7a310c35a432fd..e83c4878b2321d5ceefc4ab78ed46feaf3314931 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/compatibility/AndroidStreamChannelFactory.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidStreamChannelFactory.kt
@@ -1,8 +1,8 @@
-package de.kuschku.quasseldroid_ng.util.compatibility
+package de.kuschku.quasseldroid.util.compatibility
import de.kuschku.libquassel.util.compatibility.StreamChannelFactory
-import de.kuschku.quasseldroid_ng.util.backport.ReadableWrappedChannel
-import de.kuschku.quasseldroid_ng.util.backport.WritableWrappedChannel
+import de.kuschku.quasseldroid.util.backport.ReadableWrappedChannel
+import de.kuschku.quasseldroid.util.backport.WritableWrappedChannel
import java.io.InputStream
import java.io.OutputStream
import java.nio.channels.ReadableByteChannel
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/AccountDaoHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/AccountDaoHelper.kt
similarity index 62%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/AccountDaoHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/AccountDaoHelper.kt
index e450651890a97a4583373cd769a77df421389390..766abbfb4f8c8541b884149fd13fa42c0faed313 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/AccountDaoHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/AccountDaoHelper.kt
@@ -1,6 +1,6 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
-import de.kuschku.quasseldroid_ng.persistence.AccountDatabase
+import de.kuschku.quasseldroid.persistence.AccountDatabase
fun AccountDatabase.AccountDao.new(vararg entities: AccountDatabase.Account) {
val ids = create(*entities)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ActivityHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ActivityHelper.kt
similarity index 98%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ActivityHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/ActivityHelper.kt
index 2e1d4dc8886f76d7d0320c31979455b79fbb0742..75c02ae44d37cbff4977f2bf3537d5c9c3f67d74 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ActivityHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ActivityHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
import android.annotation.TargetApi
import android.app.Activity
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/CharSequenceHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/CharSequenceHelper.kt
similarity index 94%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/CharSequenceHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/CharSequenceHelper.kt
index 9337183b6a96a1e7a673a58b974de0827bff1001..9f8856f8780738536ed8acbad704a0016f7710df 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/CharSequenceHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/CharSequenceHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
fun CharSequence.lastWord(cursor: Int = this.length,
onlyBeforeCursor: Boolean = false): CharSequence {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ContextHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ContextHelper.kt
similarity index 96%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ContextHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/ContextHelper.kt
index f62f03f2cf0773d8a39054dff437f9013f3d8aff..df66c4fe5d585cefc00ed2b728bba53f1221aa41 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ContextHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ContextHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
import android.content.Context
import android.content.SharedPreferences
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/FloatingActionButtonHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/FloatingActionButtonHelper.kt
similarity index 76%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/FloatingActionButtonHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/FloatingActionButtonHelper.kt
index 67d4bf5b061b7becf43a59982078ed62b5aae898..e8842c408be5679e61385e75da261fa269decc1d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/FloatingActionButtonHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/FloatingActionButtonHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
import android.support.design.widget.FloatingActionButton
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/IntProgressionHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/IntProgressionHelper.kt
similarity index 59%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/IntProgressionHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/IntProgressionHelper.kt
index 28ea37162780229bb5fa39c419befeba9624a4f1..69c46737144e39900de5d053726d4e5393f30245 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/IntProgressionHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/IntProgressionHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
val IntProgression.length: Int
get() = this.last + 1 - this.first
\ No newline at end of file
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/LruCacheHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/LruCacheHelper.kt
similarity index 75%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/LruCacheHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/LruCacheHelper.kt
index 772a9f53ef6df686cb3a0ff0e4c818f695bd3cb8..47e7447e3c93d7cafeba95c87dd346eeb17aed5e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/LruCacheHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/LruCacheHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
import android.util.LruCache
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/MenuHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/MenuHelper.kt
similarity index 83%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/MenuHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/MenuHelper.kt
index d2d70dcb4a87e7442964c6bb3b25fb8cc6c7a8a0..abc5cc3a11689315080005da00c51e5be7a4a310 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/MenuHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/MenuHelper.kt
@@ -1,9 +1,9 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
import android.content.Context
import android.support.v4.graphics.drawable.DrawableCompat
import android.view.Menu
-import de.kuschku.quasseldroid_ng.R
+import de.kuschku.quasseldroid.R
fun Menu.retint(context: Context) {
context.theme.styledAttributes(R.attr.colorControlNormal) {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ResourcesHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ResourcesHelper.kt
similarity index 91%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ResourcesHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/ResourcesHelper.kt
index 3785690c28d13ce278153a577ba09f4de38e3059..ba0c69e0063d585bcfb9f667d480e6a830fb55e5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ResourcesHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ResourcesHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
import android.content.res.Resources
import android.os.Build
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/SelectionHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SelectionHelper.kt
similarity index 83%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/SelectionHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/SelectionHelper.kt
index f69883b38725bc086edd517414db5ef0d856a56f..67924afdc5d8d1742d66e86ff1fa71b1ba0ae69d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/SelectionHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SelectionHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
import android.text.Selection
import android.widget.EditText
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/SharedPreferencesHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SharedPreferencesHelper.kt
similarity index 89%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/SharedPreferencesHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/SharedPreferencesHelper.kt
index 517648920736508c2023134a716ca70581ca1ada..8ec134bb6499cca732dbd82574781c3fe7b52b8e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/SharedPreferencesHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SharedPreferencesHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
import android.annotation.SuppressLint
import android.content.SharedPreferences
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/SpannedHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SpannedHelper.kt
similarity index 98%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/SpannedHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/SpannedHelper.kt
index 496344b09d8feee695168b41e15d8654739b7194..974c257c28e74fd674307e2a62844a461e60b0d0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/SpannedHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SpannedHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
private class DelimitedRangesSequence(
private val input: CharSequence,
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ThemeHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ThemeHelper.kt
similarity index 88%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ThemeHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/ThemeHelper.kt
index 3b62d67e5a900536cedafd051b5e1d76a1c0eed5..c5f2724c668f53bd5244ee005e47a83743992f30 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ThemeHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ThemeHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
import android.content.res.Resources
import android.content.res.TypedArray
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ViewHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ViewHelper.kt
similarity index 76%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ViewHelper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/helper/ViewHelper.kt
index c7b18b2e6855b2e0ecba2abf563329b413aa04e2..61fb6f48d79e5d44c6ff557659d8474e0915dfaf 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ViewHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ViewHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
import android.view.View
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatDeserializer.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatDeserializer.kt
similarity index 98%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatDeserializer.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatDeserializer.kt
index 641daf540b4a03abe7ac31bc26f536208603c6bc..9e6dfb956d6d3757e9647d0b02e6f4f85cf338ab 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatDeserializer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatDeserializer.kt
@@ -19,15 +19,15 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.quasseldroid_ng.util.irc.format
+package de.kuschku.quasseldroid.util.irc.format
import android.content.Context
import android.text.SpannableStringBuilder
import android.text.Spanned
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.util.helper.styledAttributes
-import de.kuschku.quasseldroid_ng.util.irc.format.spans.*
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.util.helper.styledAttributes
+import de.kuschku.quasseldroid.util.irc.format.spans.*
/**
* A helper class to turn mIRC formatted Strings into Android’s SpannableStrings with the same
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatSerializer.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatSerializer.kt
similarity index 98%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatSerializer.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatSerializer.kt
index 64d17aa50eaae1e2893f933fbbea3fe6c1510b11..6134e068a88701beb0076b671c6c1aeeb0e97c85 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatSerializer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatSerializer.kt
@@ -1,11 +1,11 @@
-package de.kuschku.quasseldroid_ng.util.irc.format
+package de.kuschku.quasseldroid.util.irc.format
import android.content.Context
import android.graphics.Typeface
import android.text.Spanned
import android.text.style.*
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.util.helper.styledAttributes
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.util.helper.styledAttributes
import java.util.*
class IrcFormatSerializer internal constructor(private val context: Context) {
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/Copyable.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/Copyable.kt
new file mode 100644
index 0000000000000000000000000000000000000000..aef3f9e0e8765610bc36c0217f8f82e8497178ba
--- /dev/null
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/Copyable.kt
@@ -0,0 +1,5 @@
+package de.kuschku.quasseldroid.util.irc.format.spans
+
+interface Copyable<out T> {
+ fun copy(): T
+}
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcBackgroundColorSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBackgroundColorSpan.kt
similarity index 84%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcBackgroundColorSpan.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBackgroundColorSpan.kt
index 5927da7b04d8b2a2762226d75def5186c6cbadbe..934efb741044cde4c75c87396b958475557978b7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcBackgroundColorSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBackgroundColorSpan.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.irc.format.spans
+package de.kuschku.quasseldroid.util.irc.format.spans
import android.support.annotation.ColorInt
import android.text.style.BackgroundColorSpan
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcBoldSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBoldSpan.kt
similarity index 76%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcBoldSpan.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBoldSpan.kt
index ddaeec36b27ff3c85d02963e622da8773bf8fac8..455a5c867a41ff9b4c678aaaa60168957188e126 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcBoldSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBoldSpan.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.irc.format.spans
+package de.kuschku.quasseldroid.util.irc.format.spans
import android.graphics.Typeface
import android.text.style.StyleSpan
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcForegroundColorSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcForegroundColorSpan.kt
similarity index 84%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcForegroundColorSpan.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcForegroundColorSpan.kt
index 70461675acaf583a8cbe8f24d2561d19413a5a7d..12641c5c82c9851e45f84721d1f71c45e9dd2a75 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcForegroundColorSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcForegroundColorSpan.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.irc.format.spans
+package de.kuschku.quasseldroid.util.irc.format.spans
import android.support.annotation.ColorInt
import android.text.style.ForegroundColorSpan
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcHexBackgroundColorSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcHexBackgroundColorSpan.kt
similarity index 85%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcHexBackgroundColorSpan.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcHexBackgroundColorSpan.kt
index a7b4f87f6f6f8ab10b3b5083257a531705f5cdbd..2269de782892bdcd5a75055c388851358d4cebe5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcHexBackgroundColorSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcHexBackgroundColorSpan.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.irc.format.spans
+package de.kuschku.quasseldroid.util.irc.format.spans
import android.support.annotation.ColorInt
import android.text.style.BackgroundColorSpan
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcHexForegroundColorSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcHexForegroundColorSpan.kt
similarity index 85%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcHexForegroundColorSpan.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcHexForegroundColorSpan.kt
index b46ce023c29b0fa75878c8b2271cffbe1949c9e3..f3d680b1c8b91e028a60e1e5cf7310cb1691f78e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcHexForegroundColorSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcHexForegroundColorSpan.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.irc.format.spans
+package de.kuschku.quasseldroid.util.irc.format.spans
import android.support.annotation.ColorInt
import android.text.style.ForegroundColorSpan
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcItalicSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcItalicSpan.kt
similarity index 76%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcItalicSpan.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcItalicSpan.kt
index d38f195e58627ecdae1573d86c31524fdd79b358..a147724f3e04c102e72f8b295e2c6b8fc64b7ba9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcItalicSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcItalicSpan.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.irc.format.spans
+package de.kuschku.quasseldroid.util.irc.format.spans
import android.graphics.Typeface
import android.text.style.StyleSpan
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcMonospaceSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcMonospaceSpan.kt
similarity index 74%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcMonospaceSpan.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcMonospaceSpan.kt
index 93be73ccf918d3cefd96014902dc8f8d9c63cff0..6cf95370fce59118784b568bb80aeca14b5f864c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcMonospaceSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcMonospaceSpan.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.irc.format.spans
+package de.kuschku.quasseldroid.util.irc.format.spans
import android.text.style.TypefaceSpan
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcStrikethroughSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcStrikethroughSpan.kt
similarity index 75%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcStrikethroughSpan.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcStrikethroughSpan.kt
index 7223229f3c7becd028deaa780d62fca4330a3555..5d97897b32b008a3232c0d7ccacc4006503299e0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcStrikethroughSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcStrikethroughSpan.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.irc.format.spans
+package de.kuschku.quasseldroid.util.irc.format.spans
import android.text.style.StrikethroughSpan
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcUnderlineSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcUnderlineSpan.kt
similarity index 73%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcUnderlineSpan.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcUnderlineSpan.kt
index 447a11bd7300e1dd9b285705ce0081a3b95b8d7d..3322a03cf6465ef5d8884e8576d74a76d9d8c56e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/IrcUnderlineSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcUnderlineSpan.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.irc.format.spans
+package de.kuschku.quasseldroid.util.irc.format.spans
import android.text.style.UnderlineSpan
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/quassel/CRCUtils.kt b/app/src/main/java/de/kuschku/quasseldroid/util/quassel/CRCUtils.kt
similarity index 94%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/quassel/CRCUtils.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/quassel/CRCUtils.kt
index 9a734a320aa2e1e0965175e9bda5962ed5597ed1..b9fb401ab6228a460cb11de3851d23b3341f2ac0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/quassel/CRCUtils.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/quassel/CRCUtils.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.quassel
+package de.kuschku.quasseldroid.util.quassel
object CRCUtils {
fun qChecksum(data: ByteArray): Int {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/quassel/IrcUserUtils.kt b/app/src/main/java/de/kuschku/quasseldroid/util/quassel/IrcUserUtils.kt
similarity index 96%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/quassel/IrcUserUtils.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/quassel/IrcUserUtils.kt
index a259c1e11b054f4b132ed718bdb6b761478cbe09..3011988388af692331d363b0bac7306e8e8bba88 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/quassel/IrcUserUtils.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/quassel/IrcUserUtils.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.quassel
+package de.kuschku.quasseldroid.util.quassel
import java.util.*
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/service/BackendServiceConnection.kt b/app/src/main/java/de/kuschku/quasseldroid/util/service/BackendServiceConnection.kt
similarity index 92%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/service/BackendServiceConnection.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/service/BackendServiceConnection.kt
index b703da406ef63a7e88e84ce26da98a28866fc292..45f4f2f5911afd535504ae14b5c7ccff0ef1d34e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/service/BackendServiceConnection.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/service/BackendServiceConnection.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.service
+package de.kuschku.quasseldroid.util.service
import android.arch.lifecycle.MutableLiveData
import android.content.ComponentName
@@ -7,7 +7,7 @@ import android.content.Intent
import android.content.ServiceConnection
import android.os.IBinder
import de.kuschku.libquassel.session.Backend
-import de.kuschku.quasseldroid_ng.service.QuasselService
+import de.kuschku.quasseldroid.service.QuasselService
class BackendServiceConnection : ServiceConnection {
val backend = MutableLiveData<Backend?>()
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/service/ServiceBoundActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundActivity.kt
similarity index 86%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/service/ServiceBoundActivity.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundActivity.kt
index 62a2351b063a7ab41b87e4817cc9cd10c9cd3081..37f301572d581b353b3b27c230df54b3697e7f82 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/service/ServiceBoundActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundActivity.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.service
+package de.kuschku.quasseldroid.util.service
import android.app.Activity
import android.arch.lifecycle.LiveData
@@ -10,14 +10,14 @@ import android.support.annotation.ColorRes
import android.support.annotation.DrawableRes
import android.support.v7.app.AppCompatActivity
import de.kuschku.libquassel.session.Backend
-import de.kuschku.quasseldroid_ng.Keys
-import de.kuschku.quasseldroid_ng.R
-import de.kuschku.quasseldroid_ng.settings.AppearanceSettings
-import de.kuschku.quasseldroid_ng.settings.ConnectionSettings
-import de.kuschku.quasseldroid_ng.settings.Settings
-import de.kuschku.quasseldroid_ng.ui.setup.accounts.AccountSelectionActivity
-import de.kuschku.quasseldroid_ng.util.helper.sharedPreferences
-import de.kuschku.quasseldroid_ng.util.helper.updateRecentsHeaderIfExisting
+import de.kuschku.quasseldroid.Keys
+import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.settings.AppearanceSettings
+import de.kuschku.quasseldroid.settings.ConnectionSettings
+import de.kuschku.quasseldroid.settings.Settings
+import de.kuschku.quasseldroid.ui.setup.accounts.AccountSelectionActivity
+import de.kuschku.quasseldroid.util.helper.sharedPreferences
+import de.kuschku.quasseldroid.util.helper.updateRecentsHeaderIfExisting
abstract class ServiceBoundActivity : AppCompatActivity(),
SharedPreferences.OnSharedPreferenceChangeListener {
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/service/ServiceBoundFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundFragment.kt
similarity index 90%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/service/ServiceBoundFragment.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundFragment.kt
index c524cc583da6c9ff1cf1793f01fdb3d7a7a685cf..2896a08a39f5e3172f62b7c6dfae53730a86bd39 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/service/ServiceBoundFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundFragment.kt
@@ -1,11 +1,11 @@
-package de.kuschku.quasseldroid_ng.util.service
+package de.kuschku.quasseldroid.util.service
import android.arch.lifecycle.LiveData
import android.content.Context
import android.os.Bundle
import android.support.v4.app.Fragment
import de.kuschku.libquassel.session.Backend
-import de.kuschku.quasseldroid_ng.Keys
+import de.kuschku.quasseldroid.Keys
abstract class ServiceBoundFragment : Fragment() {
private var connection = BackendServiceConnection()
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/AutoCompleteRecyclerView.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/AutoCompleteRecyclerView.kt
similarity index 89%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/AutoCompleteRecyclerView.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/ui/AutoCompleteRecyclerView.kt
index b6aece06960a690db7f10be9d76bdd74d48a4fdb..2e82c52716bc3a8700bff4e0afdd706d2146f8e4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/AutoCompleteRecyclerView.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/AutoCompleteRecyclerView.kt
@@ -1,9 +1,9 @@
-package de.kuschku.quasseldroid_ng.util.ui
+package de.kuschku.quasseldroid.util.ui
import android.content.Context
import android.support.v7.widget.RecyclerView
import android.util.AttributeSet
-import de.kuschku.quasseldroid_ng.R
+import de.kuschku.quasseldroid.R
class AutoCompleteRecyclerView : RecyclerView {
constructor(context: Context?) : super(context)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/ContextThemeWrapper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ContextThemeWrapper.kt
similarity index 98%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/ContextThemeWrapper.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/ui/ContextThemeWrapper.kt
index 1d253a110b44198caacaad0c612fddd373183fdb..ebcc0969debe9a8fef8c969397bc38ca8dd0cf8d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/ContextThemeWrapper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ContextThemeWrapper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.ui
+package de.kuschku.quasseldroid.util.ui
import android.content.Context
import android.content.ContextWrapper
@@ -8,7 +8,7 @@ import android.content.res.Resources
import android.os.Build
import android.support.annotation.StyleRes
import android.view.LayoutInflater
-import de.kuschku.quasseldroid_ng.R
+import de.kuschku.quasseldroid.R
/**
* A ContextWrapper that allows you to modify the theme from what is in the
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/DrawerRecyclerView.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/DrawerRecyclerView.kt
similarity index 97%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/DrawerRecyclerView.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/ui/DrawerRecyclerView.kt
index 2d0f6f9483bc2ba55c27caeebbeb5c3d7741f2e9..9aa7ca95e92a4be245fdc44fd7f5804edca5fd19 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/DrawerRecyclerView.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/DrawerRecyclerView.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.ui
+package de.kuschku.quasseldroid.util.ui
import android.content.Context
import android.graphics.Canvas
@@ -7,7 +7,7 @@ import android.graphics.drawable.Drawable
import android.support.v4.view.ViewCompat
import android.support.v7.widget.RecyclerView
import android.util.AttributeSet
-import de.kuschku.quasseldroid_ng.R
+import de.kuschku.quasseldroid.R
class DrawerRecyclerView @JvmOverloads constructor(
context: Context,
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/MaterialContentLoadingProgressBar.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/MaterialContentLoadingProgressBar.kt
similarity index 98%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/MaterialContentLoadingProgressBar.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/ui/MaterialContentLoadingProgressBar.kt
index ed521dc57c1b52b7724785f556de5790888bc49c..e9324978e4e93ceae2a8f0eac513011ca8fe21e2 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/MaterialContentLoadingProgressBar.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/MaterialContentLoadingProgressBar.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.ui
+package de.kuschku.quasseldroid.util.ui
/*
* Copyright (C) 2013 The Android Open Source Project
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/NavigationDrawerLayout.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/NavigationDrawerLayout.kt
similarity index 98%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/NavigationDrawerLayout.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/ui/NavigationDrawerLayout.kt
index b42f6d9c7b6b0105146a78e71fd1e8a04c3068c9..09f3d52a98ed299f0516d18acfc69f0c82ced62c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/NavigationDrawerLayout.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/NavigationDrawerLayout.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.kuschku.quasseldroid_ng.util.ui
+package de.kuschku.quasseldroid.util.ui
import android.content.Context
import android.graphics.Canvas
@@ -22,7 +22,7 @@ import android.graphics.drawable.Drawable
import android.support.v4.view.ViewCompat
import android.util.AttributeSet
import android.widget.FrameLayout
-import de.kuschku.quasseldroid_ng.R
+import de.kuschku.quasseldroid.R
class NavigationDrawerLayout @JvmOverloads constructor(
context: Context,
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/RecyclerSpinnerAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/RecyclerSpinnerAdapter.kt
similarity index 96%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/RecyclerSpinnerAdapter.kt
rename to app/src/main/java/de/kuschku/quasseldroid/util/ui/RecyclerSpinnerAdapter.kt
index 368b5c791598241bfc240be2b9ca2608e69d6ea0..3732bd81194b69c5f2eab09222ce78d2033183f6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/RecyclerSpinnerAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/RecyclerSpinnerAdapter.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.ui
+package de.kuschku.quasseldroid.util.ui
import android.content.res.Resources
import android.support.v7.widget.RecyclerView
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/SpanFormatter.java b/app/src/main/java/de/kuschku/quasseldroid/util/ui/SpanFormatter.java
similarity index 99%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/SpanFormatter.java
rename to app/src/main/java/de/kuschku/quasseldroid/util/ui/SpanFormatter.java
index fe0e46f91469f793d4991f6d647e81b2b9489882..b6e9122e6bc8bbbcf3cedd1343920ecb9b549d86 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ui/SpanFormatter.java
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/SpanFormatter.java
@@ -35,7 +35,7 @@
* limitations under the License.
*/
-package de.kuschku.quasseldroid_ng.util.ui;
+package de.kuschku.quasseldroid.util.ui;
import android.support.annotation.NonNull;
import android.text.Spannable;
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/Copyable.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/Copyable.kt
deleted file mode 100644
index dd103d0169fb7bca2ba61faf97bc3484a26e08e7..0000000000000000000000000000000000000000
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/Copyable.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.kuschku.quasseldroid_ng.util.irc.format.spans
-
-interface Copyable<out T> {
- fun copy(): T
-}
diff --git a/app/src/main/res/layout-land/layout_main.xml b/app/src/main/res/layout-land/layout_main.xml
index 0f2a4dfaec1d0b38504a7ab7ee90d0bc7b0f27e5..3920f603470d999a5b89805a3c6b595118d11c56 100644
--- a/app/src/main/res/layout-land/layout_main.xml
+++ b/app/src/main/res/layout-land/layout_main.xml
@@ -21,13 +21,13 @@
<fragment
android:id="@+id/fragment_messages"
- android:name="de.kuschku.quasseldroid_ng.ui.chat.messages.MessageListFragment"
+ android:name="de.kuschku.quasseldroid.ui.chat.messages.MessageListFragment"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
tools:layout="@layout/fragment_messages" />
- <de.kuschku.quasseldroid_ng.util.ui.AutoCompleteRecyclerView
+ <de.kuschku.quasseldroid.util.ui.AutoCompleteRecyclerView
android:id="@+id/autocomplete_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout-sw600dp-land/layout_main.xml b/app/src/main/res/layout-sw600dp-land/layout_main.xml
index 8f62bb12fd064b84320711b0bccb94c8b921e9b0..736c7882725f88abca0295e743ca35e747f4465d 100644
--- a/app/src/main/res/layout-sw600dp-land/layout_main.xml
+++ b/app/src/main/res/layout-sw600dp-land/layout_main.xml
@@ -26,13 +26,13 @@
<fragment
android:id="@+id/fragment_messages"
- android:name="de.kuschku.quasseldroid_ng.ui.chat.messages.MessageListFragment"
+ android:name="de.kuschku.quasseldroid.ui.chat.messages.MessageListFragment"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
tools:layout="@layout/fragment_messages" />
- <de.kuschku.quasseldroid_ng.util.ui.AutoCompleteRecyclerView
+ <de.kuschku.quasseldroid.util.ui.AutoCompleteRecyclerView
android:id="@+id/autocomplete_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout-sw720dp-land/activity_main.xml b/app/src/main/res/layout-sw720dp-land/activity_main.xml
index 3e3145e8d8cfb32e18e83c8be70cf3270e7d3732..82db79c8cd776279f932cde77857875dfbb5dafe 100644
--- a/app/src/main/res/layout-sw720dp-land/activity_main.xml
+++ b/app/src/main/res/layout-sw720dp-land/activity_main.xml
@@ -12,7 +12,7 @@
<fragment
android:id="@+id/fragment_chat_list"
- android:name="de.kuschku.quasseldroid_ng.ui.chat.buffers.BufferViewConfigFragment"
+ android:name="de.kuschku.quasseldroid.ui.chat.buffers.BufferViewConfigFragment"
android:layout_width="320dp"
android:layout_height="match_parent"
tools:layout="@layout/fragment_chat_list" />
@@ -47,7 +47,7 @@
<fragment
android:id="@+id/fragment_nick_list"
- android:name="de.kuschku.quasseldroid_ng.ui.chat.nicks.NickListFragment"
+ android:name="de.kuschku.quasseldroid.ui.chat.nicks.NickListFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="end"
diff --git a/app/src/main/res/layout-sw720dp/activity_settings.xml b/app/src/main/res/layout-sw720dp/activity_settings.xml
index 33c312ffd3149b82ec8688e76678574ce8471fba..893bde649bed402cfe11c5263d1c46bd5e5e5313 100644
--- a/app/src/main/res/layout-sw720dp/activity_settings.xml
+++ b/app/src/main/res/layout-sw720dp/activity_settings.xml
@@ -29,7 +29,7 @@
<fragment
android:id="@+id/settingsFragment"
- android:name="de.kuschku.quasseldroid_ng.ui.settings.SettingsFragment"
+ android:name="de.kuschku.quasseldroid.ui.settings.SettingsFragment"
android:layout_width="600dp"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 908b2b8d77b8defbb261899531d8e7693db4ee00..3db33f9dc2775dfb19bfc6553f5f62687f601294 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,13 +10,13 @@
<fragment
android:id="@+id/fragment_nick_list"
- android:name="de.kuschku.quasseldroid_ng.ui.chat.nicks.NickListFragment"
+ android:name="de.kuschku.quasseldroid.ui.chat.nicks.NickListFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="end"
tools:layout="@layout/fragment_nick_list" />
- <de.kuschku.quasseldroid_ng.util.ui.NavigationDrawerLayout
+ <de.kuschku.quasseldroid.util.ui.NavigationDrawerLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="start"
@@ -26,9 +26,9 @@
<fragment
android:id="@+id/fragment_chat_list"
- android:name="de.kuschku.quasseldroid_ng.ui.chat.buffers.BufferViewConfigFragment"
+ android:name="de.kuschku.quasseldroid.ui.chat.buffers.BufferViewConfigFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_chat_list" />
- </de.kuschku.quasseldroid_ng.util.ui.NavigationDrawerLayout>
+ </de.kuschku.quasseldroid.util.ui.NavigationDrawerLayout>
</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index f9a771bbe46637ac6b2284845cc97b1b0cd773c3..7e6d5f030c40cb5acdb4a9f0519d8dc2c7bcb4f1 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -29,7 +29,7 @@
<fragment
android:id="@+id/settingsFragment"
- android:name="de.kuschku.quasseldroid_ng.ui.settings.SettingsFragment"
+ android:name="de.kuschku.quasseldroid.ui.settings.SettingsFragment"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
tools:layout="@xml/preferences" />
diff --git a/app/src/main/res/layout/fragment_nick_list.xml b/app/src/main/res/layout/fragment_nick_list.xml
index e7b01adea6c2206db48a9cf8131d3d59f22d45a6..d1e0c34a75b97d59d1b65b192172eebf443689b6 100644
--- a/app/src/main/res/layout/fragment_nick_list.xml
+++ b/app/src/main/res/layout/fragment_nick_list.xml
@@ -1,4 +1,4 @@
-<de.kuschku.quasseldroid_ng.util.ui.DrawerRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<de.kuschku.quasseldroid.util.ui.DrawerRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nickList"
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_editor.xml b/app/src/main/res/layout/layout_editor.xml
index 8af1417d769c33906fb2029b2f70c64e0c3215b5..792c6b68e76c68629079f92f82e1281db275db08 100644
--- a/app/src/main/res/layout/layout_editor.xml
+++ b/app/src/main/res/layout/layout_editor.xml
@@ -45,7 +45,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/ic_send" />
- <de.kuschku.quasseldroid_ng.util.ui.AutoCompleteRecyclerView
+ <de.kuschku.quasseldroid.util.ui.AutoCompleteRecyclerView
android:id="@+id/autocomplete_list_expanded"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml
index 50001794ea9d83dcb2a9c2f89e1a2ca18a8b49a4..52a72825548d02728ee7ce244f3976752c9fce62 100644
--- a/app/src/main/res/layout/layout_main.xml
+++ b/app/src/main/res/layout/layout_main.xml
@@ -26,13 +26,13 @@
<fragment
android:id="@+id/fragment_messages"
- android:name="de.kuschku.quasseldroid_ng.ui.chat.messages.MessageListFragment"
+ android:name="de.kuschku.quasseldroid.ui.chat.messages.MessageListFragment"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
tools:layout="@layout/fragment_messages" />
- <de.kuschku.quasseldroid_ng.util.ui.AutoCompleteRecyclerView
+ <de.kuschku.quasseldroid.util.ui.AutoCompleteRecyclerView
android:id="@+id/autocomplete_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/layout_toolbar.xml b/app/src/main/res/layout/layout_toolbar.xml
index ff2a777470131e6628aa6f24da70a9cefb080826..edc30f657df7bb2d85bf9014bc137be7145d1daf 100644
--- a/app/src/main/res/layout/layout_toolbar.xml
+++ b/app/src/main/res/layout/layout_toolbar.xml
@@ -19,14 +19,14 @@
<fragment
android:id="@+id/fragment_toolbar"
- android:name="de.kuschku.quasseldroid_ng.ui.chat.ToolbarFragment"
+ android:name="de.kuschku.quasseldroid.ui.chat.ToolbarFragment"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
tools:layout="@layout/fragment_toolbar" />
</android.support.v7.widget.Toolbar>
- <de.kuschku.quasseldroid_ng.util.ui.MaterialContentLoadingProgressBar
+ <de.kuschku.quasseldroid.util.ui.MaterialContentLoadingProgressBar
android:id="@+id/progress_bar"
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal.NoPadding"
android:layout_width="match_parent"
diff --git a/viewmodel/src/main/AndroidManifest.xml b/viewmodel/src/main/AndroidManifest.xml
index 834be47102421f39909545a27175413cecd4fd87..86175d72b665d685737be5dc0b87bc92c615a768 100644
--- a/viewmodel/src/main/AndroidManifest.xml
+++ b/viewmodel/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest package="de.kuschku.quasseldroid_ng.viewmodel"></manifest>
+<manifest package="de.kuschku.quasseldroid.viewmodel"></manifest>
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/util/helper/LiveDataHelper.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataHelper.kt
similarity index 98%
rename from viewmodel/src/main/java/de/kuschku/quasseldroid_ng/util/helper/LiveDataHelper.kt
rename to viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataHelper.kt
index b44582900bdbb0d4f45c9658d3f6f12df70717cf..45f74e097ca1cf67ad204566fe9a94d1a858a84a 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/util/helper/LiveDataHelper.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
import android.arch.lifecycle.*
import android.support.annotation.MainThread
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/util/helper/LiveDataZipHelper.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataZipHelper.kt
similarity index 98%
rename from viewmodel/src/main/java/de/kuschku/quasseldroid_ng/util/helper/LiveDataZipHelper.kt
rename to viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataZipHelper.kt
index 7e650dece2ebda3db2de2b926146b3b8e230dc36..192049fc96e26e89a65337c8d1482db4fef9cb01 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/util/helper/LiveDataZipHelper.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataZipHelper.kt
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
import android.arch.lifecycle.LiveData
import android.arch.lifecycle.MediatorLiveData
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ObservableHelper.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/ObservableHelper.kt
similarity index 91%
rename from viewmodel/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ObservableHelper.kt
rename to viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/ObservableHelper.kt
index 81e68d9fd06d20b40c4ab5a398092716f259520e..891516836e2feffc0fd708f248a2adc0e6ab4cbb 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ObservableHelper.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/ObservableHelper.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.util.helper
+package de.kuschku.quasseldroid.util.helper
import android.arch.lifecycle.LiveData
import android.arch.lifecycle.LiveDataReactiveStreams
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/QuasselViewModel.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
similarity index 99%
rename from viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/QuasselViewModel.kt
rename to viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
index 7aca16bb7c77d1341b423441ac71113525a7f775..1ee66ffa2f4b987eaaa9fe2fef36e28f4cfdd9fa 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/QuasselViewModel.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.viewmodel
+package de.kuschku.quasseldroid.viewmodel
import android.arch.lifecycle.LiveData
import android.arch.lifecycle.MutableLiveData
@@ -15,8 +15,8 @@ import de.kuschku.libquassel.session.Backend
import de.kuschku.libquassel.session.ISession
import de.kuschku.libquassel.util.and
import de.kuschku.libquassel.util.hasFlag
-import de.kuschku.quasseldroid_ng.util.helper.*
-import de.kuschku.quasseldroid_ng.viewmodel.data.*
+import de.kuschku.quasseldroid.util.helper.*
+import de.kuschku.quasseldroid.viewmodel.data.*
import io.reactivex.Observable
import java.util.concurrent.TimeUnit
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/AutoCompleteItem.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/AutoCompleteItem.kt
similarity index 94%
rename from viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/AutoCompleteItem.kt
rename to viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/AutoCompleteItem.kt
index 0a27fcbed29ef738a7ba498f686022d21358cbb7..f207cea27108971922229faa8c48d4895088bcff 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/AutoCompleteItem.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/AutoCompleteItem.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.viewmodel.data
+package de.kuschku.quasseldroid.viewmodel.data
import de.kuschku.libquassel.quassel.BufferInfo
import de.kuschku.libquassel.quassel.syncables.interfaces.INetwork
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferData.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferData.kt
similarity index 83%
rename from viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferData.kt
rename to viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferData.kt
index 915a98732032605c7c776af0cb4dd96aa0de0b13..8b17ab13a4a0aaba83787a114d3060a2a75bf15c 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferData.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferData.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.viewmodel.data
+package de.kuschku.quasseldroid.viewmodel.data
import de.kuschku.libquassel.quassel.BufferInfo
import de.kuschku.libquassel.quassel.syncables.interfaces.INetwork
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferHiddenState.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferHiddenState.kt
similarity index 62%
rename from viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferHiddenState.kt
rename to viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferHiddenState.kt
index 6198395301eff9ded6e3bd39017989a1f2ea071a..c4a11b6ee4d1f5e7d01d5ac3a527b8de20e2a407 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferHiddenState.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferHiddenState.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.viewmodel.data
+package de.kuschku.quasseldroid.viewmodel.data
enum class BufferHiddenState {
VISIBLE,
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferListItem.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferListItem.kt
similarity index 61%
rename from viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferListItem.kt
rename to viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferListItem.kt
index 27243657bee95a10bd97d360f096693840406c2f..76f60e254e517ef84d1d2834faf3c6ddb1144574 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferListItem.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferListItem.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.viewmodel.data
+package de.kuschku.quasseldroid.viewmodel.data
data class BufferListItem(
val props: BufferProps,
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferProps.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferProps.kt
similarity index 92%
rename from viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferProps.kt
rename to viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferProps.kt
index 53757d484112bb0a897e48bceaa3be2cc3de20f1..ccc6258dc60e697bfca911c3f6fc7ca1113d01f0 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferProps.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferProps.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.viewmodel.data
+package de.kuschku.quasseldroid.viewmodel.data
import de.kuschku.libquassel.protocol.Buffer_Activities
import de.kuschku.libquassel.protocol.Message_Types
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferState.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferState.kt
similarity index 62%
rename from viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferState.kt
rename to viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferState.kt
index 361a42da602774771c155d93beb775b0c01701e6..b95936c90fedcfd0d5dff8cf5572e9b67b52fd26 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferState.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferState.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.viewmodel.data
+package de.kuschku.quasseldroid.viewmodel.data
data class BufferState(
val networkExpanded: Boolean,
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferStatus.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferStatus.kt
similarity index 52%
rename from viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferStatus.kt
rename to viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferStatus.kt
index d182f0f9befa71f952a17cb9f7c52e3d80a7b382..a586e1eb3937a25e50cb95c4c12e3ebe983cb1c5 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/BufferStatus.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferStatus.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.viewmodel.data
+package de.kuschku.quasseldroid.viewmodel.data
enum class BufferStatus {
ONLINE,
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/IrcUserItem.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/IrcUserItem.kt
similarity index 77%
rename from viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/IrcUserItem.kt
rename to viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/IrcUserItem.kt
index ce9af2f2b6994e68ec3f6fa17a9ee830e4aa71e1..3b0a7e062607e8f1afac022c0c01577beaa0a239 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/IrcUserItem.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/IrcUserItem.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.viewmodel.data
+package de.kuschku.quasseldroid.viewmodel.data
data class IrcUserItem(
val nick: String,
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/SelectedBufferItem.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/SelectedBufferItem.kt
similarity index 87%
rename from viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/SelectedBufferItem.kt
rename to viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/SelectedBufferItem.kt
index 617f50e0ccdfc5a6c0b09825e664655d1ba5798b..21daf1af69cff7cecae1b5ea71b5a2361f4d1c6a 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid_ng/viewmodel/data/SelectedBufferItem.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/SelectedBufferItem.kt
@@ -1,4 +1,4 @@
-package de.kuschku.quasseldroid_ng.viewmodel.data
+package de.kuschku.quasseldroid.viewmodel.data
import de.kuschku.libquassel.quassel.BufferInfo
import de.kuschku.libquassel.quassel.syncables.interfaces.INetwork