Skip to content
Snippets Groups Projects
Verified Commit 6dbe2d75 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Updated kotlin, implemented channel listings

parent 6df449f4
Branches
Tags v1.0.21
No related merge requests found
Pipeline #373 canceled
Showing
with 147 additions and 48 deletions
...@@ -17,16 +17,6 @@ ...@@ -17,16 +17,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import org.gradle.api.Project
import java.io.FileInputStream
import java.util.*
import org.gradle.api.artifacts.ExternalModuleDependency
import org.gradle.kotlin.dsl.*
import org.jetbrains.kotlin.gradle.plugin.KaptExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.io.ByteArrayOutputStream
import java.util.*
plugins { plugins {
id("com.android.application") id("com.android.application")
kotlin("android") kotlin("android")
...@@ -115,7 +105,7 @@ android { ...@@ -115,7 +105,7 @@ android {
} }
dependencies { dependencies {
implementation(kotlin("stdlib", "1.3.11")) implementation(kotlin("stdlib", "1.3.20"))
// App Compat // App Compat
implementation("com.google.android.material", "material", "1.0.0-rc01") implementation("com.google.android.material", "material", "1.0.0-rc01")
......
{
"data": [
{
"name": "#fdroid",
"topic": "Due to spam you temporarily need to be registered to speak. | https://f-droid.org | https://forum.f-droid.org | https://mastodon.technology/@fdroidorg | For development discussion use #fdroid-dev | This channel is logged via matrix at https://view.matrix.org/alias/%23fdroid:f-droid.org",
"users": "673 users"
},
{
"name": "#fdroid-dev",
"topic": "Due to spam you temporarily need to be registered to speak. | | F-Droid development discussion only, use #fdroid for general, app and repo-related matters | This channel is logged via matrix at https://view.matrix.org/alias/%23fdroid-dev:f-droid.org",
"users": "59 users"
},
{
"name": "#ircdocs",
"topic": "http://ircdocs.horse/ and associated projects - http://defs.ircdocs.horse/ - http://stats.ircdocs.horse/ - http://modern.ircdocs.horse/ - https://wooooms.ircdocs.horse/ - https://github.com/irc-archive/ - combating IRC spec nonsense, one document at a time <3 👌😩 < merivingian~",
"users": "54 users"
},
{
"name": "#ircv3",
"topic": "https://ircv3.net | Roadmap: https://git.io/IRCv3-Roadmap | Code of conduct: https://ircv3.net/conduct",
"users": "202 users"
},
{
"name": "#quassel",
"topic": "Quassel IRC - https://quassel-irc.org || Latest: 0.13.0 || Mailing Lists: https://lists.quassel-irc.org || Tracker: https://bugs.quassel-irc.org || Activity RSS: #quassel-announce || German: #quassel.de || Quassel on Android: #quasseldroid; on iOS: #woboquassel",
"users": "667 users"
},
{
"name": "#quasseldroid",
"topic": "Quasseldroid is an Android client for #quassel ♥ https://quasseldroid.info/ ♥ Requires a Quassel 0.13 Core for full functionality: https://quasseldroid.info/releases/ ♥ https://git.kuschku.de/justjanne/Quasseldroid-NG/",
"users": "165 users"
}
]
}
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
}, },
{ {
"name": "Kotlin Standard Library", "name": "Kotlin Standard Library",
"version": "1.3.11", "version": "1.3.20",
"license": { "license": {
"short_name": "Apache-2.0", "short_name": "Apache-2.0",
"full_name": "Apache License" "full_name": "Apache License"
......
...@@ -76,33 +76,37 @@ ...@@ -76,33 +76,37 @@
<data android:scheme="ircs" /> <data android:scheme="ircs" />
</intent-filter> </intent-filter>
</activity> </activity>
<!-- Info -->
<activity <activity
android:name=".ui.chat.info.user.UserInfoActivity" android:name="de.kuschku.quasseldroid.ui.info.user.UserInfoActivity"
android:exported="false" android:exported="false"
android:label="@string/label_info_user" android:label="@string/label_info_user"
android:parentActivityName=".ui.chat.ChatActivity" android:parentActivityName=".ui.chat.ChatActivity"
android:windowSoftInputMode="adjustResize" /> android:windowSoftInputMode="adjustResize" />
<activity <activity
android:name=".ui.chat.info.channel.ChannelInfoActivity" android:name="de.kuschku.quasseldroid.ui.info.channel.ChannelInfoActivity"
android:exported="false" android:exported="false"
android:label="@string/label_info_channel" android:label="@string/label_info_channel"
android:parentActivityName=".ui.chat.ChatActivity" android:parentActivityName=".ui.chat.ChatActivity"
android:windowSoftInputMode="adjustResize" /> android:windowSoftInputMode="adjustResize" />
<activity <activity
android:name=".ui.chat.info.core.CoreInfoActivity" android:name="de.kuschku.quasseldroid.ui.info.core.CoreInfoActivity"
android:exported="false" android:exported="false"
android:label="@string/label_info_core" android:label="@string/label_info_core"
android:parentActivityName=".ui.chat.ChatActivity" android:parentActivityName=".ui.chat.ChatActivity"
android:windowSoftInputMode="adjustResize" /> android:windowSoftInputMode="adjustResize" />
<activity <activity
android:name=".ui.chat.topic.TopicActivity" android:name="de.kuschku.quasseldroid.ui.info.topic.TopicActivity"
android:exported="false" android:exported="false"
android:label="@string/label_topic" android:label="@string/label_topic"
android:windowSoftInputMode="adjustResize" /> android:windowSoftInputMode="adjustResize" />
<activity <activity
android:name=".ui.chat.passwordchange.PasswordChangeActivity" android:name="de.kuschku.quasseldroid.ui.info.channellist.ChannelListActivity"
android:exported="false" android:exported="false"
android:label="@string/label_password_change" android:label="@string/label_info_channellist"
android:windowSoftInputMode="adjustResize" /> android:windowSoftInputMode="adjustResize" />
<!-- Core Settings --> <!-- Core Settings -->
...@@ -195,6 +199,11 @@ ...@@ -195,6 +199,11 @@
android:label="@string/settings_networkconfig_title" android:label="@string/settings_networkconfig_title"
android:parentActivityName=".ui.coresettings.CoreSettingsActivity" android:parentActivityName=".ui.coresettings.CoreSettingsActivity"
android:windowSoftInputMode="adjustResize" /> android:windowSoftInputMode="adjustResize" />
<activity
android:name="de.kuschku.quasseldroid.ui.coresettings.passwordchange.PasswordChangeActivity"
android:exported="false"
android:label="@string/label_password_change"
android:windowSoftInputMode="adjustResize" />
<!-- Client Settings --> <!-- Client Settings -->
<activity <activity
......
...@@ -26,15 +26,6 @@ import de.kuschku.quasseldroid.service.QuasselServiceModule ...@@ -26,15 +26,6 @@ import de.kuschku.quasseldroid.service.QuasselServiceModule
import de.kuschku.quasseldroid.ui.chat.ChatActivity import de.kuschku.quasseldroid.ui.chat.ChatActivity
import de.kuschku.quasseldroid.ui.chat.ChatActivityModule import de.kuschku.quasseldroid.ui.chat.ChatActivityModule
import de.kuschku.quasseldroid.ui.chat.ChatFragmentProvider import de.kuschku.quasseldroid.ui.chat.ChatFragmentProvider
import de.kuschku.quasseldroid.ui.chat.info.channel.ChannelInfoActivity
import de.kuschku.quasseldroid.ui.chat.info.channel.ChannelInfoFragmentProvider
import de.kuschku.quasseldroid.ui.chat.info.core.CoreInfoActivity
import de.kuschku.quasseldroid.ui.chat.info.core.CoreInfoFragmentProvider
import de.kuschku.quasseldroid.ui.chat.info.user.UserInfoActivity
import de.kuschku.quasseldroid.ui.chat.info.user.UserInfoFragmentProvider
import de.kuschku.quasseldroid.ui.chat.passwordchange.PasswordChangeActivity
import de.kuschku.quasseldroid.ui.chat.passwordchange.PasswordChangeFragmentProvider
import de.kuschku.quasseldroid.ui.chat.topic.TopicActivity
import de.kuschku.quasseldroid.ui.chat.topic.TopicFragmentProvider import de.kuschku.quasseldroid.ui.chat.topic.TopicFragmentProvider
import de.kuschku.quasseldroid.ui.clientsettings.about.AboutActivity import de.kuschku.quasseldroid.ui.clientsettings.about.AboutActivity
import de.kuschku.quasseldroid.ui.clientsettings.about.AboutFragmentProvider import de.kuschku.quasseldroid.ui.clientsettings.about.AboutFragmentProvider
...@@ -76,6 +67,17 @@ import de.kuschku.quasseldroid.ui.coresettings.networkconfig.NetworkConfigActivi ...@@ -76,6 +67,17 @@ import de.kuschku.quasseldroid.ui.coresettings.networkconfig.NetworkConfigActivi
import de.kuschku.quasseldroid.ui.coresettings.networkconfig.NetworkConfigFragmentProvider import de.kuschku.quasseldroid.ui.coresettings.networkconfig.NetworkConfigFragmentProvider
import de.kuschku.quasseldroid.ui.coresettings.networkserver.NetworkServerActivity import de.kuschku.quasseldroid.ui.coresettings.networkserver.NetworkServerActivity
import de.kuschku.quasseldroid.ui.coresettings.networkserver.NetworkServerFragmentProvider import de.kuschku.quasseldroid.ui.coresettings.networkserver.NetworkServerFragmentProvider
import de.kuschku.quasseldroid.ui.coresettings.passwordchange.PasswordChangeActivity
import de.kuschku.quasseldroid.ui.coresettings.passwordchange.PasswordChangeFragmentProvider
import de.kuschku.quasseldroid.ui.info.channel.ChannelInfoActivity
import de.kuschku.quasseldroid.ui.info.channel.ChannelInfoFragmentProvider
import de.kuschku.quasseldroid.ui.info.channellist.ChannelListActivity
import de.kuschku.quasseldroid.ui.info.channellist.ChannelListFragmentProvider
import de.kuschku.quasseldroid.ui.info.core.CoreInfoActivity
import de.kuschku.quasseldroid.ui.info.core.CoreInfoFragmentProvider
import de.kuschku.quasseldroid.ui.info.topic.TopicActivity
import de.kuschku.quasseldroid.ui.info.user.UserInfoActivity
import de.kuschku.quasseldroid.ui.info.user.UserInfoFragmentProvider
import de.kuschku.quasseldroid.ui.setup.accounts.edit.AccountEditActivity import de.kuschku.quasseldroid.ui.setup.accounts.edit.AccountEditActivity
import de.kuschku.quasseldroid.ui.setup.accounts.edit.AccountEditFragmentProvider import de.kuschku.quasseldroid.ui.setup.accounts.edit.AccountEditFragmentProvider
import de.kuschku.quasseldroid.ui.setup.accounts.selection.AccountSelectionActivity import de.kuschku.quasseldroid.ui.setup.accounts.selection.AccountSelectionActivity
...@@ -112,8 +114,10 @@ abstract class ActivityModule { ...@@ -112,8 +114,10 @@ abstract class ActivityModule {
abstract fun bindTopicActivity(): TopicActivity abstract fun bindTopicActivity(): TopicActivity
@ActivityScope @ActivityScope
@ContributesAndroidInjector(modules = [PasswordChangeFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class]) @ContributesAndroidInjector(modules = [ChannelListFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class])
abstract fun bindPasswordChangeActivity(): PasswordChangeActivity abstract fun bindChannelListActivity(): ChannelListActivity
// Client Settings
@ActivityScope @ActivityScope
@ContributesAndroidInjector(modules = [ClientSettingsFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class]) @ContributesAndroidInjector(modules = [ClientSettingsFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class])
...@@ -135,6 +139,8 @@ abstract class ActivityModule { ...@@ -135,6 +139,8 @@ abstract class ActivityModule {
@ContributesAndroidInjector(modules = [LicenseFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class]) @ContributesAndroidInjector(modules = [LicenseFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class])
abstract fun bindLicenseActivity(): LicenseActivity abstract fun bindLicenseActivity(): LicenseActivity
// Core Settings
@ActivityScope @ActivityScope
@ContributesAndroidInjector(modules = [CoreSettingsFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class]) @ContributesAndroidInjector(modules = [CoreSettingsFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class])
abstract fun bindCoreSettingsActivity(): CoreSettingsActivity abstract fun bindCoreSettingsActivity(): CoreSettingsActivity
...@@ -195,6 +201,12 @@ abstract class ActivityModule { ...@@ -195,6 +201,12 @@ abstract class ActivityModule {
@ContributesAndroidInjector(modules = [NetworkConfigFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class]) @ContributesAndroidInjector(modules = [NetworkConfigFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class])
abstract fun bindNetworkConfigActivity(): NetworkConfigActivity abstract fun bindNetworkConfigActivity(): NetworkConfigActivity
@ActivityScope
@ContributesAndroidInjector(modules = [PasswordChangeFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class])
abstract fun bindPasswordChangeActivity(): PasswordChangeActivity
// Setup
@ActivityScope @ActivityScope
@ContributesAndroidInjector(modules = [AccountSetupFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class]) @ContributesAndroidInjector(modules = [AccountSetupFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class])
abstract fun bindAccountSetupActivity(): AccountSetupActivity abstract fun bindAccountSetupActivity(): AccountSetupActivity
...@@ -219,6 +231,8 @@ abstract class ActivityModule { ...@@ -219,6 +231,8 @@ abstract class ActivityModule {
@ContributesAndroidInjector(modules = [CoreSetupFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class]) @ContributesAndroidInjector(modules = [CoreSetupFragmentProvider::class, SettingsModule::class, DatabaseModule::class, ActivityBaseModule::class])
abstract fun bindCoreSetupActivity(): CoreSetupActivity abstract fun bindCoreSetupActivity(): CoreSetupActivity
// Service
@ActivityScope @ActivityScope
@ContributesAndroidInjector(modules = [QuasselServiceModule::class, SettingsModule::class, DatabaseModule::class]) @ContributesAndroidInjector(modules = [QuasselServiceModule::class, SettingsModule::class, DatabaseModule::class])
abstract fun bindQuasselService(): QuasselService abstract fun bindQuasselService(): QuasselService
......
...@@ -36,8 +36,8 @@ import de.kuschku.quasseldroid.GlideApp ...@@ -36,8 +36,8 @@ import de.kuschku.quasseldroid.GlideApp
import de.kuschku.quasseldroid.R import de.kuschku.quasseldroid.R
import de.kuschku.quasseldroid.settings.AppearanceSettings import de.kuschku.quasseldroid.settings.AppearanceSettings
import de.kuschku.quasseldroid.settings.MessageSettings import de.kuschku.quasseldroid.settings.MessageSettings
import de.kuschku.quasseldroid.ui.chat.info.channel.ChannelInfoActivity import de.kuschku.quasseldroid.ui.info.channel.ChannelInfoActivity
import de.kuschku.quasseldroid.ui.chat.info.user.UserInfoActivity import de.kuschku.quasseldroid.ui.info.user.UserInfoActivity
import de.kuschku.quasseldroid.util.ColorContext import de.kuschku.quasseldroid.util.ColorContext
import de.kuschku.quasseldroid.util.avatars.AvatarHelper import de.kuschku.quasseldroid.util.avatars.AvatarHelper
import de.kuschku.quasseldroid.util.helper.* import de.kuschku.quasseldroid.util.helper.*
......
...@@ -57,6 +57,7 @@ import de.kuschku.quasseldroid.settings.AppearanceSettings ...@@ -57,6 +57,7 @@ import de.kuschku.quasseldroid.settings.AppearanceSettings
import de.kuschku.quasseldroid.settings.MessageSettings import de.kuschku.quasseldroid.settings.MessageSettings
import de.kuschku.quasseldroid.ui.chat.ChatActivity import de.kuschku.quasseldroid.ui.chat.ChatActivity
import de.kuschku.quasseldroid.ui.coresettings.network.NetworkEditActivity import de.kuschku.quasseldroid.ui.coresettings.network.NetworkEditActivity
import de.kuschku.quasseldroid.ui.info.channellist.ChannelListActivity
import de.kuschku.quasseldroid.util.ColorContext import de.kuschku.quasseldroid.util.ColorContext
import de.kuschku.quasseldroid.util.avatars.AvatarHelper import de.kuschku.quasseldroid.util.avatars.AvatarHelper
import de.kuschku.quasseldroid.util.helper.* import de.kuschku.quasseldroid.util.helper.*
...@@ -119,6 +120,13 @@ class BufferViewConfigFragment : ServiceBoundFragment() { ...@@ -119,6 +120,13 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
return if (info != null && session != null) { return if (info != null && session != null) {
when (item?.itemId) { when (item?.itemId) {
R.id.action_channellist -> {
network?.let {
ChannelListActivity.launch(requireContext(), network = it.networkId())
}
actionMode?.finish()
true
}
R.id.action_configure -> { R.id.action_configure -> {
network?.let { network?.let {
NetworkEditActivity.launch(requireContext(), network = it.networkId()) NetworkEditActivity.launch(requireContext(), network = it.networkId())
...@@ -394,6 +402,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() { ...@@ -394,6 +402,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
val menu = actionMode?.menu val menu = actionMode?.menu
if (menu != null) { if (menu != null) {
val allActions = setOf( val allActions = setOf(
R.id.action_channellist,
R.id.action_configure, R.id.action_configure,
R.id.action_connect, R.id.action_connect,
R.id.action_disconnect, R.id.action_disconnect,
...@@ -428,7 +437,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() { ...@@ -428,7 +437,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
R.id.action_configure, R.id.action_connect R.id.action_configure, R.id.action_connect
) )
INetwork.ConnectionState.Initialized -> setOf( INetwork.ConnectionState.Initialized -> setOf(
R.id.action_configure, R.id.action_disconnect R.id.action_channellist, R.id.action_configure, R.id.action_disconnect
) )
else -> setOf( else -> setOf(
R.id.action_configure, R.id.action_connect, R.id.action_disconnect R.id.action_configure, R.id.action_connect, R.id.action_disconnect
......
...@@ -63,7 +63,7 @@ import de.kuschku.quasseldroid.settings.AutoCompleteSettings ...@@ -63,7 +63,7 @@ import de.kuschku.quasseldroid.settings.AutoCompleteSettings
import de.kuschku.quasseldroid.settings.BacklogSettings import de.kuschku.quasseldroid.settings.BacklogSettings
import de.kuschku.quasseldroid.settings.MessageSettings import de.kuschku.quasseldroid.settings.MessageSettings
import de.kuschku.quasseldroid.ui.chat.ChatActivity import de.kuschku.quasseldroid.ui.chat.ChatActivity
import de.kuschku.quasseldroid.ui.chat.info.user.UserInfoActivity import de.kuschku.quasseldroid.ui.info.user.UserInfoActivity
import de.kuschku.quasseldroid.util.Patterns import de.kuschku.quasseldroid.util.Patterns
import de.kuschku.quasseldroid.util.avatars.AvatarHelper import de.kuschku.quasseldroid.util.avatars.AvatarHelper
import de.kuschku.quasseldroid.util.helper.* import de.kuschku.quasseldroid.util.helper.*
......
...@@ -46,7 +46,7 @@ import de.kuschku.quasseldroid.GlideApp ...@@ -46,7 +46,7 @@ import de.kuschku.quasseldroid.GlideApp
import de.kuschku.quasseldroid.R import de.kuschku.quasseldroid.R
import de.kuschku.quasseldroid.settings.AppearanceSettings import de.kuschku.quasseldroid.settings.AppearanceSettings
import de.kuschku.quasseldroid.settings.MessageSettings import de.kuschku.quasseldroid.settings.MessageSettings
import de.kuschku.quasseldroid.ui.chat.info.user.UserInfoActivity import de.kuschku.quasseldroid.ui.info.user.UserInfoActivity
import de.kuschku.quasseldroid.util.ColorContext import de.kuschku.quasseldroid.util.ColorContext
import de.kuschku.quasseldroid.util.avatars.AvatarHelper import de.kuschku.quasseldroid.util.avatars.AvatarHelper
import de.kuschku.quasseldroid.util.helper.loadWithFallbacks import de.kuschku.quasseldroid.util.helper.loadWithFallbacks
......
...@@ -79,7 +79,7 @@ class TopicFragment : ServiceBoundSettingsFragment(), Savable { ...@@ -79,7 +79,7 @@ class TopicFragment : ServiceBoundSettingsFragment(), Savable {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?): View? { savedInstanceState: Bundle?): View? {
val view = inflater.inflate(R.layout.fragment_topic, container, false) val view = inflater.inflate(R.layout.fragment_info_topic, container, false)
ButterKnife.bind(this, view) ButterKnife.bind(this, view)
editorViewModel.quasselViewModel.onNext(viewModel) editorViewModel.quasselViewModel.onNext(viewModel)
......
...@@ -23,6 +23,7 @@ import androidx.fragment.app.FragmentActivity ...@@ -23,6 +23,7 @@ import androidx.fragment.app.FragmentActivity
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector
import de.kuschku.quasseldroid.ui.info.topic.TopicActivity
@Module @Module
abstract class TopicFragmentProvider { abstract class TopicFragmentProvider {
......
...@@ -195,7 +195,7 @@ class AboutFragment : DaggerFragment() { ...@@ -195,7 +195,7 @@ class AboutFragment : DaggerFragment() {
), ),
Library( Library(
name = "Kotlin Standard Library", name = "Kotlin Standard Library",
version = "1.3.11", version = "1.3.20",
license = apache2, license = apache2,
url = "https://kotlinlang.org/" url = "https://kotlinlang.org/"
), ),
......
...@@ -35,8 +35,6 @@ import de.kuschku.libquassel.quassel.syncables.BufferViewConfig ...@@ -35,8 +35,6 @@ import de.kuschku.libquassel.quassel.syncables.BufferViewConfig
import de.kuschku.libquassel.quassel.syncables.Identity import de.kuschku.libquassel.quassel.syncables.Identity
import de.kuschku.libquassel.quassel.syncables.Network import de.kuschku.libquassel.quassel.syncables.Network
import de.kuschku.quasseldroid.R import de.kuschku.quasseldroid.R
import de.kuschku.quasseldroid.ui.chat.info.core.CoreInfoActivity
import de.kuschku.quasseldroid.ui.chat.passwordchange.PasswordChangeActivity
import de.kuschku.quasseldroid.ui.coresettings.aliaslist.AliasListActivity import de.kuschku.quasseldroid.ui.coresettings.aliaslist.AliasListActivity
import de.kuschku.quasseldroid.ui.coresettings.chatlist.ChatlistCreateActivity import de.kuschku.quasseldroid.ui.coresettings.chatlist.ChatlistCreateActivity
import de.kuschku.quasseldroid.ui.coresettings.chatlist.ChatlistEditActivity import de.kuschku.quasseldroid.ui.coresettings.chatlist.ChatlistEditActivity
...@@ -47,6 +45,8 @@ import de.kuschku.quasseldroid.ui.coresettings.ignorelist.IgnoreListActivity ...@@ -47,6 +45,8 @@ import de.kuschku.quasseldroid.ui.coresettings.ignorelist.IgnoreListActivity
import de.kuschku.quasseldroid.ui.coresettings.network.NetworkCreateActivity import de.kuschku.quasseldroid.ui.coresettings.network.NetworkCreateActivity
import de.kuschku.quasseldroid.ui.coresettings.network.NetworkEditActivity import de.kuschku.quasseldroid.ui.coresettings.network.NetworkEditActivity
import de.kuschku.quasseldroid.ui.coresettings.networkconfig.NetworkConfigActivity import de.kuschku.quasseldroid.ui.coresettings.networkconfig.NetworkConfigActivity
import de.kuschku.quasseldroid.ui.coresettings.passwordchange.PasswordChangeActivity
import de.kuschku.quasseldroid.ui.info.core.CoreInfoActivity
import de.kuschku.quasseldroid.util.helper.combineLatest import de.kuschku.quasseldroid.util.helper.combineLatest
import de.kuschku.quasseldroid.util.helper.toLiveData import de.kuschku.quasseldroid.util.helper.toLiveData
import de.kuschku.quasseldroid.util.helper.visibleIf import de.kuschku.quasseldroid.util.helper.visibleIf
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package de.kuschku.quasseldroid.ui.chat.passwordchange package de.kuschku.quasseldroid.ui.coresettings.passwordchange
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package de.kuschku.quasseldroid.ui.chat.passwordchange package de.kuschku.quasseldroid.ui.coresettings.passwordchange
import android.os.Bundle import android.os.Bundle
import android.text.Editable import android.text.Editable
...@@ -80,7 +80,7 @@ class PasswordChangeFragment : ServiceBoundFragment() { ...@@ -80,7 +80,7 @@ class PasswordChangeFragment : ServiceBoundFragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?): View? { savedInstanceState: Bundle?): View? {
val view = inflater.inflate(R.layout.fragment_passwordchange, container, false) val view = inflater.inflate(R.layout.settings_passwordchange, container, false)
ButterKnife.bind(this, view) ButterKnife.bind(this, view)
val account = accountDatabase.accounts().findById(accountId) val account = accountDatabase.accounts().findById(accountId)
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package de.kuschku.quasseldroid.ui.chat.passwordchange package de.kuschku.quasseldroid.ui.coresettings.passwordchange
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import dagger.Binds import dagger.Binds
......
...@@ -17,10 +17,11 @@ ...@@ -17,10 +17,11 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package de.kuschku.quasseldroid.ui.chat.info.channel package de.kuschku.quasseldroid.ui.info.channel
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import de.kuschku.libquassel.protocol.BufferId
import de.kuschku.quasseldroid.util.ui.settings.ServiceBoundSettingsActivity import de.kuschku.quasseldroid.util.ui.settings.ServiceBoundSettingsActivity
class ChannelInfoActivity : ServiceBoundSettingsActivity(ChannelInfoFragment()) { class ChannelInfoActivity : ServiceBoundSettingsActivity(ChannelInfoFragment()) {
...@@ -28,13 +29,13 @@ class ChannelInfoActivity : ServiceBoundSettingsActivity(ChannelInfoFragment()) ...@@ -28,13 +29,13 @@ class ChannelInfoActivity : ServiceBoundSettingsActivity(ChannelInfoFragment())
fun launch( fun launch(
context: Context, context: Context,
openBuffer: Boolean, openBuffer: Boolean,
bufferId: Int bufferId: BufferId
) = context.startActivity(intent(context, openBuffer, bufferId)) ) = context.startActivity(intent(context, openBuffer, bufferId))
fun intent( fun intent(
context: Context, context: Context,
openBuffer: Boolean, openBuffer: Boolean,
bufferId: Int bufferId: BufferId
) = Intent(context, ChannelInfoActivity::class.java).apply { ) = Intent(context, ChannelInfoActivity::class.java).apply {
putExtra("bufferId", bufferId) putExtra("bufferId", bufferId)
putExtra("openBuffer", openBuffer) putExtra("openBuffer", openBuffer)
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package de.kuschku.quasseldroid.ui.chat.info.channel package de.kuschku.quasseldroid.ui.info.channel
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
...@@ -35,7 +35,7 @@ import de.kuschku.libquassel.quassel.syncables.IrcChannel ...@@ -35,7 +35,7 @@ import de.kuschku.libquassel.quassel.syncables.IrcChannel
import de.kuschku.libquassel.util.helpers.value import de.kuschku.libquassel.util.helpers.value
import de.kuschku.quasseldroid.R import de.kuschku.quasseldroid.R
import de.kuschku.quasseldroid.settings.MessageSettings import de.kuschku.quasseldroid.settings.MessageSettings
import de.kuschku.quasseldroid.ui.chat.topic.TopicActivity import de.kuschku.quasseldroid.ui.info.topic.TopicActivity
import de.kuschku.quasseldroid.util.ShortcutCreationHelper import de.kuschku.quasseldroid.util.ShortcutCreationHelper
import de.kuschku.quasseldroid.util.helper.* import de.kuschku.quasseldroid.util.helper.*
import de.kuschku.quasseldroid.util.irc.format.ContentFormatter import de.kuschku.quasseldroid.util.irc.format.ContentFormatter
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package de.kuschku.quasseldroid.ui.chat.info.channel package de.kuschku.quasseldroid.ui.info.channel
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import dagger.Binds import dagger.Binds
......
/*
* Quasseldroid - Quassel client for Android
*
* Copyright (c) 2019 Janne Koschinski
* Copyright (c) 2019 The Quassel Project
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3 as published
* by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package de.kuschku.quasseldroid.ui.info.channellist
import android.content.Context
import android.content.Intent
import de.kuschku.libquassel.protocol.NetworkId
import de.kuschku.quasseldroid.util.ui.settings.ServiceBoundSettingsActivity
class ChannelListActivity : ServiceBoundSettingsActivity(ChannelListFragment()) {
companion object {
fun launch(
context: Context,
network: NetworkId
) = context.startActivity(intent(context, network))
fun intent(
context: Context,
network: NetworkId
) = Intent(context, ChannelListActivity::class.java).apply {
putExtra("network_id", network)
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment