From c940d630117b8afa020bada6c8421da905049d27 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Fri, 28 Dec 2018 16:28:50 +0100
Subject: [PATCH] Fixes lint issues
---
.../de/kuschku/quasseldroid/ui/chat/ChatActivity.kt | 2 +-
.../networkserver/NetworkServerFragment.kt | 9 +++++----
.../ui/setup/user/UserSetupNetworkSlide.kt | 9 +++++----
.../java/de/kuschku/quasseldroid/util/irc/IrcPorts.kt | 6 ++++++
.../util/missingfeatures/MissingFeaturesDialog.kt | 2 ++
.../layout/widget_advertisement_support_patreon.xml | 1 +
app/src/main/res/layout/widget_chatmessage_action.xml | 1 +
app/src/main/res/layout/widget_chatmessage_error.xml | 11 ++++++-----
app/src/main/res/layout/widget_chatmessage_info.xml | 11 ++++++-----
app/src/main/res/layout/widget_chatmessage_notice.xml | 11 ++++++-----
app/src/main/res/layout/widget_chatmessage_plain.xml | 7 ++++---
app/src/main/res/layout/widget_chatmessage_server.xml | 11 ++++++-----
app/src/main/res/values/strings.xml | 4 ++--
lint.xml | 3 +++
14 files changed, 54 insertions(+), 34 deletions(-)
create mode 100644 app/src/main/java/de/kuschku/quasseldroid/util/irc/IrcPorts.kt
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
index d6bd0e34c..41fa189d7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
@@ -221,7 +221,7 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
})
}.filter {
it.isNotEmpty()
- }.firstElement().subscribe {
+ }.firstElement().toLiveData().observeForever {
it?.firstOrNull()?.let { info ->
ChatActivity.launch(this, bufferId = info.bufferId)
}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragment.kt
index 2b8cf8a3c..8288a8dde 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragment.kt
@@ -34,6 +34,7 @@ import de.kuschku.libquassel.quassel.syncables.interfaces.INetwork
import de.kuschku.quasseldroid.R
import de.kuschku.quasseldroid.ui.coresettings.SettingsFragment
import de.kuschku.quasseldroid.util.helper.setDependent
+import de.kuschku.quasseldroid.util.irc.IrcPorts
class NetworkServerFragment : SettingsFragment(), SettingsFragment.Savable,
SettingsFragment.Changeable {
@@ -115,10 +116,10 @@ class NetworkServerFragment : SettingsFragment(), SettingsFragment.Savable,
sslEnabled.setOnCheckedChangeListener { _, isChecked ->
sslVerify.isEnabled = isChecked
val portValue = port.text.trim().toString()
- if (isChecked && portValue == "6667") {
- port.setText("6697")
- } else if (!isChecked && portValue == "6697") {
- port.setText("6667")
+ if (isChecked && portValue == IrcPorts.normal) {
+ port.setText(IrcPorts.secure)
+ } else if (!isChecked && portValue == IrcPorts.secure) {
+ port.setText(IrcPorts.normal)
}
}
sslVerify.isEnabled = sslEnabled.isChecked
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/user/UserSetupNetworkSlide.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/user/UserSetupNetworkSlide.kt
index 2008713d3..fecc48213 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/user/UserSetupNetworkSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/user/UserSetupNetworkSlide.kt
@@ -38,6 +38,7 @@ import de.kuschku.quasseldroid.defaults.DefaultNetworkServer
import de.kuschku.quasseldroid.ui.setup.SlideFragment
import de.kuschku.quasseldroid.util.Patterns
import de.kuschku.quasseldroid.util.TextValidator
+import de.kuschku.quasseldroid.util.irc.IrcPorts
import de.kuschku.quasseldroid.util.ui.AnimationHelper
import javax.inject.Inject
@@ -176,10 +177,10 @@ class UserSetupNetworkSlide : SlideFragment() {
sslEnabled.setOnCheckedChangeListener { _, isChecked ->
val portValue = portField.text.trim().toString()
- if (isChecked && portValue == "6667") {
- portField.setText("6697")
- } else if (!isChecked && portValue == "6697") {
- portField.setText("6667")
+ if (isChecked && portValue == IrcPorts.normal) {
+ portField.setText(IrcPorts.secure)
+ } else if (!isChecked && portValue == IrcPorts.secure) {
+ portField.setText(IrcPorts.normal)
}
}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/IrcPorts.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/IrcPorts.kt
new file mode 100644
index 000000000..57bfe1cea
--- /dev/null
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/IrcPorts.kt
@@ -0,0 +1,6 @@
+package de.kuschku.quasseldroid.util.irc
+
+object IrcPorts {
+ const val normal = "6667"
+ const val secure = "6697"
+}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/missingfeatures/MissingFeaturesDialog.kt b/app/src/main/java/de/kuschku/quasseldroid/util/missingfeatures/MissingFeaturesDialog.kt
index c877f4614..81da93c8d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/missingfeatures/MissingFeaturesDialog.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/missingfeatures/MissingFeaturesDialog.kt
@@ -19,6 +19,7 @@
package de.kuschku.quasseldroid.util.missingfeatures
+import android.annotation.SuppressLint
import android.app.Dialog
import android.content.DialogInterface
import android.os.Bundle
@@ -46,6 +47,7 @@ class MissingFeaturesDialog : DialogFragment() {
@BindView(R.id.message)
lateinit var message: TextView
+ @SuppressLint("StringFormatInvalid")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val dialog = MaterialDialog.Builder(requireContext())
.customView(R.layout.dialog_missing_features, true)
diff --git a/app/src/main/res/layout/widget_advertisement_support_patreon.xml b/app/src/main/res/layout/widget_advertisement_support_patreon.xml
index cd895e769..737115f9d 100644
--- a/app/src/main/res/layout/widget_advertisement_support_patreon.xml
+++ b/app/src/main/res/layout/widget_advertisement_support_patreon.xml
@@ -20,6 +20,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="-4dp"
android:layout_marginLeft="-4dp"
+ android:baselineAligned="false"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:orientation="horizontal">
diff --git a/app/src/main/res/layout/widget_chatmessage_action.xml b/app/src/main/res/layout/widget_chatmessage_action.xml
index 93932e97e..e33e3b1c0 100644
--- a/app/src/main/res/layout/widget_chatmessage_action.xml
+++ b/app/src/main/res/layout/widget_chatmessage_action.xml
@@ -105,6 +105,7 @@
android:visibility="gone"
tools:text="@sample/messages.json/data/time"
tools:textSize="11.9sp"
+ tools:ignore="SmallSp"
tools:visibility="visible" />
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/widget_chatmessage_error.xml b/app/src/main/res/layout/widget_chatmessage_error.xml
index 10e125844..c51e1d4a9 100644
--- a/app/src/main/res/layout/widget_chatmessage_error.xml
+++ b/app/src/main/res/layout/widget_chatmessage_error.xml
@@ -32,12 +32,12 @@
android:layout_height="wrap_content"
android:background="?attr/backgroundMenuItem"
android:orientation="horizontal"
- android:paddingBottom="@dimen/message_vertical"
- android:paddingEnd="@dimen/message_horizontal"
- android:paddingLeft="@dimen/message_horizontal"
- android:paddingRight="@dimen/message_horizontal"
android:paddingStart="@dimen/message_horizontal"
+ android:paddingLeft="@dimen/message_horizontal"
android:paddingTop="@dimen/message_vertical"
+ android:paddingEnd="@dimen/message_horizontal"
+ android:paddingRight="@dimen/message_horizontal"
+ android:paddingBottom="@dimen/message_vertical"
android:textAppearance="?android:attr/textAppearanceListItemSmall">
<TextView
@@ -73,11 +73,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
- android:layout_marginLeft="@dimen/message_horizontal"
android:layout_marginStart="@dimen/message_horizontal"
+ android:layout_marginLeft="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary"
android:textStyle="italic"
android:visibility="gone"
+ tools:ignore="SmallSp"
tools:text="@sample/messages.json/data/time"
tools:textSize="11.9sp"
tools:visibility="visible" />
diff --git a/app/src/main/res/layout/widget_chatmessage_info.xml b/app/src/main/res/layout/widget_chatmessage_info.xml
index 6942d08c3..48de836ae 100644
--- a/app/src/main/res/layout/widget_chatmessage_info.xml
+++ b/app/src/main/res/layout/widget_chatmessage_info.xml
@@ -32,12 +32,12 @@
android:layout_height="wrap_content"
android:background="?attr/backgroundMenuItem"
android:orientation="horizontal"
- android:paddingBottom="@dimen/message_vertical"
- android:paddingEnd="@dimen/message_horizontal"
- android:paddingLeft="@dimen/message_horizontal"
- android:paddingRight="@dimen/message_horizontal"
android:paddingStart="@dimen/message_horizontal"
+ android:paddingLeft="@dimen/message_horizontal"
android:paddingTop="@dimen/message_vertical"
+ android:paddingEnd="@dimen/message_horizontal"
+ android:paddingRight="@dimen/message_horizontal"
+ android:paddingBottom="@dimen/message_vertical"
android:textAppearance="?android:attr/textAppearanceListItemSmall">
<TextView
@@ -74,11 +74,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
- android:layout_marginLeft="@dimen/message_horizontal"
android:layout_marginStart="@dimen/message_horizontal"
+ android:layout_marginLeft="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary"
android:textStyle="italic"
android:visibility="gone"
+ tools:ignore="SmallSp"
tools:text="@sample/messages.json/data/time"
tools:textSize="11.9sp"
tools:visibility="visible" />
diff --git a/app/src/main/res/layout/widget_chatmessage_notice.xml b/app/src/main/res/layout/widget_chatmessage_notice.xml
index f54b35518..4cd9aaa65 100644
--- a/app/src/main/res/layout/widget_chatmessage_notice.xml
+++ b/app/src/main/res/layout/widget_chatmessage_notice.xml
@@ -32,12 +32,12 @@
android:layout_height="wrap_content"
android:background="?attr/backgroundMenuItem"
android:orientation="horizontal"
- android:paddingBottom="@dimen/message_vertical"
- android:paddingEnd="@dimen/message_horizontal"
- android:paddingLeft="@dimen/message_horizontal"
- android:paddingRight="@dimen/message_horizontal"
android:paddingStart="@dimen/message_horizontal"
+ android:paddingLeft="@dimen/message_horizontal"
android:paddingTop="@dimen/message_vertical"
+ android:paddingEnd="@dimen/message_horizontal"
+ android:paddingRight="@dimen/message_horizontal"
+ android:paddingBottom="@dimen/message_vertical"
android:textAppearance="?android:attr/textAppearanceListItemSmall">
<TextView
@@ -73,11 +73,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
- android:layout_marginLeft="@dimen/message_horizontal"
android:layout_marginStart="@dimen/message_horizontal"
+ android:layout_marginLeft="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary"
android:textStyle="italic"
android:visibility="gone"
+ tools:ignore="SmallSp"
tools:text="@sample/messages.json/data/time"
tools:textSize="11.9sp"
tools:visibility="visible" />
diff --git a/app/src/main/res/layout/widget_chatmessage_plain.xml b/app/src/main/res/layout/widget_chatmessage_plain.xml
index 081f6ad2e..a805c1c9b 100644
--- a/app/src/main/res/layout/widget_chatmessage_plain.xml
+++ b/app/src/main/res/layout/widget_chatmessage_plain.xml
@@ -32,10 +32,10 @@
android:layout_height="wrap_content"
android:background="?attr/backgroundMenuItem"
android:orientation="horizontal"
- android:paddingBottom="@dimen/message_vertical"
android:paddingLeft="@dimen/message_horizontal"
- android:paddingRight="@dimen/message_horizontal"
android:paddingTop="@dimen/message_vertical"
+ android:paddingRight="@dimen/message_horizontal"
+ android:paddingBottom="@dimen/message_vertical"
android:textAppearance="?android:attr/textAppearanceListItemSmall">
<TextView
@@ -146,11 +146,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
- android:layout_marginLeft="@dimen/message_horizontal"
android:layout_marginStart="@dimen/message_horizontal"
+ android:layout_marginLeft="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary"
android:textStyle="italic"
android:visibility="gone"
+ tools:ignore="SmallSp"
tools:text="@sample/messages.json/data/time"
tools:textSize="11.9sp"
tools:visibility="visible" />
diff --git a/app/src/main/res/layout/widget_chatmessage_server.xml b/app/src/main/res/layout/widget_chatmessage_server.xml
index bda613b2a..9b74fe9f3 100644
--- a/app/src/main/res/layout/widget_chatmessage_server.xml
+++ b/app/src/main/res/layout/widget_chatmessage_server.xml
@@ -32,12 +32,12 @@
android:layout_height="wrap_content"
android:background="?attr/backgroundMenuItem"
android:orientation="horizontal"
- android:paddingBottom="@dimen/message_vertical"
- android:paddingEnd="@dimen/message_horizontal"
- android:paddingLeft="@dimen/message_horizontal"
- android:paddingRight="@dimen/message_horizontal"
android:paddingStart="@dimen/message_horizontal"
+ android:paddingLeft="@dimen/message_horizontal"
android:paddingTop="@dimen/message_vertical"
+ android:paddingEnd="@dimen/message_horizontal"
+ android:paddingRight="@dimen/message_horizontal"
+ android:paddingBottom="@dimen/message_vertical"
android:textAppearance="?android:attr/textAppearanceListItemSmall">
<TextView
@@ -73,11 +73,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
- android:layout_marginLeft="@dimen/message_horizontal"
android:layout_marginStart="@dimen/message_horizontal"
+ android:layout_marginLeft="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary"
android:textStyle="italic"
android:visibility="gone"
+ tools:ignore="SmallSp"
tools:text="@sample/messages.json/data/time"
tools:textSize="11.9sp"
tools:visibility="visible" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3a1f157c8..2c49f211a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@
with this program. If not, see <http://www.gnu.org/licenses/>.
-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
<string name="app_name">Quasseldroid</string>
<string name="app_description">An Android-based client for the decentralized Quassel IRC client.</string>
<string name="app_description_long">Quassel is a distributed, decentralized IRC client, written using C++ and Qt. Quasseldroid is a pure-kotlin client for the Quassel core, allowing you to connect to your Quassel core using your Android™ phone.</string>
@@ -145,7 +145,7 @@
<string name="notification_channel_old_highlight_title">Old Highlights</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. You should <a href="https://quassel-irc.org>upgrade</a> your Quassel core to %1$s or newer.</string>
+ <string name="info_missing_features" tools:ignore="StringFormatCount">Your core is missing features that are required for Quasseldroid to work correctly. You should <a href="https://quassel-irc.org>upgrade</a> your Quassel core to %1$s or newer.</string>
<string name="buffer_delete_confirmation">Do you want to delete this buffer permanently?</string>
diff --git a/lint.xml b/lint.xml
index 2230d765c..089fa173d 100644
--- a/lint.xml
+++ b/lint.xml
@@ -38,4 +38,7 @@
<issue id="MissingTranslation" severity="informational" />
<!-- Because this tries to apply english orthography to other locales -->
<issue id="Typos" severity="ignore" />
+
+ <!-- Because Autofill isn’t a priority at the moment -->
+ <issue id="Autofill" severity="informational" />
</lint>
--
GitLab