Beta 0.5.3

feelfreelinux · Jan 28, 2018 · 76507fc · 76507fc
1 parent 5c6bb1c
commit 76507fc
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,8 +28,8 @@ android {
         applicationId "io.github.feelfreelinux.wykopmobilny"
         minSdkVersion 17
         targetSdkVersion 27
-        versionCode 22
-        versionName "0.5.2"
+        versionCode 23
+        versionName "0.5.3"
 
         def credentialsPropertiesFile = rootProject.file("credentials.properties")
         def credentialsProperties = new Properties()

diff --git a/...kotlin/io/github/feelfreelinux/wykopmobilny/ui/modules/mikroblog/feed/hot/HotPresenter.kt b/...kotlin/io/github/feelfreelinux/wykopmobilny/ui/modules/mikroblog/feed/hot/HotPresenter.kt
@@ -16,7 +16,7 @@ class HotPresenter(private val schedulers: Schedulers, private val entriesApi: E
             if (it.isNotEmpty()) {
                 page++
                 view?.addDataToAdapter(it, shouldRefresh)
-            }
+            } else view?.disableLoading()
         }
         val failure : (Throwable) -> Unit  = { view?.showErrorDialog(it) }
 

diff --git a/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/modules/tag/TagActivity.kt b/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/modules/tag/TagActivity.kt
@@ -80,6 +80,12 @@ class TagActivity : BaseActivity(), TagActivityView {
             R.id.action_block -> presenter.blockTag()
             R.id.action_unblock -> presenter.unblockTag()
             android.R.id.home -> finish()
+            R.id.refresh -> {
+                for (i in 0 until tagPagerAdapter.registeredFragments.size()) {
+                    (tagPagerAdapter.registeredFragments.valueAt(i) as TagFragmentNotifier)
+                            .onRefresh()
+                }
+            }
         }
         return super.onOptionsItemSelected(item)
     }
@@ -94,4 +100,13 @@ class TagActivity : BaseActivity(), TagActivityView {
         tagMeta?.isObserved = tagState.isObserved
         invalidateOptionsMenu()
     }
+
+    override fun onPause() {
+        super.onPause()
+        if (isFinishing)
+            for (i in 0 until tagPagerAdapter.registeredFragments.size()) {
+                (tagPagerAdapter.registeredFragments.valueAt(i) as TagFragmentNotifier)
+                        .removeDataFragment()
+            }
+    }
 }
diff --git a/...rc/main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/modules/tag/TagFragmentNotifier.kt b/...rc/main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/modules/tag/TagFragmentNotifier.kt
@@ -0,0 +1,6 @@
+package io.github.feelfreelinux.wykopmobilny.ui.modules.tag
+
+interface TagFragmentNotifier {
+    fun removeDataFragment()
+    fun onRefresh()
+}
diff --git a/.../kotlin/io/github/feelfreelinux/wykopmobilny/ui/modules/tag/entries/TagEntriesFragment.kt b/.../kotlin/io/github/feelfreelinux/wykopmobilny/ui/modules/tag/entries/TagEntriesFragment.kt
@@ -14,10 +14,11 @@ import io.github.feelfreelinux.wykopmobilny.models.pojo.apiv2.models.TagMetaResp
 import io.github.feelfreelinux.wykopmobilny.models.pojo.apiv2.models.TagStateResponse
 import io.github.feelfreelinux.wykopmobilny.ui.adapters.FeedAdapter
 import io.github.feelfreelinux.wykopmobilny.ui.modules.tag.TagActivityView
+import io.github.feelfreelinux.wykopmobilny.ui.modules.tag.TagFragmentNotifier
 import io.github.feelfreelinux.wykopmobilny.utils.usermanager.UserManagerApi
 import javax.inject.Inject
 
-class TagEntriesFragment : BaseFeedFragment<Entry>(), TagEntriesView {
+class TagEntriesFragment : BaseFeedFragment<Entry>(), TagEntriesView, TagFragmentNotifier {
     @Inject lateinit var presenter : TagEntriesPresenter
     @Inject override lateinit var feedAdapter : FeedAdapter
     val entryTag by lazy { arguments!!.getString(EXTRA_TAG) }
@@ -74,6 +75,10 @@ class TagEntriesFragment : BaseFeedFragment<Entry>(), TagEntriesView {
         if (isRemoving) supportFragmentManager.removeDataFragment(tagDataFragment)
     }
 
+    override fun removeDataFragment() {
+        supportFragmentManager.removeDataFragment(tagDataFragment)
+    }
+
     override fun onDetach() {
         super.onDetach()
         presenter.unsubscribe()

diff --git a/...main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/modules/tag/links/TagLinksFragment.kt b/...main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/modules/tag/links/TagLinksFragment.kt
@@ -14,9 +14,10 @@ import io.github.feelfreelinux.wykopmobilny.models.fragments.removeDataFragment
 import io.github.feelfreelinux.wykopmobilny.models.pojo.apiv2.models.TagMetaResponse
 import io.github.feelfreelinux.wykopmobilny.ui.adapters.LinkAdapter
 import io.github.feelfreelinux.wykopmobilny.ui.modules.tag.TagActivityView
+import io.github.feelfreelinux.wykopmobilny.ui.modules.tag.TagFragmentNotifier
 import javax.inject.Inject
 
-class TagLinksFragment : BaseFeedFragment<Link>(), TagLinksView {
+class TagLinksFragment : BaseFeedFragment<Link>(), TagLinksView, TagFragmentNotifier {
     @Inject override lateinit var feedAdapter : LinkAdapter
     @Inject lateinit var presenter : TagLinksPresenter
     lateinit var dataFragment : DataFragment<PagedDataModel<List<Link>>>
@@ -70,6 +71,10 @@ class TagLinksFragment : BaseFeedFragment<Link>(), TagLinksView {
         if (isRemoving) supportFragmentManager.removeDataFragment(dataFragment)
     }
 
+    override fun removeDataFragment() {
+        supportFragmentManager.removeDataFragment(dataFragment)
+    }
+
     override fun setParentMeta(tagMetaResponse: TagMetaResponse) {
         (activity as TagActivityView).setMeta(tagMetaResponse)
     }

diff --git a/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/widgets/entry/EntryWidget.kt b/app/src/main/kotlin/io/github/feelfreelinux/wykopmobilny/ui/widgets/entry/EntryWidget.kt
@@ -84,6 +84,7 @@ class EntryWidget(context: Context, attrs: AttributeSet) : CardView(context, att
             }
         }
 
+
         if (shouldEnableClickListener) {
             setOnClickListener {
                 presenter.openDetails()
@@ -115,6 +116,7 @@ class EntryWidget(context: Context, attrs: AttributeSet) : CardView(context, att
         if (entry.body.isNotEmpty()) {
             entryContentTextView.isVisible = true
             entryContentTextView.prepareBody(entry.body, this)
+            if (shouldEnableClickListener) entryContentTextView.setOnClickListener { presenter.openDetails() }
         } else entryContentTextView.isVisible = false
 
         if (entry.survey != null) {

diff --git a/app/src/main/res/menu/tag_menu.xml b/app/src/main/res/menu/tag_menu.xml
@@ -2,6 +2,11 @@
 <menu
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/refresh"
+        android:title="@string/refresh"
+        android:icon="@drawable/ic_refresh"
+        app:showAsAction="always"/>
 
     <item
         android:id="@+id/action_observe"