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

Minor fixes

parent 011d72e8
No related branches found
No related tags found
No related merge requests found
Pipeline #264 canceled
...@@ -24,5 +24,6 @@ import de.kuschku.libquassel.quassel.ExtendedFeature ...@@ -24,5 +24,6 @@ import de.kuschku.libquassel.quassel.ExtendedFeature
data class MissingFeature( data class MissingFeature(
val feature: ExtendedFeature, val feature: ExtendedFeature,
val minimumVersion: QuasselVersion,
@StringRes val description: Int @StringRes val description: Int
) )
...@@ -22,6 +22,8 @@ package de.kuschku.quasseldroid.util.missingfeatures ...@@ -22,6 +22,8 @@ package de.kuschku.quasseldroid.util.missingfeatures
import android.app.Dialog import android.app.Dialog
import android.content.DialogInterface import android.content.DialogInterface
import android.os.Bundle import android.os.Bundle
import android.text.Html
import android.widget.TextView
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager
...@@ -31,6 +33,7 @@ import butterknife.BindView ...@@ -31,6 +33,7 @@ import butterknife.BindView
import butterknife.ButterKnife import butterknife.ButterKnife
import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.MaterialDialog
import de.kuschku.quasseldroid.R import de.kuschku.quasseldroid.R
import de.kuschku.quasseldroid.util.ui.BetterLinkMovementMethod
import java.io.Serializable import java.io.Serializable
class MissingFeaturesDialog : DialogFragment() { class MissingFeaturesDialog : DialogFragment() {
...@@ -40,6 +43,9 @@ class MissingFeaturesDialog : DialogFragment() { ...@@ -40,6 +43,9 @@ class MissingFeaturesDialog : DialogFragment() {
@BindView(R.id.list) @BindView(R.id.list)
lateinit var list: RecyclerView lateinit var list: RecyclerView
@BindView(R.id.message)
lateinit var message: TextView
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val dialog = MaterialDialog.Builder(requireContext()) val dialog = MaterialDialog.Builder(requireContext())
.customView(R.layout.dialog_missing_features, true) .customView(R.layout.dialog_missing_features, true)
...@@ -51,6 +57,10 @@ class MissingFeaturesDialog : DialogFragment() { ...@@ -51,6 +57,10 @@ class MissingFeaturesDialog : DialogFragment() {
} }
.build() .build()
ButterKnife.bind(this, dialog.customView!!) ButterKnife.bind(this, dialog.customView!!)
val version = builder?.missingFeatures?.maxBy(MissingFeature::minimumVersion)?.minimumVersion
?: QuasselVersion.VERSION_0_13
message.text = Html.fromHtml(getString(R.string.info_missing_features, version.humanName))
message.movementMethod = BetterLinkMovementMethod.newInstance()
list.layoutManager = LinearLayoutManager(list.context) list.layoutManager = LinearLayoutManager(list.context)
val adapter = MissingFeaturesAdapter() val adapter = MissingFeaturesAdapter()
list.adapter = adapter list.adapter = adapter
......
package de.kuschku.quasseldroid.util.missingfeatures
enum class QuasselVersion(val humanName: String) {
VERSION_0_13("v0.13");
}
...@@ -25,34 +25,49 @@ import de.kuschku.quasseldroid.R ...@@ -25,34 +25,49 @@ import de.kuschku.quasseldroid.R
object RequiredFeatures { object RequiredFeatures {
val features = listOf( val features = listOf(
MissingFeature(ExtendedFeature.SynchronizedMarkerLine, MissingFeature(ExtendedFeature.SynchronizedMarkerLine,
QuasselVersion.VERSION_0_13,
R.string.label_feature_synchronizedmarkerline), R.string.label_feature_synchronizedmarkerline),
MissingFeature(ExtendedFeature.SaslAuthentication, MissingFeature(ExtendedFeature.SaslAuthentication,
QuasselVersion.VERSION_0_13,
R.string.label_feature_saslauthentication), R.string.label_feature_saslauthentication),
MissingFeature(ExtendedFeature.SaslExternal, MissingFeature(ExtendedFeature.SaslExternal,
QuasselVersion.VERSION_0_13,
R.string.label_feature_saslexternal), R.string.label_feature_saslexternal),
MissingFeature(ExtendedFeature.HideInactiveNetworks, MissingFeature(ExtendedFeature.HideInactiveNetworks,
QuasselVersion.VERSION_0_13,
R.string.label_feature_hideinactivenetworks), R.string.label_feature_hideinactivenetworks),
MissingFeature(ExtendedFeature.PasswordChange, MissingFeature(ExtendedFeature.PasswordChange,
QuasselVersion.VERSION_0_13,
R.string.label_feature_passwordchange), R.string.label_feature_passwordchange),
MissingFeature(ExtendedFeature.CapNegotiation, MissingFeature(ExtendedFeature.CapNegotiation,
QuasselVersion.VERSION_0_13,
R.string.label_feature_capnegotiation), R.string.label_feature_capnegotiation),
MissingFeature(ExtendedFeature.VerifyServerSSL, MissingFeature(ExtendedFeature.VerifyServerSSL,
QuasselVersion.VERSION_0_13,
R.string.label_feature_verifyserverssl), R.string.label_feature_verifyserverssl),
MissingFeature(ExtendedFeature.CustomRateLimits, MissingFeature(ExtendedFeature.CustomRateLimits,
QuasselVersion.VERSION_0_13,
R.string.label_feature_customratelimits), R.string.label_feature_customratelimits),
MissingFeature(ExtendedFeature.AwayFormatTimestamp, MissingFeature(ExtendedFeature.AwayFormatTimestamp,
QuasselVersion.VERSION_0_13,
R.string.label_feature_awayformattimestamp), R.string.label_feature_awayformattimestamp),
MissingFeature(ExtendedFeature.BufferActivitySync, MissingFeature(ExtendedFeature.BufferActivitySync,
QuasselVersion.VERSION_0_13,
R.string.label_feature_bufferactivitysync), R.string.label_feature_bufferactivitysync),
MissingFeature(ExtendedFeature.CoreSideHighlights, MissingFeature(ExtendedFeature.CoreSideHighlights,
QuasselVersion.VERSION_0_13,
R.string.label_feature_coresidehighlights), R.string.label_feature_coresidehighlights),
MissingFeature(ExtendedFeature.SenderPrefixes, MissingFeature(ExtendedFeature.SenderPrefixes,
QuasselVersion.VERSION_0_13,
R.string.label_feature_senderprefixes), R.string.label_feature_senderprefixes),
MissingFeature(ExtendedFeature.RemoteDisconnect, MissingFeature(ExtendedFeature.RemoteDisconnect,
QuasselVersion.VERSION_0_13,
R.string.label_feature_remotedisconnect), R.string.label_feature_remotedisconnect),
MissingFeature(ExtendedFeature.RichMessages, MissingFeature(ExtendedFeature.RichMessages,
QuasselVersion.VERSION_0_13,
R.string.label_feature_richmessages), R.string.label_feature_richmessages),
MissingFeature(ExtendedFeature.BacklogFilterType, MissingFeature(ExtendedFeature.BacklogFilterType,
QuasselVersion.VERSION_0_13,
R.string.label_feature_backlogfiltertype) R.string.label_feature_backlogfiltertype)
) )
} }
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
android:paddingTop="8dp"> android:paddingTop="8dp">
<TextView <TextView
android:id="@+id/message"
style="@style/Widget.RtlConformTextView" style="@style/Widget.RtlConformTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -35,7 +36,6 @@ ...@@ -35,7 +36,6 @@
android:paddingRight="?listPreferredItemPaddingRight" android:paddingRight="?listPreferredItemPaddingRight"
android:paddingStart="?listPreferredItemPaddingLeft" android:paddingStart="?listPreferredItemPaddingLeft"
android:paddingTop="8dp" android:paddingTop="8dp"
android:text="@string/info_missing_features"
android:textColor="?colorTextPrimary" android:textColor="?colorTextPrimary"
android:textSize="16sp" /> android:textSize="16sp" />
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<string name="notification_channel_old_highlight_title">Alte Benachrichtigungen</string> <string name="notification_channel_old_highlight_title">Alte Benachrichtigungen</string>
<string name="label_missing_features">Fehlende Features</string> <string name="label_missing_features">Fehlende Features</string>
<string name="info_missing_features">Deinem Core fehlen bestimmte Features die benötigt werden damit Quasseldroid korrekt funktionieren kann</string> <string name="info_missing_features">Deinem Core fehlen bestimmte Features die benötigt werden damit Quasseldroid korrekt funktionieren kann. Du solltest deinen Quassel Core auf Version %1$s oder neuer &lt;a href="https://quassel-irc.org&gt;updaten&lt;/a&gt;.</string>
<string name="buffer_delete_confirmation">Bist du sicher, dass du diesen Chat auf ewig löschen möchtest?</string> <string name="buffer_delete_confirmation">Bist du sicher, dass du diesen Chat auf ewig löschen möchtest?</string>
......
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<string name="notification_channel_old_highlight_title">Old Highlights</string> <string name="notification_channel_old_highlight_title">Old Highlights</string>
<string name="label_missing_features">Missing Features</string> <string name="label_missing_features">Missing Features</string>
<string name="info_missing_features">Your core is missing features that are required for Quasseldroid to work correctly.</string> <string name="info_missing_features">Your core is missing features that are required for Quasseldroid to work correctly. You should &lt;a href="https://quassel-irc.org&gt;upgrade&lt;/a&gt; your Quassel core to %1$s or newer.</string>
<string name="buffer_delete_confirmation">Do you want to delete this buffer permanently?</string> <string name="buffer_delete_confirmation">Do you want to delete this buffer permanently?</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment