You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(54) |
Aug
(33) |
Sep
(27) |
Oct
(10) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(7) |
Feb
(5) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
(25) |
Aug
(41) |
Sep
(89) |
Oct
(99) |
Nov
(161) |
Dec
(85) |
| 2010 |
Jan
(10) |
Feb
(35) |
Mar
(44) |
Apr
(115) |
May
(98) |
Jun
(87) |
Jul
(23) |
Aug
(27) |
Sep
(63) |
Oct
(57) |
Nov
(97) |
Dec
(62) |
| 2011 |
Jan
(67) |
Feb
(83) |
Mar
(43) |
Apr
(14) |
May
(43) |
Jun
(52) |
Jul
(55) |
Aug
(97) |
Sep
(65) |
Oct
(36) |
Nov
(67) |
Dec
(46) |
| 2012 |
Jan
(29) |
Feb
(24) |
Mar
(10) |
Apr
(2) |
May
(10) |
Jun
(34) |
Jul
(31) |
Aug
(9) |
Sep
(10) |
Oct
(10) |
Nov
(6) |
Dec
(7) |
| 2013 |
Jan
(1) |
Feb
(1) |
Mar
(5) |
Apr
(2) |
May
(17) |
Jun
(10) |
Jul
(8) |
Aug
(17) |
Sep
|
Oct
(3) |
Nov
(4) |
Dec
(1) |
| 2014 |
Jan
(2) |
Feb
(8) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
(5) |
Dec
(8) |
| 2015 |
Jan
(1) |
Feb
|
Mar
(4) |
Apr
|
May
(2) |
Jun
(1) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
| 2018 |
Jan
|
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2019 |
Jan
(2) |
Feb
|
Mar
(4) |
Apr
(4) |
May
(2) |
Jun
(1) |
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(4) |
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(1) |
Jun
(6) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2021 |
Jan
|
Feb
(7) |
Mar
(29) |
Apr
(8) |
May
(7) |
Jun
(45) |
Jul
(66) |
Aug
|
Sep
|
Oct
(2) |
Nov
(37) |
Dec
(34) |
| 2022 |
Jan
(15) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(1) |
Dec
(7) |
| 2023 |
Jan
(23) |
Feb
(18) |
Mar
(18) |
Apr
(6) |
May
(10) |
Jun
(7) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2024 |
Jan
(11) |
Feb
(3) |
Mar
|
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
(2) |
Sep
(16) |
Oct
(6) |
Nov
(7) |
Dec
(6) |
| 2025 |
Jan
(8) |
Feb
(3) |
Mar
(7) |
Apr
(5) |
May
(21) |
Jun
(10) |
Jul
(16) |
Aug
(5) |
Sep
(19) |
Oct
(2) |
Nov
|
Dec
|
|
From: <yu...@us...> - 2021-12-15 12:57:14
|
Revision: 2610
http://sourceforge.net/p/swingme/code/2610
Author: yuranet
Date: 2021-12-15 12:57:11 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
each component reports if it needs to respect minimum size
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java
SwingME/src/net/yura/mobile/gui/cellrenderer/MenuItemRenderer.java
SwingME/src/net/yura/mobile/gui/components/Button.java
SwingME/src/net/yura/mobile/gui/components/Camera.java
SwingME/src/net/yura/mobile/gui/components/Component.java
SwingME/src/net/yura/mobile/gui/components/ImageView.java
SwingME/src/net/yura/mobile/gui/components/Label.java
SwingME/src/net/yura/mobile/gui/components/List.java
SwingME/src/net/yura/mobile/gui/components/MenuBar.java
SwingME/src/net/yura/mobile/gui/components/Panel.java
SwingME/src/net/yura/mobile/gui/components/ProgressBar.java
SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
SwingME/src/net/yura/mobile/gui/components/Slider.java
SwingME/src/net/yura/mobile/gui/components/Spinner.java
SwingME/src/net/yura/mobile/gui/components/Table.java
SwingME/src/net/yura/mobile/gui/components/TextComponent.java
SwingME/src/net/yura/mobile/gui/components/TextPane.java
Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/DefaultListCellRenderer.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -33,6 +33,10 @@
setName("ListRenderer");
}
+ protected boolean getDefaultEnabled() {
+ return true;
+ }
+
/**
* @see javax.swing.DefaultListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) DefaultListCellRenderer.getListCellRendererComponent
*/
Modified: SwingME/src/net/yura/mobile/gui/cellrenderer/MenuItemRenderer.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/cellrenderer/MenuItemRenderer.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/cellrenderer/MenuItemRenderer.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -62,6 +62,10 @@
return "MenuRenderer";
}
+ protected boolean getDefaultEnabled() {
+ return true;
+ }
+
//#mdebug debug
public String toString() {
return super.toString()+"["+component+"]";
Modified: SwingME/src/net/yura/mobile/gui/components/Button.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Button.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/Button.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -82,7 +82,6 @@
*/
public Button(String label) {
super(label);
- focusable = true;
setHorizontalAlignment(Graphics.HCENTER);
}
@@ -96,6 +95,14 @@
setIcon(img);
}
+ public String getDefaultName() {
+ return "Button";
+ }
+
+ protected boolean getDefaultEnabled() {
+ return true;
+ }
+
public boolean isVisible() {
if ( mneonic == KeyEvent.KEY_SOFTKEY1 ||
@@ -375,10 +382,6 @@
this.useSelectButton = useSelectButton;
}
- public String getDefaultName() {
- return "Button";
- }
-
protected int getState() {
int result = super.getState();
if (selected) {
Modified: SwingME/src/net/yura/mobile/gui/components/Camera.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Camera.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/Camera.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -69,12 +69,16 @@
private boolean seBug = true;
public Camera() {
-
//#debug debug
Logger.debug("CameraPanel() constructor");
+ }
- focusable = true;
+ protected boolean getDefaultEnabled() {
+ return true;
+ }
+ public void updateUI() {
+ super.updateUI();
font = theme.getFont(Style.ALL);
}
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -74,8 +74,8 @@
* @see javax.swing.JComponent#JComponent() JComponent.JComponent
*/
public Component() {
- focusable = true;
visible = true;
+ focusable = getDefaultEnabled();
updateUI();
}
@@ -190,6 +190,12 @@
protected abstract String getDefaultName();
/**
+ * as this property will never change for a given component, we avoid adding extra state by making it a method
+ * @return true if this component receives touch events by default and so needs to respect the OS minimum touch size
+ */
+ protected abstract boolean getDefaultEnabled();
+
+ /**
* @see java.awt.Component#isFocusOwner() Component.isFocusOwner
*/
public boolean isFocusOwner() {
@@ -584,7 +590,7 @@
workoutMinimumSize();
//}
- if ((getCurrentState() & Style.DISABLED) == 0) {
+ if (getDefaultEnabled()) {
int minimumTouchTarget = getDesktopPane().minimumTouchTarget;
Border insets = getInsets();
if (getWidthWithBorder() < minimumTouchTarget) {
Modified: SwingME/src/net/yura/mobile/gui/components/ImageView.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ImageView.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/ImageView.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -20,9 +20,11 @@
// private int[] py;
public ImageView() {
- focusable = false;
}
+ protected boolean getDefaultEnabled() {
+ return false;
+ }
public void setBackgroundImage(Icon backgroundImage) {
this.bgImage = backgroundImage;
Modified: SwingME/src/net/yura/mobile/gui/components/Label.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Label.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/Label.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -55,9 +55,6 @@
* @see javax.swing.JLabel#JLabel(java.lang.String) JLabel.JLabel
*/
public Label(String text) {
-
- focusable = false;
-
// swing will set a empty string as the value if you pass in null to the constructor
// but if u call setText(null) then the text will be null, (getText() will return null)
// but it will still display as a empty string)
@@ -67,9 +64,12 @@
alignment = Graphics.VCENTER | Graphics.LEFT;
textPosition = Graphics.VCENTER | Graphics.RIGHT;
-
}
+ protected boolean getDefaultEnabled() {
+ return false;
+ }
+
/**
* @param icon The image to be displayed by the label
* @see javax.swing.JLabel#JLabel(javax.swing.Icon) JLabel.JLabel
Modified: SwingME/src/net/yura/mobile/gui/components/List.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/List.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/List.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -113,6 +113,10 @@
setSelectedIndex(-1);
}
+ protected boolean getDefaultEnabled() {
+ return true;
+ }
+
/**
* @param a
* @see javax.swing.JList#setListData(java.util.Vector) JList.setListData
Modified: SwingME/src/net/yura/mobile/gui/components/MenuBar.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/MenuBar.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/MenuBar.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -36,13 +36,28 @@
MenuBar owner;
+ /**
+ * {@link #focusable} is automatically updated in {@link #workoutMinimumSize()}
+ */
public MenuBar() {
setLayoutOrientation(List.HORIZONTAL);
setCellRenderer( new MenuItemRenderer() );
setActionCommand("activate");
addActionListener(this);
+ // ignore getDefaultEnabled value
+ focusable = true;
}
+ public String getDefaultName() {
+ return "MenuBar";
+ }
+
+ protected boolean getDefaultEnabled() {
+ // we do not have a default, as sometimes we have buttons and someone we don't and want to shrink to nothing
+ // when we do have buttons we will get the minimum size from them
+ return false;
+ }
+
public boolean processKeyEvent(KeyEvent keyEvent) {
if (getLayoutOrientation()==List.VERTICAL && getSelectedValue() instanceof Menu && keyEvent.justPressedAction(Canvas.RIGHT)) {
fireActionPerformed();
@@ -61,10 +76,6 @@
return super.isVisible();
}
- public String getDefaultName() {
- return "MenuBar";
- }
-
/**
* @see Panel#add(net.yura.mobile.gui.components.Component)
* @see java.awt.Container#add(java.awt.Component) Container.add
Modified: SwingME/src/net/yura/mobile/gui/components/Panel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Panel.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/Panel.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -47,7 +47,6 @@
public Panel() {
components = new Vector();
constraints = new Hashtable(1);
- focusable = false;
if (defaultLayout==null) {
defaultLayout = new FlowLayout();
@@ -57,6 +56,10 @@
// this is true as u need to select a panel to get to 1 of its components
}
+ protected boolean getDefaultEnabled() {
+ return false;
+ }
+
/**
* @param n the LayoutManager to use
* @see javax.swing.JPanel#JPanel(java.awt.LayoutManager) JPanel.JPanel
@@ -199,7 +202,7 @@
protected void workoutMinimumSize() {
for(int i = 0; i < components.size(); i++) {
- Component component = (Component)components.elementAt(i);
+ Component component = (Component)components.elementAt(i);
if (component.isVisible()) {
component.workoutPreferredSize();
}
Modified: SwingME/src/net/yura/mobile/gui/components/ProgressBar.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ProgressBar.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/ProgressBar.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -40,8 +40,6 @@
* @see javax.swing.JProgressBar#JProgressBar() JProgressBar.JProgressBar
*/
public ProgressBar() {
- focusable = false;
-
// set the default value to 100, but only if it has not been already set by the theme (super constructor -> updateUI)
if (loaded == 0) {
loaded = 100;
@@ -53,6 +51,10 @@
setSprite(sp);
}
+ protected boolean getDefaultEnabled() {
+ return false;
+ }
+
public void setSprite(Sprite sp) {
sprite = sp;
loaded = sprite.getFrameSequenceLength()-1;
Modified: SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/ScrollPane.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -71,7 +71,6 @@
slider = new Slider();
slider.setName("ScrollBar");
- slider.setFocusable(false);
setMode(m);
}
@@ -343,7 +342,7 @@
protected void workoutMinimumSize() {
- slider.workoutPreferredSize();
+ slider.workoutMinimumSize();
switch (mode) {
case MODE_SCROLLBARS: barThickness = getBarThickness(); break;
Modified: SwingME/src/net/yura/mobile/gui/components/Slider.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Slider.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/Slider.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -71,6 +71,10 @@
tickSpace = font.getHeight()/2;
}
+ protected boolean getDefaultEnabled() {
+ return true;
+ }
+
/**
* @see javax.swing.JSlider#addChangeListener(javax.swing.event.ChangeListener) JSlider.addChangeListener
*/
Modified: SwingME/src/net/yura/mobile/gui/components/Spinner.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Spinner.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/Spinner.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -67,7 +67,6 @@
*/
public Spinner(Vector vec, boolean cont) {
super((String)null);
- focusable = true;
setHorizontalAlignment(Graphics.HCENTER);
continuous = cont;
@@ -79,6 +78,10 @@
}
}
+ protected boolean getDefaultEnabled() {
+ return true;
+ }
+
/**
* @see javax.swing.JSpinner#addChangeListener(javax.swing.event.ChangeListener) JSpinner.addChangeListener
*/
Modified: SwingME/src/net/yura/mobile/gui/components/Table.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Table.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/Table.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -84,9 +84,6 @@
renderers = new Hashtable();
editors = new Hashtable();
- // should ALWAYS be selectable to that pointer event can give it focus
- focusable = true;
-
// default renderer
setDefaultRenderer(Object.class, new DefaultListCellRenderer());
setDefaultEditor(Object.class, new DefaultCellEditor( new TextField() ));
@@ -98,6 +95,11 @@
return "Table";
}
+ protected boolean getDefaultEnabled() {
+ // should ALWAYS be selectable to that pointer event can give it focus
+ return true;
+ }
+
/**
* @see javax.swing.JTable#JTable(java.util.Vector, java.util.Vector) JTable.JTable
*/
@@ -117,7 +119,6 @@
if (!done) {
super.breakOutAction(component, direction, scrolltothere,forceFocus);
}
-
}
private boolean moveSelection(int d) {
@@ -156,7 +157,6 @@
}
return false;
-
}
public void processMouseEvent(int type, int x, int y, KeyEvent keys) {
@@ -209,9 +209,7 @@
setSelectedCell(currentRow,currentCol);
}
}
-
}
-
}
/**
@@ -372,9 +370,7 @@
// this NEEDS to be after requestFocusInWindow, or focus will go somewhere else
removeAll();
-
}
-
}
public void paintComponent(Graphics2D g) {
@@ -448,7 +444,6 @@
Component comp = renderer.getListCellRendererComponent(this, object, (r*getColumnCount())+c, sel ,sel && isFocusOwner() );
return comp;
-
}
protected void workoutMinimumSize() {
@@ -551,7 +546,6 @@
if (renderer==null) renderer = (ListCellRenderer)renderers.get(Object.class);
return renderer;
-
}
public String getToolTipText() {
@@ -657,7 +651,6 @@
// else {
// return getDesktopPane().getWidth() /getColumnCount();
// }
-
}
/**
@@ -762,5 +755,4 @@
return dataVector.size();
}
-
}
Modified: SwingME/src/net/yura/mobile/gui/components/TextComponent.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextComponent.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/TextComponent.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -125,6 +125,10 @@
setText(initialText);
}
+ protected boolean getDefaultEnabled() {
+ return true;
+ }
+
/**
* @see Label#getMargin()
* @see javax.swing.text.JTextComponent#getMargin() JTextComponent.getMargin
Modified: SwingME/src/net/yura/mobile/gui/components/TextPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextPane.java 2021-12-10 16:56:38 UTC (rev 2609)
+++ SwingME/src/net/yura/mobile/gui/components/TextPane.java 2021-12-15 12:57:11 UTC (rev 2610)
@@ -48,6 +48,10 @@
return "TextPane";
}
+ protected boolean getDefaultEnabled() {
+ return true;
+ }
+
// Overwrites Component.paintComponent()
public void paintComponent(Graphics2D g) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-10 16:56:40
|
Revision: 2609
http://sourceforge.net/p/swingme/code/2609
Author: yuranet
Date: 2021-12-10 16:56:38 +0000 (Fri, 10 Dec 2021)
Log Message:
-----------
swingME pack works on retina
Modified Paths:
--------------
me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java
me4se/src/javax/microedition/midlet/ApplicationManager.java
me4se/src/org/me4se/scm/ScmWrapper.java
Modified: me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java
===================================================================
--- me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java 2021-12-08 00:23:52 UTC (rev 2608)
+++ me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java 2021-12-10 16:56:38 UTC (rev 2609)
@@ -158,17 +158,21 @@
Dimension d = super.getPreferredSize();
if (swingMEFrame!=null) {
- Dimension a = new Dimension( swingMEFrame.getWidth(), swingMEFrame.getHeight());
+ Dimension originalSize = new Dimension( swingMEFrame.getWidth(), swingMEFrame.getHeight());
swingMEFrame.pack(); // TODO: does this really set the height right away to the min???
- Dimension b = new Dimension( swingMEFrame.getWidth(), swingMEFrame.getHeight());
+ Dimension packedSize = new Dimension(swingSizeFromj2MESize(swingMEFrame.getWidth()), swingSizeFromj2MESize(swingMEFrame.getHeight()));
//System.out.println("d="+d);
- swingMEFrame.setSize(a.width, a.height);
- return b;
+ swingMEFrame.setSize(originalSize.width, originalSize.height);
+ return packedSize;
}
return d;
}
+ public int swingSizeFromj2MESize(int size) {
+ return (int)(size * manager.wrapper.scale);
+ }
+
public Dimension getPreferredSize() {
Dimension d = super.getPreferredSize();
if (d==null || d.width == 0 || d.height == 0) {
Modified: me4se/src/javax/microedition/midlet/ApplicationManager.java
===================================================================
--- me4se/src/javax/microedition/midlet/ApplicationManager.java 2021-12-08 00:23:52 UTC (rev 2608)
+++ me4se/src/javax/microedition/midlet/ApplicationManager.java 2021-12-10 16:56:38 UTC (rev 2609)
@@ -1364,7 +1364,7 @@
/**
* tells us how many pixels actually go into 1 pixel in swing
- * this is used by apple for retina screens.
+ * this is used by apple for retina screens and new versions of Java on all OSs.
*/
public static double getScale() {
Modified: me4se/src/org/me4se/scm/ScmWrapper.java
===================================================================
--- me4se/src/org/me4se/scm/ScmWrapper.java 2021-12-08 00:23:52 UTC (rev 2608)
+++ me4se/src/org/me4se/scm/ScmWrapper.java 2021-12-10 16:56:38 UTC (rev 2609)
@@ -30,7 +30,7 @@
int pressedY = -1;
- float scale = 1;
+ public float scale = 1;
/** Currently pressed key, used for keyRepeated events */
String pressing;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-08 00:23:54
|
Revision: 2608
http://sourceforge.net/p/swingme/code/2608
Author: yuranet
Date: 2021-12-08 00:23:52 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
draw with filter works much better
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Graphics.java
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java 2021-12-04 14:23:30 UTC (rev 2607)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java 2021-12-08 00:23:52 UTC (rev 2608)
@@ -4,6 +4,7 @@
import apple.coregraphics.opaque.CGColorRef;
import apple.coregraphics.opaque.CGContextRef;
import apple.coregraphics.opaque.CGFontRef;
+import apple.coregraphics.opaque.CGImageRef;
import apple.coregraphics.struct.CGAffineTransform;
import apple.coregraphics.struct.CGPoint;
import apple.coregraphics.struct.CGRect;
@@ -418,6 +419,14 @@
}
}
+ /**
+ * https://stackoverflow.com/questions/40031499/call-to-cicontext-fromoptions-crashes-in-ios
+ *
+ * Call cicontext = CIContext.FromOptions(null) just once and hold on to the return value, either as a member variable or a static variable.
+ * After calling CreateCGImage call cicontext.ClearCaches(). If this is not done, you will eventually run out of memory.
+ */
+ static CIContext ciContext = CIContext.context();
+
public void drawInRect(UIImage uiImageToDraw, int x, int y, int width, int height, CIFilter filter) {
CGRect inRect = getDestRect(x, y, width, height);
@@ -433,18 +442,36 @@
// not sure whats difference between imageByApplyingOrientation and imageByApplyingCGOrientation
output = output.imageByApplyingOrientation(CGImagePropertyOrientation.DownMirrored);
+ // this does nothing as this CIImage was not created from a CGImage
+ //CoreGraphics.CGContextDrawImage(context, inRect, output.CGImage());
+
+ // this has bad performance and crashes after a while
+ //CIContext c = CIContext.contextWithCGContextOptions(context, null); // crash on this line when image is being drawn?!?!
+ //c.drawImageInRectFromRect(output, inRect, output.extent()); // maybe this just calls createCGImage.. anyway, so not actually any better
+ //c.clearCaches();
+
+ // also crashes
//CGImageRef cgImage = CIContext.alloc().init().createCGImageFromRect(output, output.extent());
//CoreGraphics.CGContextDrawImage(context, inRect, cgImage);
+ //CoreGraphics.CGImageRelease(cgImage);
- CIContext c = CIContext.contextWithCGContextOptions(context, null); // crash on this line when image is being drawn?!?!
-// the image may be being drawn deep in apple famework,
-// 0 libsystem_platform.dylib 0x00000001cc0dc6a8 _platform_memmove + 168
-// 1 CoreGraphics 0x0000000181ed4394 CGSImageDataLock + 152
-// 2 CoreGraphics 0x0000000181cf32bc ripc_AcquireRIPImageData + 716
-// 3 CoreGraphics 0x0000000181ef525c ripc_DrawImage + 1152
+ // also crashes
+ //CGImageRef cgImage = CIContext.context().createCGImageFromRectFormatColorSpaceDeferred(output, output.extent(), CoreImage.kCIFormatARGB8(), CoreGraphics.CGColorSpaceCreateDeviceRGB(), true);
+ //CoreGraphics.CGContextDrawImage(context, inRect, cgImage);
+ //CoreGraphics.CGImageRelease(cgImage);
- c.drawImageInRectFromRect(output, inRect, output.extent());
+ // WORKS! but has bad performance
+ //CGImageRef cgImage = ciContext.createCGImageFromRectFormatColorSpaceDeferred(output, output.extent(), CoreImage.kCIFormatARGB8(), CoreGraphics.CGColorSpaceCreateDeviceRGB(), true);
+ //CoreGraphics.CGContextDrawImage(context, inRect, cgImage);
+ //CoreGraphics.CGImageRelease(cgImage);
+ //ciContext.clearCaches();
+ // WORKS! and has decent performance
+ CGImageRef cgImage = ciContext.createCGImageFromRect(output, output.extent());
+ CoreGraphics.CGContextDrawImage(context, inRect, cgImage);
+ CoreGraphics.CGImageRelease(cgImage);
+ ciContext.clearCaches();
+
// for strange reason filter.setNilValueForKey(CoreImage.kCIInputImageKey()); does not work, but this does
filter.setValueForKey(null, CoreImage.kCIInputImageKey());
}
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-12-04 14:23:30 UTC (rev 2607)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-12-08 00:23:52 UTC (rev 2608)
@@ -73,6 +73,9 @@
if (img.size().width() % 1 != 0 || img.size().height() % 1 != 0) {
System.out.println("WARN strange image size " + resource + " " + UIKit.NSStringFromCGSize(img.size()));
}
+ if (img.scale() % 1 != 0) {
+ System.err.println("ERROR unexpected scale " + resource + " " + img.scale());
+ }
if (resource.endsWith(".9.png") && img.scale() != 1.0) {
img = grow9patch(img);
@@ -341,7 +344,14 @@
// as we always created UIImages from java, only java holds the referances to the objects
// so when we release them in java (through GC), they will also get released in iOS
// https://www.noisyfox.io/natj-memory-management.html
+
+ // this sometimes causes crashes
+ //System.out.println("ref count " + this + " " + CoreFoundation.CFGetRetainCount(uiImage.CGImage()));
+
uiImage = null;
+
+ // we want to clear the uiImage from the apple side too so we avoid the copy-on-write being called
+ //System.gc();
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-04 14:23:33
|
Revision: 2607
http://sourceforge.net/p/swingme/code/2607
Author: yuranet
Date: 2021-12-04 14:23:30 +0000 (Sat, 04 Dec 2021)
Log Message:
-----------
got rid of useless javadoc
Modified Paths:
--------------
ToolsME/src/net/yura/tools/mobilegen/BaseGen.java
ToolsME/src/net/yura/tools/mobilegen/MobileProtoGen.java
Modified: ToolsME/src/net/yura/tools/mobilegen/BaseGen.java
===================================================================
--- ToolsME/src/net/yura/tools/mobilegen/BaseGen.java 2021-12-03 20:11:13 UTC (rev 2606)
+++ ToolsME/src/net/yura/tools/mobilegen/BaseGen.java 2021-12-04 14:23:30 UTC (rev 2607)
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package net.yura.tools.mobilegen;
import java.io.File;
@@ -18,7 +14,6 @@
import org.apache.tools.ant.Task;
/**
- *
* @author BMA
*/
public abstract class BaseGen extends Task {
@@ -90,13 +85,9 @@
Collections.sort(list2, new ClassComparator());
return list2;
}
-
- /**
+
+ /*
* Load classes from a white space delimited file
- *
- * @param fileName
- * @return
- * @throws Exception
*/
public static Collection<MyClass> loadClassesFromFileRaw(String fileName) throws Exception {
LineNumberReader reader = new LineNumberReader(new FileReader(fileName));
Modified: ToolsME/src/net/yura/tools/mobilegen/MobileProtoGen.java
===================================================================
--- ToolsME/src/net/yura/tools/mobilegen/MobileProtoGen.java 2021-12-03 20:11:13 UTC (rev 2606)
+++ ToolsME/src/net/yura/tools/mobilegen/MobileProtoGen.java 2021-12-04 14:23:30 UTC (rev 2607)
@@ -883,7 +883,7 @@
- /**
+ /*
* @see MigwClient#unCamel(GeneratedMessage)
*/
public static String unCamel(String gm) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-03 20:11:20
|
Revision: 2606
http://sourceforge.net/p/swingme/code/2606
Author: yuranet
Date: 2021-12-03 20:11:13 +0000 (Fri, 03 Dec 2021)
Log Message:
-----------
theme fix for line wrapped optionpane
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/OptionPane.java
Modified: SwingME/src/net/yura/mobile/gui/components/OptionPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2021-12-03 19:04:40 UTC (rev 2605)
+++ SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2021-12-03 20:11:13 UTC (rev 2606)
@@ -258,6 +258,7 @@
TextArea tmp2 = new TextArea(); // TODO change to TextPane and centered text
tmp2.setLineWrap(true);
tmp2.setFocusable(false);
+ tmp2.setName(tmp.getName()); // theme it as if it was a label
tmp2.setText(txt);
Border taInsets = tmp2.getInsets();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-03 19:04:42
|
Revision: 2605
http://sourceforge.net/p/swingme/code/2605
Author: yuranet
Date: 2021-12-03 19:04:40 +0000 (Fri, 03 Dec 2021)
Log Message:
-----------
cache font baseline
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Font.java
Modified: iOSME/src/javax/microedition/lcdui/Font.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Font.java 2021-12-03 19:01:13 UTC (rev 2604)
+++ iOSME/src/javax/microedition/lcdui/Font.java 2021-12-03 19:04:40 UTC (rev 2605)
@@ -177,7 +177,7 @@
public int getBaselinePosition() {
if (baselinePosition == -1) {
- return - (int)font.ascender();
+ baselinePosition = - (int)font.ascender();
}
return baselinePosition;
}
@@ -187,16 +187,17 @@
}
public int charsWidth(char[] ch, int offset, int length) {
- if (ch == null) {
- throw new NullPointerException();
- }
+ if (ch == null) {
+ throw new NullPointerException();
+ }
+
return stringWidth(new String(ch, offset, length));
}
public int stringWidth(String str) {
- if (str == null) {
- throw new NullPointerException();
- }
+ if (str == null) {
+ throw new NullPointerException();
+ }
NSString string = NSString.stringWithString(str);
CGSize size = string.sizeWithAttributes(getAsNSDictionary());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-03 19:01:15
|
Revision: 2604
http://sourceforge.net/p/swingme/code/2604
Author: yuranet
Date: 2021-12-03 19:01:13 +0000 (Fri, 03 Dec 2021)
Log Message:
-----------
cache font height
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Font.java
Modified: iOSME/src/javax/microedition/lcdui/Font.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Font.java 2021-12-03 18:40:10 UTC (rev 2603)
+++ iOSME/src/javax/microedition/lcdui/Font.java 2021-12-03 19:01:13 UTC (rev 2604)
@@ -170,7 +170,7 @@
public int getHeight() {
if (height == -1) {
- return (int)font.lineHeight();
+ height = (int)font.lineHeight();
}
return height;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-03 18:40:13
|
Revision: 2603
http://sourceforge.net/p/swingme/code/2603
Author: yuranet
Date: 2021-12-03 18:40:10 +0000 (Fri, 03 Dec 2021)
Log Message:
-----------
offset by 0.5 fix
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Graphics.java
Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java 2021-12-03 18:22:46 UTC (rev 2602)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java 2021-12-03 18:40:10 UTC (rev 2603)
@@ -194,15 +194,18 @@
return new CGRect(new CGPoint(tx + x, ty + y), new CGSize(width, height));
}
+ private CGRect getDrawRect(int x, int y, int width, int height) {
+ return new CGRect(new CGPoint(tx + x + 0.5, ty + y + 0.5), new CGSize(width, height));
+ }
+
public void drawRect(int x, int y, int width, int height) {
- CGRect rectangle = getDestRect(x, y, width, height);
+ CGRect rectangle = getDrawRect(x, y, width, height);
CoreGraphics.CGContextAddRect(context, rectangle);
CoreGraphics.CGContextStrokePath(context);
}
public void drawRoundRect(int x, int y, int width, int height, int rx, int ry) {
- CGRect rectangle = new CGRect(new CGPoint(tx + x + 0.5, ty + y + 0.5), new CGSize(width, height));
- //CGRect rectangle = getDestRect(x, y, width, height);
+ CGRect rectangle = getDrawRect(x, y, width, height);
UIBezierPath bezierPath = UIBezierPath.bezierPathWithRoundedRectByRoundingCornersCornerRadii(rectangle, UIRectCorner.AllCorners, new CGSize(rx, ry));
CoreGraphics.CGContextAddPath(context, bezierPath.CGPath());
CoreGraphics.CGContextStrokePath(context);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-03 18:22:49
|
Revision: 2602
http://sourceforge.net/p/swingme/code/2602
Author: yuranet
Date: 2021-12-03 18:22:46 +0000 (Fri, 03 Dec 2021)
Log Message:
-----------
arcs work correctly
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Graphics.java
Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java 2021-12-03 17:33:57 UTC (rev 2601)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java 2021-12-03 18:22:46 UTC (rev 2602)
@@ -201,7 +201,8 @@
}
public void drawRoundRect(int x, int y, int width, int height, int rx, int ry) {
- CGRect rectangle = getDestRect(x, y, width, height);
+ CGRect rectangle = new CGRect(new CGPoint(tx + x + 0.5, ty + y + 0.5), new CGSize(width, height));
+ //CGRect rectangle = getDestRect(x, y, width, height);
UIBezierPath bezierPath = UIBezierPath.bezierPathWithRoundedRectByRoundingCornersCornerRadii(rectangle, UIRectCorner.AllCorners, new CGSize(rx, ry));
CoreGraphics.CGContextAddPath(context, bezierPath.CGPath());
CoreGraphics.CGContextStrokePath(context);
@@ -221,37 +222,43 @@
}
public void drawArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
- CGPoint center = new CGPoint(tx + x + width / 2, ty + y + height / 2);
+ if (arcAngle < 360) {
+ CoreGraphics.CGContextSaveGState(context);
+ clipToCircle(x, y, width, height, startAngle, arcAngle);
+ }
- CoreGraphics.CGContextSaveGState(context);
-
- UIBezierPath clip = UIBezierPath.bezierPathWithArcCenterRadiusStartAngleEndAngleClockwise(center, Math.max(width / 2, height/ 2), startAngle, arcAngle, true);
- clip.addLineToPoint(center);
- clip.closePath();
- clip.addClip();
-
- UIBezierPath bezierPath = UIBezierPath.bezierPathWithOvalInRect(getDestRect(x, y, width, height));
- CoreGraphics.CGContextAddPath(context, bezierPath.CGPath());
+ UIBezierPath ovalPath = UIBezierPath.bezierPathWithOvalInRect(getDestRect(x, y, width, height));
+ CoreGraphics.CGContextAddPath(context, ovalPath.CGPath());
CoreGraphics.CGContextStrokePath(context);
- CoreGraphics.CGContextRestoreGState(context);
+ if (arcAngle < 360) {
+ CoreGraphics.CGContextRestoreGState(context);
+ }
}
public void fillArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
- CGPoint center = new CGPoint(tx + x + width / 2, ty + y + height / 2);
+ if (arcAngle < 360) {
+ CoreGraphics.CGContextSaveGState(context);
+ clipToCircle(x, y, width, height, startAngle, arcAngle);
+ }
- CoreGraphics.CGContextSaveGState(context);
+ UIBezierPath ovalPath = UIBezierPath.bezierPathWithOvalInRect(getDestRect(x, y, width, height));
+ CoreGraphics.CGContextAddPath(context, ovalPath.CGPath());
+ CoreGraphics.CGContextFillPath(context);
- UIBezierPath clip = UIBezierPath.bezierPathWithArcCenterRadiusStartAngleEndAngleClockwise(center, Math.max(width / 2, height/ 2), startAngle, arcAngle, true);
+ if (arcAngle < 360) {
+ CoreGraphics.CGContextRestoreGState(context);
+ }
+ }
+
+ private void clipToCircle(int x, int y, int width, int height, int startAngle, int arcAngle) {
+ CGPoint center = new CGPoint(tx + x + width / 2D, ty + y + height / 2D);
+ UIBezierPath clip = UIBezierPath.bezierPathWithArcCenterRadiusStartAngleEndAngleClockwise(center, Math.max(width / 2D, height / 2D), Math.toRadians(-startAngle), Math.toRadians(-startAngle - arcAngle), false);
clip.addLineToPoint(center);
clip.closePath();
- clip.addClip();
-
- UIBezierPath bezierPath = UIBezierPath.bezierPathWithOvalInRect(getDestRect(x, y, width, height));
- CoreGraphics.CGContextAddPath(context, bezierPath.CGPath());
- CoreGraphics.CGContextFillPath(context);
-
- CoreGraphics.CGContextRestoreGState(context);
+ //clip.addClip(); // for some reason this does not work, maybe wrong context
+ CoreGraphics.CGContextAddPath(context, clip.CGPath());
+ CoreGraphics.CGContextClip(context);
}
public void fillTriangle(int x1, int y1, int x2, int y2, int x3, int y3) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-03 17:34:00
|
Revision: 2601
http://sourceforge.net/p/swingme/code/2601
Author: yuranet
Date: 2021-12-03 17:33:57 +0000 (Fri, 03 Dec 2021)
Log Message:
-----------
another method to save jpeg added
Modified Paths:
--------------
me4se/opt/m3g_basic/src/javax/microedition/amms/AwtJpegEncoder.java
Modified: me4se/opt/m3g_basic/src/javax/microedition/amms/AwtJpegEncoder.java
===================================================================
--- me4se/opt/m3g_basic/src/javax/microedition/amms/AwtJpegEncoder.java 2021-12-03 16:15:55 UTC (rev 2600)
+++ me4se/opt/m3g_basic/src/javax/microedition/amms/AwtJpegEncoder.java 2021-12-03 17:33:57 UTC (rev 2601)
@@ -16,33 +16,65 @@
public void complete() throws javax.microedition.media.MediaException {
String imageIOformat = format.substring( "image/".length() );
+ Throwable error;
try {
- if (!javax.imageio.ImageIO.write(image._image, imageIOformat, outputStream) ) {
- throw new Exception("ImageIO.write return false");
- }
+ if (!javax.imageio.ImageIO.write(image._image, imageIOformat, outputStream) ) {
+ throw new Exception("ImageIO.write return false");
+ }
+
+ return; // yay, everything worked!
}
catch(Throwable th) {
+ System.out.println("could not save1 " + th);
+ error = th;
+ }
+
+ if ("jpg".equalsIgnoreCase(imageIOformat) || "jpeg".equalsIgnoreCase(imageIOformat)) {
- if ("jpeg".equals(imageIOformat) || "jpg".equals(imageIOformat)) {
+ BufferedImage img = image._image;
+ if (img.getType() == BufferedImage.TYPE_INT_ARGB || img.getType() == BufferedImage.TYPE_4BYTE_ABGR) {
+
try {
- System.out.println("failed to save with ImageIO, falling back to com.sun.image.codec.jpeg");
- BufferedImage img = image._image;
- com.sun.image.codec.jpeg.JPEGImageEncoder encoder = com.sun.image.codec.jpeg.JPEGCodec.createJPEGEncoder(outputStream);
- com.sun.image.codec.jpeg.JPEGEncodeParam param = encoder.getDefaultJPEGEncodeParam(img);
- param.setQuality( 0.5f, false);
- encoder.setJPEGEncodeParam(param);
- encoder.encode(img);
- outputStream.close();
+ System.out.println("failed to save with ImageIO, will try TYPE_3BYTE_BGR image type");
+ // there is some bug in openJDK that does not allow saving images with alpha as JPEGs
+ // https://stackoverflow.com/a/17845696
+ BufferedImage newImg = new BufferedImage(img.getWidth(), img.getHeight(), BufferedImage.TYPE_3BYTE_BGR);
+ newImg.getGraphics().drawImage(img, 0, 0, null);
+
+ if (!javax.imageio.ImageIO.write(newImg, imageIOformat, outputStream) ) {
+ throw new Exception("ImageIO.write return false");
+ }
+
return; // yay, everything worked!
}
- catch (Throwable ex) { } // anything really can go wrong here, but we do not really care
+ catch (Throwable th) {
+ System.out.println("could not save2 " + th);
+ error = th;
+ }
}
- javax.microedition.media.MediaException mex = new javax.microedition.media.MediaException();
- mex.initCause(th);
- throw mex;
+ try {
+ System.out.println("failed to save with ImageIO, falling back to com.sun.image.codec.jpeg");
+ com.sun.image.codec.jpeg.JPEGImageEncoder encoder = com.sun.image.codec.jpeg.JPEGCodec.createJPEGEncoder(outputStream);
+ com.sun.image.codec.jpeg.JPEGEncodeParam param = encoder.getDefaultJPEGEncodeParam(img);
+ param.setQuality(0.5f, false);
+ encoder.setJPEGEncodeParam(param);
+ encoder.encode(img);
+ outputStream.close();
+
+ return; // yay, everything worked!
+ }
+ catch (Throwable th) {
+ System.out.println("could not save3 " + th);
+ // anything really can go wrong here, but we do not really care
+ }
}
+
+ // all methods to save have failed, throw an error
+ javax.microedition.media.MediaException mex = new javax.microedition.media.MediaException();
+ mex.initCause(error);
+ throw mex;
}
public void setInput(Object inputStream) {
@@ -64,5 +96,4 @@
public void setFormat(String string) {
format = string;
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-03 16:15:58
|
Revision: 2600
http://sourceforge.net/p/swingme/code/2600
Author: yuranet
Date: 2021-12-03 16:15:55 +0000 (Fri, 03 Dec 2021)
Log Message:
-----------
underline also works
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Font.java
iOSME/src/javax/microedition/lcdui/Graphics.java
Modified: iOSME/src/javax/microedition/lcdui/Font.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Font.java 2021-12-03 15:31:29 UTC (rev 2599)
+++ iOSME/src/javax/microedition/lcdui/Font.java 2021-12-03 16:15:55 UTC (rev 2600)
@@ -117,7 +117,6 @@
font = UIFont.systemFontOfSizeWeight(fontSize, weight);
}
}
- // TODO add support for underline
}
public static Font getDefaultFont() {
Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java 2021-12-03 15:31:29 UTC (rev 2599)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java 2021-12-03 16:15:55 UTC (rev 2600)
@@ -13,6 +13,7 @@
import apple.coreimage.CIImage;
import apple.coreimage.c.CoreImage;
import apple.foundation.NSMutableDictionary;
+import apple.foundation.NSNumber;
import apple.foundation.NSString;
import apple.imageio.enums.CGImagePropertyOrientation;
import apple.uikit.UIBezierPath;
@@ -19,6 +20,7 @@
import apple.uikit.UIColor;
import apple.uikit.UIImage;
import apple.uikit.c.UIKit;
+import apple.uikit.enums.NSUnderlineStyle;
import apple.uikit.enums.UIImageOrientation;
import apple.uikit.enums.UIRectCorner;
import javax.microedition.lcdui.game.Sprite;
@@ -303,6 +305,10 @@
NSMutableDictionary attributes = NSMutableDictionary.dictionaryWithCapacity(2);
attributes.put(UIKit.NSFontAttributeName(), font.font);
attributes.put(UIKit.NSForegroundColorAttributeName(), color);
+ if (font.isUnderlined()) {
+ // we have to use NSNumber here or this does not work
+ attributes.put(UIKit.NSUnderlineStyleAttributeName(), NSNumber.numberWithInteger(NSUnderlineStyle.Single));
+ }
NSString string = NSString.stringWithString(str);
boolean same = isCurrentContext();
@@ -386,6 +392,7 @@
// we get the image first, this may close a current bitmap context
UIImage uiImageToDraw = image.getUIImage();
+ // telling CoreGraphics to draw the image will add it to a CGDisplayList for the CGLayer, so the RetainCount will go up by 1
drawInRect(uiImageToDraw, ax, ay, image.getWidth(), image.getHeight());
}
@@ -419,7 +426,13 @@
//CGImageRef cgImage = CIContext.alloc().init().createCGImageFromRect(output, output.extent());
//CoreGraphics.CGContextDrawImage(context, inRect, cgImage);
- CIContext c = CIContext.contextWithCGContextOptions(context, null);
+ CIContext c = CIContext.contextWithCGContextOptions(context, null); // crash on this line when image is being drawn?!?!
+// the image may be being drawn deep in apple famework,
+// 0 libsystem_platform.dylib 0x00000001cc0dc6a8 _platform_memmove + 168
+// 1 CoreGraphics 0x0000000181ed4394 CGSImageDataLock + 152
+// 2 CoreGraphics 0x0000000181cf32bc ripc_AcquireRIPImageData + 716
+// 3 CoreGraphics 0x0000000181ef525c ripc_DrawImage + 1152
+
c.drawImageInRectFromRect(output, inRect, output.extent());
// for strange reason filter.setNilValueForKey(CoreImage.kCIInputImageKey()); does not work, but this does
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-03 15:31:31
|
Revision: 2599
http://sourceforge.net/p/swingme/code/2599
Author: yuranet
Date: 2021-12-03 15:31:29 +0000 (Fri, 03 Dec 2021)
Log Message:
-----------
italic support final
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Font.java
Modified: iOSME/src/javax/microedition/lcdui/Font.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Font.java 2021-12-03 15:28:57 UTC (rev 2598)
+++ iOSME/src/javax/microedition/lcdui/Font.java 2021-12-03 15:31:29 UTC (rev 2599)
@@ -43,7 +43,7 @@
private int height = -1;
- UIFont font;
+ final UIFont font;
/**
* NOTE: We support negative sizes, meaning literal font sizes.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-03 15:28:59
|
Revision: 2598
http://sourceforge.net/p/swingme/code/2598
Author: yuranet
Date: 2021-12-03 15:28:57 +0000 (Fri, 03 Dec 2021)
Log Message:
-----------
italic support
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Font.java
Modified: iOSME/src/javax/microedition/lcdui/Font.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Font.java 2021-11-30 23:41:41 UTC (rev 2597)
+++ iOSME/src/javax/microedition/lcdui/Font.java 2021-12-03 15:28:57 UTC (rev 2598)
@@ -6,7 +6,9 @@
import apple.foundation.NSDictionary;
import apple.foundation.NSString;
import apple.uikit.UIFont;
+import apple.uikit.UIFontDescriptor;
import apple.uikit.c.UIKit;
+import apple.uikit.enums.UIFontDescriptorSymbolicTraits;
public final class Font {
public static final int STYLE_PLAIN = 0;
@@ -79,22 +81,43 @@
break;
}
- double weight;
- if (isBold()) {
- weight = UIKit.UIFontWeightBold();
+ if (isBold() && isItalic()) {
+ UIFontDescriptor fontDescriptor = DEFAULT_FONT.font.fontDescriptor();
+ if (face == FACE_MONOSPACE) {
+ fontDescriptor = fontDescriptor.fontDescriptorWithSymbolicTraits(UIFontDescriptorSymbolicTraits.TraitBold | UIFontDescriptorSymbolicTraits.TraitItalic | UIFontDescriptorSymbolicTraits.TraitMonoSpace);
+ }
+ else {
+ fontDescriptor = fontDescriptor.fontDescriptorWithSymbolicTraits(UIFontDescriptorSymbolicTraits.TraitBold | UIFontDescriptorSymbolicTraits.TraitItalic);
+ }
+ font = UIFont.fontWithDescriptorSize(fontDescriptor, fontSize);
}
- else {
- weight = UIKit.UIFontWeightRegular();
+ else if (isItalic()) {
+ if (face == FACE_MONOSPACE) {
+ UIFontDescriptor fontDescriptor = DEFAULT_FONT.font.fontDescriptor();
+ fontDescriptor = fontDescriptor.fontDescriptorWithSymbolicTraits(UIFontDescriptorSymbolicTraits.TraitItalic | UIFontDescriptorSymbolicTraits.TraitMonoSpace);
+ font = UIFont.fontWithDescriptorSize(fontDescriptor, fontSize);
+ }
+ else {
+ font = UIFont.italicSystemFontOfSize(fontSize);
+ }
}
+ else { // Bold or normal
+ double weight;
+ if (isBold()) {
+ weight = UIKit.UIFontWeightBold();
+ }
+ else {
+ weight = UIKit.UIFontWeightRegular();
+ }
- if (face == FACE_MONOSPACE) {
- font = UIFont.monospacedSystemFontOfSizeWeight(fontSize, weight);
+ if (face == FACE_MONOSPACE) {
+ font = UIFont.monospacedSystemFontOfSizeWeight(fontSize, weight);
+ }
+ else {
+ font = UIFont.systemFontOfSizeWeight(fontSize, weight);
+ }
}
- else {
- font = UIFont.systemFontOfSizeWeight(fontSize, weight);
- }
-
- // TODO add support for italic and underline
+ // TODO add support for underline
}
public static Font getDefaultFont() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-11-30 23:41:43
|
Revision: 2597
http://sourceforge.net/p/swingme/code/2597
Author: yuranet
Date: 2021-11-30 23:41:41 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
hint text correct color in textfield
Modified Paths:
--------------
iOSME/res/iOS_theme.xml
Modified: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml 2021-11-29 11:55:37 UTC (rev 2596)
+++ iOSME/res/iOS_theme.xml 2021-11-30 23:41:41 UTC (rev 2597)
@@ -47,6 +47,9 @@
<color type="BORDERFILL" value="#ffffff"/>
<color type="FOREGROUND" value="#000000"/>
</state>
+ <state value="DISABLED">
+ <color type="FOREGROUND" value="#808080"/>
+ </state>
</style>
<bind style="text" key="TextField"/>
<bind style="text" key="TextArea"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-11-29 11:55:39
|
Revision: 2596
http://sourceforge.net/p/swingme/code/2596
Author: yuranet
Date: 2021-11-29 11:55:37 +0000 (Mon, 29 Nov 2021)
Log Message:
-----------
hack to deal with badly rounded size in sprite
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java 2021-11-25 00:07:17 UTC (rev 2595)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java 2021-11-29 11:55:37 UTC (rev 2596)
@@ -91,11 +91,16 @@
// implicit check for null img
final int w = img.getWidth();
final int h = img.getHeight();
-
+
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);
+
+ // hack to deal with badly rounded frame size. so we don't get wrong number of cols as that throws DEBUG IllegalArgumentException bellow
+ frameWidth = w / (int)Math.round(w / (double)frameWidth);
+ frameHeight = h / (int)Math.round(h / (double)frameHeight);
+ setSize(frameWidth, frameHeight);
}
this.img = img;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-11-25 00:07:20
|
Revision: 2595
http://sourceforge.net/p/swingme/code/2595
Author: yuranet
Date: 2021-11-25 00:07:17 +0000 (Thu, 25 Nov 2021)
Log Message:
-----------
set status as system setting
Modified Paths:
--------------
iOSME/src/net/yura/ios/iOSNotifications.java
Modified: iOSME/src/net/yura/ios/iOSNotifications.java
===================================================================
--- iOSME/src/net/yura/ios/iOSNotifications.java 2021-11-24 18:59:06 UTC (rev 2594)
+++ iOSME/src/net/yura/ios/iOSNotifications.java 2021-11-25 00:07:17 UTC (rev 2595)
@@ -21,10 +21,14 @@
public class iOSNotifications implements UNUserNotificationCenterDelegate {
+ public static final String NOTIFICATION_AUTHORIZATION_STATUS = "iosNotificationSetting";
+
public static void init() {
// this is needed to allow showing local notifications when the app is in foreground.
UNUserNotificationCenter notificationCenter = UNUserNotificationCenter.currentNotificationCenter();
notificationCenter.setDelegate(new iOSNotifications());
+
+ checkNotificationAuthorization();
}
/**
@@ -73,6 +77,8 @@
@Override
public void call_requestAuthorizationWithOptionsCompletionHandler(boolean granted, NSError error) {
System.out.println("notificationCenter.requestAuthorization " + granted + " " + error);
+
+ checkNotificationAuthorization(); // update system setting
}
});
}
@@ -112,24 +118,31 @@
notificationCenter.getNotificationSettingsWithCompletionHandler(new UNUserNotificationCenter.Block_getNotificationSettingsWithCompletionHandler() {
@Override
public void call_getNotificationSettingsWithCompletionHandler(UNNotificationSettings settings) {
- if (settings.authorizationStatus() == UNAuthorizationStatus.Authorized || settings.authorizationStatus() == UNAuthorizationStatus.Provisional) {
+ long status = settings.authorizationStatus();
+ if (status == UNAuthorizationStatus.Denied) {
+ System.out.println("[iOSNotifications] notifications not allowed");
+
+ System.setProperty(NOTIFICATION_AUTHORIZATION_STATUS, "off");
+ }
+ else if (status == UNAuthorizationStatus.NotDetermined) {
+ // not determined, ask user for permission now
+ System.out.println("[iOSNotifications] not determined, ask user for permission now");
+
+ System.setProperty(NOTIFICATION_AUTHORIZATION_STATUS, "ask");
+ }
+ else {
if (settings.alertSetting() == UNNotificationSetting.Enabled) {
// Schedule an alert-only notification.
- System.out.println("Schedule an alert-only notification.");
+ System.out.println("[iOSNotifications] Schedule an alert-only notification.");
}
else {
// Schedule a notification with a badge and sound.
- System.out.println("Schedule a notification with a badge and sound.");
+ System.out.println("[iOSNotifications] Schedule a notification with a badge and sound.");
}
+
+ System.setProperty(NOTIFICATION_AUTHORIZATION_STATUS, "on");
}
- else if (settings.authorizationStatus() == UNAuthorizationStatus.NotDetermined) {
- // not determined, ask user for permission now
- System.out.println("not determined, ask user for permission now");
- }
- else { // Denied or Ephemeral
- System.out.println("notifications not allowed");
- }
}
});
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-11-24 18:59:08
|
Revision: 2594
http://sourceforge.net/p/swingme/code/2594
Author: yuranet
Date: 2021-11-24 18:59:06 +0000 (Wed, 24 Nov 2021)
Log Message:
-----------
getToken method split out
Modified Paths:
--------------
iOSME/src/javax/microedition/midlet/MIDlet.java
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
iOSME/src/net/yura/ios/iOSNotifications.java
Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java 2021-11-18 18:45:47 UTC (rev 2593)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java 2021-11-24 18:59:06 UTC (rev 2594)
@@ -115,6 +115,14 @@
else if (url.startsWith(PROTOCOL_NOTIFY + "//requestAuthorization")) {
iOSNotifications.requestNotificationAuthorization();
}
+ else if (url.startsWith(PROTOCOL_NOTIFY + "//getToken")) {
+ callOnMainThread(new Runnable() {
+ @Override
+ public void run() {
+ iOSNotifications.getToken();
+ }
+ });
+ }
else if (url.startsWith(PROTOCOL_NOTIFY)) {
Map<String, String> options = Url.toHashtable(nsUrl.query());
String title = options.remove("title");
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-11-18 18:45:47 UTC (rev 2593)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-11-24 18:59:06 UTC (rev 2594)
@@ -205,7 +205,9 @@
@Override
public void applicationDidRegisterForRemoteNotificationsWithDeviceToken(UIApplication application, NSData deviceToken) {
byte[] bytes = iOSUtil.toBytes(deviceToken);
- String tokenString = IntegralToString.bytesToHexString(bytes, true);
+ // https://help.pushwoosh.com/hc/en-us/articles/360000364923-What-is-a-Device-token-
+ // says that the token should be lower case
+ String tokenString = IntegralToString.bytesToHexString(bytes, false);
MIDlet.DEFAULT_MIDLET.pushNotificationsToken(tokenString);
}
Modified: iOSME/src/net/yura/ios/iOSNotifications.java
===================================================================
--- iOSME/src/net/yura/ios/iOSNotifications.java 2021-11-18 18:45:47 UTC (rev 2593)
+++ iOSME/src/net/yura/ios/iOSNotifications.java 2021-11-24 18:59:06 UTC (rev 2594)
@@ -56,6 +56,16 @@
UIApplication.sharedApplication().setApplicationIconBadgeNumber(0);
}
+ /**
+ * token can change at any time, so app needs to keep asking for it on launch or some other time
+ * https://developer.apple.com/library/archive/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/HandlingRemoteNotifications.html#//apple_ref/doc/uid/TP40008194-CH6-SW3
+ * this method MUST be called on the main UI Thread
+ */
+ public static void getToken() {
+ UIApplication app = UIApplication.sharedApplication();
+ app.registerForRemoteNotifications();
+ }
+
public static void requestNotificationAuthorization() {
UNUserNotificationCenter notificationCenter = UNUserNotificationCenter.currentNotificationCenter();
notificationCenter.requestAuthorizationWithOptionsCompletionHandler(UNAuthorizationOptions.Alert | UNAuthorizationOptions.Sound | UNAuthorizationOptions.Badge,
@@ -63,17 +73,11 @@
@Override
public void call_requestAuthorizationWithOptionsCompletionHandler(boolean granted, NSError error) {
System.out.println("notificationCenter.requestAuthorization " + granted + " " + error);
-
- UIApplication app = UIApplication.sharedApplication();
- app.registerForRemoteNotifications();
}
});
}
public static void showNotification(String title, String message, int num, Map<?,?> extras) {
- //requestNotificationAuthorization();
- //checkNotificationAuthorization();
-
UNUserNotificationCenter notificationCenter = UNUserNotificationCenter.currentNotificationCenter();
UNMutableNotificationContent content = UNMutableNotificationContent.alloc().init();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-11-18 18:45:49
|
Revision: 2593
http://sourceforge.net/p/swingme/code/2593
Author: yuranet
Date: 2021-11-18 18:45:47 +0000 (Thu, 18 Nov 2021)
Log Message:
-----------
code cleanup, no code changes
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-11-18 16:28:56 UTC (rev 2592)
+++ AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java 2021-11-18 18:45:47 UTC (rev 2593)
@@ -40,10 +40,12 @@
public static final String PROTOCOL_SMS = "sms:";
public static final String PROTOCOL_PHONE = "tel:";
public static final String PROTOCOL_EMAIL = "email:";
+
public static final String PROTOCOL_NOTIFY = "notify:";
- public static final String PROTOCOL_NATIVE = "native:";
- public static final String PROTOCOL_NATIVE_NO_RESULT = "nativeNoResult:";
+ public static final String PROTOCOL_NATIVE = "nativeNoResult:";
+ public static final String PROTOCOL_NATIVE_FOR_RESULT = "native:";
+
public static MIDlet DEFAULT_MIDLET;
public static Properties DEFAULT_APPLICATION_PROPERTIES;
@@ -69,6 +71,11 @@
}
+ /**
+ * kind of almost the same as pauseApp but is NOT called when the user quits the app themselves
+ * TODO maybe could be removed one day and functionality merged with pauseApp
+ * @see #pauseApp()
+ */
public void saveState() {
}
@@ -109,12 +116,12 @@
try {
final Uri content = Uri.parse(url);
boolean isProtoNative = url.startsWith(PROTOCOL_NATIVE);
- boolean isProtoNativeNoRes = url.startsWith(PROTOCOL_NATIVE_NO_RESULT);
+ boolean isProtoNativeForResult = url.startsWith(PROTOCOL_NATIVE_FOR_RESULT);
Activity activity = AndroidMeActivity.DEFAULT_ACTIVITY;
- if (isProtoNative || isProtoNativeNoRes) {
+ if (isProtoNative || isProtoNativeForResult) {
- if (isProtoNative) {
+ if (isProtoNativeForResult) {
hideSoftKeyboard();
}
@@ -146,10 +153,10 @@
int reqCode = reqStr == null ? 0 : Integer.parseInt(reqStr);
if (isProtoNative) {
- activity.startActivityForResult(i, reqCode);
+ activity.startActivity(i);
}
else {
- activity.startActivity(i);
+ activity.startActivityForResult(i, reqCode);
}
}
}
@@ -163,49 +170,6 @@
String onlyBackground = options.remove("onlyBackground");
showNotification(title, num, message, icon, onlyBackground, options);
}
- else if (url.startsWith("toast://show")) {
- // there is a bug on android older versions so we use our Url to decode.
- Url myurl = new Url( url );
- showToast(myurl.getQueryParameter("message"),"SHORT".equals(myurl.getQueryParameter("duration"))?Toast.LENGTH_SHORT:Toast.LENGTH_LONG);
- }
-
-
- else if (url.startsWith("grasshopper")) {
- try {
- String params = url.substring(url.indexOf('?')+1);
- String[] s1 = params.split("\\&");
- String appName="Unknown android app",appVersion="Unknown version",locale="";
- for (int c=0;c<s1.length;c++) {
- String[] s2 = s1[c].split("\\=");
- if ("name".equals(s2[0])) {
- appName = s2[1];
- }
- else if ("version".equals(s2[0])) {
- appVersion = s2[1];
- }
- else if ("locale".equals(s2[0])) {
- locale = s2[1];
- }
- else {
- System.out.println("unknown grasshopper param: "+s1[c]);
- }
- }
- try {
- Class<?> simpleBug = Class.forName("net.yura.grasshopper.SimpleBug");
- java.lang.reflect.Method initLogFile = simpleBug.getMethod("initLogFile", new Class[] {String.class,String.class,String.class});
- initLogFile.invoke( null, new Object[] {appName, appVersion, locale} );
- System.out.println("Grasshopper loaded");
- }
- catch(Throwable th) {
- System.out.println("Grasshopper not loaded");
- }
- }
- catch (Exception ex) {
- ex.printStackTrace();
- }
-
- }
-
else if (url.equals("clipboard://get")) {
ClipboardManager clipboardManager = (ClipboardManager) AndroidMeApp.getIntance().getSystemService(Context.CLIPBOARD_SERVICE);
@@ -216,7 +180,6 @@
else {
System.setProperty("clipboard.text", obj.toString()); // so far we only support Strings
}
-
}
else if (url.startsWith("clipboard://put/")) {
ClipboardManager clipboardManager = (ClipboardManager) AndroidMeApp.getIntance().getSystemService(Context.CLIPBOARD_SERVICE);
@@ -232,7 +195,6 @@
if (!"".equals(text)) {
clipboardManager.setText( text );
}
-
}
else if (url.equals("wakelock://true")) {
((AndroidMeActivity)AndroidMeActivity.DEFAULT_ACTIVITY).setWakeLock(true);
@@ -240,22 +202,6 @@
else if (url.equals("wakelock://false")) {
((AndroidMeActivity)AndroidMeActivity.DEFAULT_ACTIVITY).setWakeLock(false);
}
- else if (url.startsWith("geo:")) {
- // eg (with the brackets and everything else past the = URL encoded): geo://lat,long?q=lat,long(description)
- Intent intent = new Intent(Intent.ACTION_VIEW, content);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- try {
- AndroidMeActivity.DEFAULT_ACTIVITY.startActivity(intent);
- }
- catch (ActivityNotFoundException anf) {
- // there's nothing on the phone that knows how to process a geo: URI.
- url = "http://maps.google.com/" + url.substring(url.indexOf("?q="));
- Intent browserIntent = new Intent(Intent.ACTION_VIEW, content);
- browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- AndroidMeActivity.DEFAULT_ACTIVITY.startActivity(browserIntent);
- }
-
- }
else if (url.startsWith("file:///android_asset/")) {
Intent i = new Intent(activity, WebViewActivity.class);
@@ -262,7 +208,6 @@
//i.setClassName("com.android.browser", "com.android.browser.BrowserActivity"); // does not work
i.setData(content);
activity.startActivity(i);
-
}
else if (url.startsWith("mailto:") && containsQueryParameter(url, "attachment")) {
@@ -309,12 +254,69 @@
activity.startActivity(Intent.createChooser(shareIntent, "Choose an app"));
}
+ else if (url.startsWith("toast://show")) {
+ // there is a bug on android older versions so we use our Url to decode.
+ Url myurl = new Url( url );
+ showToast(myurl.getQueryParameter("message"),"SHORT".equals(myurl.getQueryParameter("duration"))?Toast.LENGTH_SHORT:Toast.LENGTH_LONG);
+ }
+ else if (url.startsWith("geo:")) {
+ // eg (with the brackets and everything else past the = URL encoded): geo://lat,long?q=lat,long(description)
+ Intent intent = new Intent(Intent.ACTION_VIEW, content);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ try {
+ AndroidMeActivity.DEFAULT_ACTIVITY.startActivity(intent);
+ }
+ catch (ActivityNotFoundException anf) {
+ // there's nothing on the phone that knows how to process a geo: URI.
+ url = "http://maps.google.com/" + url.substring(url.indexOf("?q="));
+ Intent browserIntent = new Intent(Intent.ACTION_VIEW, content);
+ browserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ AndroidMeActivity.DEFAULT_ACTIVITY.startActivity(browserIntent);
+ }
+
+ }
+ else if (url.startsWith("grasshopper")) {
+ // i think this was used by the booking system J2ME app
+ try {
+ String params = url.substring(url.indexOf('?')+1);
+ String[] s1 = params.split("\\&");
+ String appName="Unknown android app",appVersion="Unknown version",locale="";
+ for (int c=0;c<s1.length;c++) {
+ String[] s2 = s1[c].split("\\=");
+ if ("name".equals(s2[0])) {
+ appName = s2[1];
+ }
+ else if ("version".equals(s2[0])) {
+ appVersion = s2[1];
+ }
+ else if ("locale".equals(s2[0])) {
+ locale = s2[1];
+ }
+ else {
+ System.out.println("unknown grasshopper param: "+s1[c]);
+ }
+ }
+ try {
+ Class<?> simpleBug = Class.forName("net.yura.grasshopper.SimpleBug");
+ java.lang.reflect.Method initLogFile = simpleBug.getMethod("initLogFile", new Class[] {String.class,String.class,String.class});
+ initLogFile.invoke( null, new Object[] {appName, appVersion, locale} );
+ System.out.println("Grasshopper loaded");
+ }
+ catch(Throwable th) {
+ System.out.println("Grasshopper not loaded");
+ }
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
else {
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);
}
- } catch (Throwable e) {
+ }
+ catch (Throwable e) {
//#debug debug
Logger.warn("error handling " + url, e);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-11-18 16:28:58
|
Revision: 2592
http://sourceforge.net/p/swingme/code/2592
Author: yuranet
Date: 2021-11-18 16:28:56 +0000 (Thu, 18 Nov 2021)
Log Message:
-----------
can show local Notifications
Modified Paths:
--------------
iOSME/src/javax/microedition/midlet/MIDlet.java
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
iOSME/src/net/yura/ios/iOSImageEncoder.java
Added Paths:
-----------
iOSME/src/net/yura/ios/iOSNotifications.java
iOSME/src/net/yura/ios/iOSUtil.java
Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java 2021-11-12 15:41:42 UTC (rev 2591)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java 2021-11-18 16:28:56 UTC (rev 2592)
@@ -1,37 +1,43 @@
package javax.microedition.midlet;
+import net.yura.ios.iOSNotifications;
import net.yura.ios.WebViewControllear;
-import java.util.Properties;
+import net.yura.mobile.util.Url;
+import java.util.Map;
import javax.microedition.io.ConnectionNotFoundException;
import javax.microedition.lcdui.Display;
import apple.c.Globals;
-import apple.foundation.NSOperationQueue;
+import apple.foundation.NSBundle;
import apple.foundation.NSThread;
import apple.foundation.NSURL;
-import apple.foundation.NSURLComponents;
import apple.uikit.UIApplication;
import apple.uikit.UINavigationController;
import apple.uikit.UIPasteboard;
+import apple.uikit.enums.UIApplicationState;
public abstract class MIDlet {
+ // standard protocols
public static final String PROTOCOL_HTTP = "http://";
public static final String PROTOCOL_HTTPS = "https://";
public static final String PROTOCOL_SMS = "sms:";
public static final String PROTOCOL_PHONE = "tel:";
public static final String PROTOCOL_EMAIL = "email:";
+
+ // swingme features
public static final String PROTOCOL_NOTIFY = "notify:";
+ public static final String PROTOCOL_CLIPBOARD = "clipboard:";
+ public static final String PROTOCOL_WAKELOCK = "wakelock:";
+
+ // native ios
public static final String PROTOCOL_NATIVE = "native:";
- public static final String PROTOCOL_NATIVE_NO_RESULT = "nativeNoResult:";
+ public static final String PROTOCOL_NATIVE_FOR_RESULT = "nativeForResult:";
public static MIDlet DEFAULT_MIDLET;
- public static Properties DEFAULT_APPLICATION_PROPERTIES;
private static String platformLastUrl;
private static long platformLastTime;
- private Properties applicationProperties = DEFAULT_APPLICATION_PROPERTIES;
-
protected MIDlet() {
DEFAULT_MIDLET = this;
}
@@ -47,10 +53,19 @@
}
+ /**
+ * kind of almost the same as pauseApp but is NOT called when the user quits the app themselves
+ * TODO maybe could be removed one day and functionality merged with pauseApp
+ * @see #pauseApp()
+ */
public void saveState() {
}
+ // not part of J2ME, there is no J2ME way of doing this
+ public void pushNotificationsToken(String token) { }
+ public void openNotification(Map params) { }
+
public final void notifyDestroyed() {
Globals.exit(0);
@@ -80,6 +95,9 @@
this.destroyApp(unconditional);
}
+ /**
+ * @return true if the MIDlet suite MUST first exit before the content can be fetched. (always FALSE)
+ */
public boolean platformRequest(String url) throws ConnectionNotFoundException {
try {
@@ -87,31 +105,32 @@
//NSURLComponents nsurlComponents = NSURLComponents.componentsWithString(url);
boolean isProtoNative = url.startsWith(PROTOCOL_NATIVE);
- boolean isProtoNativeNoRes = url.startsWith(PROTOCOL_NATIVE_NO_RESULT);
+ boolean isProtoNativeForRes = url.startsWith(PROTOCOL_NATIVE_FOR_RESULT);
- if (isProtoNative || isProtoNativeNoRes) {
+ if (isProtoNative || isProtoNativeForRes) {
// TODO launch native stuff
throw new UnsupportedOperationException();
}
+ else if (url.startsWith(PROTOCOL_NOTIFY + "//requestAuthorization")) {
+ iOSNotifications.requestNotificationAuthorization();
+ }
else if (url.startsWith(PROTOCOL_NOTIFY)) {
- // there is a bug on android older versions so we use our Url to decode.
-// Map<String, String> options = Url.toHashtable(content.getQuery());
-// String title = options.remove("title");
-// String num = options.remove("num");
-// String message = options.remove("message");
-// String icon = options.remove("icon");
-// String onlyBackground = options.remove("onlyBackground");
- // TODO showNotification(title, num, message, icon, onlyBackground, options);
- throw new UnsupportedOperationException();
+ Map<String, String> options = Url.toHashtable(nsUrl.query());
+ String title = options.remove("title");
+ String num = options.remove("num");
+ String message = options.remove("message");
+ String icon = options.remove("icon"); // iOS does not allow other icons, so we ignore this param
+ String onlyBackgroundString = options.remove("onlyBackground");
+
+ boolean onlyBackground = onlyBackgroundString == null ? false : Boolean.parseBoolean(onlyBackgroundString);
+ int number = num == null ? 0 : Integer.parseInt(num);
+
+ if (!onlyBackground || UIApplication.sharedApplication().applicationState() != UIApplicationState.Active) {
+ iOSNotifications.showNotification(title, message, number, options);
+ }
}
- else if (url.startsWith("toast://show")) {
- // there is a bug on android older versions so we use our Url to decode.
- //Url myurl = new Url( url );
- // TODO showToast(myurl.getQueryParameter("message"),"SHORT".equals(myurl.getQueryParameter("duration"))?Toast.LENGTH_SHORT:Toast.LENGTH_LONG);
- throw new UnsupportedOperationException();
- }
- else if (url.equals("clipboard://get")) {
+ else if (url.equals(PROTOCOL_CLIPBOARD + "//get")) {
UIPasteboard clipboard = UIPasteboard.generalPasteboard();
String text = clipboard.string();
@@ -122,7 +141,7 @@
System.setProperty("clipboard.text", text); // so far we only support Strings
}
}
- else if (url.startsWith("clipboard://put/")) {
+ else if (url.startsWith(PROTOCOL_CLIPBOARD + "//put/")) {
UIPasteboard clipboard = UIPasteboard.generalPasteboard();
String text = url.substring("clipboard://put/".length());
@@ -130,7 +149,7 @@
clipboard.setString(text);
}
}
- else if (url.equals("wakelock://true")) {
+ else if (url.equals(PROTOCOL_WAKELOCK + "//true")) {
callOnMainThread(new Runnable() {
@Override
public void run() {
@@ -138,7 +157,7 @@
}
});
}
- else if (url.equals("wakelock://false")) {
+ else if (url.equals(PROTOCOL_WAKELOCK + "//false")) {
callOnMainThread(new Runnable() {
@Override
public void run() {
@@ -146,11 +165,6 @@
}
});
}
- else if (url.startsWith("geo:")) {
- throw new UnsupportedOperationException();
- // eg (with the brackets and everything else past the = URL encoded): geo://lat,long?q=lat,long(description)
- // TODO open map
- }
else if (url.startsWith(WebViewControllear.PROTOCOL_ASSET)) {
WebViewControllear webViewControllear = WebViewControllear.alloc().init();
@@ -192,9 +206,13 @@
}
public String getAppProperty(String key) {
- return this.applicationProperties.getProperty(key);
+ NSBundle mainBundle = NSBundle.mainBundle();
+ return (String)mainBundle.objectForInfoDictionaryKey(key);
}
+ /**
+ * @return 0 if the permission is denied; 1 if the permission is allowed; -1 if the status is unknown
+ */
public int checkPermission(String string) {
return 0;
}
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-11-12 15:41:42 UTC (rev 2591)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-11-18 16:28:56 UTC (rev 2592)
@@ -13,7 +13,9 @@
import apple.foundation.NSArray;
import apple.foundation.NSBundle;
import apple.foundation.NSCoder;
+import apple.foundation.NSData;
import apple.foundation.NSDictionary;
+import apple.foundation.NSError;
import apple.foundation.NSProcessInfo;
import apple.foundation.c.Foundation;
import apple.foundation.enums.NSSearchPathDirectory;
@@ -87,6 +89,7 @@
// setup and launch swingme app
setupSystemProperties();
+ iOSNotifications.init();
NativeTextEntry.init();
NSBundle mainBundle = NSBundle.mainBundle();
@@ -198,4 +201,16 @@
public boolean applicationShouldRestoreSecureApplicationState(UIApplication application, NSCoder coder) {
return true;
}
+
+ @Override
+ public void applicationDidRegisterForRemoteNotificationsWithDeviceToken(UIApplication application, NSData deviceToken) {
+ byte[] bytes = iOSUtil.toBytes(deviceToken);
+ String tokenString = IntegralToString.bytesToHexString(bytes, true);
+ MIDlet.DEFAULT_MIDLET.pushNotificationsToken(tokenString);
+ }
+
+ @Override
+ public void applicationDidFailToRegisterForRemoteNotificationsWithError(UIApplication application, NSError error) {
+ System.err.println("applicationDidFailToRegisterForRemoteNotificationsWithError " + error);
+ }
}
Modified: iOSME/src/net/yura/ios/iOSImageEncoder.java
===================================================================
--- iOSME/src/net/yura/ios/iOSImageEncoder.java 2021-11-12 15:41:42 UTC (rev 2591)
+++ iOSME/src/net/yura/ios/iOSImageEncoder.java 2021-11-18 16:28:56 UTC (rev 2592)
@@ -31,7 +31,7 @@
try {
// TODO there must be a better way to do this
- byte[] bytes = data.bytes().getBytePtr().toByteArray((int)data.length());
+ byte[] bytes = iOSUtil.toBytes(data);
out.write(bytes);
}
catch (Exception ex) {
Added: iOSME/src/net/yura/ios/iOSNotifications.java
===================================================================
--- iOSME/src/net/yura/ios/iOSNotifications.java (rev 0)
+++ iOSME/src/net/yura/ios/iOSNotifications.java 2021-11-18 16:28:56 UTC (rev 2592)
@@ -0,0 +1,132 @@
+package net.yura.ios;
+
+import java.util.Map;
+import javax.microedition.midlet.MIDlet;
+import apple.foundation.NSError;
+import apple.foundation.NSNumber;
+import apple.uikit.UIApplication;
+import apple.usernotifications.UNMutableNotificationContent;
+import apple.usernotifications.UNNotification;
+import apple.usernotifications.UNNotificationContent;
+import apple.usernotifications.UNNotificationRequest;
+import apple.usernotifications.UNNotificationResponse;
+import apple.usernotifications.UNNotificationSettings;
+import apple.usernotifications.UNTimeIntervalNotificationTrigger;
+import apple.usernotifications.UNUserNotificationCenter;
+import apple.usernotifications.enums.UNAuthorizationOptions;
+import apple.usernotifications.enums.UNAuthorizationStatus;
+import apple.usernotifications.enums.UNNotificationPresentationOptions;
+import apple.usernotifications.enums.UNNotificationSetting;
+import apple.usernotifications.protocol.UNUserNotificationCenterDelegate;
+
+public class iOSNotifications implements UNUserNotificationCenterDelegate {
+
+ public static void init() {
+ // this is needed to allow showing local notifications when the app is in foreground.
+ UNUserNotificationCenter notificationCenter = UNUserNotificationCenter.currentNotificationCenter();
+ notificationCenter.setDelegate(new iOSNotifications());
+ }
+
+ /**
+ * this is needed to allow local notifications to display when the app is already open (in foreground)
+ */
+ @Override
+ public void userNotificationCenterWillPresentNotificationWithCompletionHandler(UNUserNotificationCenter center, UNNotification notification, Block_userNotificationCenterWillPresentNotificationWithCompletionHandler completionHandler) {
+ completionHandler.call_userNotificationCenterWillPresentNotificationWithCompletionHandler(UNNotificationPresentationOptions.Sound | UNNotificationPresentationOptions.Alert | UNNotificationPresentationOptions.Badge);
+ }
+
+ @Override
+ public void userNotificationCenterDidReceiveNotificationResponseWithCompletionHandler(UNUserNotificationCenter center, UNNotificationResponse response, Block_userNotificationCenterDidReceiveNotificationResponseWithCompletionHandler completionHandler) {
+ // Handle the actions for the notification
+
+ UNNotificationContent content = response.notification().request().content();
+ Map<?, ?> customParams = content.userInfo();
+
+ System.out.println("notification with extras " + customParams);
+ //String queryString = Url.toQueryString(new Hashtable(customParams));
+
+ try {
+ MIDlet.DEFAULT_MIDLET.openNotification(customParams);
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ // user clicked on notification, we can clear the app icon badge
+ UIApplication.sharedApplication().setApplicationIconBadgeNumber(0);
+ }
+
+ public static void requestNotificationAuthorization() {
+ UNUserNotificationCenter notificationCenter = UNUserNotificationCenter.currentNotificationCenter();
+ notificationCenter.requestAuthorizationWithOptionsCompletionHandler(UNAuthorizationOptions.Alert | UNAuthorizationOptions.Sound | UNAuthorizationOptions.Badge,
+ new UNUserNotificationCenter.Block_requestAuthorizationWithOptionsCompletionHandler() {
+ @Override
+ public void call_requestAuthorizationWithOptionsCompletionHandler(boolean granted, NSError error) {
+ System.out.println("notificationCenter.requestAuthorization " + granted + " " + error);
+
+ UIApplication app = UIApplication.sharedApplication();
+ app.registerForRemoteNotifications();
+ }
+ });
+ }
+
+ public static void showNotification(String title, String message, int num, Map<?,?> extras) {
+ //requestNotificationAuthorization();
+ //checkNotificationAuthorization();
+
+ UNUserNotificationCenter notificationCenter = UNUserNotificationCenter.currentNotificationCenter();
+
+ UNMutableNotificationContent content = UNMutableNotificationContent.alloc().init();
+ content.setTitle(title);
+ content.setBody(message);
+ //content.setSound(UNNotificationSound.defaultSound());
+ content.setBadge(NSNumber.numberWithLong(UIApplication.sharedApplication().applicationIconBadgeNumber() + num));
+
+ content.setUserInfo(iOSUtil.toNSDictionary(extras));
+
+ UNTimeIntervalNotificationTrigger trigger = UNTimeIntervalNotificationTrigger.triggerWithTimeIntervalRepeats(0.1, false);
+
+ String uuidString = "notificationIdentifier"; //UUID.randomUUID().toString();
+ UNNotificationRequest request = UNNotificationRequest.requestWithIdentifierContentTrigger(uuidString, content, trigger);
+
+ notificationCenter.addNotificationRequestWithCompletionHandler(request, new UNUserNotificationCenter.Block_addNotificationRequestWithCompletionHandler() {
+ @Override
+ public void call_addNotificationRequestWithCompletionHandler(NSError error) {
+ if (error != null) {
+ System.out.println("error showing notification " + error);
+ }
+ else {
+ System.out.println("showing notification");
+ }
+ }
+ });
+ }
+
+ public static void checkNotificationAuthorization() {
+
+ UNUserNotificationCenter notificationCenter = UNUserNotificationCenter.currentNotificationCenter();
+ notificationCenter.getNotificationSettingsWithCompletionHandler(new UNUserNotificationCenter.Block_getNotificationSettingsWithCompletionHandler() {
+ @Override
+ public void call_getNotificationSettingsWithCompletionHandler(UNNotificationSettings settings) {
+ if (settings.authorizationStatus() == UNAuthorizationStatus.Authorized || settings.authorizationStatus() == UNAuthorizationStatus.Provisional) {
+
+ if (settings.alertSetting() == UNNotificationSetting.Enabled) {
+ // Schedule an alert-only notification.
+ System.out.println("Schedule an alert-only notification.");
+ }
+ else {
+ // Schedule a notification with a badge and sound.
+ System.out.println("Schedule a notification with a badge and sound.");
+ }
+ }
+ else if (settings.authorizationStatus() == UNAuthorizationStatus.NotDetermined) {
+ // not determined, ask user for permission now
+ System.out.println("not determined, ask user for permission now");
+ }
+ else { // Denied or Ephemeral
+ System.out.println("notifications not allowed");
+ }
+ }
+ });
+ }
+}
Added: iOSME/src/net/yura/ios/iOSUtil.java
===================================================================
--- iOSME/src/net/yura/ios/iOSUtil.java (rev 0)
+++ iOSME/src/net/yura/ios/iOSUtil.java 2021-11-18 16:28:56 UTC (rev 2592)
@@ -0,0 +1,27 @@
+package net.yura.ios;
+
+import java.util.Map;
+import apple.foundation.NSData;
+import apple.foundation.NSDictionary;
+import apple.foundation.NSMutableDictionary;
+
+public class iOSUtil {
+
+ /**
+ * Convert a Java [Map] to [NSDictionary].
+ */
+ public static <K, V> NSDictionary<K, V> toNSDictionary(Map<K, V> map) {
+ NSMutableDictionary dict = NSMutableDictionary.alloc().initWithCapacity(map.size());
+ //map.forEach(dict::put);
+
+ for (Map.Entry<K, V> entry : map.entrySet()) {
+ dict.put(entry.getKey(), entry.getValue());
+ }
+
+ return dict;
+ }
+
+ public static byte[] toBytes(NSData data) {
+ return data.bytes().getBytePtr().toByteArray((int)data.length());
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-11-12 15:41:46
|
Revision: 2591
http://sourceforge.net/p/swingme/code/2591
Author: yuranet
Date: 2021-11-12 15:41:42 +0000 (Fri, 12 Nov 2021)
Log Message:
-----------
call saveState on app
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2021-11-12 15:39:56 UTC (rev 2590)
+++ AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2021-11-12 15:41:42 UTC (rev 2591)
@@ -416,4 +416,19 @@
Logger.warn("error with config change " + newConfig, th);
}
}
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+
+ MIDlet myMain = AndroidMeApp.getMIDlet();
+ if (myMain != null) {
+ try {
+ myMain.saveState();
+ }
+ catch (Exception ex) {
+ Logger.warn("save state error", ex);
+ }
+ }
+ }
}
Modified: AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java 2021-11-12 15:39:56 UTC (rev 2590)
+++ AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java 2021-11-12 15:41:42 UTC (rev 2591)
@@ -64,6 +64,15 @@
protected abstract void destroyApp(boolean unconditional) throws MIDletStateChangeException;
+ // To be overload by children
+ public void onResult(int requestCode, int resultCode, Object result) {
+
+ }
+
+ public void saveState() {
+
+ }
+
public final void notifyDestroyed() {
AndroidMeActivity.DEFAULT_ACTIVITY.finish();
@@ -532,11 +541,6 @@
}
}
- // To be overload by children
- public void onResult(int requestCode, int resultCode, Object result) {
-
- }
-
private void hideSoftKeyboard() {
try {
View view = Display.getDisplay(this).getCurrent().getView();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-11-12 15:39:58
|
Revision: 2590
http://sourceforge.net/p/swingme/code/2590
Author: yuranet
Date: 2021-11-12 15:39:56 +0000 (Fri, 12 Nov 2021)
Log Message:
-----------
save state gets called
Modified Paths:
--------------
iOSME/src/javax/microedition/midlet/MIDlet.java
iOSME/src/net/yura/ios/AppController.java
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java 2021-11-12 13:39:04 UTC (rev 2589)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java 2021-11-12 15:39:56 UTC (rev 2590)
@@ -30,7 +30,6 @@
private static String platformLastUrl;
private static long platformLastTime;
-
private Properties applicationProperties = DEFAULT_APPLICATION_PROPERTIES;
protected MIDlet() {
@@ -37,12 +36,21 @@
DEFAULT_MIDLET = this;
}
+ protected abstract void startApp() throws MIDletStateChangeException;
+
+ protected abstract void pauseApp();
+
protected abstract void destroyApp(boolean unconditional) throws MIDletStateChangeException;
- protected abstract void pauseApp() throws MIDletStateChangeException;
+ // To be overload by children
+ public void onResult(int requestCode, int resultCode, Object result) {
- protected abstract void startApp() throws MIDletStateChangeException;
+ }
+ public void saveState() {
+
+ }
+
public final void notifyDestroyed() {
Globals.exit(0);
@@ -60,18 +68,18 @@
}.start();
}
- public final void doDestroyApp(boolean unconditional) throws MIDletStateChangeException {
- this.destroyApp(unconditional);
- }
-
public final void doStartApp() throws MIDletStateChangeException {
this.startApp();
}
- public final void doPauseApp() throws MIDletStateChangeException {
+ public final void doPauseApp() {
this.pauseApp();
}
+ public final void doDestroyApp(boolean unconditional) throws MIDletStateChangeException {
+ this.destroyApp(unconditional);
+ }
+
public boolean platformRequest(String url) throws ConnectionNotFoundException {
try {
@@ -190,9 +198,4 @@
public int checkPermission(String string) {
return 0;
}
-
- // To be overload by children
- public void onResult(int requestCode, int resultCode, Object result) {
-
- }
}
Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java 2021-11-12 13:39:04 UTC (rev 2589)
+++ iOSME/src/net/yura/ios/AppController.java 2021-11-12 15:39:56 UTC (rev 2590)
@@ -8,6 +8,7 @@
import javax.microedition.lcdui.Displayable;
import javax.microedition.midlet.MIDlet;
import apple.foundation.NSArray;
+import apple.foundation.NSCoder;
import apple.foundation.NSDictionary;
import apple.foundation.NSNotification;
import apple.foundation.NSNotificationCenter;
@@ -148,4 +149,21 @@
Thread.yield();
System.gc();
}
+
+ @Override
+ public void encodeRestorableStateWithCoder(NSCoder coder) {
+ super.encodeRestorableStateWithCoder(coder);
+
+ System.out.println("[SwingMEiOS] saveState");
+
+ MIDlet midlet = MIDlet.DEFAULT_MIDLET;
+ if (midlet != null) {
+ try {
+ midlet.saveState();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
}
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-11-12 13:39:04 UTC (rev 2589)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-11-12 15:39:56 UTC (rev 2590)
@@ -12,6 +12,7 @@
import apple.NSObject;
import apple.foundation.NSArray;
import apple.foundation.NSBundle;
+import apple.foundation.NSCoder;
import apple.foundation.NSDictionary;
import apple.foundation.NSProcessInfo;
import apple.foundation.c.Foundation;
@@ -18,7 +19,6 @@
import apple.foundation.enums.NSSearchPathDirectory;
import apple.foundation.enums.NSSearchPathDomainMask;
import apple.uikit.UIApplication;
-import apple.uikit.UIDevice;
import apple.uikit.UINavigationController;
import apple.uikit.UIScreen;
import apple.uikit.UIViewController;
@@ -73,6 +73,10 @@
UINavigationController navigationController = UINavigationController.alloc().init();
navigationController.initWithRootViewController(vc);
+ // need to give names so the encodeRestorableStateWithCoder gets called
+ vc.setRestorationIdentifier("SwingMEAppController");
+ navigationController.setRestorationIdentifier("SwingMENavigationController");
+
UIScreen screen = UIScreen.mainScreen();
window = UIWindow.alloc().initWithFrame(screen.bounds());
window.setRootViewController(navigationController);
@@ -169,4 +173,29 @@
public UIWindow window() {
return window;
}
+
+ @Override
+ public void applicationWillResignActive(UIApplication application) {
+ System.out.println("[SwingMEiOS] pauseApp");
+
+ MIDlet midlet = MIDlet.DEFAULT_MIDLET;
+ if (midlet != null) {
+ try {
+ midlet.doPauseApp();
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ @Override
+ public boolean applicationShouldSaveSecureApplicationState(UIApplication application, NSCoder coder) {
+ return true;
+ }
+
+ @Override
+ public boolean applicationShouldRestoreSecureApplicationState(UIApplication application, NSCoder coder) {
+ return true;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-11-12 13:39:14
|
Revision: 2589
http://sourceforge.net/p/swingme/code/2589
Author: yuranet
Date: 2021-11-12 13:39:04 +0000 (Fri, 12 Nov 2021)
Log Message:
-----------
call pauseApp correctly
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2021-11-09 12:32:04 UTC (rev 2588)
+++ AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2021-11-12 13:39:04 UTC (rev 2589)
@@ -153,6 +153,16 @@
Logger.warn("exception in WakeLock release", ex);
}
}
+
+ MIDlet midlet = AndroidMeApp.getMIDlet();
+ if (midlet != null) {
+ try {
+ midlet.doPauseApp();
+ }
+ catch (Exception ex) {
+ Logger.warn("exception in pauseApp", ex);
+ }
+ }
}
public boolean isForeground() {
Modified: AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java 2021-11-09 12:32:04 UTC (rev 2588)
+++ AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java 2021-11-12 13:39:04 UTC (rev 2589)
@@ -34,6 +34,7 @@
import android.widget.Toast;
public abstract class MIDlet {
+
public static final String PROTOCOL_HTTP = "http://";
public static final String PROTOCOL_HTTPS = "https://";
public static final String PROTOCOL_SMS = "sms:";
@@ -57,12 +58,11 @@
PhoneListener.init();
}
- protected abstract void destroyApp(boolean unconditional)
- throws MIDletStateChangeException;
+ protected abstract void startApp() throws MIDletStateChangeException;
- protected abstract void pauseApp() throws MIDletStateChangeException;
+ protected abstract void pauseApp();
- protected abstract void startApp() throws MIDletStateChangeException;
+ protected abstract void destroyApp(boolean unconditional) throws MIDletStateChangeException;
public final void notifyDestroyed() {
AndroidMeActivity.DEFAULT_ACTIVITY.finish();
@@ -80,19 +80,18 @@
}.start();
}
- public final void doDestroyApp(boolean unconditional)
- throws MIDletStateChangeException {
- this.destroyApp(unconditional);
- }
-
public final void doStartApp() throws MIDletStateChangeException {
this.startApp();
}
- public final void doPauseApp() throws MIDletStateChangeException {
+ public final void doPauseApp() {
this.pauseApp();
}
+ public final void doDestroyApp(boolean unconditional) throws MIDletStateChangeException {
+ this.destroyApp(unconditional);
+ }
+
/**
* @return true if the MIDlet suite MUST first exit before the content can be fetched.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-11-09 12:32:07
|
Revision: 2588
http://sourceforge.net/p/swingme/code/2588
Author: yuranet
Date: 2021-11-09 12:32:04 +0000 (Tue, 09 Nov 2021)
Log Message:
-----------
do not use label for multiline text
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/OptionPane.java
Modified: SwingME/src/net/yura/mobile/gui/components/OptionPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2021-11-09 12:00:13 UTC (rev 2587)
+++ SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2021-11-09 12:32:04 UTC (rev 2588)
@@ -237,7 +237,7 @@
String txt = String.valueOf(object);
- if (txt.startsWith("<html>")) {
+ if (txt.startsWith("<html>") || txt.indexOf('\n') >= 0) {
TextPane tp = new TextPane();
tp.setText(txt);
Border tpInsets = tp.getInsets();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-11-09 12:00:15
|
Revision: 2587
http://sourceforge.net/p/swingme/code/2587
Author: yuranet
Date: 2021-11-09 12:00:13 +0000 (Tue, 09 Nov 2021)
Log Message:
-----------
get device name better
Modified Paths:
--------------
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-11-09 11:20:02 UTC (rev 2586)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-11-09 12:00:13 UTC (rev 2587)
@@ -10,7 +10,6 @@
import java.io.UnsupportedEncodingException;
import javax.microedition.midlet.MIDlet;
import apple.NSObject;
-import apple.coregraphics.struct.CGRect;
import apple.foundation.NSArray;
import apple.foundation.NSBundle;
import apple.foundation.NSDictionary;
@@ -27,6 +26,7 @@
import apple.uikit.UIWindow;
import apple.uikit.c.UIKit;
import apple.uikit.protocol.UIApplicationDelegate;
+import libcore.io.Libcore;
@RegisterOnStartup
public class SwingMEiOSApplication extends NSObject implements UIApplicationDelegate {
@@ -117,15 +117,25 @@
String userAgent = webView.stringByEvaluatingJavaScriptFromString("navigator.userAgent");
System.setProperty("http.agent", userAgent);
- String model = UIDevice.currentDevice().name();
- String osVersion = NSProcessInfo.processInfo().operatingSystemVersionString();
+ //UIDevice device = UIDevice.currentDevice();
+ // this is the name the user gives to the device
+ //String name = device.name(); // e.g "Yura's iPhone"
+ //String model = device.model(); // this will just return "iPhone"
+
+ NSProcessInfo processInfo = NSProcessInfo.processInfo();
+
+ String model = Libcore.os.uname().machine; // iPhone13,1
+ if ("x86_64".equals(model)) {
+ model = processInfo.environment().get("SIMULATOR_MODEL_IDENTIFIER");
+ }
+
+ String osVersion = processInfo.operatingSystemVersionString();
System.setProperty("microedition.platform", "iOSME(" + model + " " + osVersion + ")");
-
- NSDictionary<String, String> environment = NSProcessInfo.processInfo().environment();
+ NSDictionary<String, String> environment = processInfo.environment();
String environmentDebug = environment.get("DEBUG");
- NSArray<String> arguments = NSProcessInfo.processInfo().arguments();
+ NSArray<String> arguments = processInfo.arguments();
if (arguments.contains("-Ddebug=true") || "true".equals(environmentDebug)) {
System.setProperty("debug", "true");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-11-09 11:20:08
|
Revision: 2586
http://sourceforge.net/p/swingme/code/2586
Author: yuranet
Date: 2021-11-09 11:20:02 +0000 (Tue, 09 Nov 2021)
Log Message:
-----------
get title with JS if normal method does not work
Modified Paths:
--------------
iOSME/src/net/yura/ios/WebViewControllear.java
Modified: iOSME/src/net/yura/ios/WebViewControllear.java
===================================================================
--- iOSME/src/net/yura/ios/WebViewControllear.java 2021-11-09 01:05:05 UTC (rev 2585)
+++ iOSME/src/net/yura/ios/WebViewControllear.java 2021-11-09 11:20:02 UTC (rev 2586)
@@ -2,6 +2,7 @@
import org.moe.natj.general.Pointer;
import apple.foundation.NSBundle;
+import apple.foundation.NSError;
import apple.foundation.NSURL;
import apple.uikit.UIScreen;
import apple.uikit.UIViewController;
@@ -103,6 +104,24 @@
@Override
public void webViewDidFinishNavigation(WKWebView webView, WKNavigation navigation) {
- setTitle(myWebView.title());
+ String title = myWebView.title();
+
+ if (!"".equals(title)) {
+ setTitle(title);
+ }
+ else {
+ // for some unknown reason the normal method does not work on iPhone mini, so we just JS method instead.
+ myWebView.evaluateJavaScriptCompletionHandler("document.title", new WKWebView.Block_evaluateJavaScriptCompletionHandler() {
+ @Override
+ public void call_evaluateJavaScriptCompletionHandler(Object title, NSError error) {
+ if (error == null) {
+ setTitle(String.valueOf(title));
+ }
+ else {
+ System.err.println("Error getting title: " + error);
+ }
+ }
+ });
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
