Skip to content

Commit

Permalink
Merge pull request #4550 from FineFindus/feat/channel-group-creation-…
Browse files Browse the repository at this point in the history
…feedback

feat(channelGroups): disable confirm button if creation is not possible
  • Loading branch information
Bnyro authored Aug 20, 2023
2 parents ab9e543 + b2f3c8e commit 43b4ec6
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ interface SubscriptionGroupsDao {
@Query("SELECT * FROM subscriptionGroups")
suspend fun getAll(): List<SubscriptionGroup>

@Query("SELECT EXISTS(SELECT * FROM subscriptionGroups WHERE name = :name)")
suspend fun exists(name: String): Boolean

@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun createGroup(subscriptionGroup: SubscriptionGroup)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@ import androidx.core.widget.addTextChangedListener
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import com.github.libretube.R
import com.github.libretube.api.SubscriptionHelper
import com.github.libretube.api.obj.Subscription
import com.github.libretube.databinding.DialogEditChannelGroupBinding
import com.github.libretube.db.DatabaseHolder
import com.github.libretube.db.obj.SubscriptionGroup
import com.github.libretube.ui.adapters.SubscriptionGroupChannelsAdapter
import com.github.libretube.ui.models.SubscriptionsViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext

class EditChannelGroupSheet(
Expand All @@ -31,13 +34,17 @@ class EditChannelGroupSheet(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
): View {
binding = DialogEditChannelGroupBinding.inflate(layoutInflater)
binding.groupName.setText(group.name)

binding.channelsRV.layoutManager = LinearLayoutManager(context)
fetchSubscriptions()

binding.groupName.addTextChangedListener {
updateConfirmStatus()
}

binding.searchInput.addTextChangedListener {
showChannels(channels, it?.toString())
}
Expand All @@ -46,6 +53,7 @@ class EditChannelGroupSheet(
dismiss()
}

updateConfirmStatus()
binding.confirm.setOnClickListener {
group.name = binding.groupName.text.toString()
if (group.name.isBlank()) return@setOnClickListener
Expand Down Expand Up @@ -78,8 +86,33 @@ class EditChannelGroupSheet(
group
) {
group = it
updateConfirmStatus()
}
binding.subscriptionsContainer.isVisible = true
binding.progress.isVisible = false
}

private fun updateConfirmStatus() {
with(binding) {
val name = groupName.text.toString()
groupName.error = getGroupNameError(name)

confirm.isEnabled = groupName.error == null && group.channels.isNotEmpty()
}
}

private fun getGroupNameError(name: String): String? {
if (name.isBlank()) {
return getString(R.string.group_name_error_empty)
}

val groupExists = runBlocking(Dispatchers.IO) {
DatabaseHolder.Database.subscriptionGroupsDao().exists(name)
}
if (groupExists) {
return getString(R.string.group_name_error_exists)
}

return null
}
}
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,8 @@
<string name="channel_groups">Channel groups</string>
<string name="new_group">New</string>
<string name="group_name">Group name</string>
<string name="group_name_error_empty">Please enter a name</string>
<string name="group_name_error_exists">Please choose a name that is unique</string>
<string name="edit_group">Edit group</string>
<string name="play_automatically">Play automatically</string>
<string name="play_automatically_summary">Start playing video automatically when selecting</string>
Expand Down

0 comments on commit 43b4ec6

Please sign in to comment.