Эх сурвалжийг харах

implement code review changes

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 6 жил өмнө
parent
commit
904d89712f

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

@@ -39,7 +39,6 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 import com.google.android.material.snackbar.Snackbar;
-import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.utils.ThemeUtils;
@@ -100,20 +99,20 @@ public class    PassCodeActivity extends AppCompatActivity {
 
         mPassCodeEditTexts[0] = findViewById(R.id.txt0);
         ThemeUtils.colorEditText(mPassCodeEditTexts[0], elementColor);
-        ThemeUtils.themeEditText(MainApp.getAppContext(), mPassCodeEditTexts[0], false);
+        ThemeUtils.themeEditText(this, mPassCodeEditTexts[0], false);
         mPassCodeEditTexts[0].requestFocus();
 
         mPassCodeEditTexts[1] = findViewById(R.id.txt1);
         ThemeUtils.colorEditText(mPassCodeEditTexts[1], elementColor);
-        ThemeUtils.themeEditText(MainApp.getAppContext(), mPassCodeEditTexts[1], false);
+        ThemeUtils.themeEditText(this, mPassCodeEditTexts[1], false);
 
         mPassCodeEditTexts[2] = findViewById(R.id.txt2);
         ThemeUtils.colorEditText(mPassCodeEditTexts[2], elementColor);
-        ThemeUtils.themeEditText(MainApp.getAppContext(), mPassCodeEditTexts[2], false);
+        ThemeUtils.themeEditText(this, mPassCodeEditTexts[2], false);
 
         mPassCodeEditTexts[3] = findViewById(R.id.txt3);
         ThemeUtils.colorEditText(mPassCodeEditTexts[3], elementColor);
-        ThemeUtils.themeEditText(MainApp.getAppContext(), mPassCodeEditTexts[3], false);
+        ThemeUtils.themeEditText(this, mPassCodeEditTexts[3], false);
 
         Window window = getWindow();
         if (window != null) {

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

@@ -183,7 +183,7 @@ public class ExtendedListFragment extends Fragment
         searchView = (SearchView) MenuItemCompat.getActionView(item);
         searchView.setOnQueryTextListener(this);
         searchView.setOnCloseListener(this);
-        themeSearchView(getContext(), searchView, true);
+        ThemeUtils.themeSearchView(getContext(), searchView, true);
 
         final Handler handler = new Handler();
 

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

@@ -196,7 +196,7 @@ public class FileDetailActivitiesFragment extends Fragment implements ActivityLi
                 ThemeUtils.primaryAccentColor(getContext()),
                 PorterDuff.Mode.SRC_ATOP
         );
-//        ThemeUtils.colorEditText(commentInput, ThemeUtils.primaryAccentColor(getContext()));
+
         ThemeUtils.themeEditText(getContext(), commentInput, false);
 
         return view;

+ 11 - 7
src/main/java/com/owncloud/android/utils/ThemeUtils.java

@@ -47,6 +47,7 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OCCapability;
 import com.owncloud.android.ui.activity.ToolbarActivity;
 
@@ -71,6 +72,10 @@ import androidx.fragment.app.FragmentActivity;
  */
 public final class ThemeUtils {
 
+    private static final String TAG = ThemeUtils.class.getSimpleName();
+
+    private static final int INDEX_LUMINATION = 2;
+
     private ThemeUtils() {
         // utility class -> private constructor
     }
@@ -165,7 +170,7 @@ public final class ThemeUtils {
 
             float[] hsl = colorToHSL(primaryColor);
 
-            if (hsl[2] > 0.8) {
+            if (hsl[INDEX_LUMINATION] > 0.8) {
                 return context.getResources().getColor(R.color.elementFallbackColor);
             } else {
                 return primaryColor;
@@ -201,7 +206,7 @@ public final class ThemeUtils {
         int primaryColor = primaryColor(context);
         float[] hsl = colorToHSL(primaryColor);
 
-        return hsl[2] <= 0.55;
+        return hsl[INDEX_LUMINATION] <= 0.55;
     }
 
     /**
@@ -277,9 +282,9 @@ public final class ThemeUtils {
         float[] hsl = colorToHSL(color);
 
         if (threshold == -1f) {
-            hsl[2] += lightnessDelta;
+            hsl[INDEX_LUMINATION] += lightnessDelta;
         } else {
-            hsl[2] = Math.min(hsl[2] + lightnessDelta, threshold);
+            hsl[INDEX_LUMINATION] = Math.min(hsl[INDEX_LUMINATION] + lightnessDelta, threshold);
         }
 
         return ColorUtils.HSLToColor(hsl);
@@ -422,7 +427,7 @@ public final class ThemeUtils {
             }
         } else {
             float[] colorHSL = colorToHSL(color);
-            if (colorHSL[2] >= 0.92) {
+            if (colorHSL[INDEX_LUMINATION] >= 0.92) {
                 color = ContextCompat.getColor(context, R.color.themed_fg_inverse);
             }
         }
@@ -594,7 +599,6 @@ public final class ThemeUtils {
                         resField.setAccessible(true);
                     }
                     int resId = resField.getInt(view);
-//                    handleDrawable = view.getResources().getDrawable(resId);
                     handleDrawable = ContextCompat.getDrawable(context, resId);
                 }
 
@@ -605,7 +609,7 @@ public final class ThemeUtils {
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            Log_OC.e(TAG, "Error setting TextView handles color", e);
         }
     }
 }