From d5fcacf0cd4406cb3f39dde3f355a9108630872a Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Tue, 10 Jun 2025 18:05:50 +0200 Subject: [PATCH] rename setupSystemColors to initSystemBars Signed-off-by: Marcel Hibbe --- .../com/nextcloud/talk/account/AccountVerificationActivity.kt | 2 +- .../com/nextcloud/talk/account/ServerSelectionActivity.kt | 2 +- .../java/com/nextcloud/talk/account/SwitchAccountActivity.kt | 2 +- .../java/com/nextcloud/talk/account/WebViewLoginActivity.kt | 2 +- .../main/java/com/nextcloud/talk/activities/BaseActivity.kt | 2 +- .../talk/conversationinfo/ConversationInfoActivity.kt | 2 +- .../talk/conversationinfoedit/ConversationInfoEditActivity.kt | 2 +- .../talk/conversationlist/ConversationsListActivity.kt | 4 ++-- .../java/com/nextcloud/talk/invitation/InvitationsActivity.kt | 2 +- .../java/com/nextcloud/talk/location/GeocodingActivity.kt | 2 +- .../com/nextcloud/talk/location/LocationPickerActivity.kt | 2 +- .../com/nextcloud/talk/messagesearch/MessageSearchActivity.kt | 2 +- .../talk/openconversations/ListOpenConversationsActivity.kt | 2 +- .../main/java/com/nextcloud/talk/profile/ProfileActivity.kt | 2 +- .../main/java/com/nextcloud/talk/settings/SettingsActivity.kt | 2 +- .../java/com/nextcloud/talk/translate/ui/TranslateActivity.kt | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt b/app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt index 1eb50c189..e23b90b41 100644 --- a/app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt @@ -91,7 +91,7 @@ class AccountVerificationActivity : BaseActivity() { requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT setContentView(binding.root) actionBar?.hide() - setupSystemColors() + initSystemBars() handleIntent() } diff --git a/app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt b/app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt index 473263568..6f111b6d5 100644 --- a/app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt @@ -78,7 +78,7 @@ class ServerSelectionActivity : BaseActivity() { requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT setContentView(binding.root) actionBar?.hide() - setupSystemColors() + initSystemBars() onBackPressedDispatcher.addCallback(this, onBackPressedCallback) } diff --git a/app/src/main/java/com/nextcloud/talk/account/SwitchAccountActivity.kt b/app/src/main/java/com/nextcloud/talk/account/SwitchAccountActivity.kt index 6b137c2d0..81dcd9939 100644 --- a/app/src/main/java/com/nextcloud/talk/account/SwitchAccountActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/account/SwitchAccountActivity.kt @@ -86,7 +86,7 @@ class SwitchAccountActivity : BaseActivity() { requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT setContentView(binding.root) setupActionBar() - setupSystemColors() + initSystemBars() Configuration.getInstance().load(context, PreferenceManager.getDefaultSharedPreferences(context)) diff --git a/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt b/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt index 7d98d59c6..bf49b0ac5 100644 --- a/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt @@ -114,7 +114,7 @@ class WebViewLoginActivity : BaseActivity() { requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT setContentView(binding.root) actionBar?.hide() - setupSystemColors() + initSystemBars() onBackPressedDispatcher.addCallback(this, onBackPressedCallback) handleIntent() diff --git a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt index fd339cf02..d89ee60c5 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt @@ -115,7 +115,7 @@ open class BaseActivity : AppCompatActivity() { eventBus.unregister(this) } - fun setupSystemColors() { + fun initSystemBars() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) { setStatusBarColor(ResourcesCompat.getColor(resources, R.color.bg_default, context.theme)) } else { diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt index 0ac8e5097..08e97f91d 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt @@ -190,7 +190,7 @@ class ConversationInfoActivity : binding = ActivityConversationInfoBinding.inflate(layoutInflater) setupActionBar() setContentView(binding.root) - setupSystemColors() + initSystemBars() viewModel = ViewModelProvider(this, viewModelFactory)[ConversationInfoViewModel::class.java] diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt index 47e007a06..6af3850e3 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt @@ -99,7 +99,7 @@ class ConversationInfoEditActivity : BaseActivity() { binding = ActivityConversationInfoEditBinding.inflate(layoutInflater) setupActionBar() setContentView(binding.root) - setupSystemColors() + initSystemBars() val extras: Bundle? = intent.extras diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 07acbd29a..f1a364c26 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -264,7 +264,7 @@ class ConversationsListActivity : binding = ActivityConversationsBinding.inflate(layoutInflater) setupActionBar() setContentView(binding.root) - setupSystemColors() + initSystemBars() viewThemeUtils.material.themeCardView(binding.searchToolbar) viewThemeUtils.material.themeSearchBarText(binding.searchText) @@ -934,7 +934,7 @@ class ConversationsListActivity : } else { showToolbar() } - setupSystemColors() + initSystemBars() } } diff --git a/app/src/main/java/com/nextcloud/talk/invitation/InvitationsActivity.kt b/app/src/main/java/com/nextcloud/talk/invitation/InvitationsActivity.kt index 3f1c60650..40cfc61f3 100644 --- a/app/src/main/java/com/nextcloud/talk/invitation/InvitationsActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/invitation/InvitationsActivity.kt @@ -65,7 +65,7 @@ class InvitationsActivity : BaseActivity() { binding = ActivityInvitationsBinding.inflate(layoutInflater) setupActionBar() setContentView(binding.root) - setupSystemColors() + initSystemBars() adapter = InvitationsAdapter(currentUser) { invitation, action -> handleInvitation(invitation, action) diff --git a/app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt b/app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt index 33605a6ea..c4fcc694e 100644 --- a/app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/location/GeocodingActivity.kt @@ -67,7 +67,7 @@ class GeocodingActivity : binding = ActivityGeocodingBinding.inflate(layoutInflater) setupActionBar() setContentView(binding.root) - setupSystemColors() + initSystemBars() Configuration.getInstance().load(context, PreferenceManager.getDefaultSharedPreferences(context)) diff --git a/app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt b/app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt index 569a1a269..339f46ca2 100644 --- a/app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt @@ -129,7 +129,7 @@ class LocationPickerActivity : binding = ActivityLocationBinding.inflate(layoutInflater) setupActionBar() setContentView(binding.root) - setupSystemColors() + initSystemBars() getInstance().load(context, PreferenceManager.getDefaultSharedPreferences(context)) diff --git a/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt b/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt index f32e54193..7e9bae5b3 100644 --- a/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/messagesearch/MessageSearchActivity.kt @@ -70,7 +70,7 @@ class MessageSearchActivity : BaseActivity() { binding = ActivityMessageSearchBinding.inflate(layoutInflater) setupActionBar() setContentView(binding.root) - setupSystemColors() + initSystemBars() viewModel = ViewModelProvider(this, viewModelFactory)[MessageSearchViewModel::class.java] user = currentUserProvider.currentUser.blockingGet() diff --git a/app/src/main/java/com/nextcloud/talk/openconversations/ListOpenConversationsActivity.kt b/app/src/main/java/com/nextcloud/talk/openconversations/ListOpenConversationsActivity.kt index 986ff8b9a..9ceea142f 100644 --- a/app/src/main/java/com/nextcloud/talk/openconversations/ListOpenConversationsActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/openconversations/ListOpenConversationsActivity.kt @@ -57,7 +57,7 @@ class ListOpenConversationsActivity : BaseActivity() { binding = ActivityOpenConversationsBinding.inflate(layoutInflater) setupActionBar() setContentView(binding.root) - setupSystemColors() + initSystemBars() viewThemeUtils.platform.colorImageView(binding.searchOpenConversations, ColorRole.ON_SURFACE) viewThemeUtils.material.colorTextInputLayout(binding.textInputLayout) diff --git a/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt b/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt index 1333178fc..facf47ef6 100644 --- a/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/profile/ProfileActivity.kt @@ -119,7 +119,7 @@ class ProfileActivity : BaseActivity() { binding = ActivityProfileBinding.inflate(layoutInflater) setupActionBar() setContentView(binding.root) - setupSystemColors() + initSystemBars() } override fun onResume() { diff --git a/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt b/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt index 73b88bbfb..9dad6eec4 100644 --- a/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt @@ -145,7 +145,7 @@ class SettingsActivity : binding = ActivitySettingsBinding.inflate(layoutInflater) setupActionBar() setContentView(binding.root) - setupSystemColors() + initSystemBars() binding.avatarImage.let { ViewCompat.setTransitionName(it, "userAvatar.transitionTag") } diff --git a/app/src/main/java/com/nextcloud/talk/translate/ui/TranslateActivity.kt b/app/src/main/java/com/nextcloud/talk/translate/ui/TranslateActivity.kt index 04758b847..8817d7ccb 100644 --- a/app/src/main/java/com/nextcloud/talk/translate/ui/TranslateActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/translate/ui/TranslateActivity.kt @@ -86,7 +86,7 @@ class TranslateActivity : BaseActivity() { } setupActionBar() setContentView(binding.root) - setupSystemColors() + initSystemBars() setupTextViews() viewModel.getLanguages() setupCopyButton()