Attempt at improving lint, updating versions, improving CI

Signed-off-by: Janne Koschinski <janne@kuschku.de>

.gitlab-ci.yml

@@ -37,11 +37,16 @@ unitTests:
   cache:
     policy: "pull"
   script:
-    - "./gradlew test"
+    - "./gradlew check"
 
 deploy:
   stage: "deploy"
   image: "k8r.eu/justjanne/docker-s3cmd:latest"
+  only:
+    refs:
+    - "master"
+    variables:
+    - "$S3_CONFIG != ''"
   dependencies:
   - "build"
   script:

app/build.gradle.kts

@@ -106,7 +106,8 @@ android {
   }
 
   lintOptions {
-    disable("ResourceType")
+    isWarningsAsErrors = true
+    setLintConfig(file("../lint.xml"))
   }
 }
 
@@ -133,7 +134,7 @@ dependencies {
   }
 
   // App Arch Persistence
-  withVersion("1.1.0-beta2") {
+  withVersion("1.1.0-beta3") {
     implementation("android.arch.persistence.room", "runtime", version)
     implementation("android.arch.persistence.room", "rxjava2", version)
     kapt("android.arch.persistence.room", "compiler", version)
@@ -141,7 +142,7 @@ dependencies {
   }
 
   // App Arch Paging
-  implementation("android.arch.paging", "runtime", "1.0.0-beta1") {
+  implementation("android.arch.paging", "runtime", "1.0.0-rc1") {
     exclude(group = "junit", module = "junit")
   }
 

app/sampledata/libraries.json

@@ -20,7 +20,7 @@
     },
     {
       "name": "Android Architecture Components: Persistence",
-      "version": "1.1.0-beta1",
+      "version": "1.1.0-beta3",
       "license": {
         "short_name": "Apache-2.0",
         "full_name": "Apache License"
@@ -29,7 +29,7 @@
     },
     {
       "name": "Android Architecture Components: Room",
-      "version": "1.1.0-beta1",
+      "version": "1.1.0-beta3",
       "license": {
         "short_name": "Apache-2.0",
         "full_name": "Apache License"
@@ -47,7 +47,7 @@
     },
     {
       "name": "Android Support Library",
-      "version": "27.1.0",
+      "version": "27.1.1",
       "license": {
         "short_name": "Apache-2.0",
         "full_name": "Apache License"

app/src/main/AndroidManifest.xml

@@ -38,6 +38,7 @@
   <application
     android:name=".QuasselDroid"
     android:allowBackup="true"
+    android:fullBackupContent="@xml/backup_content"
     android:description="@string/app_description"
     android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"

app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt

@@ -107,13 +107,13 @@ class AboutFragment : DaggerFragment() {
       ),
       Library(
         name = "Android Architecture Components: Persistence",
-        version = "1.1.0-beta1",
+        version = "1.1.0-beta3",
         license = apache2,
         url = "https://android.googlesource.com/platform/frameworks/support/+/master/persistence"
       ),
       Library(
         name = "Android Architecture Components: Room",
-        version = "1.1.0-beta1",
+        version = "1.1.0-beta3",
         license = apache2,
         url = "https://android.googlesource.com/platform/frameworks/support/+/master/persistence"
       ),
@@ -125,7 +125,7 @@ class AboutFragment : DaggerFragment() {
       ),
       Library(
         name = "Android Support Library",
-        version = "27.1.0",
+        version = "27.1.1",
         license = apache2,
         url = "https://android.googlesource.com/platform/frameworks/support/+/master"
       ),

app/src/main/java/de/kuschku/quasseldroid/util/ui/ColorChooserDialog.java

@@ -67,7 +67,7 @@ import de.kuschku.quasseldroid.R;
 /**
  * @author Aidan Follestad (afollestad)
  */
-@SuppressWarnings({"FieldCanBeLocal", "ConstantConditions"})
+@SuppressWarnings({"FieldCanBeLocal", "ConstantConditions", "PrivateResource"})
 public class ColorChooserDialog extends DialogFragment
   implements View.OnClickListener, View.OnLongClickListener {
 

app/src/main/java/de/kuschku/quasseldroid/util/ui/DoubleClickHelper.kt

@@ -22,6 +22,7 @@
 
 package de.kuschku.quasseldroid.util.ui
 
+import android.annotation.SuppressLint
 import android.view.GestureDetector
 import android.view.MotionEvent
 import android.view.View
@@ -43,5 +44,6 @@ class DoubleClickHelper(view: View) : View.OnTouchListener {
     }
   )
 
+  @SuppressLint("ClickableViewAccessibility")
   override fun onTouch(v: View?, event: MotionEvent?) = gestureDetector.onTouchEvent(event)
 }

app/src/main/java/de/kuschku/quasseldroid/util/ui/RipplePassthroughTextView.kt

@@ -22,6 +22,7 @@
 
 package de.kuschku.quasseldroid.util.ui
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.support.v7.widget.AppCompatTextView
 import android.text.Spannable
@@ -36,6 +37,7 @@ class RipplePassthroughTextView : AppCompatTextView {
 
   // The goal is to provide all normal interaction to the parent view, unless a link is touched
   // But additionally, we want to provide all normal textview interactions as well
+  @SuppressLint("ClickableViewAccessibility")
   override fun onTouchEvent(event: MotionEvent): Boolean {
     val movementMethod = this.movementMethod
     this.movementMethod = null

app/src/main/java/de/kuschku/quasseldroid/util/ui/TextDrawable.java

@@ -35,6 +35,8 @@ import android.graphics.drawable.shapes.OvalShape;
 import android.graphics.drawable.shapes.RectShape;
 import android.graphics.drawable.shapes.RoundRectShape;
 
+import java.util.Locale;
+
 /**
  * @author amulya
  * created 14 Oct 2014
@@ -62,7 +64,7 @@ public class TextDrawable extends ShapeDrawable {
     radius = builder.radius;
 
     // text and color
-    text = builder.toUpperCase ? builder.text.toUpperCase() : builder.text;
+    text = builder.toUpperCase ? builder.text.toUpperCase(Locale.getDefault()) : builder.text;
 
     // text paint settings
     fontSize = builder.fontSize;

app/src/main/res/drawable/ic_settings.xml

@@ -21,10 +21,12 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   android:width="24dp"
   android:height="24dp"
   android:viewportHeight="24"
-  android:viewportWidth="24">
+  android:viewportWidth="24"
+  tools:ignore="VectorPath">
   <path
     android:fillColor="#000"
     android:pathData="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" />

app/src/main/res/layout-sw600dp-land/setup_slide.xml

@@ -28,7 +28,8 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:paddingLeft="?attr/actionBarSize"
-  android:paddingRight="?attr/actionBarSize">
+  android:paddingRight="?attr/actionBarSize"
+  tools:ignore="InconsistentLayout">
 
   <LinearLayout
     android:layout_width="0dip"

app/src/main/res/layout-sw600dp/setup_slide.xml

@@ -24,7 +24,8 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:layout_height="match_parent"
+  tools:ignore="InconsistentLayout">
 
   <LinearLayout
     android:layout_width="400dp"

app/src/main/res/layout/dialog_colorchooser.xml

@@ -21,10 +21,12 @@
   -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:layout_height="match_parent"
+  tools:ignore="PrivateResource">
 
-  <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  <FrameLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">

app/src/main/res/layout/dialog_colorchooser_custom.xml

@@ -27,7 +27,8 @@
   android:layout_height="wrap_content"
   android:orientation="vertical"
   android:paddingBottom="@dimen/md_title_frame_margin_bottom"
-  android:paddingTop="@dimen/md_title_frame_margin_bottom">
+  android:paddingTop="@dimen/md_title_frame_margin_bottom"
+  tools:ignore="PrivateResource">
 
   <View
     android:id="@+id/md_colorIndicator"
@@ -63,6 +64,7 @@
       android:textColor="?colorTextPrimary"
       android:textColorHint="?colorTextSecondary"
       android:textSize="@dimen/md_title_textsize"
+      android:inputType="textNoSuggestions"
       tools:ignore="HardcodedText" />
 
   </LinearLayout>

app/src/main/res/layout/dialog_colorchooser_presets.xml

@@ -21,6 +21,7 @@
   -->
 
 <com.afollestad.materialdialogs.color.FillGridView xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/md_grid"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
@@ -32,4 +33,5 @@
   android:orientation="vertical"
   android:padding="16dp"
   android:stretchMode="columnWidth"
-  android:verticalSpacing="8dp" />
+  android:verticalSpacing="8dp"
+  tools:ignore="PrivateResource" />

app/src/main/res/layout/layout_history.xml

@@ -64,7 +64,7 @@
           android:layout_weight="1" />
 
         <android.support.v7.widget.AppCompatImageView
-          android:id="@+id/send"
+          android:id="@+id/close"
           android:layout_width="48dp"
           android:layout_height="48dp"
           android:layout_gravity="top|end"

app/src/main/res/layout/setup_account_connection.xml

@@ -24,6 +24,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical"
@@ -34,7 +35,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:hint="@string/label_connection_host"
-    app:errorEnabled="true">
+    app:errorEnabled="true"
+    tools:ignore="LabelFor">
 
     <EditText
       android:id="@+id/host"
@@ -48,7 +50,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:hint="@string/labelConnectionPort"
-    app:errorEnabled="true">
+    app:errorEnabled="true"
+    tools:ignore="LabelFor">
 
     <EditText
       android:id="@+id/port"

app/src/main/res/layout/setup_account_edit.xml

@@ -59,7 +59,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/label_account_name"
-        app:errorEnabled="true">
+        app:errorEnabled="true"
+        tools:ignore="LabelFor">
 
         <EditText
           android:id="@+id/name"
@@ -102,7 +103,8 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:hint="@string/label_connection_host"
-          app:errorEnabled="true">
+          app:errorEnabled="true"
+          tools:ignore="LabelFor">
 
           <EditText
             android:id="@+id/host"
@@ -116,7 +118,8 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:hint="@string/labelConnectionPort"
-          app:errorEnabled="true">
+          app:errorEnabled="true"
+          tools:ignore="LabelFor">
 
           <EditText
             android:id="@+id/port"
@@ -161,7 +164,8 @@
           android:id="@+id/userWrapper"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:hint="@string/label_account_user">
+          android:hint="@string/label_account_user"
+          tools:ignore="LabelFor">
 
           <EditText
             android:id="@+id/user"
@@ -176,7 +180,8 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:hint="@string/label_account_pass"
-          app:passwordToggleEnabled="true">
+          app:passwordToggleEnabled="true"
+          tools:ignore="LabelFor">
 
           <EditText
             android:id="@+id/pass"

app/src/main/res/layout/setup_account_name.xml

@@ -22,6 +22,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical"
@@ -32,7 +33,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:hint="@string/label_account_name"
-    app:errorEnabled="true">
+    app:errorEnabled="true"
+    tools:ignore="LabelFor">
 
     <EditText
       android:id="@+id/name"

app/src/main/res/layout/setup_account_user.xml

@@ -22,6 +22,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical"
@@ -31,7 +32,8 @@
     android:id="@+id/userWrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:hint="@string/label_account_user">
+    android:hint="@string/label_account_user"
+    tools:ignore="LabelFor">
 
     <EditText
       android:id="@+id/user"
@@ -46,7 +48,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:hint="@string/label_account_pass"
-    app:passwordToggleEnabled="true">
+    app:passwordToggleEnabled="true"
+    tools:ignore="LabelFor">
 
     <EditText
       android:id="@+id/pass"