LCDUI: fix Item.notifyStateChanged()

app/src/main/java/javax/microedition/lcdui/ChoiceGroup.java

@@ -1,7 +1,7 @@
 /*
  * Copyright 2012 Kulikov Dmitriy
  * Copyright 2018-2021 Nikita Shakarun
- * Copyright 2019-2023 Yury Kharchenko
+ * Copyright 2019-2024 Yury Kharchenko
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -382,7 +382,7 @@ void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 			if (choiceType == MULTIPLE) {
 				item.setSelected(!item.isSelected());
 				adapter.notifyDataSetChanged();
-				notifyStateChanged();
+				postStateChanged();
 				return;
 			}
 			if (!item.isSelected()) {
@@ -391,7 +391,7 @@ void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 				}
 				item.setSelected(true);
 				adapter.notifyDataSetChanged();
-				notifyStateChanged();
+				postStateChanged();
 			}
 		}
 	}
@@ -409,7 +409,7 @@ public void onItemSelected(AdapterView<?> parent, View view, int position, long
 					adapter.notifyDataSetChanged();
 				}
 			}
-			notifyStateChanged();
+			postStateChanged();
 		}
 
 		@Override

app/src/main/java/javax/microedition/lcdui/Display.java

@@ -1,6 +1,7 @@
 /*
  * Copyright 2012 Kulikov Dmitriy
  * Copyright 2017-2018 Nikita Shakarun
+ * Copyright 2020-2024 Yury Kharchenko
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -140,8 +141,11 @@ public boolean vibrate(int duration) {
 	}
 
 	public void setCurrentItem(Item item) {
-		if (item.hasOwner()) {
-			setCurrent(item.getOwner());
+		Screen owner = item.getOwner();
+		if (owner instanceof Form) {
+			setCurrent(owner);
+		} else {
+			throw new IllegalStateException("Item is not owned by a Form");
 		}
 	}
 

app/src/main/java/javax/microedition/lcdui/Form.java

@@ -2,7 +2,7 @@
  * Copyright 2012 Kulikov Dmitriy
  * Copyright 2015-2016 Nickolay Savchenko
  * Copyright 2017-2018 Nikita Shakarun
- * Copyright 2020-2023 Yury Kharchenko
+ * Copyright 2020-2024 Yury Kharchenko
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@
 
 import java.util.ArrayList;
 
+import javax.microedition.lcdui.event.SimpleEvent;
 import javax.microedition.util.ContextHolder;
 
 public class Form extends Screen {
@@ -158,10 +159,16 @@ public void setItemStateListener(ItemStateListener listener) {
 		this.listener = listener;
 	}
 
-	public void notifyItemStateChanged(Item item) {
-		if (listener != null) {
-			listener.itemStateChanged(item);
-		}
+	void notifyItemStateChanged(Item item) {
+		Display.postEvent(new SimpleEvent() {
+			@Override
+			public void process() {
+				ItemStateListener l = listener;
+				if (l != null) {
+					l.itemStateChanged(item);
+				}
+			}
+		});
 	}
 
 	@Override

app/src/main/java/javax/microedition/lcdui/Gauge.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2012 Kulikov Dmitriy
- * Copyright 2021-2023 Yury Kharchenko
+ * Copyright 2021-2024 Yury Kharchenko
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -125,7 +125,7 @@ private class SeekBarListener implements SeekBar.OnSeekBarChangeListener {
 		public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
 			if (fromUser) {
 				value = progress;
-				notifyStateChanged();
+				postStateChanged();
 			}
 		}
 

app/src/main/java/javax/microedition/lcdui/Item.java

@@ -1,6 +1,6 @@
 /*
  * Copyright 2012 Kulikov Dmitriy
- * Copyright 2019-2023 Yury Kharchenko
+ * Copyright 2019-2024 Yury Kharchenko
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -136,8 +136,8 @@ public int getPreferredWidth() {
 	}
 
 	public void notifyStateChanged() {
-		if (owner instanceof Form form) {
-			form.notifyItemStateChanged(this);
+		if (owner instanceof Form) {
+			postStateChanged();
 		} else {
 			throw new IllegalStateException("Item is not owned by a Form");
 		}
@@ -204,6 +204,12 @@ public void setPreferredSize(int width, int height) {
 		this.height = height == -1 ? 0 : height;
 	}
 
+	void postStateChanged() {
+		if (owner instanceof Form form) {
+			form.notifyItemStateChanged(this);
+		}
+	}
+
 	void setOwner(Screen owner) {
 		this.owner = owner;
 		ViewHandler.postEvent(new SimpleEvent() {
@@ -215,10 +221,6 @@ public void process() {
 	}
 
 	Screen getOwner() {
-		if (owner == null) {
-			throw new IllegalStateException("call setOwnerForm() before calling getOwnerForm()");
-		}
-
 		return owner;
 	}
 

app/src/main/java/javax/microedition/lcdui/TextBox.java

@@ -1,6 +1,7 @@
 /*
  * Copyright 2012 Kulikov Dmitriy
  * Copyright 2017 Nikita Shakarun
+ * Copyright 2021-2024 Yury Kharchenko
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +18,10 @@
 
 package javax.microedition.lcdui;
 
-import android.content.Context;
+import android.view.Gravity;
 import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout.LayoutParams;
 
 import javax.microedition.util.ContextHolder;
 
@@ -90,8 +93,10 @@ public void delete(int offset, int length) {
 
 	@Override
 	public View getScreenView() {
-		Context context = ContextHolder.getActivity();
-		return textField.getView(context, null);
+		EditText et = textField.getView(ContextHolder.getActivity(), null);
+		et.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
+		et.setGravity(Gravity.TOP);
+		return et;
 	}
 
 	@Override

app/src/main/java/javax/microedition/lcdui/TextField.java

@@ -1,6 +1,7 @@
 /*
  * Copyright 2012 Kulikov Dmitriy
  * Copyright 2017-2018 Nikita Shakarun
+ * Copyright 2021-2024 Yury Kharchenko
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +18,6 @@
 
 package javax.microedition.lcdui;
 
-import android.content.Context;
 import android.view.View;
 
 import javax.microedition.util.ContextHolder;
@@ -105,8 +105,13 @@ public void delete(int offset, int length) {
 
 	@Override
 	public View getItemContentView() {
-		Context context = ContextHolder.getActivity();
-		return textField.getView(context, this);
+		View view = textField.getView(ContextHolder.getActivity(), this);
+		view.setOnFocusChangeListener((v, hasFocus) -> {
+			if (!hasFocus) {
+				postStateChanged();
+			}
+		});
+		return view;
 	}
 
 	@Override

app/src/main/java/javax/microedition/lcdui/TextFieldImpl.java

@@ -1,6 +1,7 @@
 /*
  * Copyright 2012 Kulikov Dmitriy
  * Copyright 2019 Nikita Shakarun
+ * Copyright 2021-2024 Yury Kharchenko
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +24,7 @@
 import android.text.InputType;
 import android.text.TextWatcher;
 import android.text.method.PasswordTransformationMethod;
-import android.view.Gravity;
-import android.view.ViewGroup.LayoutParams;
 import android.widget.EditText;
-import android.widget.LinearLayout;
 
 import androidx.appcompat.widget.AppCompatEditText;
 
@@ -193,16 +191,6 @@ public void afterTextChanged(Editable s) {
 					text = s.toString();
 				}
 			});
-
-			if (item != null) {
-				textview.setOnFocusChangeListener((v, hasFocus) -> {
-					if (!hasFocus) item.notifyStateChanged();
-				});
-			} else {
-				textview.setLayoutParams(new LinearLayout.LayoutParams(
-						LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
-				textview.setGravity(Gravity.TOP);
-			}
 		}
 		return textview;
 	}