app/build.gradle.kts

@@ -105,7 +105,7 @@ dependencies {
   implementation(kotlin("stdlib", "1.3.41"))
 
   // App Compat
-  implementation("com.google.android.material", "material", "1.1.0-alpha07")
+  implementation("com.google.android.material", "material", "1.1.0-alpha09")
 
   implementation("androidx.appcompat", "appcompat", "1.0.2")
   implementation("androidx.browser", "browser", "1.0.0")

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

+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2019 Janne Mareike Koschinski
+ * Copyright (c) 2019 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.kuschku.quasseldroid.util.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import androidx.core.widget.NestedScrollView
+
+class FixedNestingScrollView : NestedScrollView {
+  constructor(context: Context) :
+    super(context)
+
+  constructor(context: Context, attrs: AttributeSet?) :
+    super(context, attrs)
+
+  constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) :
+    super(context, attrs, defStyleAttr)
+
+  override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean {
+    if (!canScrollVertically(-1))
+      return false
+    return super.onInterceptTouchEvent(ev)
+  }
+}

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

@@ -31,9 +31,10 @@
     android:layout_weight="1"
     android:orientation="vertical">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
       android:layout_width="match_parent"
-      android:layout_height="match_parent">
+      android:layout_height="match_parent"
+      android:orientation="horizontal">
 
       <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/tab_complete"
@@ -50,15 +51,11 @@
         app:srcCompat="@drawable/ic_tab"
         app:tint="?attr/colorTextSecondary" />
 
-      <ScrollView
+      <de.kuschku.quasseldroid.util.ui.FixedNestingScrollView
         android:id="@+id/chatline_scroller"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/send"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toEndOf="@+id/tab_complete"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1">
 
         <de.kuschku.quasseldroid.ui.chat.input.RichEditText
           android:id="@+id/chatline"
@@ -77,7 +74,7 @@
           android:paddingBottom="8dp"
           android:textColor="?attr/colorForeground"
           android:textSize="16sp" />
-      </ScrollView>
+      </de.kuschku.quasseldroid.util.ui.FixedNestingScrollView>
 
       <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/send"
@@ -95,7 +92,7 @@
         app:srcCompat="@drawable/ic_send"
         app:tint="?attr/colorAccent"
         tools:ignore="UnusedAttribute" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
       android:id="@+id/autocomplete_list"

app/src/main/res/values-it/strings_preferences.xml

@@ -183,4 +183,7 @@
   <string name="preference_show_notification_title">Mostra notifica</string>
   <string name="preference_show_notification_summary">Mantiene Quasseldroid sempre collegato mostrando una notifica permanente</string>
 
+  <string name="preference_ignore_network_changes_title">Ignora cambi di rete</string>
+  <string name="preference_ignore_network_changes_summary">Interrompi la riconnessione automatica di Quasseldroid se la rete cambia</string>
+
 </resources>

app/src/main/res/values/strings.xml

@@ -200,5 +200,5 @@
   <string name="info_copied_version">Version copied to clipboard</string>
 
   <string name="advertisement_support_patreon">Please help support the development of this app on Patreon</string>
-  <string name="advertisement_support_button">Donate</string>
+  <string name="advertisement_support_button">Support development</string>
 </resources>

viewmodel/build.gradle.kts

@@ -39,7 +39,7 @@ android {
 
   lintOptions {
     isWarningsAsErrors = true
-    setLintConfig(file("../lint.xml"))
+    lintConfig = file("../lint.xml")
   }
 }
 
@@ -65,4 +65,6 @@ dependencies {
   implementation(project(":lib")) {
     exclude(group = "org.threeten", module = "threetenbp")
   }
+
+  testImplementation("junit", "junit", "4.12")
 }

viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/ChatViewModel.kt

@@ -150,14 +150,12 @@ open class ChatViewModel : QuasselViewModel() {
     )
   }
 
-  private fun recentMessagesChange(value: Int) {
-    val current = recentlySentMessageIndex.safeValue
-    val size = recentlySentMessages.safeValue.size
-    val nextValue = current + value
-    recentlySentMessageIndex.onNext(
-      if (nextValue < 0) -1
-      else (size + current + value) % size
-    )
+  private fun recentMessagesChange(change: Int) {
+    recentlySentMessageIndex.onNext(recentMessagesChangeInternal(
+      recentlySentMessageIndex.safeValue,
+      recentlySentMessages.safeValue.size,
+      change
+    ))
   }
 
   fun recentMessagesValue() =
@@ -197,5 +195,9 @@ open class ChatViewModel : QuasselViewModel() {
     const val KEY_SELECTED_BUFFER_ID = "model_chat_selectedBufferId"
 
     const val MAX_RECENT_MESSAGES = 20
+
+    fun recentMessagesChangeInternal(current: Int, size: Int, change: Int) =
+      if (current + change < 0 || size == 0) -1
+      else (size + current + change) % size
   }
 }

viewmodel/src/test/java/de/kuschku/quasseldroid/viewmodel/ChatViewModelTest.kt

+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2019 Janne Mareike Koschinski
+ * Copyright (c) 2019 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.kuschku.quasseldroid.viewmodel
+
+import de.kuschku.quasseldroid.viewmodel.ChatViewModel.Companion.recentMessagesChangeInternal
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class ChatViewModelTest {
+  @Test
+  fun testRecentMessagesChange() {
+    assertEquals(recentMessagesChangeInternal(0, 0, -1), -1)
+    assertEquals(recentMessagesChangeInternal(0, 0, +1), -1)
+    assertEquals(recentMessagesChangeInternal(-1, 0, -1), -1)
+    assertEquals(recentMessagesChangeInternal(-1, 0, +1), -1)
+    assertEquals(recentMessagesChangeInternal(1, 0, -1), -1)
+    assertEquals(recentMessagesChangeInternal(1, 0, +1), -1)
+
+
+    assertEquals(recentMessagesChangeInternal(0, 5, -1), -1)
+    assertEquals(recentMessagesChangeInternal(0, 5, +1), 1)
+
+    assertEquals(recentMessagesChangeInternal(1, 5, -1), 0)
+    assertEquals(recentMessagesChangeInternal(1, 5, +1), 2)
+
+    assertEquals(recentMessagesChangeInternal(4, 5, -1), 3)
+    assertEquals(recentMessagesChangeInternal(4, 5, +1), 0)
+  }
+}