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

Fixes lint issues

parent 71fba2cb
No related branches found
No related tags found
No related merge requests found
Pipeline #314 canceled
Showing
with 54 additions and 34 deletions
...@@ -221,7 +221,7 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc ...@@ -221,7 +221,7 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
}) })
}.filter { }.filter {
it.isNotEmpty() it.isNotEmpty()
}.firstElement().subscribe { }.firstElement().toLiveData().observeForever {
it?.firstOrNull()?.let { info -> it?.firstOrNull()?.let { info ->
ChatActivity.launch(this, bufferId = info.bufferId) ChatActivity.launch(this, bufferId = info.bufferId)
} }
......
...@@ -34,6 +34,7 @@ import de.kuschku.libquassel.quassel.syncables.interfaces.INetwork ...@@ -34,6 +34,7 @@ import de.kuschku.libquassel.quassel.syncables.interfaces.INetwork
import de.kuschku.quasseldroid.R import de.kuschku.quasseldroid.R
import de.kuschku.quasseldroid.ui.coresettings.SettingsFragment import de.kuschku.quasseldroid.ui.coresettings.SettingsFragment
import de.kuschku.quasseldroid.util.helper.setDependent import de.kuschku.quasseldroid.util.helper.setDependent
import de.kuschku.quasseldroid.util.irc.IrcPorts
class NetworkServerFragment : SettingsFragment(), SettingsFragment.Savable, class NetworkServerFragment : SettingsFragment(), SettingsFragment.Savable,
SettingsFragment.Changeable { SettingsFragment.Changeable {
...@@ -115,10 +116,10 @@ class NetworkServerFragment : SettingsFragment(), SettingsFragment.Savable, ...@@ -115,10 +116,10 @@ class NetworkServerFragment : SettingsFragment(), SettingsFragment.Savable,
sslEnabled.setOnCheckedChangeListener { _, isChecked -> sslEnabled.setOnCheckedChangeListener { _, isChecked ->
sslVerify.isEnabled = isChecked sslVerify.isEnabled = isChecked
val portValue = port.text.trim().toString() val portValue = port.text.trim().toString()
if (isChecked && portValue == "6667") { if (isChecked && portValue == IrcPorts.normal) {
port.setText("6697") port.setText(IrcPorts.secure)
} else if (!isChecked && portValue == "6697") { } else if (!isChecked && portValue == IrcPorts.secure) {
port.setText("6667") port.setText(IrcPorts.normal)
} }
} }
sslVerify.isEnabled = sslEnabled.isChecked sslVerify.isEnabled = sslEnabled.isChecked
......
...@@ -38,6 +38,7 @@ import de.kuschku.quasseldroid.defaults.DefaultNetworkServer ...@@ -38,6 +38,7 @@ import de.kuschku.quasseldroid.defaults.DefaultNetworkServer
import de.kuschku.quasseldroid.ui.setup.SlideFragment import de.kuschku.quasseldroid.ui.setup.SlideFragment
import de.kuschku.quasseldroid.util.Patterns import de.kuschku.quasseldroid.util.Patterns
import de.kuschku.quasseldroid.util.TextValidator import de.kuschku.quasseldroid.util.TextValidator
import de.kuschku.quasseldroid.util.irc.IrcPorts
import de.kuschku.quasseldroid.util.ui.AnimationHelper import de.kuschku.quasseldroid.util.ui.AnimationHelper
import javax.inject.Inject import javax.inject.Inject
...@@ -176,10 +177,10 @@ class UserSetupNetworkSlide : SlideFragment() { ...@@ -176,10 +177,10 @@ class UserSetupNetworkSlide : SlideFragment() {
sslEnabled.setOnCheckedChangeListener { _, isChecked -> sslEnabled.setOnCheckedChangeListener { _, isChecked ->
val portValue = portField.text.trim().toString() val portValue = portField.text.trim().toString()
if (isChecked && portValue == "6667") { if (isChecked && portValue == IrcPorts.normal) {
portField.setText("6697") portField.setText(IrcPorts.secure)
} else if (!isChecked && portValue == "6697") { } else if (!isChecked && portValue == IrcPorts.secure) {
portField.setText("6667") portField.setText(IrcPorts.normal)
} }
} }
......
package de.kuschku.quasseldroid.util.irc
object IrcPorts {
const val normal = "6667"
const val secure = "6697"
}
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
package de.kuschku.quasseldroid.util.missingfeatures package de.kuschku.quasseldroid.util.missingfeatures
import android.annotation.SuppressLint
import android.app.Dialog import android.app.Dialog
import android.content.DialogInterface import android.content.DialogInterface
import android.os.Bundle import android.os.Bundle
...@@ -46,6 +47,7 @@ class MissingFeaturesDialog : DialogFragment() { ...@@ -46,6 +47,7 @@ class MissingFeaturesDialog : DialogFragment() {
@BindView(R.id.message) @BindView(R.id.message)
lateinit var message: TextView lateinit var message: TextView
@SuppressLint("StringFormatInvalid")
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)
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="-4dp" android:layout_marginStart="-4dp"
android:layout_marginLeft="-4dp" android:layout_marginLeft="-4dp"
android:baselineAligned="false"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall" android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:orientation="horizontal"> android:orientation="horizontal">
......
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
android:visibility="gone" android:visibility="gone"
tools:text="@sample/messages.json/data/time" tools:text="@sample/messages.json/data/time"
tools:textSize="11.9sp" tools:textSize="11.9sp"
tools:ignore="SmallSp"
tools:visibility="visible" /> tools:visibility="visible" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/backgroundMenuItem" android:background="?attr/backgroundMenuItem"
android:orientation="horizontal" 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:paddingStart="@dimen/message_horizontal"
android:paddingLeft="@dimen/message_horizontal"
android:paddingTop="@dimen/message_vertical" 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"> android:textAppearance="?android:attr/textAppearanceListItemSmall">
<TextView <TextView
...@@ -73,11 +73,12 @@ ...@@ -73,11 +73,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginLeft="@dimen/message_horizontal"
android:layout_marginStart="@dimen/message_horizontal" android:layout_marginStart="@dimen/message_horizontal"
android:layout_marginLeft="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary" android:textColor="?attr/colorForegroundSecondary"
android:textStyle="italic" android:textStyle="italic"
android:visibility="gone" android:visibility="gone"
tools:ignore="SmallSp"
tools:text="@sample/messages.json/data/time" tools:text="@sample/messages.json/data/time"
tools:textSize="11.9sp" tools:textSize="11.9sp"
tools:visibility="visible" /> tools:visibility="visible" />
......
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/backgroundMenuItem" android:background="?attr/backgroundMenuItem"
android:orientation="horizontal" 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:paddingStart="@dimen/message_horizontal"
android:paddingLeft="@dimen/message_horizontal"
android:paddingTop="@dimen/message_vertical" 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"> android:textAppearance="?android:attr/textAppearanceListItemSmall">
<TextView <TextView
...@@ -74,11 +74,12 @@ ...@@ -74,11 +74,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginLeft="@dimen/message_horizontal"
android:layout_marginStart="@dimen/message_horizontal" android:layout_marginStart="@dimen/message_horizontal"
android:layout_marginLeft="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary" android:textColor="?attr/colorForegroundSecondary"
android:textStyle="italic" android:textStyle="italic"
android:visibility="gone" android:visibility="gone"
tools:ignore="SmallSp"
tools:text="@sample/messages.json/data/time" tools:text="@sample/messages.json/data/time"
tools:textSize="11.9sp" tools:textSize="11.9sp"
tools:visibility="visible" /> tools:visibility="visible" />
......
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/backgroundMenuItem" android:background="?attr/backgroundMenuItem"
android:orientation="horizontal" 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:paddingStart="@dimen/message_horizontal"
android:paddingLeft="@dimen/message_horizontal"
android:paddingTop="@dimen/message_vertical" 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"> android:textAppearance="?android:attr/textAppearanceListItemSmall">
<TextView <TextView
...@@ -73,11 +73,12 @@ ...@@ -73,11 +73,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginLeft="@dimen/message_horizontal"
android:layout_marginStart="@dimen/message_horizontal" android:layout_marginStart="@dimen/message_horizontal"
android:layout_marginLeft="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary" android:textColor="?attr/colorForegroundSecondary"
android:textStyle="italic" android:textStyle="italic"
android:visibility="gone" android:visibility="gone"
tools:ignore="SmallSp"
tools:text="@sample/messages.json/data/time" tools:text="@sample/messages.json/data/time"
tools:textSize="11.9sp" tools:textSize="11.9sp"
tools:visibility="visible" /> tools:visibility="visible" />
......
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/backgroundMenuItem" android:background="?attr/backgroundMenuItem"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="@dimen/message_vertical"
android:paddingLeft="@dimen/message_horizontal" android:paddingLeft="@dimen/message_horizontal"
android:paddingRight="@dimen/message_horizontal"
android:paddingTop="@dimen/message_vertical" android:paddingTop="@dimen/message_vertical"
android:paddingRight="@dimen/message_horizontal"
android:paddingBottom="@dimen/message_vertical"
android:textAppearance="?android:attr/textAppearanceListItemSmall"> android:textAppearance="?android:attr/textAppearanceListItemSmall">
<TextView <TextView
...@@ -146,11 +146,12 @@ ...@@ -146,11 +146,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginLeft="@dimen/message_horizontal"
android:layout_marginStart="@dimen/message_horizontal" android:layout_marginStart="@dimen/message_horizontal"
android:layout_marginLeft="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary" android:textColor="?attr/colorForegroundSecondary"
android:textStyle="italic" android:textStyle="italic"
android:visibility="gone" android:visibility="gone"
tools:ignore="SmallSp"
tools:text="@sample/messages.json/data/time" tools:text="@sample/messages.json/data/time"
tools:textSize="11.9sp" tools:textSize="11.9sp"
tools:visibility="visible" /> tools:visibility="visible" />
......
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/backgroundMenuItem" android:background="?attr/backgroundMenuItem"
android:orientation="horizontal" 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:paddingStart="@dimen/message_horizontal"
android:paddingLeft="@dimen/message_horizontal"
android:paddingTop="@dimen/message_vertical" 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"> android:textAppearance="?android:attr/textAppearanceListItemSmall">
<TextView <TextView
...@@ -73,11 +73,12 @@ ...@@ -73,11 +73,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginLeft="@dimen/message_horizontal"
android:layout_marginStart="@dimen/message_horizontal" android:layout_marginStart="@dimen/message_horizontal"
android:layout_marginLeft="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary" android:textColor="?attr/colorForegroundSecondary"
android:textStyle="italic" android:textStyle="italic"
android:visibility="gone" android:visibility="gone"
tools:ignore="SmallSp"
tools:text="@sample/messages.json/data/time" tools:text="@sample/messages.json/data/time"
tools:textSize="11.9sp" tools:textSize="11.9sp"
tools:visibility="visible" /> tools:visibility="visible" />
......
...@@ -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/>.
--> -->
<resources> <resources xmlns:tools="http://schemas.android.com/tools">
<string name="app_name">Quasseldroid</string> <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">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> <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 @@ ...@@ -145,7 +145,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. 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="info_missing_features" tools:ignore="StringFormatCount">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>
......
...@@ -38,4 +38,7 @@ ...@@ -38,4 +38,7 @@
<issue id="MissingTranslation" severity="informational" /> <issue id="MissingTranslation" severity="informational" />
<!-- Because this tries to apply english orthography to other locales --> <!-- Because this tries to apply english orthography to other locales -->
<issue id="Typos" severity="ignore" /> <issue id="Typos" severity="ignore" />
<!-- Because Autofill isn’t a priority at the moment -->
<issue id="Autofill" severity="informational" />
</lint> </lint>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment