[Swingme-svn] SF.net SVN: swingme:[2398] AndroidME

[<yu...@us...>]

Revision: 2398
          http://sourceforge.net/p/swingme/code/2398
Author:   yuranet
Date:     2021-02-24 12:14:49 +0000 (Wed, 24 Feb 2021)
Log Message:
-----------
better names in code

Modified Paths:
--------------
    AndroidME/gradle/wrapper/gradle-wrapper.properties
    AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java

Modified: AndroidME/gradle/wrapper/gradle-wrapper.properties
===================================================================
--- AndroidME/gradle/wrapper/gradle-wrapper.properties	2021-02-24 11:18:41 UTC (rev 2397)
+++ AndroidME/gradle/wrapper/gradle-wrapper.properties	2021-02-24 12:14:49 UTC (rev 2398)
@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java	2021-02-24 11:18:41 UTC (rev 2397)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java	2021-02-24 12:14:49 UTC (rev 2398)
@@ -84,7 +84,7 @@
         Context ctx = AndroidMeActivity.DEFAULT_ACTIVITY;
 
         TypedArray a2 = ctx.getTheme().obtainStyledAttributes(new int[]{android.R.attr.colorForeground});
-        int c = a2.getColor(0, 0xFFFF00FF);
+        int colorForeground = a2.getColor(0, 0xFFFF00FF);
         a2.recycle();
 
         a2 = ctx.getTheme().obtainStyledAttributes(new int[]{android.R.attr.textColorSecondary});
@@ -291,7 +291,7 @@
         // --- Frame ---
         Style frameStyle = new Style(defaultStyle);
         frameStyle.addBorder(getBorder(ctx, 0, android.R.attr.windowBackground),Style.ALL);
-        frameStyle.addForeground(c , Style.ALL);
+        frameStyle.addForeground(colorForeground, Style.ALL);
         setStyleFor("Frame",frameStyle);
 
         // --- Window ---
@@ -299,7 +299,7 @@
         //DisplayMetrics dm = ctx.getResources().getDisplayMetrics();
         //int size = Math.max(dm.widthPixels, dm.heightPixels);
         windowStyle.addProperty( new Integer(0x80000000), "dim", Style.ALL);
-        windowStyle.addForeground(c , Style.ALL);
+        windowStyle.addForeground(colorForeground, Style.ALL);
         setStyleFor("Window", windowStyle);
 
         // --- TextField ---
@@ -603,7 +603,7 @@
     }
 
     static void setForegroundColor(Context ctx, Style style, int defStyle,Class cl) {
-        int[] map = {
+        int[] all = {
                 Style.ALL,
                 Style.DISABLED,
                 Style.DISABLED|Style.FOCUSED,
@@ -617,24 +617,23 @@
         ColorStateList clist = getTextColor(ctx, defStyle);
         int defColor = clist.getDefaultColor();
 
-        for (int i = 0; i < map.length; i++) {
-
-            int swingMeStyle = map[i];
-            int[] stateSet = AndroidBorder.getDrawableState(swingMeStyle,cl,true);
+        for (int i = 0; i < all.length; i++) {
+            int swingMeState = all[i];
+            int[] stateSet = AndroidBorder.getDrawableState(swingMeState, cl, true);
             int color = clist.getColorForState(stateSet, defColor);
-            style.addForeground(color , swingMeStyle);
+            style.addForeground(color, swingMeState);
         }
     }
 
 
-    static void setForegroundColor(Context ctx, Style style, int defStyle, Class cl, int swingMeStyle) {
+    static void setForegroundColor(Context ctx, Style style, int defStyle, Class cl, int swingMeState) {
 
         ColorStateList clist = getTextColor(ctx, defStyle);
         int defColor = clist.getDefaultColor();
 
-        int[] stateSet = AndroidBorder.getDrawableState(swingMeStyle,cl,true);
+        int[] stateSet = AndroidBorder.getDrawableState(swingMeState,cl,true);
         int color = clist.getColorForState(stateSet, defColor);
-        style.addForeground(color , swingMeStyle);
+        style.addForeground(color, swingMeState);
     }
 
     private static Rect getAdjustedDensityRect(Context ctx, int left, int top, int right, int bottom) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.