Browse Source

Clean up some theme utils

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 years ago
parent
commit
538102b3e7

+ 2 - 1
app/src/main/java/com/owncloud/android/ui/activity/TextEditorWebView.kt

@@ -26,6 +26,7 @@ import android.net.Uri
 import android.widget.Toast
 import android.widget.Toast
 import androidx.webkit.WebSettingsCompat
 import androidx.webkit.WebSettingsCompat
 import androidx.webkit.WebViewFeature
 import androidx.webkit.WebViewFeature
+import com.nextcloud.android.common.ui.util.PlatformThemeUtil
 import com.nextcloud.client.appinfo.AppInfo
 import com.nextcloud.client.appinfo.AppInfo
 import com.nextcloud.client.device.DeviceInfo
 import com.nextcloud.client.device.DeviceInfo
 import com.owncloud.android.R
 import com.owncloud.android.R
@@ -67,7 +68,7 @@ class TextEditorWebView : EditorWebView() {
                 WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
                 WebSettingsCompat.DARK_STRATEGY_WEB_THEME_DARKENING_ONLY
             )
             )
         }
         }
-        if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK) && themeUtils.isDarkModeActive(this)) {
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK) && PlatformThemeUtil.isDarkMode(this)) {
             WebSettingsCompat.setForceDark(getWebView().settings, WebSettingsCompat.FORCE_DARK_ON)
             WebSettingsCompat.setForceDark(getWebView().settings, WebSettingsCompat.FORCE_DARK_ON)
         }
         }
 
 

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

@@ -201,7 +201,7 @@ public class FileDetailSharingFragment extends Fragment implements ShareeListAda
             (SearchManager) fileActivity.getSystemService(Context.SEARCH_SERVICE),
             (SearchManager) fileActivity.getSystemService(Context.SEARCH_SERVICE),
             binding.searchView,
             binding.searchView,
             fileActivity.getComponentName());
             fileActivity.getComponentName());
-        themeToolbarUtils.themeSearchView(binding.searchView, requireContext());
+        viewThemeUtils.androidx.themeToolbarSearchView(binding.searchView);
 
 
         if (file.canReshare()) {
         if (file.canReshare()) {
             binding.searchView.setQueryHint(getResources().getString(R.string.share_search));
             binding.searchView.setQueryHint(getResources().getString(R.string.share_search));

+ 1 - 0
app/src/main/java/com/owncloud/android/utils/theme/ThemeDrawableUtils.java

@@ -34,6 +34,7 @@ import androidx.core.graphics.drawable.DrawableCompat;
 /**
 /**
  * Utility class with methods for client side button theming.
  * Utility class with methods for client side button theming.
  */
  */
+@Deprecated
 public final class ThemeDrawableUtils {
 public final class ThemeDrawableUtils {
     private final Context context;
     private final Context context;
 
 

+ 1 - 22
app/src/main/java/com/owncloud/android/utils/theme/ThemeToolbarUtils.java

@@ -31,7 +31,6 @@ import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.ForegroundColorSpan;
 import android.view.View;
 import android.view.View;
 import android.view.Window;
 import android.view.Window;
-import android.widget.ImageView;
 
 
 import com.owncloud.android.R;
 import com.owncloud.android.R;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
@@ -39,12 +38,12 @@ import com.owncloud.android.utils.theme.newm3.ViewThemeUtils;
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorInt;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.SearchView;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.content.res.ResourcesCompat;
 
 
 /**
 /**
  * Utility class with methods for client side action/toolbar theming.
  * Utility class with methods for client side action/toolbar theming.
  */
  */
+@Deprecated
 public class ThemeToolbarUtils {
 public class ThemeToolbarUtils {
     private final ThemeColorUtils themeColorUtils;
     private final ThemeColorUtils themeColorUtils;
     private final ThemeDrawableUtils themeDrawableUtils;
     private final ThemeDrawableUtils themeDrawableUtils;
@@ -101,26 +100,6 @@ public class ThemeToolbarUtils {
         }
         }
     }
     }
 
 
-    /**
-     * Theme search view
-     *
-     * @param searchView searchView to be changed
-     * @param context    the app's context
-     */
-    public void themeSearchView(SearchView searchView, Context context) {
-        // hacky as no default way is provided
-        int fontColor = themeColorUtils.appBarPrimaryFontColor(context);
-        SearchView.SearchAutoComplete editText = searchView.findViewById(R.id.search_src_text);
-        editText.setTextSize(16);
-        viewThemeUtils.platform.colorEditText(editText);
-        editText.setHintTextColor(themeColorUtils.appBarSecondaryFontColor(context));
-
-        ImageView closeButton = searchView.findViewById(androidx.appcompat.R.id.search_close_btn);
-        closeButton.setColorFilter(fontColor);
-        ImageView searchButton = searchView.findViewById(androidx.appcompat.R.id.search_button);
-        searchButton.setColorFilter(fontColor);
-    }
-
     /**
     /**
      * Sets the color of the status bar to {@code color}.
      * Sets the color of the status bar to {@code color}.
      *
      *

+ 0 - 6
app/src/main/java/com/owncloud/android/utils/theme/ThemeUtils.java

@@ -51,10 +51,4 @@ public final class ThemeUtils {
             }
             }
         }
         }
     }
     }
-
-    public boolean isDarkModeActive(Context context) {
-        int nightModeFlag = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-
-        return Configuration.UI_MODE_NIGHT_YES == nightModeFlag;
-    }
 }
 }