From b182bfe9188f698a60c8766670ad649c63d62fee Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 22 Mar 2018 12:04:31 +0100
Subject: [PATCH] Move app to correct package
---
.../ExampleInstrumentedTest.kt | 2 +-
app/src/main/AndroidManifest.xml | 22 ++++++------
.../java/com/robobunny/SeekBarPreference.kt | 2 +-
.../{quasseldroid_ng => quasseldroid}/Keys.kt | 2 +-
.../QuasseldroidNG.kt | 16 ++++-----
.../persistence/AccountDatabase.kt | 2 +-
.../persistence/QuasselBacklogStorage.kt | 2 +-
.../persistence/QuasselDatabase.kt | 6 ++--
.../service/QuasselService.kt | 30 ++++++++--------
.../settings/AppearanceSettings.kt | 4 +--
.../settings/BacklogSettings.kt | 2 +-
.../settings/ConnectionSettings.kt | 2 +-
.../settings/Settings.kt | 8 ++---
.../ui/chat/ChatActivity.kt | 36 +++++++++----------
.../ui/chat/ToolbarFragment.kt | 20 +++++------
.../ui/chat/buffers/BufferListAdapter.kt | 20 +++++------
.../chat/buffers/BufferViewConfigAdapter.kt | 8 ++---
.../chat/buffers/BufferViewConfigFragment.kt | 24 ++++++-------
.../ui/chat/input/AutoCompleteAdapter.kt | 16 ++++-----
.../ui/chat/input/Editor.kt | 18 +++++-----
.../ui/chat/input/FormatHandler.kt | 16 ++++-----
.../ui/chat/input/MessageHistoryAdapter.kt | 4 +--
.../ui/chat/messages/FormattedMessage.kt | 2 +-
.../ui/chat/messages/MessageAdapter.kt | 8 ++---
.../ui/chat/messages/MessageListFragment.kt | 20 +++++------
.../ui/chat/messages/MessageRenderer.kt | 4 +--
.../chat/messages/QuasselMessageRenderer.kt | 22 ++++++------
.../chat/messages/QuasselMessageViewHolder.kt | 4 +--
.../ui/chat/nicks/NickListAdapter.kt | 8 ++---
.../ui/chat/nicks/NickListFragment.kt | 18 +++++-----
.../ui/settings/SettingsActivity.kt | 6 ++--
.../ui/settings/SettingsFragment.kt | 8 ++---
.../ui/setup/SetupActivity.kt | 12 +++----
.../ui/setup/SlideFragment.kt | 4 +--
.../ui/setup/ValidityChangeCallback.kt | 2 +-
.../ui/setup/accounts/AccountAdapter.kt | 8 ++---
.../ui/setup/accounts/AccountEditActivity.kt | 16 ++++-----
.../accounts/AccountSelectionActivity.kt | 8 ++---
.../setup/accounts/AccountSelectionSlide.kt | 12 +++----
.../ui/setup/accounts/AccountSetupActivity.kt | 8 ++---
.../accounts/AccountSetupConnectionSlide.kt | 10 +++---
.../setup/accounts/AccountSetupNameSlide.kt | 8 ++---
.../setup/accounts/AccountSetupUserSlide.kt | 8 ++---
.../ui/setup/accounts/AccountViewModel.kt | 4 +--
.../ui/widget/ChatWidgetProvider.kt | 7 ++++
.../util/AndroidHandlerThread.kt | 2 +-
.../util/Patterns.kt | 2 +-
.../util/QuasseldroidNotificationManager.kt | 14 ++++----
.../util/TextValidator.kt | 2 +-
.../util/backport/AndroidThreeTenBackport.kt | 2 +-
.../util/backport/ReadableWrappedChannel.kt | 2 +-
.../util/backport/WritableWrappedChannel.kt | 2 +-
.../AndroidCompatibilityUtils.kt | 2 +-
.../compatibility/AndroidHandlerService.kt | 2 +-
.../compatibility/AndroidLoggingHandler.kt | 4 +--
.../AndroidStreamChannelFactory.kt | 6 ++--
.../util/helper/AccountDaoHelper.kt | 4 +--
.../util/helper/ActivityHelper.kt | 2 +-
.../util/helper/CharSequenceHelper.kt | 2 +-
.../util/helper/ContextHelper.kt | 2 +-
.../util/helper/FloatingActionButtonHelper.kt | 2 +-
.../util/helper/IntProgressionHelper.kt | 2 +-
.../util/helper/LruCacheHelper.kt | 2 +-
.../util/helper/MenuHelper.kt | 4 +--
.../util/helper/ResourcesHelper.kt | 2 +-
.../util/helper/SelectionHelper.kt | 2 +-
.../util/helper/SharedPreferencesHelper.kt | 2 +-
.../util/helper/SpannedHelper.kt | 2 +-
.../util/helper/ThemeHelper.kt | 2 +-
.../util/helper/ViewHelper.kt | 2 +-
.../util/irc/format/IrcFormatDeserializer.kt | 8 ++---
.../util/irc/format/IrcFormatSerializer.kt | 6 ++--
.../util/irc/format/spans/Copyable.kt | 5 +++
.../format/spans/IrcBackgroundColorSpan.kt | 2 +-
.../util/irc/format/spans/IrcBoldSpan.kt | 2 +-
.../format/spans/IrcForegroundColorSpan.kt | 2 +-
.../format/spans/IrcHexBackgroundColorSpan.kt | 2 +-
.../format/spans/IrcHexForegroundColorSpan.kt | 2 +-
.../util/irc/format/spans/IrcItalicSpan.kt | 2 +-
.../util/irc/format/spans/IrcMonospaceSpan.kt | 2 +-
.../irc/format/spans/IrcStrikethroughSpan.kt | 2 +-
.../util/irc/format/spans/IrcUnderlineSpan.kt | 2 +-
.../util/quassel/CRCUtils.kt | 2 +-
.../util/quassel/IrcUserUtils.kt | 2 +-
.../util/service/BackendServiceConnection.kt | 4 +--
.../util/service/ServiceBoundActivity.kt | 18 +++++-----
.../util/service/ServiceBoundFragment.kt | 4 +--
.../util/ui/AutoCompleteRecyclerView.kt | 4 +--
.../util/ui/ContextThemeWrapper.kt | 4 +--
.../util/ui/DrawerRecyclerView.kt | 4 +--
.../ui/MaterialContentLoadingProgressBar.kt | 2 +-
.../util/ui/NavigationDrawerLayout.kt | 4 +--
.../util/ui/RecyclerSpinnerAdapter.kt | 2 +-
.../util/ui/SpanFormatter.java | 2 +-
.../util/irc/format/spans/Copyable.kt | 5 ---
app/src/main/res/layout-land/layout_main.xml | 4 +--
.../res/layout-sw600dp-land/layout_main.xml | 4 +--
.../res/layout-sw720dp-land/activity_main.xml | 4 +--
.../res/layout-sw720dp/activity_settings.xml | 2 +-
app/src/main/res/layout/activity_main.xml | 8 ++---
app/src/main/res/layout/activity_settings.xml | 2 +-
.../main/res/layout/fragment_nick_list.xml | 2 +-
app/src/main/res/layout/layout_editor.xml | 2 +-
app/src/main/res/layout/layout_main.xml | 4 +--
app/src/main/res/layout/layout_toolbar.xml | 4 +--
viewmodel/src/main/AndroidManifest.xml | 2 +-
.../util/helper/LiveDataHelper.kt | 2 +-
.../util/helper/LiveDataZipHelper.kt | 2 +-
.../util/helper/ObservableHelper.kt | 2 +-
.../viewmodel/QuasselViewModel.kt | 6 ++--
.../viewmodel/data/AutoCompleteItem.kt | 2 +-
.../viewmodel/data/BufferData.kt | 2 +-
.../viewmodel/data/BufferHiddenState.kt | 2 +-
.../viewmodel/data/BufferListItem.kt | 2 +-
.../viewmodel/data/BufferProps.kt | 2 +-
.../viewmodel/data/BufferState.kt | 2 +-
.../viewmodel/data/BufferStatus.kt | 2 +-
.../viewmodel/data/IrcUserItem.kt | 2 +-
.../viewmodel/data/SelectedBufferItem.kt | 2 +-
119 files changed, 354 insertions(+), 349 deletions(-)
rename app/src/androidTest/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ExampleInstrumentedTest.kt (94%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/Keys.kt (81%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/QuasseldroidNG.kt (86%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/persistence/AccountDatabase.kt (97%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/persistence/QuasselBacklogStorage.kt (97%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/persistence/QuasselDatabase.kt (96%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/service/QuasselService.kt (91%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/settings/AppearanceSettings.kt (95%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/settings/BacklogSettings.kt (74%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/settings/ConnectionSettings.kt (76%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/settings/Settings.kt (92%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/ChatActivity.kt (91%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/ToolbarFragment.kt (83%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/buffers/BufferListAdapter.kt (96%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/buffers/BufferViewConfigAdapter.kt (91%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/buffers/BufferViewConfigFragment.kt (94%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/input/AutoCompleteAdapter.kt (91%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/input/Editor.kt (93%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/input/FormatHandler.kt (94%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/input/MessageHistoryAdapter.kt (95%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/messages/FormattedMessage.kt (70%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/messages/MessageAdapter.kt (92%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/messages/MessageListFragment.kt (92%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/messages/MessageRenderer.kt (82%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/messages/QuasselMessageRenderer.kt (95%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/messages/QuasselMessageViewHolder.kt (86%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/nicks/NickListAdapter.kt (91%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/chat/nicks/NickListFragment.kt (83%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/settings/SettingsActivity.kt (76%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/settings/SettingsFragment.kt (89%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/setup/SetupActivity.kt (95%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/setup/SlideFragment.kt (96%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/setup/ValidityChangeCallback.kt (61%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/setup/accounts/AccountAdapter.kt (97%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/setup/accounts/AccountEditActivity.kt (92%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/setup/accounts/AccountSelectionActivity.kt (83%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/setup/accounts/AccountSelectionSlide.kt (87%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/setup/accounts/AccountSetupActivity.kt (81%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/setup/accounts/AccountSetupConnectionSlide.kt (90%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/setup/accounts/AccountSetupNameSlide.kt (88%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/setup/accounts/AccountSetupUserSlide.kt (90%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/ui/setup/accounts/AccountViewModel.kt (80%)
create mode 100644 app/src/main/java/de/kuschku/quasseldroid/ui/widget/ChatWidgetProvider.kt
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/AndroidHandlerThread.kt (99%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/Patterns.kt (98%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/QuasseldroidNotificationManager.kt (88%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/TextValidator.kt (94%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/backport/AndroidThreeTenBackport.kt (94%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/backport/ReadableWrappedChannel.kt (97%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/backport/WritableWrappedChannel.kt (96%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/compatibility/AndroidCompatibilityUtils.kt (95%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/compatibility/AndroidHandlerService.kt (96%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/compatibility/AndroidLoggingHandler.kt (90%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/compatibility/AndroidStreamChannelFactory.kt (73%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/AccountDaoHelper.kt (62%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/ActivityHelper.kt (98%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/CharSequenceHelper.kt (94%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/ContextHelper.kt (96%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/FloatingActionButtonHelper.kt (76%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/IntProgressionHelper.kt (59%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/LruCacheHelper.kt (75%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/MenuHelper.kt (83%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/ResourcesHelper.kt (91%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/SelectionHelper.kt (83%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/SharedPreferencesHelper.kt (89%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/SpannedHelper.kt (98%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/ThemeHelper.kt (88%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/ViewHelper.kt (76%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/irc/format/IrcFormatDeserializer.kt (98%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/irc/format/IrcFormatSerializer.kt (98%)
create mode 100644 app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/Copyable.kt
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/irc/format/spans/IrcBackgroundColorSpan.kt (84%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/irc/format/spans/IrcBoldSpan.kt (76%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/irc/format/spans/IrcForegroundColorSpan.kt (84%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/irc/format/spans/IrcHexBackgroundColorSpan.kt (85%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/irc/format/spans/IrcHexForegroundColorSpan.kt (85%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/irc/format/spans/IrcItalicSpan.kt (76%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/irc/format/spans/IrcMonospaceSpan.kt (74%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/irc/format/spans/IrcStrikethroughSpan.kt (75%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/irc/format/spans/IrcUnderlineSpan.kt (73%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/quassel/CRCUtils.kt (94%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/quassel/IrcUserUtils.kt (96%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/service/BackendServiceConnection.kt (92%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/service/ServiceBoundActivity.kt (86%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/service/ServiceBoundFragment.kt (90%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/ui/AutoCompleteRecyclerView.kt (89%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/ui/ContextThemeWrapper.kt (98%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/ui/DrawerRecyclerView.kt (97%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/ui/MaterialContentLoadingProgressBar.kt (98%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/ui/NavigationDrawerLayout.kt (98%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/ui/RecyclerSpinnerAdapter.kt (96%)
rename app/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/ui/SpanFormatter.java (99%)
delete mode 100644 app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/spans/Copyable.kt
rename viewmodel/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/LiveDataHelper.kt (98%)
rename viewmodel/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/LiveDataZipHelper.kt (98%)
rename viewmodel/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/util/helper/ObservableHelper.kt (91%)
rename viewmodel/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/viewmodel/QuasselViewModel.kt (99%)
rename viewmodel/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/viewmodel/data/AutoCompleteItem.kt (94%)
rename viewmodel/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/viewmodel/data/BufferData.kt (83%)
rename viewmodel/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/viewmodel/data/BufferHiddenState.kt (62%)
rename viewmodel/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/viewmodel/data/BufferListItem.kt (61%)
rename viewmodel/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/viewmodel/data/BufferProps.kt (92%)
rename viewmodel/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/viewmodel/data/BufferState.kt (62%)
rename viewmodel/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/viewmodel/data/BufferStatus.kt (52%)
rename viewmodel/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/viewmodel/data/IrcUserItem.kt (77%)
rename viewmodel/src/main/java/de/kuschku/{quasseldroid_ng => quasseldroid}/viewmodel/data/SelectedBufferItem.kt (87%)
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 e100dfcad..d6985543e 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 54dbdd794..834766b0c 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 c84894467..ba5496d66 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 4fa19496a..060463682 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 6cd6dab9a..6c99825b8 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 e62a5c189..37de935be 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 f3eb2a29a..f058902d3 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 ca926a7d0..9f3645142 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 fee16389d..81973c6e9 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 4facddae8..31b2c0e94 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 028724319..69d7c4b75 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 ad0e5993b..68b945534 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 24de3eb00..9158a8b51 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 19baffe7b..ed24b2b23 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 466ea7ba1..091021b73 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 f4ae35f24..190c4ac47 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 72ff5616d..df415e13a 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 e491e9592..46176a771 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 367406a36..b0d61f044 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 14a3c5cff..121b88468 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 715020386..2fcff65f9 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 8c784e275..7163ee05e 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 3427ea19c..8b3495d70 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 1eb2082c2..8728b4629 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 d27154b6a..44fc8178a 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 9620645f6..e3a9f169f 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 74836d7b1..43a38bd33 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 cea40729c..ec37dd3b5 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 9e21c534f..dc9ae4214 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 1abcaf0d8..8f708872b 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 c5515e710..9a5526a8c 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 bea6fb418..056f8cc8c 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 1ec6a99ef..fd3d489c9 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 c12ea2297..7a0c00763 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 65778143e..216ad15ca 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 4c6453927..272443d7a 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 a7e2a41da..8e3e1c47a 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 33644c911..5bf98c0da 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 6699c44eb..98ec0b7ca 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 816786b58..4bed519eb 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 23a837b86..b8732f755 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 ab839228c..f97f85c86 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 b9fa2556e..30e2b2852 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 087b38577..83ef1a70f 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 000000000..2580253ad
--- /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 eda3dd352..04e4f1198 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 52ce7acf8..d6f3e59d1 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 b5dca3a8f..f62b3efd2 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 777fe5c2c..a8381bade 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 04019a0f0..1e7087a50 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 25921a9da..92b6c78b9 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 0f1ad0eaf..e326508e8 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 dcd0ac3f3..3de8c9400 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 d1d341a09..8046286da 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 6453d805d..b2ed4d103 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 50262dba0..e83c4878b 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 e45065189..766abbfb4 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 2e1d4dc88..75c02ae44 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 9337183b6..9f8856f87 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 f62f03f2c..df66c4fe5 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 67d4bf5b0..e8842c408 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 28ea37162..69c467371 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 772a9f53e..47e7447e3 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 d2d70dcb4..abc5cc3a1 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 3785690c2..ba0c69e00 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 f69883b38..67924afdc 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 517648920..8ec134bb6 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 496344b09..974c257c2 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 3b62d67e5..c5f2724c6 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 c7b18b2e6..61fb6f48d 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 641daf540..9e6dfb956 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 64d17aa50..6134e068a 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 000000000..aef3f9e0e
--- /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 5927da7b0..934efb741 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 ddaeec36b..455a5c867 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 70461675a..12641c5c8 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 a7b4f87f6..2269de782 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 b46ce023c..f3d680b1c 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 d38f195e5..a147724f3 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 93be73ccf..6cf95370f 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 7223229f3..5d97897b3 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 447a11bd7..3322a03cf 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 9a734a320..b9fb401ab 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 a259c1e11..301198838 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 b703da406..45f4f2f59 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 62a2351b0..37f301572 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 c524cc583..2896a08a3 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 b6aece069..2e82c5271 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 1d253a110..ebcc0969d 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 2d0f6f948..9aa7ca95e 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 ed521dc57..e9324978e 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 b42f6d9c7..09f3d52a9 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 368b5c791..3732bd811 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 fe0e46f91..b6e9122e6 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 dd103d016..000000000
--- 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 0f2a4dfae..3920f6034 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 8f62bb12f..736c78827 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 3e3145e8d..82db79c8c 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 33c312ffd..893bde649 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 908b2b8d7..3db33f9dc 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 f9a771bbe..7e6d5f030 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 e7b01adea..d1e0c34a7 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 8af1417d7..792c6b68e 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 50001794e..52a728255 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 ff2a77747..edc30f657 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 834be4710..86175d72b 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 b44582900..45f74e097 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 7e650dece..192049fc9 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 81e68d9fd..891516836 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 7aca16bb7..1ee66ffa2 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 0a27fcbed..f207cea27 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 915a98732..8b17ab13a 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 619839530..c4a11b6ee 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 27243657b..76f60e254 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 53757d484..ccc6258dc 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 361a42da6..b95936c90 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 d182f0f9b..a586e1eb3 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 ce9af2f2b..3b0a7e062 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 617f50e0c..21daf1af6 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
--
GitLab