mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-19 03:29:28 +01:00
rename setupSystemColors to initSystemBars
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
parent
5395157a48
commit
d5fcacf0cd
@ -91,7 +91,7 @@ class AccountVerificationActivity : BaseActivity() {
|
|||||||
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
|
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
actionBar?.hide()
|
actionBar?.hide()
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
|
|
||||||
handleIntent()
|
handleIntent()
|
||||||
}
|
}
|
||||||
|
@ -78,7 +78,7 @@ class ServerSelectionActivity : BaseActivity() {
|
|||||||
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
|
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
actionBar?.hide()
|
actionBar?.hide()
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
|
|
||||||
onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
|
onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
|
||||||
}
|
}
|
||||||
|
@ -86,7 +86,7 @@ class SwitchAccountActivity : BaseActivity() {
|
|||||||
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
|
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
setupActionBar()
|
setupActionBar()
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
|
|
||||||
Configuration.getInstance().load(context, PreferenceManager.getDefaultSharedPreferences(context))
|
Configuration.getInstance().load(context, PreferenceManager.getDefaultSharedPreferences(context))
|
||||||
|
|
||||||
|
@ -114,7 +114,7 @@ class WebViewLoginActivity : BaseActivity() {
|
|||||||
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
|
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
actionBar?.hide()
|
actionBar?.hide()
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
|
|
||||||
onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
|
onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
|
||||||
handleIntent()
|
handleIntent()
|
||||||
|
@ -115,7 +115,7 @@ open class BaseActivity : AppCompatActivity() {
|
|||||||
eventBus.unregister(this)
|
eventBus.unregister(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setupSystemColors() {
|
fun initSystemBars() {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
|
||||||
setStatusBarColor(ResourcesCompat.getColor(resources, R.color.bg_default, context.theme))
|
setStatusBarColor(ResourcesCompat.getColor(resources, R.color.bg_default, context.theme))
|
||||||
} else {
|
} else {
|
||||||
|
@ -190,7 +190,7 @@ class ConversationInfoActivity :
|
|||||||
binding = ActivityConversationInfoBinding.inflate(layoutInflater)
|
binding = ActivityConversationInfoBinding.inflate(layoutInflater)
|
||||||
setupActionBar()
|
setupActionBar()
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
|
|
||||||
viewModel =
|
viewModel =
|
||||||
ViewModelProvider(this, viewModelFactory)[ConversationInfoViewModel::class.java]
|
ViewModelProvider(this, viewModelFactory)[ConversationInfoViewModel::class.java]
|
||||||
|
@ -99,7 +99,7 @@ class ConversationInfoEditActivity : BaseActivity() {
|
|||||||
binding = ActivityConversationInfoEditBinding.inflate(layoutInflater)
|
binding = ActivityConversationInfoEditBinding.inflate(layoutInflater)
|
||||||
setupActionBar()
|
setupActionBar()
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
|
|
||||||
val extras: Bundle? = intent.extras
|
val extras: Bundle? = intent.extras
|
||||||
|
|
||||||
|
@ -264,7 +264,7 @@ class ConversationsListActivity :
|
|||||||
binding = ActivityConversationsBinding.inflate(layoutInflater)
|
binding = ActivityConversationsBinding.inflate(layoutInflater)
|
||||||
setupActionBar()
|
setupActionBar()
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
viewThemeUtils.material.themeCardView(binding.searchToolbar)
|
viewThemeUtils.material.themeCardView(binding.searchToolbar)
|
||||||
viewThemeUtils.material.themeSearchBarText(binding.searchText)
|
viewThemeUtils.material.themeSearchBarText(binding.searchText)
|
||||||
|
|
||||||
@ -934,7 +934,7 @@ class ConversationsListActivity :
|
|||||||
} else {
|
} else {
|
||||||
showToolbar()
|
showToolbar()
|
||||||
}
|
}
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ class InvitationsActivity : BaseActivity() {
|
|||||||
binding = ActivityInvitationsBinding.inflate(layoutInflater)
|
binding = ActivityInvitationsBinding.inflate(layoutInflater)
|
||||||
setupActionBar()
|
setupActionBar()
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
|
|
||||||
adapter = InvitationsAdapter(currentUser) { invitation, action ->
|
adapter = InvitationsAdapter(currentUser) { invitation, action ->
|
||||||
handleInvitation(invitation, action)
|
handleInvitation(invitation, action)
|
||||||
|
@ -67,7 +67,7 @@ class GeocodingActivity :
|
|||||||
binding = ActivityGeocodingBinding.inflate(layoutInflater)
|
binding = ActivityGeocodingBinding.inflate(layoutInflater)
|
||||||
setupActionBar()
|
setupActionBar()
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
|
|
||||||
Configuration.getInstance().load(context, PreferenceManager.getDefaultSharedPreferences(context))
|
Configuration.getInstance().load(context, PreferenceManager.getDefaultSharedPreferences(context))
|
||||||
|
|
||||||
|
@ -129,7 +129,7 @@ class LocationPickerActivity :
|
|||||||
binding = ActivityLocationBinding.inflate(layoutInflater)
|
binding = ActivityLocationBinding.inflate(layoutInflater)
|
||||||
setupActionBar()
|
setupActionBar()
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
|
|
||||||
getInstance().load(context, PreferenceManager.getDefaultSharedPreferences(context))
|
getInstance().load(context, PreferenceManager.getDefaultSharedPreferences(context))
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ class MessageSearchActivity : BaseActivity() {
|
|||||||
binding = ActivityMessageSearchBinding.inflate(layoutInflater)
|
binding = ActivityMessageSearchBinding.inflate(layoutInflater)
|
||||||
setupActionBar()
|
setupActionBar()
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
|
|
||||||
viewModel = ViewModelProvider(this, viewModelFactory)[MessageSearchViewModel::class.java]
|
viewModel = ViewModelProvider(this, viewModelFactory)[MessageSearchViewModel::class.java]
|
||||||
user = currentUserProvider.currentUser.blockingGet()
|
user = currentUserProvider.currentUser.blockingGet()
|
||||||
|
@ -57,7 +57,7 @@ class ListOpenConversationsActivity : BaseActivity() {
|
|||||||
binding = ActivityOpenConversationsBinding.inflate(layoutInflater)
|
binding = ActivityOpenConversationsBinding.inflate(layoutInflater)
|
||||||
setupActionBar()
|
setupActionBar()
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
viewThemeUtils.platform.colorImageView(binding.searchOpenConversations, ColorRole.ON_SURFACE)
|
viewThemeUtils.platform.colorImageView(binding.searchOpenConversations, ColorRole.ON_SURFACE)
|
||||||
viewThemeUtils.material.colorTextInputLayout(binding.textInputLayout)
|
viewThemeUtils.material.colorTextInputLayout(binding.textInputLayout)
|
||||||
|
|
||||||
|
@ -119,7 +119,7 @@ class ProfileActivity : BaseActivity() {
|
|||||||
binding = ActivityProfileBinding.inflate(layoutInflater)
|
binding = ActivityProfileBinding.inflate(layoutInflater)
|
||||||
setupActionBar()
|
setupActionBar()
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
|
@ -145,7 +145,7 @@ class SettingsActivity :
|
|||||||
binding = ActivitySettingsBinding.inflate(layoutInflater)
|
binding = ActivitySettingsBinding.inflate(layoutInflater)
|
||||||
setupActionBar()
|
setupActionBar()
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
|
|
||||||
binding.avatarImage.let { ViewCompat.setTransitionName(it, "userAvatar.transitionTag") }
|
binding.avatarImage.let { ViewCompat.setTransitionName(it, "userAvatar.transitionTag") }
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ class TranslateActivity : BaseActivity() {
|
|||||||
}
|
}
|
||||||
setupActionBar()
|
setupActionBar()
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
setupSystemColors()
|
initSystemBars()
|
||||||
setupTextViews()
|
setupTextViews()
|
||||||
viewModel.getLanguages()
|
viewModel.getLanguages()
|
||||||
setupCopyButton()
|
setupCopyButton()
|
||||||
|
Loading…
Reference in New Issue
Block a user