Merge pull request #39 from SoftwareEngineeringDaily/develop

MostafaGazar · web-flow · commit f3be5b5ff1ac · 2019-11-13T11:31:52.000+13:00
v1.0.3
diff --git a/.stickler.yml b/.stickler.yml
@@ -0,0 +1,6 @@
+linters:
+    ktlint:
+        android: true
+        fixer: true
+fixers:
+    enable: true
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,8 +20,8 @@ android {
         applicationId "com.koalatea.sedaily"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 18
-        versionName "1.0.2"
+        versionCode 19
+        versionName "1.0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -141,6 +141,9 @@ dependencies {
     // Timber
     implementation 'com.jakewharton.timber:timber:4.7.1'
 
+    // Custom Tabs
+    implementation 'androidx.browser:browser:1.0.0'
+
     // Testing
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
diff --git a/app/src/main/java/com/koalatea/sedaily/database/model/Comment.kt b/app/src/main/java/com/koalatea/sedaily/database/model/Comment.kt
@@ -11,7 +11,6 @@ data class Comment(
         val author: Author,
         val rootEntity: String,
         val content: String,
-        val mentions: List<String>?,
         val deleted: Boolean?,
         val dateCreated: String,
         val score: Int?,
diff --git a/app/src/main/java/com/koalatea/sedaily/feature/bookmarks/BookmarksFragment.kt b/app/src/main/java/com/koalatea/sedaily/feature/bookmarks/BookmarksFragment.kt
@@ -62,6 +62,10 @@ class BookmarksFragment : BaseFragment() {
             epoxyRecyclerView.setController(this)
         }
 
+        bookmarksSwipeRefreshLayout.setOnRefreshListener {
+            viewModel.fetchBookmarks()
+        }
+
         viewModel.bookmarksResource.observe(this, Observer { resource ->
             when (resource) {
                 is Resource.Loading -> {
@@ -94,18 +98,18 @@ class BookmarksFragment : BaseFragment() {
 
     private fun showLoading() {
         emptyStateContainer.visibility = View.GONE
-        epoxyRecyclerView.visibility = View.GONE
+        bookmarksSwipeRefreshLayout.visibility = View.GONE
 
-        progressBar.visibility = View.VISIBLE
+        bookmarksSwipeRefreshLayout.isRefreshing = true
     }
 
     private fun hideLoading() {
-        progressBar.visibility = View.GONE
+        bookmarksSwipeRefreshLayout.isRefreshing = false
     }
 
     private fun showLoginEmptyState() {
-        epoxyRecyclerView.visibility = View.GONE
-        progressBar.visibility = View.GONE
+        bookmarksSwipeRefreshLayout.visibility = View.GONE
+        bookmarksSwipeRefreshLayout.isRefreshing = false
 
         emptyStateContainer.textView.text = getString(R.string.login_to_manage_bookmarks)
         emptyStateContainer.visibility = View.VISIBLE
@@ -115,9 +119,9 @@ class BookmarksFragment : BaseFragment() {
         bookmarksEpoxyController?.setData(episodes)
 
         emptyStateContainer.visibility = View.GONE
-        progressBar.visibility = View.GONE
+        bookmarksSwipeRefreshLayout.isRefreshing = false
 
-        epoxyRecyclerView.visibility = View.VISIBLE
+        bookmarksSwipeRefreshLayout.visibility = View.VISIBLE
     }
 
 }
diff --git a/app/src/main/java/com/koalatea/sedaily/feature/commentList/CommentsFragment.kt b/app/src/main/java/com/koalatea/sedaily/feature/commentList/CommentsFragment.kt
@@ -51,6 +51,9 @@ class CommentsFragment : BaseFragment() {
         commentsEpoxyController = CommentsEpoxyController(
                 replyClickListener = { comment ->
                     viewModel.replyTo(comment)
+                },
+                upVoteClickListener = { comment ->
+                    viewModel.upVoteComment(comment)
                 }
         ).apply {
             epoxyRecyclerView.setController(this)
@@ -73,6 +76,21 @@ class CommentsFragment : BaseFragment() {
             viewModel.cancelReply()
         }
 
+        viewModel.commentVoteLiveData.observe(this, Observer { it.getContentIfNotHandled()?.let { resource ->
+                when (resource) {
+                    is Resource.RequireLogin -> showPromptLoginDialog()
+                    is Resource.Success -> {
+                        viewModel.reloadComments(entityId)
+                    }
+                    is Resource.Error -> {
+                        hideLoading()
+
+                        if (resource.isConnected) acknowledgeGenericError() else acknowledgeConnectionError()
+                    }
+                }
+            }
+        })
+
         viewModel.commentsResource.observe(this, Observer { resource ->
             when (resource) {
                 is Resource.Loading -> {
diff --git a/app/src/main/java/com/koalatea/sedaily/feature/commentList/CommentsViewModel.kt b/app/src/main/java/com/koalatea/sedaily/feature/commentList/CommentsViewModel.kt
@@ -26,6 +26,10 @@ class CommentsViewModel(
     val replyToCommentLiveData: LiveData<Comment?>
         get() = _replyToCommentLiveData
 
+    private val _commentVoteLiveData = MutableLiveData<Event<Resource<Boolean>>>()
+    val commentVoteLiveData: LiveData<Event<Resource<Boolean>>>
+        get() = _commentVoteLiveData
+
     private val _addCommentLiveData = MutableLiveData<Event<Resource<Boolean>>>()
     val addCommentLiveData: LiveData<Event<Resource<Boolean>>>
         get() = _addCommentLiveData
@@ -42,6 +46,16 @@ class CommentsViewModel(
         entityIdLiveData.value = entityId
     }
 
+    @MainThread
+    fun upVoteComment(comment: Comment) = viewModelScope.launch {
+        with(_commentVoteLiveData) {
+            postValue(Event(Resource.Loading))
+
+            val resource = commentsRepository.upVoteComment(comment._id)
+            postValue(Event(resource))
+        }
+    }
+
     @MainThread
     fun addComment(comment: String) = viewModelScope.launch {
         if (comment.isBlank()) return@launch
diff --git a/app/src/main/java/com/koalatea/sedaily/feature/commentList/epoxy/BaseCommentEpoxyModelWithHolder.kt b/app/src/main/java/com/koalatea/sedaily/feature/commentList/epoxy/BaseCommentEpoxyModelWithHolder.kt
@@ -21,6 +21,8 @@ abstract class BaseCommentEpoxyModelWithHolder<Holder: BaseCommentHolder> : Epox
     @EpoxyAttribute lateinit var authorName: String
     @EpoxyAttribute lateinit var comment: String
     @EpoxyAttribute var date: Date? = null
+    @EpoxyAttribute var score: Int? = 0
+    @EpoxyAttribute var upvoted: Boolean = false
 
     @CallSuper
     override fun bind(holder: Holder) {
@@ -43,7 +45,6 @@ abstract class BaseCommentEpoxyModelWithHolder<Holder: BaseCommentHolder> : Epox
             holder.dateTextView.visibility = View.GONE
         }
     }
-
 }
 
 abstract class BaseCommentHolder : KotlinEpoxyHolder() {
diff --git a/app/src/main/java/com/koalatea/sedaily/feature/commentList/epoxy/CommentEpoxyModelWithHolder.kt b/app/src/main/java/com/koalatea/sedaily/feature/commentList/epoxy/CommentEpoxyModelWithHolder.kt
@@ -9,15 +9,21 @@ import com.koalatea.sedaily.R
 abstract class CommentEpoxyModelWithHolder : BaseCommentEpoxyModelWithHolder<CommentHolder>() {
 
     @EpoxyAttribute lateinit var replyClickListener: () -> Unit
+    @EpoxyAttribute lateinit var upVoteClickListener: () -> Unit
 
     override fun bind(holder: CommentHolder) {
         super.bind(holder)
 
         holder.replayButton.setOnClickListener { replyClickListener() }
+        holder.upVoteButton.setOnClickListener { upVoteClickListener() }
+        holder.upVoteButton.isSelected = upvoted
+        holder.upVoteButton.text = score?.let {
+            if (it > 0) { it.toString() } else { "" }
+        } ?: ""
     }
-
 }
 
 class CommentHolder : BaseCommentHolder() {
     val replayButton by bind<Button>(R.id.replyButton)
-}
+    val upVoteButton by bind<Button>(R.id.commentUpvoteButton)
+}
diff --git a/app/src/main/java/com/koalatea/sedaily/feature/commentList/epoxy/CommentsEpoxyController.kt b/app/src/main/java/com/koalatea/sedaily/feature/commentList/epoxy/CommentsEpoxyController.kt
@@ -4,7 +4,8 @@ import com.airbnb.epoxy.TypedEpoxyController
 import com.koalatea.sedaily.database.model.Comment
 
 class CommentsEpoxyController(
-        private val replyClickListener: (comment: Comment) -> Unit
+    private val replyClickListener: (comment: Comment) -> Unit,
+    private val upVoteClickListener: (comment: Comment) -> Unit
 ) : TypedEpoxyController<List<Comment>>() {
 
     override fun buildModels(comments: List<Comment>) {
@@ -17,7 +18,10 @@ class CommentsEpoxyController(
                 authorName(comment.author.name ?: comment.author.username)
                 comment(comment.content)
                 date(comment.utcDateCreated)
+                score(comment.score)
                 replyClickListener { replyClickListener(comment) }
+                upVoteClickListener { upVoteClickListener(comment) }
+                upvoted(comment?.upvoted ?: false)
             }
 
             comment.replies?.forEach { reply ->
@@ -29,9 +33,12 @@ class CommentsEpoxyController(
                     authorName(reply.author.name ?: comment.author.username)
                     comment(reply.content)
                     date(reply.utcDateCreated)
+                    upVoteClickListener { upVoteClickListener(reply) }
+                    upvoted(reply?.upvoted ?: false)
+                    score(reply.score)
                 }
             }
         }
     }
 
-}
+}
diff --git a/app/src/main/java/com/koalatea/sedaily/feature/commentList/epoxy/ReplyEpoxyModelWithHolder.kt b/app/src/main/java/com/koalatea/sedaily/feature/commentList/epoxy/ReplyEpoxyModelWithHolder.kt
@@ -1,9 +1,26 @@
 package com.koalatea.sedaily.feature.commentList.epoxy
 
+import android.widget.Button
+import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.koalatea.sedaily.R
 
 @EpoxyModelClass(layout = R.layout.view_holder_reply)
-abstract class ReplyEpoxyModelWithHolder : BaseCommentEpoxyModelWithHolder<ReplyHolder>()
+abstract class ReplyEpoxyModelWithHolder : BaseCommentEpoxyModelWithHolder<ReplyHolder>() {
 
-class ReplyHolder : BaseCommentHolder()
+    @EpoxyAttribute lateinit var upVoteClickListener: () -> Unit
+
+    override fun bind(holder: ReplyHolder) {
+        super.bind(holder)
+
+        holder.upVoteButton.setOnClickListener { upVoteClickListener() }
+        holder.upVoteButton.isSelected = upvoted
+        holder.upVoteButton.text = score?.let {
+            if (it > 0) { it.toString() } else { "" }
+        } ?: ""
+    }
+}
+
+class ReplyHolder : BaseCommentHolder() {
+    val upVoteButton by bind<Button>(R.id.replyUpvoteButton)
+}
diff --git a/app/src/main/java/com/koalatea/sedaily/feature/episodedetail/EpisodeDetailFragment.kt b/app/src/main/java/com/koalatea/sedaily/feature/episodedetail/EpisodeDetailFragment.kt
@@ -292,8 +292,8 @@ class EpisodeDetailFragment : BaseFragment() {
     }
 
     private fun renderPlay(episode: Episode) {
-        // Playback is not supported
-        if (playerCallback == null) {
+        // Playback is not supported or viewing an article
+        if (playerCallback == null || episode.httpsMp3Url.isNullOrBlank()) {
             hidePlayerViews()
         } else {
             monitorPlayback(episode)
@@ -313,6 +313,13 @@ class EpisodeDetailFragment : BaseFragment() {
                 playerCallback?.playerStatusLiveData?.removeObservers(this)
             }
         }
+
+        // Cannot download or view related links for an article
+        if (episode.httpsMp3Url.isNullOrBlank()) {
+            hideDownloadViews()
+
+            relatedLinksButton.visibility = View.INVISIBLE
+        }
     }
 
     private fun monitorPlayback(episode: Episode) {
@@ -337,6 +344,12 @@ class EpisodeDetailFragment : BaseFragment() {
         downloadProgressBar.visibility = View.INVISIBLE
     }
 
+    private fun hideDownloadViews() {
+        deleteButton.visibility = View.GONE
+        downloadButton.visibility = View.INVISIBLE
+        downloadProgressBar.visibility = View.INVISIBLE
+    }
+
     private fun showDeleteViews() {
         deleteButton.visibility = View.VISIBLE
         downloadButton.visibility = View.INVISIBLE
diff --git a/app/src/main/java/com/koalatea/sedaily/feature/player/AudioService.kt b/app/src/main/java/com/koalatea/sedaily/feature/player/AudioService.kt
@@ -42,6 +42,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.inject
+import timber.log.Timber
 import java.util.*
 
 private const val PLAYBACK_CHANNEL_ID = "playback_channel"
@@ -100,14 +101,6 @@ class AudioService : LifecycleService() {
     val playerStatusLiveData: LiveData<PlayerStatus>
         get() = _playerStatusLiveData
 
-    override fun onBind(intent: Intent?): IBinder {
-        super.onBind(intent)
-
-        handleIntent(intent)
-
-        return AudioServiceBinder()
-    }
-
     override fun onCreate() {
         super.onCreate()
 
@@ -213,6 +206,14 @@ class AudioService : LifecycleService() {
         }
     }
 
+    override fun onBind(intent: Intent?): IBinder {
+        super.onBind(intent)
+
+        handleIntent(intent)
+
+        return AudioServiceBinder()
+    }
+
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         handleIntent(intent)
 
@@ -233,17 +234,16 @@ class AudioService : LifecycleService() {
 
     @MainThread
     private fun handleIntent(intent: Intent?) {
-        episodeId = intent?.getStringExtra(ARG_EPISODE_ID)
-        episodeTitle = intent?.getStringExtra(ARG_TITLE)
-
         // Play
         intent?.let {
             intent.getParcelableExtra<Uri>(ARG_URI)?.also { uri ->
+                episodeId = intent.getStringExtra(ARG_EPISODE_ID)
+                episodeTitle = intent.getStringExtra(ARG_TITLE)
                 val startPosition = intent.getLongExtra(ARG_START_POSITION, C.POSITION_UNSET.toLong())
                 val playbackSpeed = playbackManager.playbackSpeed
 
                 play(uri, startPosition, playbackSpeed)
-            }
+            } ?: Timber.w("Playback uri was not set")
         }
     }
 
diff --git a/app/src/main/java/com/koalatea/sedaily/network/SEDailyApi.kt b/app/src/main/java/com/koalatea/sedaily/network/SEDailyApi.kt
@@ -36,6 +36,9 @@ interface SEDailyApi {
     @GET("comments/forEntity/{entity_id}")
     fun getEpisodeCommentsAsync(@Path("entity_id") entityId: String): Deferred<Response<CommentsResponse>>
 
+    @POST("comments/{entity_id}/upvote")
+    fun upVoteCommentsAsync(@Path("entity_id") entityId: String): Deferred<Response<GenericResponse>>
+
     @FormUrlEncoded
     @POST("comments/forEntity/{entity_id}")
     fun addEpisodeCommentAsync(
diff --git a/app/src/main/java/com/koalatea/sedaily/repository/CommentsRepository.kt b/app/src/main/java/com/koalatea/sedaily/repository/CommentsRepository.kt
@@ -38,4 +38,16 @@ class CommentsRepository(
         }
     }
 
-}
+    suspend fun upVoteComment(entityId: String) = withContext(Dispatchers.IO) {
+        if (sessionRepository.isLoggedIn) {
+            val response = safeApiCall { api.upVoteCommentsAsync(entityId).await() }
+            if (response?.isSuccessful == true) {
+                Resource.Success(true)
+            } else {
+                Resource.Error(response?.errorBody().toException(), networkManager.isConnected)
+            }
+        } else {
+            Resource.RequireLogin
+        }
+    }
+}
diff --git a/app/src/main/java/com/koalatea/sedaily/util/UiExtensions.kt b/app/src/main/java/com/koalatea/sedaily/util/UiExtensions.kt
diff --git a/app/src/main/res/drawable/upvote_downvote_src.xml b/app/src/main/res/drawable/upvote_downvote_src.xml
diff --git a/app/src/main/res/drawable/vd_thumb_up.xml b/app/src/main/res/drawable/vd_thumb_up.xml
diff --git a/app/src/main/res/drawable/vd_thumb_up_outline.xml b/app/src/main/res/drawable/vd_thumb_up_outline.xml
diff --git a/app/src/main/res/layout/fragment_bookmarks.xml b/app/src/main/res/layout/fragment_bookmarks.xml
diff --git a/app/src/main/res/layout/view_holder_comment.xml b/app/src/main/res/layout/view_holder_comment.xml
diff --git a/app/src/main/res/layout/view_holder_reply.xml b/app/src/main/res/layout/view_holder_reply.xml

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ abstract class BaseCommentEpoxyModelWithHolder<Holder: BaseCommentHolder> : Epox`
`21`	`21`	`@EpoxyAttribute lateinit var authorName: String`
`22`	`22`	`@EpoxyAttribute lateinit var comment: String`
`23`	`23`	`@EpoxyAttribute var date: Date? = null`
	`24`	`+ @EpoxyAttribute var score: Int? = 0`
	`25`	`+ @EpoxyAttribute var upvoted: Boolean = false`
`24`	`26`
`25`	`27`	`@CallSuper`
`26`	`28`	`override fun bind(holder: Holder) {`
`@@ -43,7 +45,6 @@ abstract class BaseCommentEpoxyModelWithHolder<Holder: BaseCommentHolder> : Epox`
`43`	`45`	`holder.dateTextView.visibility = View.GONE`
`44`	`46`	`}`
`45`	`47`	`}`
`46`		`-`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`abstract class BaseCommentHolder : KotlinEpoxyHolder() {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@ import com.airbnb.epoxy.TypedEpoxyController`
`4`	`4`	`import com.koalatea.sedaily.database.model.Comment`
`5`	`5`
`6`	`6`	`class CommentsEpoxyController(`
`7`		`- private val replyClickListener: (comment: Comment) -> Unit`
	`7`	`+ private val replyClickListener: (comment: Comment) -> Unit,`
	`8`	`+ private val upVoteClickListener: (comment: Comment) -> Unit`
`8`	`9`	`) : TypedEpoxyController<List<Comment>>() {`
`9`	`10`
`10`	`11`	`override fun buildModels(comments: List<Comment>) {`
`@@ -17,7 +18,10 @@ class CommentsEpoxyController(`
`17`	`18`	`authorName(comment.author.name ?: comment.author.username)`
`18`	`19`	`comment(comment.content)`
`19`	`20`	`date(comment.utcDateCreated)`
	`21`	`+ score(comment.score)`
`20`	`22`	`replyClickListener { replyClickListener(comment) }`
	`23`	`+ upVoteClickListener { upVoteClickListener(comment) }`
	`24`	`+ upvoted(comment?.upvoted ?: false)`
`21`	`25`	`}`
`22`	`26`
`23`	`27`	`comment.replies?.forEach { reply ->`
`@@ -29,9 +33,12 @@ class CommentsEpoxyController(`
`29`	`33`	`authorName(reply.author.name ?: comment.author.username)`
`30`	`34`	`comment(reply.content)`
`31`	`35`	`date(reply.utcDateCreated)`
	`36`	`+ upVoteClickListener { upVoteClickListener(reply) }`
	`37`	`+ upvoted(reply?.upvoted ?: false)`
	`38`	`+ score(reply.score)`
`32`	`39`	`}`
`33`	`40`	`}`
`34`	`41`	`}`
`35`	`42`	`}`
`36`	`43`
`37`		`-}`
	`44`	`+}`