swingme-svn — subversion diffs

[Swingme-svn] SF.net SVN: swingme:[2422] AndroidME/src_MIDP/javax/microedition/lcdui/ Image.java

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

Revision: 2422
          http://sourceforge.net/p/swingme/code/2422
Author:   yuranet
Date:     2021-03-18 20:33:12 +0000 (Thu, 18 Mar 2021)
Log Message:
-----------
use stable density, seems to be correct more times

Modified Paths:
--------------
    AndroidME/src_MIDP/javax/microedition/lcdui/Image.java

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2021-03-18 11:49:40 UTC (rev 2421)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2021-03-18 20:33:12 UTC (rev 2422)
@@ -137,13 +137,20 @@
 
             // some Samsungs will scale the image to be smaller (bitmap=315 system=420)
             if (bitmap.getDensity() != Bitmap.DENSITY_NONE && bitmap.getDensity() != getTargetDensity()) {
-                int systemDensity = getTargetDensity();
-                int bitmapDensity = bitmap.getDensity();
-                int w = bitmap.getWidth();
-                int h = bitmap.getHeight();
-                System.err.println("changed bitmap density=" + bitmapDensity + " " + w + "x" + h + " (system=" + systemDensity + " " + scaleFromDensity(w, bitmapDensity, systemDensity) + "x" + scaleFromDensity(h, bitmapDensity, systemDensity) + ")");
+                System.err.println("unexpected bitmap density=" + bitmap.getDensity() + " (system=" + getTargetDensity()+")");
             }
         }
+
+        if (bitmap.getDensity() != Bitmap.DENSITY_NONE && bitmap.getDensity() != getTargetDensity()) {
+            int systemDensity = getTargetDensity();
+            int bitmapDensity = bitmap.getDensity();
+            int w = bitmap.getWidth();
+            int h = bitmap.getHeight();
+            System.out.println("bitmap density=" + bitmapDensity + " " + w + "x" + h +
+                    " (system=" + systemDensity + " " + scaleFromDensity(w, bitmapDensity, systemDensity) + "x" + scaleFromDensity(h, bitmapDensity, systemDensity) + ")" +
+                    " for " + stream);
+        }
+
         return new Image(bitmap);
     }
 
@@ -256,10 +263,11 @@
      * @see android.graphics.drawable.Drawable#resolveDensity(Resources, int)
      */
     static int getTargetDensity() {
-        // not really sure in what situations density changes, but lets make sure we scale to current density
-        //if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        //    return DisplayMetrics.DENSITY_DEVICE_STABLE;
-        //}
+        // since we keep images around from startup, better to use stable density if we can
+        // also on API-26 and API-30 the current density does not seem to match bitmaps density
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return DisplayMetrics.DENSITY_DEVICE_STABLE;
+        }
         Resources res = AndroidMeApp.getContext().getResources();
         final int densityDpi = res.getDisplayMetrics().densityDpi;
         return densityDpi == 0 ? DisplayMetrics.DENSITY_DEFAULT : densityDpi;

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

[Swingme-svn] SF.net SVN: swingme:[2421] AndroidME/src_Android/net/yura/android/ AndroidMeApp.java

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

Revision: 2421
          http://sourceforge.net/p/swingme/code/2421
Author:   yuranet
Date:     2021-03-18 11:49:40 +0000 (Thu, 18 Mar 2021)
Log Message:
-----------
more system info

Modified Paths:
--------------
    AndroidME/src_Android/net/yura/android/AndroidMeApp.java

Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java	2021-03-17 22:24:56 UTC (rev 2420)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java	2021-03-18 11:49:40 UTC (rev 2421)
@@ -237,6 +237,10 @@
         System.setProperty("display.density", String.valueOf(dm.density));
         System.setProperty("display.scaledDensity", String.valueOf(dm.scaledDensity));
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            System.setProperty("display.stableDensity", String.valueOf(DisplayMetrics.DENSITY_DEVICE_STABLE));
+        }
+
         // Multimedia Properties
         System.setProperty("microedition.media.version", "1.2");
         System.setProperty("supports.mixing", "false");

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

[Swingme-svn] SF.net SVN: swingme:[2420] AndroidME/src_MIDP/javax/microedition/lcdui/ Image.java

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

Revision: 2420
          http://sourceforge.net/p/swingme/code/2420
Author:   yuranet
Date:     2021-03-17 22:24:56 +0000 (Wed, 17 Mar 2021)
Log Message:
-----------
handle any image dpi Samsung will throw at us

Modified Paths:
--------------
    AndroidME/src_MIDP/javax/microedition/lcdui/Image.java

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2021-03-16 13:18:32 UTC (rev 2419)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2021-03-17 22:24:56 UTC (rev 2420)
@@ -112,6 +112,8 @@
             options.inPreferredConfig = Bitmap.Config.ARGB_8888;
             options.inDither = false;
             options.inPurgeable = true; // http://www.droidnova.com/2d-sprite-animation-in-android-addendum,505.html
+            options.inScaled = false;
+            options.inSampleSize = 1;
 
             OutOfMemoryError error = null;
             try {
@@ -121,6 +123,8 @@
                 error = e;
                 buffInput.reset();
                 buffInput.mark(1024);
+                options.inScaled = true;
+                options.inSampleSize = 0;
                 bitmap = BitmapFactory.decodeStream(buffInput,null,options);
             }
 
@@ -128,9 +132,16 @@
                 throw new IOException("BitmapFactory.decodeStream returned null " + stream + " available=" + available + " " + options.outMimeType + " " + options.outWidth + "x" + options.outHeight + " " + error);
             }
 
-            // this should always be none or same as display
+            // for testing/emulating loading images at low res as some Samsungs sometimes do
+            //bitmap.setDensity(getTargetDensity() / options.inSampleSize);
+
+            // some Samsungs will scale the image to be smaller (bitmap=315 system=420)
             if (bitmap.getDensity() != Bitmap.DENSITY_NONE && bitmap.getDensity() != getTargetDensity()) {
-                System.err.println("unexpected bitmap density " + bitmap.getDensity() + " (system=" + getTargetDensity() + ")");
+                int systemDensity = getTargetDensity();
+                int bitmapDensity = bitmap.getDensity();
+                int w = bitmap.getWidth();
+                int h = bitmap.getHeight();
+                System.err.println("changed bitmap density=" + bitmapDensity + " " + w + "x" + h + " (system=" + systemDensity + " " + scaleFromDensity(w, bitmapDensity, systemDensity) + "x" + scaleFromDensity(h, bitmapDensity, systemDensity) + ")");
             }
         }
         return new Image(bitmap);
@@ -290,7 +301,40 @@
     }
 
     public void getRGB(int[] rgb, int offset, int scanlength, int x, int y, int width, int height) {
+        final int scanHeight = height;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            int bitmapDensity = bitmap.getDensity();
+            int systemDensity = getTargetDensity();
+            if (bitmapDensity != Bitmap.DENSITY_NONE && bitmapDensity != systemDensity) {
+                x = scaleFromDensity(x, systemDensity, bitmapDensity);
+                y = scaleFromDensity(y, systemDensity, bitmapDensity);
+                width = scaleFromDensity(width, systemDensity, bitmapDensity);
+                height = scaleFromDensity(height, systemDensity, bitmapDensity);
+
+                // can end up with 0 height because of rounding error
+                if (height == 0) {
+                    height = 1;
+                }
+
+                // can end up 1 more then end through rounding error
+                if (y + height == bitmap.getHeight() + 1) {
+                    y = bitmap.getHeight() - height;
+                }
+            }
+        }
+
         bitmap.getPixels(rgb, offset, scanlength, x, y, width, height);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            int bitmapDensity = bitmap.getDensity();
+            int systemDensity = getTargetDensity();
+            if (bitmapDensity != Bitmap.DENSITY_NONE && bitmapDensity != systemDensity) {
+                for (int c = offset + scanlength * scanHeight - 1; c >= offset; c--) {
+                    rgb[c] = rgb[((c / scanlength) * scanlength) + scaleFromDensity(c % scanlength, systemDensity, bitmapDensity)];
+                }
+            }
+        }
     }
 
     public boolean isMutable() {

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

[Swingme-svn] SF.net SVN: swingme:[2419] SwingMETest/lib

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

Revision: 2419
          http://sourceforge.net/p/swingme/code/2419
Author:   yuranet
Date:     2021-03-16 13:18:32 +0000 (Tue, 16 Mar 2021)
Log Message:
-----------
lib update

Modified Paths:
--------------
    SwingMETest/lib/SwingME.jar
    SwingMETest/lib/midletrunner.jar

Modified: SwingMETest/lib/SwingME.jar
===================================================================
(Binary files differ)

Modified: SwingMETest/lib/midletrunner.jar
===================================================================
(Binary files differ)

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

[Swingme-svn] SF.net SVN: swingme:[2418] AndroidME/src_MIDP/javax/microedition/midlet/ MIDlet.java

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

Revision: 2418
          http://sourceforge.net/p/swingme/code/2418
Author:   yuranet
Date:     2021-03-12 20:46:16 +0000 (Fri, 12 Mar 2021)
Log Message:
-----------
mailto does not fire ACTION_DEFAULT any more

Modified Paths:
--------------
    AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java

Modified: AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java	2021-03-12 20:10:26 UTC (rev 2417)
+++ AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java	2021-03-12 20:46:16 UTC (rev 2418)
@@ -248,7 +248,7 @@
                 activity.startActivity(i);
                 
             }
-            else if (url.startsWith("mailto:")) {
+            else if (url.startsWith("mailto:") && containsQueryParameter(url, "attachment")) {
 
                 // use swingme to correctly parse the query as android has bugs
                 Map<String, String> query = Url.toHashtable(content.getEncodedQuery());
@@ -255,16 +255,11 @@
                 // use android to correctly parse the recipient, as swingme does not support that
                 MailTo mailto = MailTo.parse(url);
 
-                Intent shareIntent;
+                Intent shareIntent = new Intent(Intent.ACTION_SEND); // (for one attachment) ACTION_SEND_MULTIPLE (for multiple attachments)
+
                 if (mailto.getTo() != null) {
-                    shareIntent = new Intent(Intent.ACTION_SENDTO);
                     shareIntent.putExtra(Intent.EXTRA_EMAIL, mailto.getTo().split(","));
                 }
-                else {
-                    shareIntent = new Intent(Intent.ACTION_SEND);
-                }
-                shareIntent.setData(Uri.parse("mailto:")); // only email apps should handle this
-
                 if (mailto.getCc() != null) {
                     shareIntent.putExtra(Intent.EXTRA_CC, mailto.getCc().split(","));
                 }
@@ -275,33 +270,31 @@
                     shareIntent.putExtra(Intent.EXTRA_TEXT, query.get("body"));
                 }
 
-                if (containsQueryParameter(url, "attachment")) {
+                File attachment = new File(query.get("attachment"));
+                File privateDir = activity.getFilesDir().getParentFile();
 
-                    File attachment = new File(query.get("attachment"));
-                    File privateDir = activity.getFilesDir().getParentFile();
-
-                    final Uri attachmentUri;
-                    if (attachment.toString().startsWith(privateDir.toString())) {
-                        String authority = query.get("authority");
-                        if (authority == null) {
-                            throw new IllegalArgumentException("need to give 'authority' for FileProvider for sending private files");
-                        }
-                        Class<?> fileProvider = Class.forName("android.support.v4.content.FileProvider");
-                        java.lang.reflect.Method getUriForFile = fileProvider.getMethod("getUriForFile", new Class[]{Context.class, String.class, File.class});
-                        attachmentUri = (Uri) getUriForFile.invoke(null, new Object[]{activity, authority, attachment});
-                    } else {
-                        attachmentUri = Uri.fromFile(attachment);
+                final Uri attachmentUri;
+                if (attachment.toString().startsWith(privateDir.toString())) {
+                    String authority = query.get("authority");
+                    if (authority == null) {
+                        throw new IllegalArgumentException("need to give 'authority' for FileProvider for sending private files");
                     }
-
-                    shareIntent.setType("text/plain");
-                    shareIntent.putExtra(Intent.EXTRA_STREAM, attachmentUri);
-                    shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                    Class<?> fileProvider = Class.forName("android.support.v4.content.FileProvider");
+                    java.lang.reflect.Method getUriForFile = fileProvider.getMethod("getUriForFile", new Class[] {Context.class, String.class, File.class});
+                    attachmentUri = (Uri) getUriForFile.invoke(null, new Object[] {activity, authority, attachment});
                 }
+                else {
+                    attachmentUri = Uri.fromFile(attachment);
+                }
 
-                activity.startActivity(Intent.createChooser(shareIntent, "Send email..."));
+                shareIntent.setType("text/plain");
+                shareIntent.putExtra(Intent.EXTRA_STREAM, attachmentUri);
+                shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+                activity.startActivity(Intent.createChooser(shareIntent, "Choose an app"));
             }
             else {
-                String action = (url.startsWith(PROTOCOL_PHONE)) ? Intent.ACTION_DIAL : Intent.ACTION_DEFAULT;
+                String action = url.startsWith(PROTOCOL_PHONE) ? Intent.ACTION_DIAL : (url.startsWith("mailto:") ? Intent.ACTION_SENDTO : Intent.ACTION_DEFAULT);
                 Intent intent = new Intent(action, content);
                 activity.startActivity(intent);
             }

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

[Swingme-svn] SF.net SVN: swingme:[2417] AndroidME/src_MIDP/javax/microedition/midlet/ MIDlet.java

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

Revision: 2417
          http://sourceforge.net/p/swingme/code/2417
Author:   yuranet
Date:     2021-03-12 20:10:26 +0000 (Fri, 12 Mar 2021)
Log Message:
-----------
mailto does not fire ACTION_DEFAULT any more

Modified Paths:
--------------
    AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java

Modified: AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java	2021-03-12 18:56:11 UTC (rev 2416)
+++ AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java	2021-03-12 20:10:26 UTC (rev 2417)
@@ -248,7 +248,7 @@
                 activity.startActivity(i);
                 
             }
-            else if (url.startsWith("mailto:") && containsQueryParameter(url, "attachment")) {
+            else if (url.startsWith("mailto:")) {
 
                 // use swingme to correctly parse the query as android has bugs
                 Map<String, String> query = Url.toHashtable(content.getEncodedQuery());
@@ -255,31 +255,16 @@
                 // use android to correctly parse the recipient, as swingme does not support that
                 MailTo mailto = MailTo.parse(url);
 
-                File attachment = new File(query.get("attachment"));
-                File privateDir = activity.getFilesDir().getParentFile();
-
-                final Uri attachmentUri;
-                if (attachment.toString().startsWith(privateDir.toString())) {
-                    String authority = query.get("authority");
-                    if (authority == null) {
-                        throw new IllegalArgumentException("need to give 'authority' for FileProvider for sending private files");
-                    }
-                    Class<?> fileProvider = Class.forName("android.support.v4.content.FileProvider");
-                    java.lang.reflect.Method getUriForFile = fileProvider.getMethod("getUriForFile", new Class[] {Context.class, String.class, File.class});
-                    attachmentUri = (Uri) getUriForFile.invoke(null, new Object[] {activity, authority, attachment});
+                Intent shareIntent;
+                if (mailto.getTo() != null) {
+                    shareIntent = new Intent(Intent.ACTION_SENDTO);
+                    shareIntent.putExtra(Intent.EXTRA_EMAIL, mailto.getTo().split(","));
                 }
                 else {
-                    attachmentUri = Uri.fromFile(attachment);
+                    shareIntent = new Intent(Intent.ACTION_SEND);
                 }
+                shareIntent.setData(Uri.parse("mailto:")); // only email apps should handle this
 
-                Intent shareIntent = new Intent(Intent.ACTION_SEND);
-                shareIntent.setType("text/plain");
-                shareIntent.putExtra(Intent.EXTRA_STREAM, attachmentUri);
-                shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
-                if (mailto.getTo() != null) {
-                    shareIntent.putExtra(Intent.EXTRA_EMAIL, mailto.getTo().split(","));
-                }
                 if (mailto.getCc() != null) {
                     shareIntent.putExtra(Intent.EXTRA_CC, mailto.getCc().split(","));
                 }
@@ -290,11 +275,33 @@
                     shareIntent.putExtra(Intent.EXTRA_TEXT, query.get("body"));
                 }
 
-                activity.startActivity(Intent.createChooser(shareIntent, "Choose an app"));
+                if (containsQueryParameter(url, "attachment")) {
+
+                    File attachment = new File(query.get("attachment"));
+                    File privateDir = activity.getFilesDir().getParentFile();
+
+                    final Uri attachmentUri;
+                    if (attachment.toString().startsWith(privateDir.toString())) {
+                        String authority = query.get("authority");
+                        if (authority == null) {
+                            throw new IllegalArgumentException("need to give 'authority' for FileProvider for sending private files");
+                        }
+                        Class<?> fileProvider = Class.forName("android.support.v4.content.FileProvider");
+                        java.lang.reflect.Method getUriForFile = fileProvider.getMethod("getUriForFile", new Class[]{Context.class, String.class, File.class});
+                        attachmentUri = (Uri) getUriForFile.invoke(null, new Object[]{activity, authority, attachment});
+                    } else {
+                        attachmentUri = Uri.fromFile(attachment);
+                    }
+
+                    shareIntent.setType("text/plain");
+                    shareIntent.putExtra(Intent.EXTRA_STREAM, attachmentUri);
+                    shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                }
+
+                activity.startActivity(Intent.createChooser(shareIntent, "Send email..."));
             }
             else {
-                String action = (url.startsWith(PROTOCOL_PHONE)) ?
-                     Intent.ACTION_DIAL : Intent.ACTION_DEFAULT;
+                String action = (url.startsWith(PROTOCOL_PHONE)) ? Intent.ACTION_DIAL : Intent.ACTION_DEFAULT;
                 Intent intent = new Intent(action, content);
                 activity.startActivity(intent);
             }

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

[Swingme-svn] SF.net SVN: swingme:[2416] AndroidME/src_MIDP/javax/microedition/lcdui/ Image.java

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

Revision: 2416
          http://sourceforge.net/p/swingme/code/2416
Author:   yuranet
Date:     2021-03-12 18:56:11 +0000 (Fri, 12 Mar 2021)
Log Message:
-----------
more info about bitmaps

Modified Paths:
--------------
    AndroidME/src_MIDP/javax/microedition/lcdui/Image.java

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2021-03-12 18:30:59 UTC (rev 2415)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2021-03-12 18:56:11 UTC (rev 2416)
@@ -303,7 +303,15 @@
 
     @Override
     public String toString() {
-        return "Image{"+bitmap.toString()+"}";
+        return "Image{" +
+                "config=" + bitmap.getConfig() +
+                ", width=" + bitmap.getWidth() +
+                ", height=" + bitmap.getHeight() +
+                ", density=" + bitmap.getDensity() +
+                ", mutable=" + bitmap.isMutable() +
+                ", recycled=" + bitmap.isRecycled() +
+                ", bitmap=" + bitmap.toString() +
+                '}';
     }
 
     public static void filter(Image source, Image bm, ColorMatrix cm) {

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

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

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

Revision: 2415
          http://sourceforge.net/p/swingme/code/2415
Author:   yuranet
Date:     2021-03-12 18:30:59 +0000 (Fri, 12 Mar 2021)
Log Message:
-----------
print error when bitmap density is unexpected

Modified Paths:
--------------
    AndroidME/src_Android/net/yura/android/AndroidMeApp.java
    AndroidME/src_MIDP/javax/microedition/lcdui/Image.java

Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java	2021-03-11 11:40:35 UTC (rev 2414)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java	2021-03-12 18:30:59 UTC (rev 2415)
@@ -212,7 +212,7 @@
     }
 
     private void setSystemProperties() {
-        System.setProperty("microedition.platform", "androidMe(" + Build.MODEL + " " + Build.VERSION.RELEASE + ")");
+        System.setProperty("microedition.platform", "androidMe(" + Build.MODEL + " " + Build.VERSION.RELEASE + " api-" + Build.VERSION.SDK_INT + ")");
         System.setProperty("microedition.locale", Locale.getDefault().toString());
         System.setProperty("microedition.configuration", "CLDC-1.1");
         System.setProperty("microedition.profiles", "MIDP-2.0");

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2021-03-11 11:40:35 UTC (rev 2414)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2021-03-12 18:30:59 UTC (rev 2415)
@@ -87,15 +87,6 @@
         return res;
     }
 
-    /**
-     * code taken from android framework:
-     * @see android.graphics.Bitmap#scaleFromDensity(int, int, int)
-     */
-    static int scaleFromDensity(int size, int sdensity, int tdensity) {
-        // Scale by tdensity / sdensity, rounding up.
-        return ((size * tdensity) + (sdensity >> 1)) / sdensity;
-    }
-
     public static Image createImage(InputStream stream) throws IOException {
         Bitmap bitmap;
         if (stream instanceof ResourceInputStream) {
@@ -136,6 +127,11 @@
             if (bitmap == null) {
                 throw new IOException("BitmapFactory.decodeStream returned null " + stream + " available=" + available + " " + options.outMimeType + " " + options.outWidth + "x" + options.outHeight + " " + error);
             }
+
+            // this should always be none or same as display
+            if (bitmap.getDensity() != Bitmap.DENSITY_NONE && bitmap.getDensity() != getTargetDensity()) {
+                System.err.println("unexpected bitmap density " + bitmap.getDensity() + " (system=" + getTargetDensity() + ")");
+            }
         }
         return new Image(bitmap);
     }
@@ -231,6 +227,19 @@
     }
 
     /**
+     * code taken from android framework:
+     * @see android.graphics.Bitmap#scaleFromDensity(int, int, int)
+     */
+    static int scaleFromDensity(int size, int sdensity, int tdensity) {
+        if (sdensity == Bitmap.DENSITY_NONE || tdensity == Bitmap.DENSITY_NONE || sdensity == tdensity) {
+            return size;
+        }
+
+        // Scale by tdensity / sdensity, rounding up.
+        return ((size * tdensity) + (sdensity >> 1)) / sdensity;
+    }
+
+    /**
      * @see #getResourceAsStream(String)
      * @see android.graphics.drawable.BitmapDrawable#updateLocalState(Resources)
      * @see android.graphics.drawable.Drawable#resolveDensity(Resources, int)
@@ -354,6 +363,9 @@
             return res.getDrawable(resId);
         }
 
+        /**
+         * @return a app resource image, in API-28+ this can come back with a DPI different to the current display dpi
+         */
         public Bitmap getBitmap() {
             return ((BitmapDrawable)getDrawable()).getBitmap();
         }

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

[Swingme-svn] SF.net SVN: swingme:[2414] ToolsME/build.xml

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

Revision: 2414
          http://sourceforge.net/p/swingme/code/2414
Author:   yuranet
Date:     2021-03-11 11:40:35 +0000 (Thu, 11 Mar 2021)
Log Message:
-----------
deploy ant task

Modified Paths:
--------------
    ToolsME/build.xml

Modified: ToolsME/build.xml
===================================================================
--- ToolsME/build.xml	2021-03-08 11:01:09 UTC (rev 2413)
+++ ToolsME/build.xml	2021-03-11 11:40:35 UTC (rev 2414)
@@ -10,6 +10,17 @@
 <project name="ToolsME" default="default" basedir=".">
     <description>Builds, tests, and runs the project ToolsME.</description>
     <import file="nbproject/build-impl.xml"/>
+
+
+    <available file="../Domination" type="dir" property="Domination"/>
+
+    <target name="d1" if="Domination">
+	    <copy file="dist/ToolsME.jar" todir="../Domination/swingUI/lib"/>
+    </target>
+
+    <target name="deploy" depends="d1" description="copy lib to some other places"/>
+
+
     <!--
 
     There exist several targets which are by default empty and which can be 

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

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

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

Revision: 2413
          http://sourceforge.net/p/swingme/code/2413
Author:   yuranet
Date:     2021-03-08 11:01:09 +0000 (Mon, 08 Mar 2021)
Log Message:
-----------
empty line clean up

Modified Paths:
--------------
    AndroidME/src_Android/net/yura/android/AndroidPreferences.java
    AndroidME/src_Android/net/yura/android/WebViewActivity.java
    AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java
    AndroidME/src_SwingME_plaf/net/yura/android/NativeAndroidMenu.java

Modified: AndroidME/src_Android/net/yura/android/AndroidPreferences.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidPreferences.java	2021-03-07 12:57:40 UTC (rev 2412)
+++ AndroidME/src_Android/net/yura/android/AndroidPreferences.java	2021-03-08 11:01:09 UTC (rev 2413)
@@ -7,7 +7,6 @@
 import java.util.prefs.NodeChangeListener;
 import java.util.prefs.PreferenceChangeListener;
 import java.util.prefs.Preferences;
-
 import android.content.SharedPreferences;
 import android.os.Build;
 

Modified: AndroidME/src_Android/net/yura/android/WebViewActivity.java
===================================================================
--- AndroidME/src_Android/net/yura/android/WebViewActivity.java	2021-03-07 12:57:40 UTC (rev 2412)
+++ AndroidME/src_Android/net/yura/android/WebViewActivity.java	2021-03-08 11:01:09 UTC (rev 2413)
@@ -38,5 +38,4 @@
         }
         return super.onKeyDown(keyCode, event);
     }
-
 }

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java	2021-03-07 12:57:40 UTC (rev 2412)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java	2021-03-08 11:01:09 UTC (rev 2413)
@@ -90,6 +90,7 @@
         
         if ( w % frameWidth != 0 || h % frameHeight != 0) {
             // we cant throw an error here as android auto-resize of images means sizes can be slightly off
+            // this happens on 1080x1920: 420dpi
             System.out.println("WARN Sprite Size w="+w+" h="+h+" frameWidth="+frameWidth+" frameHeight="+frameHeight);
         }
         this.img = img;

Modified: AndroidME/src_SwingME_plaf/net/yura/android/NativeAndroidMenu.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/NativeAndroidMenu.java	2021-03-07 12:57:40 UTC (rev 2412)
+++ AndroidME/src_SwingME_plaf/net/yura/android/NativeAndroidMenu.java	2021-03-08 11:01:09 UTC (rev 2413)
@@ -1,7 +1,6 @@
 package net.yura.android;
 
 import java.util.Vector;
-
 import net.yura.android.plaf.AndroidBorder;
 import net.yura.android.plaf.AndroidIcon;
 import net.yura.mobile.gui.DesktopPane;

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

[Swingme-svn] SF.net SVN: swingme:[2412] SwingMETest

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

Revision: 2412
          http://sourceforge.net/p/swingme/code/2412
Author:   yuranet
Date:     2021-03-07 12:57:40 +0000 (Sun, 07 Mar 2021)
Log Message:
-----------
targetSdkVersion 28

Modified Paths:
--------------
    SwingMETest/AndroidManifest.xml
    SwingMETest/build.gradle

Added Paths:
-----------
    SwingMETest/gradle/
    SwingMETest/gradle/wrapper/
    SwingMETest/gradle/wrapper/gradle-wrapper.jar
    SwingMETest/gradle/wrapper/gradle-wrapper.properties
    SwingMETest/gradlew
    SwingMETest/gradlew.bat

Property Changed:
----------------
    SwingMETest/

Index: SwingMETest
===================================================================
--- SwingMETest	2021-03-07 12:43:01 UTC (rev 2411)
+++ SwingMETest	2021-03-07 12:57:40 UTC (rev 2412)

Property changes on: SwingMETest
___________________________________________________________________
Modified: svn:ignore
## -7,3 +7,7 ##
 .project
 Application Descriptor
 build.properties
+local.properties
+SwingMETest.iml
+.gradle
+.idea
Modified: SwingMETest/AndroidManifest.xml
===================================================================
--- SwingMETest/AndroidManifest.xml	2021-03-07 12:43:01 UTC (rev 2411)
+++ SwingMETest/AndroidManifest.xml	2021-03-07 12:57:40 UTC (rev 2412)
@@ -4,7 +4,7 @@
       android:versionCode="1"
       android:versionName="1.0">
 
-    <uses-sdk android:targetSdkVersion="14" />
+    <uses-sdk android:targetSdkVersion="30" />
 
     <uses-feature android:name="android.hardware.camera" android:required="false" />
 
@@ -26,7 +26,14 @@
         android:name="android.test.InstrumentationTestRunner"
         android:targetPackage="net.yura.mobile.test" />
 
-    <application android:name="net.yura.android.AndroidMeApp" android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true" android:theme="@style/AndroidME" android:hardwareAccelerated="true">
+    <application
+        android:name="net.yura.android.AndroidMeApp"
+        android:debuggable="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/icon"
+        android:label="@string/app_name"
+        android:theme="@style/AndroidME"
+        android:usesCleartextTraffic="true">
         <activity android:name="net.yura.android.AndroidMeActivity"
                   android:launchMode="singleTask"
                   android:label="@string/app_name"

Modified: SwingMETest/build.gradle
===================================================================
--- SwingMETest/build.gradle	2021-03-07 12:43:01 UTC (rev 2411)
+++ SwingMETest/build.gradle	2021-03-07 12:57:40 UTC (rev 2412)
@@ -14,7 +14,7 @@
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:3.3.3'
     }
 }
 

Added: SwingMETest/gradle/wrapper/gradle-wrapper.jar
===================================================================
(Binary files differ)

Index: SwingMETest/gradle/wrapper/gradle-wrapper.jar
===================================================================
--- SwingMETest/gradle/wrapper/gradle-wrapper.jar	2021-03-07 12:43:01 UTC (rev 2411)
+++ SwingMETest/gradle/wrapper/gradle-wrapper.jar	2021-03-07 12:57:40 UTC (rev 2412)

Property changes on: SwingMETest/gradle/wrapper/gradle-wrapper.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/gradle/wrapper/gradle-wrapper.properties
===================================================================
--- SwingMETest/gradle/wrapper/gradle-wrapper.properties	                        (rev 0)
+++ SwingMETest/gradle/wrapper/gradle-wrapper.properties	2021-03-07 12:57:40 UTC (rev 2412)
@@ -0,0 +1,6 @@
+#Thu Jun 25 12:18:23 BST 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

Added: SwingMETest/gradlew
===================================================================
--- SwingMETest/gradlew	                        (rev 0)
+++ SwingMETest/gradlew	2021-03-07 12:57:40 UTC (rev 2412)
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

Added: SwingMETest/gradlew.bat
===================================================================
--- SwingMETest/gradlew.bat	                        (rev 0)
+++ SwingMETest/gradlew.bat	2021-03-07 12:57:40 UTC (rev 2412)
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

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

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

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

Revision: 2411
          http://sourceforge.net/p/swingme/code/2411
Author:   yuranet
Date:     2021-03-07 12:43:01 +0000 (Sun, 07 Mar 2021)
Log Message:
-----------
support for targetSdkVersion 28

Modified Paths:
--------------
    AndroidME/src_Android/net/yura/android/AndroidMeApp.java
    AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java
    AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
    AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java

Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java	2021-03-05 19:09:47 UTC (rev 2410)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java	2021-03-07 12:43:01 UTC (rev 2411)
@@ -5,6 +5,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@@ -32,6 +33,8 @@
 
     private static AndroidMeApp instance;
 
+    public static int targetSdkVersion;
+
     public static Context getContext() {
         return instance;
     }
@@ -312,6 +315,16 @@
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB ) {
             System.setProperty("http.keepAlive", "false");
         }
+
+        try {
+            ApplicationInfo applicationInfo = instance.getPackageManager().getApplicationInfo(instance.getPackageName(), 0);
+            if (applicationInfo != null) {
+                targetSdkVersion = applicationInfo.targetSdkVersion;
+            }
+        }
+        catch (Exception ex) {
+            ex.printStackTrace();
+        }
     }
 
     private boolean hasPermission(String permission) {

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java	2021-03-05 19:09:47 UTC (rev 2410)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java	2021-03-07 12:43:01 UTC (rev 2411)
@@ -428,6 +428,16 @@
 
         int a = paint.getAlpha();
         paint.setAlpha(0xFF); // we do not support alpha when drawing images
+
+        int bitmapDensity = src.getBitmap().getDensity();
+        int currentDensity = Image.getTargetDensity();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && currentDensity != bitmapDensity) {
+            srcRect.set(Image.scaleFromDensity(srcRect.left, currentDensity, bitmapDensity),
+                        Image.scaleFromDensity(srcRect.top, currentDensity, bitmapDensity),
+                        Image.scaleFromDensity(srcRect.right, currentDensity, bitmapDensity),
+                        Image.scaleFromDensity(srcRect.bottom, currentDensity, bitmapDensity));
+        }
+
         canvas.drawBitmap(src.getBitmap(), srcRect, dstRect, paint);
         paint.setAlpha(a);
 

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2021-03-05 19:09:47 UTC (rev 2410)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2021-03-07 12:43:01 UTC (rev 2411)
@@ -20,12 +20,14 @@
 /**
  * for saving of image please use
  * @see net.yura.mobile.util.ImageUtil#saveImage(Image, OutputStream)
+ * This class is a bit like the native android class BitmapDrawable as it handles all the dpi scaling of an image for you
+ * @see android.graphics.drawable.BitmapDrawable
  */
 public class Image {
 
     private Bitmap bitmap;
 
-    public static Image createImage(Image image, int x, int y, int width, int height, int transform) {
+    public static Image createImage(Image image, int x, int y, final int width, final int height, int transform) {
         if (image == null) {
             throw new NullPointerException();
         }
@@ -39,16 +41,31 @@
         Image res;
         switch (transform) {
             case Sprite.TRANS_NONE:
+
+                int w = width, h = height;
+                int bitmapDensity = image.bitmap.getDensity();
+                int systemDensity = getTargetDensity();
+                if (bitmapDensity != systemDensity) {
+                    x = scaleFromDensity(x, systemDensity, bitmapDensity);
+                    y = scaleFromDensity(y, systemDensity, bitmapDensity);
+                    w = scaleFromDensity(width, systemDensity, bitmapDensity);
+                    h = scaleFromDensity(height, systemDensity, bitmapDensity);
+                }
+
                 Bitmap bmp;
                 try {
-                    bmp = Bitmap.createBitmap(image.bitmap, x, y, width, height);
+                    bmp = Bitmap.createBitmap(image.bitmap, x, y, w, h);
 
                 } catch (OutOfMemoryError e) {
                     cleanMem();
-                    bmp = Bitmap.createBitmap(image.bitmap, x, y, width, height);
+                    bmp = Bitmap.createBitmap(image.bitmap, x, y, w, h);
                 }
                 res = new Image(bmp);
 
+                if (res.getWidth() != width || res.getHeight() != height) {
+                    System.out.println("WARN Image.createImage size does not match in_w="+width+" in_h="+height+" out_w="+res.getWidth()+" out_h="+res.getHeight());
+                }
+
                 break;
             case Sprite.TRANS_ROT90:
             case Sprite.TRANS_ROT270:
@@ -70,6 +87,15 @@
         return res;
     }
 
+    /**
+     * code taken from android framework:
+     * @see android.graphics.Bitmap#scaleFromDensity(int, int, int)
+     */
+    static int scaleFromDensity(int size, int sdensity, int tdensity) {
+        // Scale by tdensity / sdensity, rounding up.
+        return ((size * tdensity) + (sdensity >> 1)) / sdensity;
+    }
+
     public static Image createImage(InputStream stream) throws IOException {
         Bitmap bitmap;
         if (stream instanceof ResourceInputStream) {

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java	2021-03-05 19:09:47 UTC (rev 2410)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java	2021-03-07 12:43:01 UTC (rev 2411)
@@ -19,17 +19,16 @@
 
 package javax.microedition.lcdui.game;
 
+import android.os.Build;
+import net.yura.android.AndroidMeApp;
+import net.yura.mobile.BuildConfig;
 import javax.microedition.lcdui.Graphics;
 import javax.microedition.lcdui.Image;
 
 /**
- *
  * @author Andres Navarro
- *
  */
-
 // TODO add more synchronization
-
 public class Sprite extends Layer {
     // transform constants
     public static final int TRANS_NONE = 0;
@@ -85,12 +84,13 @@
         // with a bound rectangle the same as the frame
         super(0, 0, frameWidth, frameHeight, true);
 
-        int w = img.getWidth();
-        int h = img.getHeight();
+        // implicit check for null img
+        final int w = img.getWidth();
+        final int h = img.getHeight();
         
-        // implicit check for null img
         if ( w % frameWidth != 0 || h % frameHeight != 0) {
-            throw new IllegalArgumentException("w="+w+" h="+h+" fw="+frameWidth+" fh="+frameHeight);
+            // we cant throw an error here as android auto-resize of images means sizes can be slightly off
+            System.out.println("WARN Sprite Size w="+w+" h="+h+" frameWidth="+frameWidth+" frameHeight="+frameHeight);
         }
         this.img = img;
         cols = w / frameWidth;
@@ -98,6 +98,15 @@
         collX = collY = 0;
         collWidth = frameWidth;
         collHeight = frameHeight;
+
+        if (BuildConfig.DEBUG && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && AndroidMeApp.targetSdkVersion >= Build.VERSION_CODES.P) {
+            int rawWidth = img.getBitmap().getWidth();
+            int rawHeight = img.getBitmap().getHeight();
+            // check those devide exactly into cols and rows
+            if (rawWidth % cols != 0 || rawHeight % rows != 0 || w / cols != frameWidth || h / rows != frameHeight) {
+                throw new IllegalArgumentException("w=" + w + " h=" + h + " fw=" + frameWidth + " fh=" + frameHeight);
+            }
+        }
     }
 
     public Sprite(Sprite otherSprite) {

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

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

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

Revision: 2410
          http://sourceforge.net/p/swingme/code/2410
Author:   yuranet
Date:     2021-03-05 19:09:47 +0000 (Fri, 05 Mar 2021)
Log Message:
-----------
can draw images correctly on targetSdkVersion = 28

Modified Paths:
--------------
    AndroidME/src_Android/net/yura/android/AndroidMeApp.java
    AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java
    AndroidME/src_MIDP/javax/microedition/lcdui/Image.java

Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java	2021-03-05 11:50:37 UTC (rev 2409)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java	2021-03-05 19:09:47 UTC (rev 2410)
@@ -25,7 +25,6 @@
 import java.util.Locale;
 import java.util.Properties;
 import java.util.Vector;
-import javax.microedition.lcdui.Display;
 import javax.microedition.midlet.MIDlet;
 import net.yura.mobile.logging.Logger;
 
@@ -313,9 +312,8 @@
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB ) {
             System.setProperty("http.keepAlive", "false");
         }
+    }
 
-    }
-    
     private boolean hasPermission(String permission) {
         int res = getContext().checkCallingOrSelfPermission( "android.permission."+ permission );
         return res == PackageManager.PERMISSION_GRANTED;       

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java	2021-03-05 11:50:37 UTC (rev 2409)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java	2021-03-05 19:09:47 UTC (rev 2410)
@@ -1,10 +1,9 @@
 package javax.microedition.lcdui;
 
-
 import javax.microedition.lcdui.game.Sprite;
-
 import net.yura.android.lcdui.FontManager;
-
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Matrix;
@@ -12,6 +11,7 @@
 import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.os.Build;
 
 public class Graphics {
     public static final int BASELINE = 64;
@@ -111,6 +111,9 @@
         canvas.drawRoundRect(new RectF(tx+x, ty+y, tx+x + width, ty+y + height), rx, y, paint);
     }
 
+    /**
+     * @see android.graphics.drawable.BitmapDrawable#draw(Canvas)
+     */
     public void drawImage(javax.microedition.lcdui.Image image, int x, int y, int anchor) {
 
         if (anchor == 0) {
@@ -136,7 +139,16 @@
         }
         int a = paint.getAlpha();
         paint.setAlpha(0xFF);// do not want to use alpha with images
-        canvas.drawBitmap(image.getBitmap(), tx+ax, ty+ay, paint);
+
+        // in targetAPI 28+ android seems to have stopped respecting the density of the bitmap for app resources
+        // this is probably a bug: https://issuetracker.google.com/issues/181887424
+        // we cant compare image with canvas.getDensity() as that seems to just return 0, and we also cant set it
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && canvas.getDensity() == Bitmap.DENSITY_NONE && Image.getTargetDensity() != image.getBitmap().getDensity()) {
+            canvas.drawBitmap(image.getBitmap(),null, new Rect(tx+ax, ty+ay, tx+ax + image.getWidth(), ty+ay + image.getHeight()), paint);
+        }
+        else {
+            canvas.drawBitmap(image.getBitmap(), tx + ax, ty + ay, paint);
+        }
         paint.setAlpha(a);
     }
 

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2021-03-05 11:50:37 UTC (rev 2409)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2021-03-05 19:09:47 UTC (rev 2410)
@@ -4,12 +4,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-
 import javax.microedition.lcdui.game.Sprite;
-
 import net.yura.android.AndroidMeApp;
-import net.yura.mobile.logging.Logger;
-
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -18,6 +14,8 @@
 import android.graphics.ColorMatrix;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.util.DisplayMetrics;
 
 /**
  * for saving of image please use
@@ -206,11 +204,40 @@
         return bitmap;
     }
 
+    /**
+     * @see #getResourceAsStream(String)
+     * @see android.graphics.drawable.BitmapDrawable#updateLocalState(Resources)
+     * @see android.graphics.drawable.Drawable#resolveDensity(Resources, int)
+     */
+    static int getTargetDensity() {
+        // not really sure in what situations density changes, but lets make sure we scale to current density
+        //if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+        //    return DisplayMetrics.DENSITY_DEVICE_STABLE;
+        //}
+        Resources res = AndroidMeApp.getContext().getResources();
+        final int densityDpi = res.getDisplayMetrics().densityDpi;
+        return densityDpi == 0 ? DisplayMetrics.DENSITY_DEFAULT : densityDpi;
+    }
+
+    /**
+     * @see android.graphics.drawable.BitmapDrawable#computeBitmapSize()
+     * @see android.graphics.drawable.BitmapDrawable#getIntrinsicWidth()
+     */
     public int getWidth() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            // images coming from the web default to the same density as the screen, so this becomes a no-op
+            // targetSdkVersion < 28 all devices (old and 28+) would load app resources at the current display density making this a no-op (maybe this was a bug)
+            // on API-28+ devices images from the app resources density depends on the resource folder name, so this size is scaled to the screen
+            return bitmap.getScaledWidth(getTargetDensity());
+        }
+        // this does not scale to the deviceDensity if app targetSdkVersion >= 28
         return bitmap.getWidth();
     }
 
     public int getHeight() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            return bitmap.getScaledHeight(getTargetDensity());
+        }
         return bitmap.getHeight();
     }
 
@@ -302,13 +329,7 @@
         }
 
         public Bitmap getBitmap() {
-            Drawable drawable = getDrawable();
-            Bitmap bitmap = ((BitmapDrawable)drawable).getBitmap();
-            if (bitmap.getWidth() != drawable.getIntrinsicWidth()) {
-                // TODO in target api 28 this will start happening
-                Logger.warn("size does not match " + this);
-            }
-            return bitmap;
+            return ((BitmapDrawable)getDrawable()).getBitmap();
         }
 
         @Override

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

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

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

Revision: 2409
          http://sourceforge.net/p/swingme/code/2409
Author:   yuranet
Date:     2021-03-05 11:50:37 +0000 (Fri, 05 Mar 2021)
Log Message:
-----------
fix for samsung Android 10 dialog buttons bug

Modified Paths:
--------------
    AndroidME/src_JSR234_Advanced_Multimedia/javax/microedition/amms/control/ImageFormatControl.java

Added Paths:
-----------
    AndroidME/res/values-v22/
    AndroidME/res/values-v22/themes.xml

Added: AndroidME/res/values-v22/themes.xml
===================================================================
--- AndroidME/res/values-v22/themes.xml	                        (rev 0)
+++ AndroidME/res/values-v22/themes.xml	2021-03-05 11:50:37 UTC (rev 2409)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Dialog" parent="android:Theme.DeviceDefault.Dialog.Alert" />
+    <style name="Dialog.Light" parent="android:Theme.DeviceDefault.Light.Dialog.Alert" />
+
+    <style name="Theme" parent="android:Theme.DeviceDefault" />
+    <style name="Theme.Light" parent="android:Theme.DeviceDefault.Light" />
+    <style name="Theme.Light.DarkDialog" parent="Theme.Light" >
+        <item name="android:alertDialogTheme">@style/Dialog</item>
+    </style>
+
+    <style name="NoActionBar" parent="android:Theme.DeviceDefault.NoActionBar" />
+    <style name="NoActionBar.Light" parent="android:Theme.DeviceDefault.Light.NoActionBar" />
+    <style name="NoActionBar.Light.DarkDialog" parent="NoActionBar.Light" >
+        <item name="android:alertDialogTheme">@style/Dialog</item>
+    </style>
+
+    <style name="AndroidME" parent="android:Theme.NoTitleBar" >
+        <item name="android:alertDialogTheme">@style/Dialog</item>
+    </style>
+    <style name="AndroidME.Light" parent="android:Theme.Light.NoTitleBar" >
+        <item name="android:alertDialogTheme">@style/Dialog.Light</item>
+    </style>
+    <style name="AndroidME.Light.DarkDialog" parent="AndroidME.Light" >
+        <item name="android:alertDialogTheme">@style/Dialog</item>
+    </style>
+</resources>

Modified: AndroidME/src_JSR234_Advanced_Multimedia/javax/microedition/amms/control/ImageFormatControl.java
===================================================================
--- AndroidME/src_JSR234_Advanced_Multimedia/javax/microedition/amms/control/ImageFormatControl.java	2021-03-05 11:36:45 UTC (rev 2408)
+++ AndroidME/src_JSR234_Advanced_Multimedia/javax/microedition/amms/control/ImageFormatControl.java	2021-03-05 11:50:37 UTC (rev 2409)
@@ -2,6 +2,9 @@
 
 public interface ImageFormatControl extends javax.microedition.media.Control {
 
+    /**
+     * @param string "image/jpeg" or "image/png"
+     */
     public void setFormat(String string);
 
 }

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

[Swingme-svn] SF.net SVN: swingme:[2408] SwingME

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

Revision: 2408
          http://sourceforge.net/p/swingme/code/2408
Author:   yuranet
Date:     2021-03-05 11:36:45 +0000 (Fri, 05 Mar 2021)
Log Message:
-----------
javadoc update

Modified Paths:
--------------
    SwingME/build.xml
    SwingME/src/net/yura/mobile/gui/KeyEvent.java

Modified: SwingME/build.xml
===================================================================
--- SwingME/build.xml	2021-03-04 01:06:32 UTC (rev 2407)
+++ SwingME/build.xml	2021-03-05 11:36:45 UTC (rev 2408)
@@ -37,7 +37,7 @@
         <copy file="${deployment.jar}" todir="../ToolsME/lib"/>
     </target>
     <target name="d3" if="Domination">
-        <copy file="${deployment.jar}" todir="../Domination/lib"/>
+        <copy file="${deployment.jar}" todir="../Domination/swingUI/lib"/>
     </target>
     <target name="d4" if="AgentClient">
         <copy file="${deployment.jar}" todir="../AgentClient/lib"/>

Modified: SwingME/src/net/yura/mobile/gui/KeyEvent.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/KeyEvent.java	2021-03-04 01:06:32 UTC (rev 2407)
+++ SwingME/src/net/yura/mobile/gui/KeyEvent.java	2021-03-05 11:36:45 UTC (rev 2408)
@@ -43,7 +43,7 @@
         /**
          * Default Softkey right value.
          * this will be activated by the 'F2' key in ME4SE and appear as 'Right SoftKey' of J2ME phones.
-         * On Android and blackberry nothing special will be done with this button
+         * On Android and blackberry the back button will activate this on-screen button, it will NOT be hidden
          * @see net.yura.mobile.gui.components.Button#setMnemonic(int)
          */
 	public static final int KEY_SOFTKEY2 = -7;
@@ -89,11 +89,11 @@
          * MS4SE Ctrl Key
          */
         public static final int KEY_EDIT = -50;
-
+
         /**
          * MS4SE Right Click Key
-         */
-        public static final int KEY_RIGHT_CLICK = -51;
+         */
+        public static final int KEY_RIGHT_CLICK = -51;
 
         //public static final int KEY_WEB = -20; // SonyE
         //public static final int KEY_PHOTO = -24 or -25 or -26; // SonyE

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

[Swingme-svn] SF.net SVN: swingme:[2407] AndroidME/src_Android/net/yura/android/ AndroidMeApp.java

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

Revision: 2407
          http://sourceforge.net/p/swingme/code/2407
Author:   yuranet
Date:     2021-03-04 01:06:32 +0000 (Thu, 04 Mar 2021)
Log Message:
-----------
get installer package name

Modified Paths:
--------------
    AndroidME/src_Android/net/yura/android/AndroidMeApp.java

Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java	2021-03-04 00:08:29 UTC (rev 2406)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java	2021-03-04 01:06:32 UTC (rev 2407)
@@ -300,7 +300,11 @@
         catch (Exception ex) {
             ex.printStackTrace();
         }
-        
+
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.ECLAIR) {
+            System.setProperty("installerPackageName", String.valueOf(getPackageManager().getInstallerPackageName(getPackageName())));
+        }
+
         System.setProperty("debug", String.valueOf(net.yura.mobile.BuildConfig.DEBUG) );
         
 

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

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

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

Revision: 2406
          http://sourceforge.net/p/swingme/code/2406
Author:   yuranet
Date:     2021-03-04 00:08:29 +0000 (Thu, 04 Mar 2021)
Log Message:
-----------
javadoc

Modified Paths:
--------------
    AndroidME/src_SwingME_plaf/net/yura/android/AlertOptionPane.java

Removed Paths:
-------------
    AndroidME/build/

Property Changed:
----------------
    AndroidME/

Index: AndroidME
===================================================================
--- AndroidME	2021-03-03 18:45:47 UTC (rev 2405)
+++ AndroidME	2021-03-04 00:08:29 UTC (rev 2406)

Property changes on: AndroidME
___________________________________________________________________
Modified: svn:ignore
## -6,3 +6,4 ##
 Application Descriptor
 build
 dist
+AndroidME.iml
Modified: AndroidME/src_SwingME_plaf/net/yura/android/AlertOptionPane.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/AlertOptionPane.java	2021-03-03 18:45:47 UTC (rev 2405)
+++ AndroidME/src_SwingME_plaf/net/yura/android/AlertOptionPane.java	2021-03-04 00:08:29 UTC (rev 2406)
@@ -17,6 +17,11 @@
 
 public class AlertOptionPane extends OptionPane implements OnCancelListener, OnClickListener {
 
+    /**
+     * in swingme the convention is from old nokia phones that action/menu is 1st (on the left) and cancel is 2nd (on the right)
+     * @see net.yura.mobile.gui.KeyEvent#KEY_SOFTKEY1 (1st or left or KEY_MENU or positive)
+     * @see net.yura.mobile.gui.KeyEvent#KEY_SOFTKEY2 (2nd or right or KEY_END or negative)
+     */
     private static final int[] BUTTON_TYPE = {DialogInterface.BUTTON_POSITIVE, DialogInterface.BUTTON_NEUTRAL, DialogInterface.BUTTON_NEGATIVE};
 
     private AlertDialog alertDialog;

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

[Swingme-svn] SF.net SVN: swingme:[2405] SwingME/src/net/yura/mobile/gui

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

Revision: 2405
          http://sourceforge.net/p/swingme/code/2405
Author:   yuranet
Date:     2021-03-03 18:45:47 +0000 (Wed, 03 Mar 2021)
Log Message:
-----------
optionPane docs

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/components/OptionPane.java
    SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java

Modified: SwingME/src/net/yura/mobile/gui/components/OptionPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/OptionPane.java	2021-03-02 15:42:28 UTC (rev 2404)
+++ SwingME/src/net/yura/mobile/gui/components/OptionPane.java	2021-03-03 18:45:47 UTC (rev 2405)
@@ -410,7 +410,9 @@
     public static Class optionPaneClass = OptionPane.class;
 
     /**
+     * @param options the buttons array with action/positive [0], (then optional/neutral [1]) then cancel/negative [2]
      * @see javax.swing.JOptionPane#showOptionDialog(java.awt.Component, java.lang.Object, java.lang.String, int, int, javax.swing.Icon, java.lang.Object[], java.lang.Object) JOptionPane.showOptionDialog
+     * @see net.yura.android.AlertOptionPane#BUTTON_TYPE
      */
     public static OptionPane showOptionDialog(ActionListener parent, Object message, String title, int optionType, int messageType, Icon icon, Button[] options, Button initialValue) {
 

Modified: SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java	2021-03-02 15:42:28 UTC (rev 2404)
+++ SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java	2021-03-03 18:45:47 UTC (rev 2405)
@@ -386,12 +386,12 @@
         setUIDefault("RadioButton[disabled].foreground",uiSettings.get("nimbusDisabledText"));
 
         // SPINNER
+        int iconSize = font.getHeight() + 6;
+        Icon spinnerLeftIcon = new NimbusIcon(iconSize, LookAndFeel.ICON_SPINNER_LEFT, buttonLeftSettings, decodeColor("text"));
+        Icon spinnerLeftSelectedIcon = new NimbusIcon(iconSize, LookAndFeel.ICON_SPINNER_LEFT, buttonLeftSelectedSettings, decodeColor("nimbusSelectedText"));
+        Icon spinnerRightIcon = new NimbusIcon(iconSize, LookAndFeel.ICON_SPINNER_RIGHT, buttonRightSettings, decodeColor("text"));
+        Icon spinnerRightSelectedIcon = new NimbusIcon(iconSize, LookAndFeel.ICON_SPINNER_RIGHT, buttonRightSelectedSettings, decodeColor("nimbusSelectedText"));
 
-        Icon spinnerLeftIcon = new NimbusIcon(font.getHeight()+6, LookAndFeel.ICON_SPINNER_LEFT, buttonLeftSettings, decodeColor("text"));
-        Icon spinnerLeftSelectedIcon = new NimbusIcon(font.getHeight()+6, LookAndFeel.ICON_SPINNER_LEFT, buttonLeftSelectedSettings, decodeColor("nimbusSelectedText"));
-        Icon spinnerRightIcon = new NimbusIcon(font.getHeight()+6, LookAndFeel.ICON_SPINNER_RIGHT, buttonRightSettings, decodeColor("text"));
-        Icon spinnerRightSelectedIcon = new NimbusIcon(font.getHeight()+6, LookAndFeel.ICON_SPINNER_RIGHT, buttonRightSelectedSettings, decodeColor("nimbusSelectedText"));
-
         Vector spinnerBorderSettings = new Vector();
         Vector spinnerSelectedSettings = new Vector();
         Vector spinnerDisabledSettings = new Vector();
@@ -400,8 +400,8 @@
         copyBorders(comboDisabledSettings, spinnerDisabledSettings);
 
         setUIDefault("Spinner.background",noColor);
-        setUIDefault("Spinner.border",new NimbusBorder(spinnerBorderSettings,0,0,20,0));
-        setUIDefault("Spinner[focused].border",new NimbusBorder(spinnerSelectedSettings,0,0,20,0));
+        setUIDefault("Spinner.border",new NimbusBorder(spinnerBorderSettings,0,0,iconSize,0));
+        setUIDefault("Spinner[focused].border",new NimbusBorder(spinnerSelectedSettings,0,0,iconSize,0));
         setUIDefault("Spinner.property[iconLeft]",spinnerLeftIcon);
         setUIDefault("Spinner[selected].property[iconLeft]",spinnerLeftSelectedIcon);
         setUIDefault("Spinner.property[iconRight]",spinnerRightIcon);

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

[Swingme-svn] SF.net SVN: swingme:[2404] AndroidME/src_SwingME_plaf/net/yura/android/ NativeAndroidTextField.java

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

Revision: 2404
          http://sourceforge.net/p/swingme/code/2404
Author:   yuranet
Date:     2021-03-02 15:42:28 +0000 (Tue, 02 Mar 2021)
Log Message:
-----------
better variable names

Modified Paths:
--------------
    AndroidME/src_SwingME_plaf/net/yura/android/NativeAndroidTextField.java

Modified: AndroidME/src_SwingME_plaf/net/yura/android/NativeAndroidTextField.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/NativeAndroidTextField.java	2021-02-25 11:32:01 UTC (rev 2403)
+++ AndroidME/src_SwingME_plaf/net/yura/android/NativeAndroidTextField.java	2021-03-02 15:42:28 UTC (rev 2404)
@@ -2,11 +2,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.microedition.lcdui.Canvas;
 import javax.microedition.lcdui.Canvas.InputHelper;
 import javax.microedition.lcdui.TextBox;
-
 import net.yura.android.lcdui.FontManager;
 import net.yura.android.plaf.AndroidBorder;
 import net.yura.mobile.gui.ActionListener;
@@ -25,7 +23,6 @@
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -104,7 +101,7 @@
             return;
         }
 
-        final View view = textBox.getCanvasView();
+        final View canvasView = textBox.getCanvasView();
 
 //System.out.println("[NativeAndroidTextField] ##################### start");
 
@@ -115,7 +112,7 @@
 
         this.textBox = textBox;
 
-        editText = new NativeEditText(view);
+        editText = new NativeEditText(canvasView);
 
         editText.setGravity( Gravity.TOP ); // on HTC the defualt is center, so we need to set it to top
 
@@ -196,12 +193,12 @@
 
 
         // add it to the parent
-        ViewGroup group = (ViewGroup)view.getParent();
+        ViewGroup group = (ViewGroup)canvasView.getParent();
         int count = group.getChildCount();
         List<View> remove = new ArrayList<View>(1);
         for (int c=0;c<count;c++) {
             View child = group.getChildAt(c);
-            if (child != view) {
+            if (child != canvasView) {
                 remove.add(child);
             }
         }
@@ -214,9 +211,11 @@
 
 
         // get focus
-        editText.requestFocus();
+        if(editText.requestFocus()) {
+            // if we want to open the keyboard as soon as the textbox becomes focused
+            //((InputMethodManager)editText.getContext().getSystemService(Context.INPUT_METHOD_SERVICE)).showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT);
+        }
 
-
         TextComponent.staticFocusListener = this;
 //        // get old focusListeners, we will keep this copy
 //        focusListeners = textField.getFocusListeners();
@@ -226,7 +225,6 @@
 //        }
 //        // add ourselves to listen for focus
 //        textField.addFocusListener(this);
-
     }
 
 //    ChangeListener[] focusListeners;
@@ -447,11 +445,11 @@
 
     class NativeEditText extends EditText {
 
-        View view;
+        View canvasView;
 
         public NativeEditText(View view) {
             super( AndroidMeActivity.DEFAULT_ACTIVITY );
-            this.view = view;
+            this.canvasView = view;
         }
 
         /*
@@ -547,7 +545,7 @@
         protected void onSelectionChanged(int selStart, int selEnd) {
 
         	try {
-	            if (view!=null) { // we check the view is not null to make sure this is not the call from the constructor
+	            if (canvasView !=null) { // we check the view is not null to make sure this is not the call from the constructor
 
 	                int caretPosition = textField.getCaretPosition();
 
@@ -573,7 +571,7 @@
                 android2swing(); // send text to swingME
 
                 //b.fireActionPerformed();// WE CAN NOT FIRE THE BUTTON DIRECTLY, as this may be the menu button
-                boolean use = view.onKeyDown(keyCode, event); // we pass this event to AndroidME, for it to send it to SwingME
+                boolean use = canvasView.onKeyDown(keyCode, event); // we pass this event to AndroidME, for it to send it to SwingME
 
                 // ========== SWING 2 MIDP ==========
                 // get the text from swingME to J2ME
@@ -585,7 +583,7 @@
             }
 
             boolean use = super.onKeyDown(keyCode, event);
-            if (!use) return view.onKeyDown(keyCode, event);
+            if (!use) return canvasView.onKeyDown(keyCode, event);
             return true;
         }
 
@@ -592,7 +590,7 @@
         @Override
         public boolean onKeyUp(int keyCode, KeyEvent event) {
             boolean use = super.onKeyUp(keyCode, event);
-            if (!use) return view.onKeyUp(keyCode, event);
+            if (!use) return canvasView.onKeyUp(keyCode, event);
             return true;
         }
 
@@ -599,7 +597,7 @@
         @Override
         public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
             boolean use = super.onKeyMultiple(keyCode, repeatCount, event);
-            if (!use) return view.onKeyMultiple(keyCode, repeatCount, event);
+            if (!use) return canvasView.onKeyMultiple(keyCode, repeatCount, event);
             return true;
         }
 
@@ -606,7 +604,7 @@
         @Override
         public boolean onKeyPreIme(int keyCode, KeyEvent event) {
             boolean use = super.onKeyPreIme(keyCode, event);
-            if (!use) return view.onKeyPreIme(keyCode, event);
+            if (!use) return canvasView.onKeyPreIme(keyCode, event);
             return true;
         }
 
@@ -613,7 +611,7 @@
         @Override
         public boolean onKeyShortcut(int keyCode, KeyEvent event) {
             boolean use = super.onKeyShortcut(keyCode, event);
-            if (!use) return view.onKeyShortcut(keyCode, event);
+            if (!use) return canvasView.onKeyShortcut(keyCode, event);
             return true;
         }
 

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

[Swingme-svn] SF.net SVN: swingme:[2403] SwingME/src/net/yura/mobile/gui/plaf/ MetalIcon.java

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

Revision: 2403
          http://sourceforge.net/p/swingme/code/2403
Author:   yuranet
Date:     2021-02-25 11:32:01 +0000 (Thu, 25 Feb 2021)
Log Message:
-----------
metal icons work on hi-res screens

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/plaf/MetalIcon.java

Modified: SwingME/src/net/yura/mobile/gui/plaf/MetalIcon.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/MetalIcon.java	2021-02-24 17:31:28 UTC (rev 2402)
+++ SwingME/src/net/yura/mobile/gui/plaf/MetalIcon.java	2021-02-25 11:32:01 UTC (rev 2403)
@@ -66,7 +66,6 @@
                         g.drawLine(x+w/3, y+h-pad,x+w-pad,y+pad);
                     }
                 }
-
         }
         else if (type == LookAndFeel.ICON_RADIO) {
 
@@ -92,20 +91,21 @@
         else if (type == LookAndFeel.ICON_SPINNER_LEFT || type == LookAndFeel.ICON_ARROW_LEFT) {
             g.setColor( fcolor );
             int gp = 2; // gap between arrow and sides
-            int side = x+((width/2)-2);
             int iconHeight = height-(gp*2);
+            int iconWidth = iconHeight/2;
+            int side = x+((width/2)-(iconWidth/2));
             g.fillTriangle(side,y+gp+(iconHeight/2)+1,
-                           side+5,y+gp+iconHeight,
-                           side+5,y+gp);
-
+                           side+iconWidth,y+gp+iconHeight,
+                           side+iconWidth,y+gp);
         }
         else if (type == LookAndFeel.ICON_SPINNER_RIGHT || type == LookAndFeel.ICON_ARROW_RIGHT) {
 
             g.setColor( fcolor );
             int gp = 2; // gap between arrow and sides
-            int side = x+((width/2)-2);
             int iconHeight = height-(gp*2);
-            g.fillTriangle(side+5,y+gp+(iconHeight/2)+1,
+            int iconWidth = iconHeight/2;
+            int side = x+((width/2)-(iconWidth/2));
+            g.fillTriangle(side+iconWidth,y+gp+(iconHeight/2)+1,
                            side,y+gp+iconHeight,
                            side,y+gp);
         }
@@ -116,12 +116,12 @@
 
             g.setColor( fcolor );
             int gp = 2; // gap between arrow and sides
-            int top = y+((height/2)-2);
             int iconWidth = width-(gp*2);
+            int iconHeight = iconWidth/2;
+            int top = y+((height/2)-(iconHeight/2));
             g.fillTriangle(x+gp+(iconWidth/2)+1, top,
-                           x+gp+iconWidth, top+5,
-                           x+gp, top+5);
-
+                           x+gp+iconWidth, top+iconHeight,
+                           x+gp, top+iconHeight);
         }
         else if (type == LookAndFeel.ICON_ARROW_DOWN) {
 
@@ -130,14 +130,13 @@
 
             g.setColor( fcolor );
             int gp = 2; // gap between arrow and sides
-            int top = y+((height/2)-2);
             int iconWidth = width-(gp*2);
-            g.fillTriangle(x+gp+(iconWidth/2)+1, top+5,
+            int iconHeight = iconWidth/2;
+            int top = y+((height/2)-(iconHeight/2));
+            g.fillTriangle(x+gp+(iconWidth/2)+1, top+iconHeight,
                            x+gp+iconWidth, top,
                            x+gp, top);
-
         }
-
     }
 
     private void drawSelectionArrow(Component c, Graphics2D g, int x, int y, int transformation) {
@@ -148,9 +147,10 @@
         g.setTransform(transformation);
 
         int gp = 2; // gap between arrow and sides
-        int top = (height/2)-2;
         int iconWidth = width-(gp*2);
-        g.fillTriangle(gp+(iconWidth/2)+1, top+5,
+        int iconHeight = iconWidth/2;
+        int top = (height/2)-(iconHeight/2);
+        g.fillTriangle(gp+(iconWidth/2)+1, top+iconHeight,
                        gp+iconWidth, top,
                        gp, top);
 

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

[Swingme-svn] SF.net SVN: swingme:[2402] AndroidME/src_SwingME_plaf/net/yura/android/ plaf/AndroidLookAndFeel.java

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

Revision: 2402
          http://sourceforge.net/p/swingme/code/2402
Author:   yuranet
Date:     2021-02-24 17:31:28 +0000 (Wed, 24 Feb 2021)
Log Message:
-----------
lists work in dialogs, yay

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

Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java	2021-02-24 16:36:58 UTC (rev 2401)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java	2021-02-24 17:31:28 UTC (rev 2402)
@@ -1,6 +1,22 @@
 package net.yura.android.plaf;
 
-import javax.microedition.lcdui.Image;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.PorterDuff.Mode;
+import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.util.DisplayMetrics;
+import android.view.ViewConfiguration;
+import net.yura.android.AlertOptionPane;
 import net.yura.android.AndroidMeActivity;
 import net.yura.android.AndroidMeApp;
 import net.yura.android.NativeAndroidMenu;
@@ -21,23 +37,7 @@
 import net.yura.mobile.gui.components.TextField;
 import net.yura.mobile.gui.plaf.Style;
 import net.yura.mobile.gui.plaf.SynthLookAndFeel;
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.PorterDuff.Mode;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.util.DisplayMetrics;
-import android.view.ViewConfiguration;
-import net.yura.android.AlertOptionPane;
+import javax.microedition.lcdui.Image;
 
 public class AndroidLookAndFeel extends SynthLookAndFeel {
 
@@ -162,10 +162,29 @@
 
         // --- List ---
 
+        int[] nonDefaultSwingMeStates = {
+                Style.DISABLED,
+                Style.DISABLED|Style.FOCUSED,
+                Style.DISABLED|Style.SELECTED,
+                Style.DISABLED|Style.FOCUSED|Style.SELECTED,
+                Style.FOCUSED,
+                Style.SELECTED,
+                Style.FOCUSED|Style.SELECTED,
+        };
+
         Style listStyle = new Style(defaultStyle);
-        listStyle.addBorder(getBorder(ctx, android.R.style.Widget_ListView_White, android.R.attr.background ),Style.ALL);
-        setStyleFor("ListWhite",listStyle);
+        setForegroundColor(ctx, listStyle, android.R.style.TextAppearance_Large, ListCellRenderer.class, nonDefaultSwingMeStates); // Has defined in simple_list_item.xml
+        setStyleFor("List",listStyle);
 
+        Style tableStyle = new Style(defaultStyle);
+        setForegroundColor(ctx, tableStyle, android.R.style.TextAppearance_Large, ListCellRenderer.class, nonDefaultSwingMeStates); // Has defined in simple_list_item.xml
+        setStyleFor("Table",tableStyle);
+
+        Style whiteListStyle = new Style(defaultStyle);
+        setForegroundColor(ctx, whiteListStyle, android.R.style.TextAppearance_Large, ListCellRenderer.class, nonDefaultSwingMeStates); // Has defined in simple_list_item.xml
+        whiteListStyle.addBorder(getBorder(ctx, android.R.style.Widget_ListView_White, android.R.attr.background ),Style.ALL);
+        setStyleFor("ListWhite",whiteListStyle);
+
         Rect listExtraPadding = getAdjustedDensityRect(ctx, 10, 10, 10, 10);
         Border divider2 = getListDivider(ctx, android.R.style.Widget_ListView, android.R.attr.listDivider);
 
@@ -172,7 +191,6 @@
         Style listCellRenderer = new Style(defaultStyle);
         Border mainBorder = getBorder(ctx, android.R.style.Widget_ListView, android.R.attr.listSelector , listExtraPadding);
         listCellRenderer.addBorder(new BorderWithDivider(mainBorder, divider2,false ),Style.ALL);
-        setForegroundColor(ctx, listCellRenderer, android.R.style.TextAppearance_Large,ListCellRenderer.class); // Has defined in simple_list_item.xml
         setStyleFor("ListRenderer",listCellRenderer);
 
         // --- List (No padding) ---
@@ -179,13 +197,11 @@
         Style listCellRendererCollapsed = new Style(defaultStyle);
         Border mainBorder2 = getBorder(ctx, android.R.style.Widget_ListView, android.R.attr.listSelector);
         listCellRendererCollapsed.addBorder(new BorderWithDivider(mainBorder2, divider2,true ),Style.ALL);
-        setForegroundColor(ctx, listCellRendererCollapsed, android.R.style.TextAppearance_Large,ListCellRenderer.class); // Has defined in simple_list_item.xml
         setStyleFor("ListRendererCollapsed",listCellRendererCollapsed);
 
 
         Style gridCellRendererCollapsed = new Style(defaultStyle);
         gridCellRendererCollapsed.addBorder( getBorder(ctx, android.R.style.Widget_ListView, android.R.attr.listSelector) ,Style.ALL);
-        setForegroundColor(ctx, gridCellRendererCollapsed, android.R.style.TextAppearance_Large,ListCellRenderer.class); // Has defined in simple_list_item.xml
         setStyleFor("GridRendererCollapsed",gridCellRendererCollapsed);
 
 
@@ -232,6 +248,17 @@
         setStyleFor("PreferenceSeparator", preferenceSeparatorStyle);
 
 
+        int[] allSwingMeStates = {
+                0, // nothing, default state
+                Style.DISABLED,
+                Style.DISABLED|Style.FOCUSED,
+                Style.DISABLED|Style.SELECTED,
+                Style.DISABLED|Style.FOCUSED|Style.SELECTED,
+                Style.FOCUSED,
+                Style.SELECTED,
+                Style.FOCUSED|Style.SELECTED,
+        };
+
         // --- Button ---
         Style buttonStyle = new Style(defaultStyle);
         Drawable but = getDrawable(ctx, android.R.attr.buttonStyle, android.R.attr.background);
@@ -244,7 +271,7 @@
         padding.left = (int) (padding.left*1.5);
         padding.right = (int) (padding.right*1.5);
         buttonStyle.addBorder(new AndroidBorder(but, padding),Style.ALL);
-        setForegroundColor(ctx, buttonStyle, android.R.style.Widget_Button,Button.class);
+        setForegroundColor(ctx, buttonStyle, android.R.style.Widget_Button,Button.class, allSwingMeStates);
         setStyleFor("Button", buttonStyle);
 
         Drawable btn_circle = getDrawable(ctx, "btn_circle"); // CAN BE NULL!!
@@ -256,13 +283,13 @@
         int w = btn_circle==null?helpDrawable.getIntrinsicWidth():btn_circle.getIntrinsicWidth();
         AndroidIcon helpIcon = new AndroidIcon(helpDrawable, w, w);
         helpButtonStyle.addBorder( new IconBorder(padding2.top,padding2.left,padding2.bottom,padding2.right,helpIcon,null) ,Style.ALL);
-        setForegroundColor(ctx, helpButtonStyle, android.R.style.Widget_Button,Button.class);
+        setForegroundColor(ctx, helpButtonStyle, android.R.style.Widget_Button,Button.class, allSwingMeStates);
         setStyleFor("helpButton", helpButtonStyle);
 
 
         Style sbuttonStyle = new Style(defaultStyle);
         sbuttonStyle.addBorder(getBorder(ctx, android.R.attr.buttonStyle, android.R.attr.background),Style.ALL);
-        setForegroundColor(ctx, sbuttonStyle, android.R.style.Widget_Button,Button.class);
+        setForegroundColor(ctx, sbuttonStyle, android.R.style.Widget_Button,Button.class, allSwingMeStates);
         setStyleFor("SmallButton", sbuttonStyle);
 
         Style redButtonStyle = new Style(defaultStyle);
@@ -269,7 +296,7 @@
         Drawable d = getDrawable(ctx, android.R.attr.buttonStyle, android.R.attr.background);
         d.setColorFilter(0x88FF0000, Mode.SRC_ATOP);
         redButtonStyle.addBorder(new AndroidBorder(d),Style.ALL);
-        setForegroundColor(ctx, redButtonStyle, android.R.style.Widget_Button,Button.class);
+        setForegroundColor(ctx, redButtonStyle, android.R.style.Widget_Button,Button.class, allSwingMeStates);
         setStyleFor("RedButton", redButtonStyle);
 
         // --- Radio Button ---
@@ -277,7 +304,7 @@
         radioStyle.addProperty(createButtonIcon(ctx, android.R.style.Widget_CompoundButton_RadioButton), "icon", Style.ALL);
         // Can't use the border. The border contains (left) padding for the button! Assuming transparent
         // addBorder(ctx, radioStyle, android.R.style.Widget_CompoundButton_RadioButton, android.R.attr.background);
-        setForegroundColor(ctx, radioStyle, android.R.style.Widget_CompoundButton_RadioButton,RadioButton.class);
+        setForegroundColor(ctx, radioStyle, android.R.style.Widget_CompoundButton_RadioButton,RadioButton.class, allSwingMeStates);
         setStyleFor("RadioButton",radioStyle);
 
         // --- Check Box ---
@@ -285,7 +312,7 @@
         checkboxStyle.addProperty(createButtonIcon(ctx, android.R.style.Widget_CompoundButton_CheckBox), "icon", Style.ALL);
         // Can't use the border. The border contains (left) padding for the button! Assuming transparent
         // addBorder(ctx, checkboxStyle, android.R.style.Widget_CompoundButton_CheckBox, android.R.attr.background);
-        setForegroundColor(ctx, checkboxStyle, android.R.style.Widget_CompoundButton_CheckBox,CheckBox.class);
+        setForegroundColor(ctx, checkboxStyle, android.R.style.Widget_CompoundButton_CheckBox,CheckBox.class, allSwingMeStates);
         setStyleFor("CheckBox",checkboxStyle);
 
         // --- Frame ---
@@ -305,7 +332,7 @@
         // --- TextField ---
         Style textFieldStyle = new Style(defaultStyle);
         textFieldStyle.addBorder(getBorder(ctx, android.R.attr.editTextStyle, android.R.attr.background),Style.ALL);
-        setForegroundColor(ctx, textFieldStyle, android.R.style.Widget_EditText,TextField.class);
+        setForegroundColor(ctx, textFieldStyle, android.R.style.Widget_EditText,TextField.class, allSwingMeStates);
         setStyleFor("TextField",textFieldStyle);
 
         // --- TextArea ---
@@ -317,7 +344,7 @@
         // --- ComboBox ---
         Style comboStyle = new Style(buttonStyle);
         comboStyle.addBorder(getBorder(ctx, android.R.style.Widget_Spinner, android.R.attr.background),Style.ALL);
-        setForegroundColor(ctx, comboStyle, android.R.style.TextAppearance_Widget_TextView_SpinnerItem,ComboBox.class);
+        setForegroundColor(ctx, comboStyle, android.R.style.TextAppearance_Widget_TextView_SpinnerItem,ComboBox.class, allSwingMeStates);
         setStyleFor("ComboBox",comboStyle);
 
         // --- ComboBox2 ---
@@ -328,7 +355,7 @@
             Style comboStyle2 = new Style(defaultStyle);
             Rect comboBox2Padding = getAdjustedDensityRect(ctx, 9, 17, 9, 17);
             comboStyle2.addBorder( new IconBorder(comboBox2Padding.top,comboBox2Padding.left,comboBox2Padding.bottom,comboBox2Padding.right,new AndroidIcon(btn_circle),new AndroidIcon(d2)) ,Style.ALL);
-            setForegroundColor(ctx, comboStyle2, android.R.style.Widget_CompoundButton_RadioButton,RadioButton.class); // TODO this is a guess
+            setForegroundColor(ctx, comboStyle2, android.R.style.Widget_CompoundButton_RadioButton,RadioButton.class, allSwingMeStates); // TODO this is a guess
             setStyleFor("ComboBox2",comboStyle2);
         }
 
@@ -602,23 +629,12 @@
         return res;
     }
 
-    static void setForegroundColor(Context ctx, Style style, int defStyle,Class cl) {
-        int[] all = {
-                Style.ALL,
-                Style.DISABLED,
-                Style.DISABLED|Style.FOCUSED,
-                Style.DISABLED|Style.SELECTED,
-                Style.DISABLED|Style.FOCUSED|Style.SELECTED,
-                Style.FOCUSED,
-                Style.SELECTED,
-                Style.FOCUSED|Style.SELECTED,
-        };
-
+    static void setForegroundColor(Context ctx, Style style, int defStyle,Class cl, int[] swingMeStates) {
         ColorStateList clist = getTextColor(ctx, defStyle);
         int defColor = clist.getDefaultColor();
 
-        for (int i = 0; i < all.length; i++) {
-            int swingMeState = all[i];
+        for (int i = 0; i < swingMeStates.length; i++) {
+            int swingMeState = swingMeStates[i];
             int[] stateSet = AndroidBorder.getDrawableState(swingMeState, cl, true);
             int color = clist.getColorForState(stateSet, defColor);
             style.addForeground(color, swingMeState);

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

[Swingme-svn] SF.net SVN: swingme:[2401] SwingME/src/net/yura/mobile/gui/plaf/nimbus/ NimbusLookAndFeel.java

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

Revision: 2401
          http://sourceforge.net/p/swingme/code/2401
Author:   yuranet
Date:     2021-02-24 16:36:58 +0000 (Wed, 24 Feb 2021)
Log Message:
-----------
forground for table

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java

Modified: SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java	2021-02-24 16:13:40 UTC (rev 2400)
+++ SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java	2021-02-24 16:36:58 UTC (rev 2401)
@@ -297,6 +297,9 @@
         setUIDefault("List[disabled].foreground",uiSettings.get("nimbusDisabledText"));
         setUIDefault("List.background", uiSettings.get("nimbusLightBackground") );
 
+        setUIDefault("Table[selected].foreground",uiSettings.get("nimbusSelectedText"));
+        setUIDefault("Table[disabled].foreground",uiSettings.get("nimbusDisabledText"));
+
         componentName = "MenuRenderer";
 
         setUIDefault(componentName+".background", noColor);

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

[Swingme-svn] SF.net SVN: swingme:[2400] SwingME/src/net/yura/mobile/gui

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

Revision: 2400
          http://sourceforge.net/p/swingme/code/2400
Author:   yuranet
Date:     2021-02-24 16:13:40 +0000 (Wed, 24 Feb 2021)
Log Message:
-----------
allow list items to inherit foreground from parent

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java
    SwingME/src/net/yura/mobile/gui/cellrenderer/ListCellRenderer.java
    SwingME/src/net/yura/mobile/gui/components/Component.java
    SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java

Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java	2021-02-24 12:28:13 UTC (rev 2399)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java	2021-02-24 16:13:40 UTC (rev 2400)
@@ -36,9 +36,14 @@
 	/**
          * @see javax.swing.DefaultListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) DefaultListCellRenderer.getListCellRendererComponent
          */
-	public Component getListCellRendererComponent(Component list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+	public Component getListCellRendererComponent(Component listOrTable, Object value, int index, boolean isSelected, boolean cellHasFocus) {
             setValue(value);
-            setupState(list, isSelected, cellHasFocus);
+            setupState(listOrTable, isSelected, cellHasFocus);
+
+            listOrTable.setState(getCurrentState());
+            setForeground(listOrTable.getForeground());
+            listOrTable.setState(-1);
+
             return this;
 	}
 

Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/ListCellRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/ListCellRenderer.java	2021-02-24 12:28:13 UTC (rev 2399)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/ListCellRenderer.java	2021-02-24 16:13:40 UTC (rev 2400)
@@ -34,7 +34,7 @@
      * @return A component whose paint() method will render the specified value
      * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) ListCellRenderer.getListCellRendererComponent
      */
-    Component getListCellRendererComponent(Component list, Object value, int index, boolean isSelected, boolean cellHasFocus);
+    Component getListCellRendererComponent(Component listOrTable, Object value, int index, boolean isSelected, boolean cellHasFocus);
 
     void updateUI();
 

Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java	2021-02-24 12:28:13 UTC (rev 2399)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java	2021-02-24 16:13:40 UTC (rev 2400)
@@ -434,12 +434,14 @@
 
     /**
      * @see java.awt.Component#getForeground() Component.getForeground
+     * @see javax.swing.JList#getSelectionForeground() JList.getSelectionForeground
+     * @see javax.swing.JTable#getSelectionForeground() JTable.getSelectionForeground
      */
     public final int getForeground() {
         if (foreground!=Style.NO_COLOR) {
             return foreground;
         }
-        int f = theme.getForeground( getCurrentState() );
+        int f = theme.getForeground(getCurrentState());
         if (f!=Style.NO_COLOR || parent==null) {
             return f;
         }

Modified: SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java	2021-02-24 12:28:13 UTC (rev 2399)
+++ SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java	2021-02-24 16:13:40 UTC (rev 2400)
@@ -289,12 +289,12 @@
             setUIDefault(componentName+".background", noColor);
             setUIDefault(componentName+".border", tmp1);
             setUIDefault(componentName+"[selected].border",tmp2);
-            setUIDefault(componentName+"[selected].foreground",uiSettings.get("nimbusSelectedText"));
-            setUIDefault(componentName+"[disabled].foreground",uiSettings.get("nimbusDisabledText"));
             setUIDefault(componentName+"[focused].border",tmp3);
             setUIDefault(componentName+"[focused+selected].border",tmp4);
         }
 
+        setUIDefault("List[selected].foreground",uiSettings.get("nimbusSelectedText"));
+        setUIDefault("List[disabled].foreground",uiSettings.get("nimbusDisabledText"));
         setUIDefault("List.background", uiSettings.get("nimbusLightBackground") );
 
         componentName = "MenuRenderer";

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

[Swingme-svn] SF.net SVN: swingme:[2399] AndroidME/src_SwingME_plaf/net/yura/android/ plaf/AndroidLookAndFeel.java

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

Revision: 2399
          http://sourceforge.net/p/swingme/code/2399
Author:   yuranet
Date:     2021-02-24 12:28:13 +0000 (Wed, 24 Feb 2021)
Log Message:
-----------
less magic numbers

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

Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java	2021-02-24 12:14:49 UTC (rev 2398)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java	2021-02-24 12:28:13 UTC (rev 2399)
@@ -84,15 +84,15 @@
         Context ctx = AndroidMeActivity.DEFAULT_ACTIVITY;
 
         TypedArray a2 = ctx.getTheme().obtainStyledAttributes(new int[]{android.R.attr.colorForeground});
-        int colorForeground = a2.getColor(0, 0xFFFF00FF);
+        int colorForeground = a2.getColor(0, Color.MAGENTA);
         a2.recycle();
 
         a2 = ctx.getTheme().obtainStyledAttributes(new int[]{android.R.attr.textColorSecondary});
-        int c2 = a2.getColor(0, 0xFFFF00FF);
+        int c2 = a2.getColor(0, Color.MAGENTA);
         a2.recycle();
 
         a2 = ctx.getTheme().obtainStyledAttributes(new int[]{android.R.attr.textColorTertiary});
-        int c3 = a2.getColor(0, 0xFFFF00FF);
+        int c3 = a2.getColor(0, Color.MAGENTA);
         a2.recycle();
 
 //        ctx.setTheme(android.R.style.Theme_Black);
@@ -594,7 +594,7 @@
         }
 
         if (res == null) {
-            res = ColorStateList.valueOf(0xFFFF00FF);
+            res = ColorStateList.valueOf(Color.MAGENTA);
         }
 
         a.recycle();

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

[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.