Beta 0.2.3

feelfreelinux · Nov 19, 2017 · 6674c16 · 6674c16
1 parent 637dfb4
commit 6674c16
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 25 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -27,8 +27,8 @@ android {
         applicationId "io.github.feelfreelinux.wykopmobilny"
         minSdkVersion 17
         targetSdkVersion 26
-        versionCode 7
-        versionName "0.2.2"
+        versionCode 8
+        versionName "0.2.3"
 
         def credentialsPropertiesFile = rootProject.file("credentials.properties")
         def credentialsProperties = new Properties()

diff --git a/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/widgets/InputToolbar.kt b/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/widgets/InputToolbar.kt
@@ -132,6 +132,7 @@ class InputToolbar : ConstraintLayout, MarkdownToolbarListener {
     }
 
     fun addAddressant(user : String) {
+        defaultText = ""
         body.requestFocus()
         textBody += "@$user: "
         selectionPosition = textBody.length

diff --git a/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/widgets/WykopImageView.kt b/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/widgets/WykopImageView.kt
@@ -3,23 +3,17 @@ package io.github.feelfreelinux.wykopmobilny.ui.widgets
 import android.app.Activity
 import android.content.Context
 import android.util.AttributeSet
-import android.widget.FrameLayout
 import android.widget.ImageView
 import io.github.feelfreelinux.wykopmobilny.WykopApp
-import io.github.feelfreelinux.wykopmobilny.glide.GlideApp
 import io.github.feelfreelinux.wykopmobilny.models.dataclass.Embed
 import io.github.feelfreelinux.wykopmobilny.ui.modules.NavigatorApi
-import io.github.feelfreelinux.wykopmobilny.utils.*
-import kotlinx.android.synthetic.main.wykopimageview_layout.view.*
+import io.github.feelfreelinux.wykopmobilny.utils.SettingsPreferencesApi
+import io.github.feelfreelinux.wykopmobilny.utils.isVisible
+import io.github.feelfreelinux.wykopmobilny.utils.loadImage
+import io.github.feelfreelinux.wykopmobilny.utils.openBrowser
 import javax.inject.Inject
 
-class WykopImageView : FrameLayout {
-    constructor(context: Context) : super(context)
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
-
+class WykopImageView(context: Context, attrs: AttributeSet) : ImageView(context, attrs) {
     companion object {
         val NSFW_IMAGE_PLACEHOLDER = "https://www.wykop.pl/cdn/c2526412/nsfw.jpg"
     }
@@ -36,8 +30,8 @@ class WykopImageView : FrameLayout {
         if (embed == null) isVisible = false
         embed?.apply {
             isVisible = true
-            if (plus18 && !settingsPreferences.showAdultContent) loadImageFromUrl(NSFW_IMAGE_PLACEHOLDER)
-            else loadImageFromUrl(preview)
+            if (plus18 && !settingsPreferences.showAdultContent) loadImage(NSFW_IMAGE_PLACEHOLDER)
+            else loadImage(preview)
             setOnClickListener {
                 when (type) {
                     "image" -> navigatorApi.openPhotoViewActivity(context as Activity, url)
@@ -46,14 +40,4 @@ class WykopImageView : FrameLayout {
             }
         }
     }
-
-    fun loadImageFromUrl(url : String) {
-        GlideApp
-                .with(context)
-                .load(url)
-                .listener(KotlinGlideRequestListener(
-                        { progressView.isVisible = false },
-                        { progressView.isVisible = false }))
-                .into(image)
-    }
 }