Bug fixes

feelfreelinux · Nov 25, 2017 · 9b5939c · 9b5939c
1 parent bfb30a1
commit 9b5939c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -27,7 +27,7 @@ android {
         applicationId "io.github.feelfreelinux.wykopmobilny"
         minSdkVersion 17
         targetSdkVersion 26
-        versionCode 9
+        versionCode 10
         versionName "0.3.0"
 
         def credentialsPropertiesFile = rootProject.file("credentials.properties")

diff --git a/...c/main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/adapters/WykopSuggestionsAdapter.kt b/...c/main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/adapters/WykopSuggestionsAdapter.kt
@@ -47,8 +47,8 @@ class WykopSuggestionsAdapter(context: Context, private val textViewResourceId:
                     if (text.contains('@')) {
                         val typedText = text.substringAfterLast('@')
                         if (typedText.isNotEmpty()) {
-                            if (!typedText.matches(".*([ \\t]).*".toRegex())) {
-                                if (typedText.length >= 2) {
+                            if (typedText.matches("^[\\w-]+\$".toRegex())) {
+                                if (typedText.length > 2) {
                                     var suggestions = suggestApi.getUserSuggestions(typedText)
                                             .blockingGet()
                                     suggestions = if (suggestions.size > 7) suggestions.subList(0, 7) else suggestions
@@ -60,8 +60,8 @@ class WykopSuggestionsAdapter(context: Context, private val textViewResourceId:
                     if (text.contains('#')) {
                         val typedText = text.substringAfterLast('#')
                         if (typedText.isNotEmpty()) {
-                            if (!typedText.matches(".*([ \\t]).*".toRegex())) {
-                                if (typedText.length >= 2) {
+                            if (typedText.matches("^[\\w-]+\$".toRegex())) {
+                                if (typedText.length > 2) {
                                     var suggestions = suggestApi.getTagSuggestions(typedText)
                                             .blockingGet()
                                     suggestions = if (suggestions.size > 7) suggestions.subList(0, 7) else suggestions

diff --git a/app/src/main/res/layout/activity_write_comment.xml b/app/src/main/res/layout/activity_write_comment.xml
@@ -100,7 +100,7 @@
     <io.github.feelfreelinux.wykopmobilny.ui.widgets.FloatingImageView
         android:id="@+id/floatingImageView"
         android:layout_width="wrap_content"
-        android:layout_height="200dp"
+        android:layout_height="80dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>

diff --git a/app/src/main/res/layout/floating_image_view_layout.xml b/app/src/main/res/layout/floating_image_view_layout.xml
@@ -2,11 +2,11 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="match_parent">
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:background="?attr/cardViewColor">
 
         <View
@@ -20,18 +20,18 @@
 
         <ScrollView
             android:id="@+id/imageViewScrollView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/separator"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/separator">
 
             <ImageView
                 android:id="@+id/imageView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:adjustViewBounds="true"/>
+                android:adjustViewBounds="true" />
 
         </ScrollView>