Переглянути джерело

remove element color references

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 4 роки тому
батько
коміт
0ad81bdd29

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java

@@ -95,7 +95,7 @@ public class PassCodeActivity extends AppCompatActivity implements Injectable {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.passcodelock);
 
-        int elementColor = ThemeUtils.elementColor(this);
+        int elementColor = ThemeUtils.primaryColor(this);
 
         mBCancel = findViewById(R.id.cancel);
         ThemeUtils.colorPrimaryButton(mBCancel, this);

+ 1 - 1
src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java

@@ -194,7 +194,7 @@ public class SendShareDialog extends BottomSheetDialogFragment {
     }
 
     private void themeShareButtonImage(ImageView shareImageView) {
-        shareImageView.getBackground().setColorFilter(ThemeUtils.elementColor(getContext()), PorterDuff.Mode.SRC_IN);
+        shareImageView.getBackground().setColorFilter(ThemeUtils.primaryColor(getContext()), PorterDuff.Mode.SRC_IN);
         shareImageView.getDrawable().mutate().setColorFilter(ThemeUtils.fontColor(getContext()),
                 PorterDuff.Mode.SRC_IN);
     }

+ 1 - 1
src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java

@@ -130,7 +130,7 @@ public class SortingOrderDialogFragment extends DialogFragment {
      * tints the icon reflecting the actual sorting choice in the apps primary color.
      */
     private void setupActiveOrderSelection() {
-        final int color = ThemeUtils.elementColor(getContext());
+        final int color = ThemeUtils.primaryColor(null, true, true, getContext());
         for (View view: mTaggedViews) {
             if (!((FileSortOrder) view.getTag()).name.equals(mCurrentSortOrderName)) {
                 continue;

+ 1 - 1
src/main/java/com/owncloud/android/utils/MimeTypeUtil.java

@@ -177,7 +177,7 @@ public final class MimeTypeUtil {
             drawableId = R.drawable.folder;
         }
 
-        return ThemeUtils.tintDrawable(drawableId, ThemeUtils.elementColor(account, context, true));
+        return ThemeUtils.tintDrawable(drawableId, ThemeUtils.primaryColor(account, true, context));
     }
 
     public static Drawable getDefaultFolderIcon(Context context) {

+ 3 - 48
src/main/java/com/owncloud/android/utils/ThemeUtils.java

@@ -200,51 +200,6 @@ public final class ThemeUtils {
         return darkTheme(context) ? context.getResources().getColor(R.color.fg_contrast) : Color.GRAY;
     }
 
-    public static int elementColor(Context context) {
-        return elementColor(null, context, false);
-    }
-
-    @NextcloudServer(max = 12)
-    public static int elementColor(Account account, Context context, boolean replaceEdgeColors) {
-        OCCapability capability = getCapability(account, context);
-
-        try {
-            return Color.parseColor(capability.getServerElementColor());
-        } catch (Exception e) {
-            int color;
-
-            try {
-                color = Color.parseColor(capability.getServerColor());
-            } catch (Exception e1) {
-                color = context.getResources().getColor(R.color.primary);
-            }
-
-            if (replaceEdgeColors) {
-                if (isDarkModeActive(context)) {
-                    if (Color.BLACK == color) {
-                        return getNeutralGrey(context);
-                    } else {
-                        return color;
-                    }
-                } else {
-                    if (Color.WHITE == color) {
-                        return getNeutralGrey(context);
-                    } else {
-                        return color;
-                    }
-                }
-            } else {
-                float[] hsl = colorToHSL(color);
-
-                if (hsl[INDEX_LUMINATION] > LUMINATION_THRESHOLD) {
-                    return context.getResources().getColor(R.color.element_fallback_color);
-                } else {
-                    return color;
-                }
-            }
-        }
-    }
-
     public static boolean themingEnabled(Context context) {
         return getCapability(context).getServerColor() != null && !getCapability(context).getServerColor().isEmpty();
     }
@@ -470,10 +425,10 @@ public final class ThemeUtils {
         }
     }
 
-    public static void colorEditText(EditText editText, int elementColor) {
+    public static void colorEditText(EditText editText, int color) {
         if (editText != null) {
-            editText.setTextColor(elementColor);
-            editText.getBackground().setColorFilter(elementColor, PorterDuff.Mode.SRC_ATOP);
+            editText.setTextColor(color);
+            editText.getBackground().setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
         }
     }
 

+ 0 - 1
src/main/res/values-night/colors.xml

@@ -43,7 +43,6 @@
     <color name="switch_thumb_color_unchecked">#2a2a2a</color>
     <color name="switch_track_color_unchecked">#B3FFFFFF</color>
     <color name="drawer_active_item_background">@color/white</color>
-    <color name="element_fallback_color">#EDEDED</color>
 
     <!-- App bar -->
     <color name="appbar">#1E1E1E</color>

+ 0 - 1
src/main/res/values/colors.xml

@@ -37,7 +37,6 @@
 
     <!-- Colors -->
     <color name="standard_grey">#757575</color>
-    <color name="element_fallback_color">#555555</color>
     <color name="grey_200">#EEEEEE</color>
     <color name="grey_db">#dbdbdb</color>
     <color name="actionbar_shadow">#222222</color>