Skip to content
Snippets Groups Projects
Commit 2c10d029 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Add more highlight rule boilerplate

parent a2e20f27
No related branches found
No related tags found
No related merge requests found
Pipeline #
......@@ -133,6 +133,12 @@
android:label="@string/settings_highlightlist_title"
android:parentActivityName=".ui.coresettings.CoreSettingsActivity"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ui.coresettings.highlightrule.HighlightRuleActivity"
android:exported="false"
android:label="@string/settings_highlightrule_title"
android:parentActivityName=".ui.coresettings.CoreSettingsActivity"
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".ui.coresettings.networkconfig.NetworkConfigActivity"
android:exported="false"
......
......@@ -28,6 +28,7 @@ import de.kuschku.quasseldroid.ui.coresettings.chatlist.ChatlistEditActivity
import de.kuschku.quasseldroid.ui.coresettings.chatlist.ChatlistEditFragmentProvider
import de.kuschku.quasseldroid.ui.coresettings.highlightlist.HighlightListActivity
import de.kuschku.quasseldroid.ui.coresettings.highlightlist.HighlightListFragmentProvider
import de.kuschku.quasseldroid.ui.coresettings.highlightrule.HighlightRuleFragment
import de.kuschku.quasseldroid.ui.coresettings.identity.IdentityCreateActivity
import de.kuschku.quasseldroid.ui.coresettings.identity.IdentityCreateFragmentProvider
import de.kuschku.quasseldroid.ui.coresettings.identity.IdentityEditActivity
......@@ -106,6 +107,9 @@ abstract class ActivityModule {
@ContributesAndroidInjector(modules = [HighlightListFragmentProvider::class])
abstract fun bindHighlightListActivity(): HighlightListActivity
@ContributesAndroidInjector(modules = [HighlightRuleFragment::class])
abstract fun bindHighlightRuleFragment(): HighlightRuleFragment
@ContributesAndroidInjector(modules = [IgnoreItemFragmentProvider::class])
abstract fun bindIgnoreItemActivity(): IgnoreItemActivity
......
package de.kuschku.quasseldroid.ui.coresettings.highlightrule
import android.content.Context
import android.content.Intent
import de.kuschku.libquassel.quassel.syncables.HighlightRuleManager
import de.kuschku.quasseldroid.util.ui.SettingsActivity
class HighlightRuleActivity : SettingsActivity(HighlightRuleFragment()) {
companion object {
fun launch(
context: Context,
rule: HighlightRuleManager.HighlightRule? = null
) = context.startActivity(intent(context, rule))
fun intent(
context: Context,
rule: HighlightRuleManager.HighlightRule? = null
) = Intent(context, HighlightRuleActivity::class.java).apply {
if (rule != null) {
putExtra("item", rule)
}
}
}
}
package de.kuschku.quasseldroid.ui.coresettings.highlightrule
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import de.kuschku.quasseldroid.ui.coresettings.SettingsFragment
class HighlightRuleFragment : SettingsFragment(), SettingsFragment.Savable,
SettingsFragment.Changeable {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?): View? {
return super.onCreateView(inflater, container, savedInstanceState)
}
override fun hasChanged(): Boolean {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
override fun onSave(): Boolean {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
}
package de.kuschku.quasseldroid.ui.coresettings.highlightrule
import dagger.Module
import dagger.android.ContributesAndroidInjector
@Module
abstract class HighlightRuleFragmentProvider {
@ContributesAndroidInjector
abstract fun bindHighlightRuleFragment(): HighlightRuleFragment
}
......@@ -97,6 +97,8 @@
<string name="settings_highlightlist_title">Hervorhebungen</string>
<string name="settings_highlightrule_title">Hervorhebungsregel</string>
<string name="settings_aliaslist_title">Aliase</string>
<string name="settings_networkconfig_title">IRC Konfiguration</string>
......
......@@ -97,6 +97,8 @@
<string name="settings_highlightlist_title">Highlights</string>
<string name="settings_highlightrule_title">Highlight Rule</string>
<string name="settings_aliaslist_title">Aliases</string>
<string name="settings_networkconfig_title">IRC Config</string>
......
......@@ -3,6 +3,7 @@ package de.kuschku.libquassel.quassel.syncables
import de.kuschku.libquassel.protocol.*
import de.kuschku.libquassel.quassel.syncables.interfaces.IHighlightRuleManager
import de.kuschku.libquassel.session.SignalProxy
import java.io.Serializable
class HighlightRuleManager(
proxy: SignalProxy
......@@ -15,7 +16,7 @@ class HighlightRuleManager(
val isInverse: Boolean = false,
val sender: String,
val channel: String
)
) : Serializable
override fun toVariantMap(): QVariantMap = mapOf(
"HighlightRuleList" to QVariant.of(initHighlightRuleList(), Type.QVariantMap),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment