Merge branch 'dev' into audio-view-design-update

build.gradle

@@ -182,8 +182,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.2'
 }
 
-def canonicalVersionCode = 110
-def canonicalVersionName = "1.6.1"
+def canonicalVersionCode = 111
+def canonicalVersionName = "1.6.2"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

res/layout-sw400dp/activity_restore.xml

@@ -34,12 +34,15 @@
         style="@style/SessionEditText"
         android:id="@+id/mnemonicEditText"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="28dp"
-        android:paddingBottom="28dp"
+        android:layout_height="80dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="12dp"
         android:layout_marginRight="@dimen/very_large_spacing"
+        android:paddingTop="0dp"
+        android:paddingBottom="0dp"
+        android:gravity="center_vertical"
+        android:inputType="textMultiLine"
+        android:maxLines="2"
         android:hint="@string/activity_restore_seed_edit_text_hint" />
 
     <View

res/layout/activity_restore.xml

@@ -34,10 +34,15 @@
         style="@style/SmallSessionEditText"
         android:id="@+id/mnemonicEditText"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="80dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
         android:layout_marginTop="10dp"
         android:layout_marginRight="@dimen/very_large_spacing"
+        android:paddingTop="0dp"
+        android:paddingBottom="0dp"
+        android:gravity="center_vertical"
+        android:inputType="textMultiLine"
+        android:maxLines="2"
         android:hint="@string/activity_restore_seed_edit_text_hint" />
 
     <View

src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt

@@ -18,8 +18,8 @@ class FakeChatView : ScrollView {
 
     // region Settings
     private val spacing = context.resources.getDimension(R.dimen.medium_spacing)
-    private val startDelay: Long = 2000
-    private val delayBetweenMessages: Long = 3000
+    private val startDelay: Long = 1000
+    private val delayBetweenMessages: Long = 1500
     private val animationDuration: Long = 400
     // endregion