gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

code format kotlin code

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-05-19 23:31:04 +02:00
parent 4784a22e18
commit 0e92e5ea2d
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -298,8 +298,7 @@ class ChatController(args: Bundle) :
} }
private fun getRoomInfo() { private fun getRoomInfo() {
val shouldRepeat = CapabilitiesUtil.hasSpreedFeatureCapability(conversationUser, "webinary-lobby") ?: val shouldRepeat = CapabilitiesUtil.hasSpreedFeatureCapability(conversationUser, "webinary-lobby")
false
if (shouldRepeat) { if (shouldRepeat) {
checkingLobbyStatus = true checkingLobbyStatus = true
} }

18
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View File

@ -88,7 +88,11 @@ import java.util.Locale
import javax.inject.Inject import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class) @AutoInjector(NextcloudTalkApplication::class)
class ConversationInfoController(args: Bundle) : NewBaseController(R.layout.controller_conversation_info, args), class ConversationInfoController(args: Bundle) :
NewBaseController(
R.layout.controller_conversation_info,
args
),
FlexibleAdapter FlexibleAdapter
.OnItemClickListener { .OnItemClickListener {
private val binding: ControllerConversationInfoBinding by viewBinding(ControllerConversationInfoBinding::bind) private val binding: ControllerConversationInfoBinding by viewBinding(ControllerConversationInfoBinding::bind)
@ -387,17 +391,7 @@ class ConversationInfoController(args: Bundle) : NewBaseController(R.layout.cont
adapter!!.updateDataSet(recyclerViewItems) adapter!!.updateDataSet(recyclerViewItems)
} }
/** override val title: String
override fun getTitle(): String? {
return if (hasAvatarSpacing) {
" " + resources!!.getString(R.string.nc_conversation_menu_conversation_info)
} else {
resources!!.getString(R.string.nc_conversation_menu_conversation_info)
}
}
*/
override val title: String?
get() = get() =
if (hasAvatarSpacing) { if (hasAvatarSpacing) {
" " + resources!!.getString(R.string.nc_conversation_menu_conversation_info) " " + resources!!.getString(R.string.nc_conversation_menu_conversation_info)

9
app/src/main/java/com/nextcloud/talk/controllers/base/NewBaseController.kt
View File

@ -138,7 +138,8 @@ abstract class NewBaseController(@LayoutRes var layoutRes: Int, args: Bundle? =
activity.binding.searchToolbar.visibility = View.VISIBLE activity.binding.searchToolbar.visibility = View.VISIBLE
activity.binding.searchText.hint = searchHint activity.binding.searchText.hint = searchHint
activity.binding.toolbar.visibility = View.GONE activity.binding.toolbar.visibility = View.GONE
//layoutParams.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS); // layoutParams.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout
// .LayoutParams.SCROLL_FLAG_SNAP | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS);
layoutParams.scrollFlags = 0 layoutParams.scrollFlags = 0
activity.binding.appBar.stateListAnimator = AnimatorInflater.loadStateListAnimator( activity.binding.appBar.stateListAnimator = AnimatorInflater.loadStateListAnimator(
activity.binding.appBar.context, activity.binding.appBar.context,
@ -157,14 +158,16 @@ abstract class NewBaseController(@LayoutRes var layoutRes: Int, args: Bundle? =
if (resources != null) { if (resources != null) {
if (showSearchBar) { if (showSearchBar) {
DisplayUtils.applyColorToStatusBar( DisplayUtils.applyColorToStatusBar(
activity, ResourcesCompat.getColor( activity,
ResourcesCompat.getColor(
resources!!, resources!!,
R.color.bg_default, null R.color.bg_default, null
) )
) )
} else { } else {
DisplayUtils.applyColorToStatusBar( DisplayUtils.applyColorToStatusBar(
activity, ResourcesCompat.getColor( activity,
ResourcesCompat.getColor(
resources!!, resources!!,
R.color.appbar, null R.color.appbar, null
) )