refactor(toolbar-activity): kotlin

app/src/main/java/com/nextcloud/client/di/ThemeModule.kt

@@ -10,7 +10,6 @@ package com.nextcloud.client.di
 import com.nextcloud.android.common.ui.theme.MaterialSchemes
 import com.owncloud.android.utils.theme.MaterialSchemesProvider
 import com.owncloud.android.utils.theme.MaterialSchemesProviderImpl
-import com.owncloud.android.utils.theme.ThemeColorUtils
 import com.owncloud.android.utils.theme.ThemeUtils
 import dagger.Binds
 import dagger.Module
@@ -25,10 +24,6 @@ internal abstract class ThemeModule {
 
     companion object {
 
-        @Provides
-        @Singleton
-        fun themeColorUtils(): ThemeColorUtils = ThemeColorUtils()
-
         @Provides
         @Singleton
         fun themeUtils(): ThemeUtils = ThemeUtils()

app/src/main/java/com/nextcloud/client/documentscan/DocumentScanActivity.kt

@@ -24,7 +24,7 @@ import com.owncloud.android.R
 import com.owncloud.android.databinding.ActivityDocumentScanBinding
 import com.owncloud.android.databinding.DialogScanExportTypeBinding
 import com.owncloud.android.ui.activity.ToolbarActivity
-import com.owncloud.android.utils.theme.ViewThemeUtils
+import com.owncloud.android.ui.navigation.model.ActionBarStyle
 import javax.inject.Inject
 
 class DocumentScanActivity :
@@ -37,9 +37,6 @@ class DocumentScanActivity :
     @Inject
     lateinit var logger: Logger
 
-    @Inject
-    lateinit var viewThemeUtils: ViewThemeUtils
-
     @Inject
     lateinit var appScanOptionalFeature: AppScanOptionalFeature
 
@@ -71,7 +68,7 @@ class DocumentScanActivity :
         binding = ActivityDocumentScanBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        setupToolbar()
+        showActionBar(ActionBarStyle.Plain)
         supportActionBar?.let {
             it.setDisplayHomeAsUpEnabled(true)
             it.setDisplayShowHomeEnabled(true)

app/src/main/java/com/nextcloud/client/etm/EtmActivity.kt

@@ -17,6 +17,7 @@ import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.di.ViewModelFactory
 import com.owncloud.android.R
 import com.owncloud.android.ui.activity.ToolbarActivity
+import com.owncloud.android.ui.navigation.model.ActionBarStyle
 import javax.inject.Inject
 
 class EtmActivity :
@@ -38,8 +39,8 @@ class EtmActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_etm)
-        setupToolbar()
-        updateActionBarTitleAndHomeButtonByString(getString(R.string.etm_title))
+        showActionBar(ActionBarStyle.Plain)
+        setActionBarTitle(getString(R.string.etm_title))
         vm = ViewModelProvider(this, viewModelFactory).get(EtmViewModel::class.java)
         vm.currentPage.observe(
             this,
@@ -80,12 +81,12 @@ class EtmActivity :
             supportFragmentManager.beginTransaction()
                 .replace(R.id.etm_page_container, fragment)
                 .commit()
-            updateActionBarTitleAndHomeButtonByString("ETM - ${getString(page.titleRes)}")
+            setActionBarTitle("ETM - ${getString(page.titleRes)}")
         } else {
             supportFragmentManager.beginTransaction()
                 .replace(R.id.etm_page_container, EtmMenuFragment())
                 .commitNow()
-            updateActionBarTitleAndHomeButtonByString(getString(R.string.etm_title))
+            setActionBarTitle(getString(R.string.etm_title))
         }
     }
 }

app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt

@@ -18,6 +18,7 @@ import com.nextcloud.client.di.ViewModelFactory
 import com.owncloud.android.R
 import com.owncloud.android.databinding.LogsActivityBinding
 import com.owncloud.android.ui.activity.ToolbarActivity
+import com.owncloud.android.ui.navigation.model.ActionBarStyle
 import javax.inject.Inject
 
 class LogsActivity : ToolbarActivity() {
@@ -60,7 +61,7 @@ class LogsActivity : ToolbarActivity() {
         vm.status.observe(this) { binding.logsStatus.text = it }
         vm.load()
 
-        setupToolbar()
+        showActionBar(ActionBarStyle.Plain)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
         supportActionBar?.let {

app/src/main/java/com/nextcloud/client/systembars/SystemBarBackgroundCallbacks.kt

@@ -62,7 +62,7 @@ class SystemBarBackgroundCallbacks(private val viewThemeUtilsProvider: Provider<
 
         @ColorInt
         private fun statusBarColor(activity: Activity, @ColorInt actionBarColor: Int): Int {
-            if (activity is ToolbarActivity && activity.isHomeSearchToolbarVisible) {
+            if (activity is ToolbarActivity && activity.isSearchActionBarVisible) {
                 return ContextCompat.getColor(activity, R.color.bg_default)
             }
 

app/src/main/java/com/nextcloud/ui/composeActivity/ComposeActivity.kt

@@ -91,7 +91,7 @@ class ComposeActivity : DrawerActivity() {
     private fun setupActivityUIFor(destination: ComposeDestination) {
         if (destination is ComposeDestination.AssistantScreen) {
             setupDrawer(menuItemId)
-            setupToolbarShowOnlyMenuButtonAndTitle(destination.title) {
+            showMenuAndTitleActionBar(destination.title) {
                 openDrawer()
             }
         } else {

app/src/main/java/com/nextcloud/utils/extensions/DrawerActivityExtensions.kt

@@ -12,13 +12,14 @@ import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.ui.activity.DrawerActivity
 import com.owncloud.android.ui.activity.FileDisplayActivity
+import com.owncloud.android.ui.navigation.model.ActionBarStyle
 
 @JvmOverloads
 fun DrawerActivity.navigateToAllFiles(onlyPersonal: Boolean = false) {
     MainApp.showOnlyFilesOnDevice(false)
     MainApp.showOnlyPersonalFiles(onlyPersonal)
     highlightNavigationViewItem(R.id.nav_all_files)
-    setupHomeSearchToolbarWithSortAndListButtons()
+    showActionBar(ActionBarStyle.Search)
 
     Intent(applicationContext, FileDisplayActivity::class.java).apply {
         addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)

app/src/main/java/com/owncloud/android/ui/activity/AlbumsPickerActivity.kt

@@ -29,6 +29,7 @@ import com.owncloud.android.ui.fragment.FileFragment
 import com.owncloud.android.ui.fragment.GalleryFragment
 import com.owncloud.android.ui.fragment.OCFileListFragment
 import com.owncloud.android.ui.fragment.albums.AlbumsFragment
+import com.owncloud.android.ui.navigation.model.ActionBarStyle
 import com.owncloud.android.utils.ErrorMessageAdapter
 
 class AlbumsPickerActivity :
@@ -57,7 +58,7 @@ class AlbumsPickerActivity :
         super.onCreate(savedInstanceState)
 
         initBinding()
-        setupToolbar()
+        showActionBar(ActionBarStyle.Plain)
         setupAction()
         setupActionBar()
         initExtras()
@@ -66,7 +67,7 @@ class AlbumsPickerActivity :
             createFragments()
         }
 
-        updateActionBarTitleAndHomeButtonByString(captionText)
+        setActionBarTitle(captionText)
     }
 
     private fun setupActionBar() {

app/src/main/java/com/owncloud/android/ui/activity/ContactsPreferenceActivity.java

@@ -21,6 +21,7 @@
 import com.owncloud.android.ui.fragment.contactsbackup.BackupFragment;
 import com.owncloud.android.ui.fragment.contactsbackup.BackupListFragment;
 
+import com.owncloud.android.ui.navigation.model.ActionBarStyle;
 import javax.inject.Inject;
 
 import androidx.activity.OnBackPressedCallback;
@@ -69,7 +70,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.contacts_preference);
 
         // setup toolbar
-        setupToolbar();
+        showActionBar(ActionBarStyle.Plain);
 
         // setup drawer
         //setupDrawer(R.id.nav_contacts); // TODO needed?

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -12,6 +12,7 @@
  */
 package com.owncloud.android.ui.activity;
 
+import android.accounts.Account;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.content.Context;
@@ -50,7 +51,9 @@
 import com.google.android.material.progressindicator.LinearProgressIndicator;
 import com.nextcloud.android.common.core.utils.ecosystem.EcosystemApp;
 import com.nextcloud.android.common.core.utils.ecosystem.EcosystemManager;
+import com.nextcloud.android.common.ui.color.ColorUtil;
 import com.nextcloud.android.common.ui.theme.utils.ColorRole;
+import com.nextcloud.android.common.ui.util.PlatformThemeUtil;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.files.DeepLinkConstants;
@@ -106,6 +109,7 @@
 import com.owncloud.android.ui.fragment.albums.AlbumsFragment;
 import com.owncloud.android.ui.navigation.NavigatorActivity;
 import com.owncloud.android.ui.navigation.NavigatorScreen;
+import com.owncloud.android.ui.navigation.model.ActionBarStyle;
 import com.owncloud.android.utils.BitmapUtils;
 import com.owncloud.android.utils.DrawableUtil;
 import com.owncloud.android.utils.DrawerMenuUtil;
@@ -244,6 +248,9 @@ protected int getMenuItemId() {
     @Inject
     public AvatarGenerator avatarGenerator;
 
+    @Inject
+    ColorUtil colorUtil;
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState, @Nullable PersistableBundle persistentState) {
         super.onCreate(savedInstanceState, persistentState);
@@ -340,15 +347,15 @@ private void checkAssistantBottomNavigationMenu() {
 
     private void openFavoritesTab() {
         resetOnlyPersonalAndOnDevice();
-        setupToolbar();
+        showActionBar(ActionBarStyle.Plain);
         SearchEvent searchEvent = new SearchEvent("", SearchRemoteOperation.SearchType.FAVORITE_SEARCH);
         launchActivityForSearch(searchEvent, R.id.nav_favorites);
     }
 
     private void openMediaTab(int menuItemId) {
         GalleryFragment.Companion.clearSavedViewState();
         resetOnlyPersonalAndOnDevice();
-        setupToolbar();
+        showActionBar(ActionBarStyle.Plain);
         startPhotoSearch(menuItemId);
     }
 
@@ -417,7 +424,7 @@ public void updateHeader() {
         if (optionalCapability.isPresent()) {
             final var capability = optionalCapability.get();
             if (account != null && capability.getServerBackground() != null && !isClientBranded) {
-                int primaryColor = themeColorUtils.unchangedPrimaryColor(account, this);
+                int primaryColor = getServerPrimaryColor(account);
                 String serverLogoURL = capability.getServerLogo();
 
                 // set background to primary color
@@ -528,7 +535,7 @@ private void showTopBanner(ConstraintLayout banner) {
         int iconColor;
         final var account = getAccount();
         if (account != null) {
-            int primaryColor = themeColorUtils.unchangedPrimaryColor(account, this);
+            int primaryColor = getServerPrimaryColor(account);
             if (Hct.fromInt(primaryColor).getTone() < 80.0) {
                 iconColor = Color.WHITE;
             } else {
@@ -559,11 +566,22 @@ private void setDrawerHeaderLogo(Drawable drawable, String serverName) {
             TextView serverNameView = mNavigationViewHeader.findViewById(R.id.drawer_header_server_name);
             serverNameView.setVisibility(View.VISIBLE);
             serverNameView.setText(serverName);
-            serverNameView.setTextColor(themeColorUtils.unchangedFontColor(this));
+            serverNameView.setTextColor(getServerTextColor());
         }
 
     }
 
+    private int getServerPrimaryColor(Account account) {
+        final var serverColor = CapabilityUtils.getCapability(account, this).getServerColor();
+        return colorUtil.getNullSafeColor(serverColor, getColor(R.color.primary));
+    }
+
+    private int getServerTextColor() {
+        final var serverTextColor = CapabilityUtils.getCapability(this).getServerTextColor();
+        final int fallbackColor = PlatformThemeUtil.isDarkMode(this) ? Color.WHITE : Color.BLACK;
+        return colorUtil.getNullSafeColor(serverTextColor, fallbackColor);
+    }
+
     /**
      * setup drawer content, basically setting the item selected listener.
      *

app/src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.kt

@@ -29,6 +29,7 @@ import com.owncloud.android.R
 import com.owncloud.android.databinding.ExternalsiteWebviewBinding
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.ui.NextcloudWebViewClient
+import com.owncloud.android.ui.navigation.model.ActionBarStyle
 import com.owncloud.android.utils.ProxyUtil
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
 import java.lang.ref.WeakReference
@@ -99,7 +100,7 @@ open class ExternalSiteWebView : FileActivity() {
 
     private fun setupToolbarAndDrawer() {
         if (showToolbar) {
-            setupToolbar()
+            showActionBar(ActionBarStyle.Plain)
         } else {
             findViewById<View?>(R.id.appbar)?.isVisible = false
         }

app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java

@@ -92,6 +92,7 @@
 import com.owncloud.android.ui.fragment.filesRepository.RemoteFilesRepository;
 import com.owncloud.android.ui.helpers.CredentialsUpdateHelper;
 import com.owncloud.android.ui.helpers.FileOperationsHelper;
+import com.owncloud.android.ui.navigation.model.ActionBarStyle;
 import com.owncloud.android.ui.preview.media.PreviewMediaActivity;
 import com.owncloud.android.utils.ClipboardUtil;
 import com.owncloud.android.utils.ErrorMessageAdapter;
@@ -192,9 +193,9 @@ public void showFiles(boolean onDeviceOnly, boolean personalFiles) {
         MainApp.showOnlyFilesOnDevice(onDeviceOnly);
         MainApp.showOnlyPersonalFiles(personalFiles);
         if (onDeviceOnly) {
-            setupToolbar();
+            showActionBar(ActionBarStyle.Plain);
         } else {
-            setupHomeSearchToolbarWithSortAndListButtons();
+            showActionBar(ActionBarStyle.Search);
         }
     }
 

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -138,6 +138,7 @@ import com.owncloud.android.ui.fragment.albums.AlbumsFragment
 import com.owncloud.android.ui.helpers.FileOperationsHelper
 import com.owncloud.android.ui.navigation.NavigatorScreen
 import com.owncloud.android.ui.navigation.animator.NavigationAnimator
+import com.owncloud.android.ui.navigation.model.ActionBarStyle
 import com.owncloud.android.ui.preview.media.PreviewMediaActivity
 import com.owncloud.android.ui.preview.media.PreviewMediaFragment
 import com.owncloud.android.ui.preview.pdf.PreviewPdfFragment
@@ -354,7 +355,7 @@ class FileDisplayActivity :
         }
 
         if (isToolbarStyleSearch) {
-            setupHomeSearchToolbarWithSortAndListButtons()
+            showActionBar(ActionBarStyle.Search)
         }
         syncCurrentFolder(ignoreETag = true, ignoreFocus = true)
         refreshFileListOnResume(currentLeftFragment, listFragmentJustCreated)
@@ -389,7 +390,7 @@ class FileDisplayActivity :
             putParcelable(KEY_WAITING_TO_SEND, waitingToSend)
             searchView?.let { putBoolean(KEY_IS_SEARCH_OPEN, !it.isIconified) }
             putString(KEY_SEARCH_QUERY, searchQuery)
-            putBoolean(KEY_IS_SORT_GROUP_VISIBLE, sortListGroupVisibility())
+            putBoolean(KEY_IS_SORT_GROUP_VISIBLE, isSortListGroupVisible)
         }
     }
 
@@ -444,11 +445,11 @@ class FileDisplayActivity :
     }
 
     private fun setupViews() {
-        setupHomeSearchToolbarWithSortAndListButtons()
-        mMenuButton.setOnClickListener { openDrawer() }
+        showActionBar(ActionBarStyle.Search)
+        menuButton.setOnClickListener { openDrawer() }
         findViewById<View>(R.id.toolbar).setOnClickListener { openCurrentFolderActions() }
-        mSwitchAccountButton.setOnClickListener { showManageAccountsDialog() }
-        mNotificationButton.setOnClickListener { pushFragment(NavigatorScreen.Notifications) }
+        switchAccountButton.setOnClickListener { showManageAccountsDialog() }
+        notificationButton.setOnClickListener { pushFragment(NavigatorScreen.Notifications) }
         fastScrollUtils.fixAppBarForFastScroll(binding.appbar.appbar, binding.rootLayout)
         listOfFilesFragment?.resetSearchAttributes()
     }
@@ -504,7 +505,7 @@ class FileDisplayActivity :
                 val result = GetNotificationsRemoteOperation().execute(client)
                 result.isSuccess && result.resultData?.isEmpty() == false
             }
-            mNotificationButton.setVisibleIf(hasNotifications)
+            notificationButton.setVisibleIf(hasNotifications)
         }
     }
 
@@ -560,13 +561,13 @@ class FileDisplayActivity :
         setFile(initialFile)
 
         val accountName = currentUser.accountName
-        mSwitchAccountButton.tag = accountName
+        switchAccountButton.tag = accountName
 
         avatarGenerator.setAccountAvatar(
             currentUser,
             this,
             resources.getDimension(R.dimen.nav_drawer_menu_avatar_radius),
-            mSwitchAccountButton
+            switchAccountButton
         )
 
         if (accountName != lastDisplayedAccountName) {
@@ -1204,7 +1205,7 @@ class FileDisplayActivity :
         val searchMenuItem = menu.findItem(R.id.action_search)
         searchView = searchMenuItem.actionView as? SearchView
         searchMenuItem.isVisible = false
-        mSearchText.setOnClickListener {
+        searchText.setOnClickListener {
             showSearchView()
             searchView?.postDelayed({
                 searchView?.isIconified = false