diff --git a/app/src/main/java/org/ntlab/amaryllis/client/fragment/ListFragment.java b/app/src/main/java/org/ntlab/amaryllis/client/fragment/ListFragment.java
index efa454c..552fc74 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/fragment/ListFragment.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/fragment/ListFragment.java
@@ -4,6 +4,7 @@
import android.os.Bundle;
import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
import android.view.LayoutInflater;
import android.view.View;
@@ -71,7 +72,7 @@
}
// 呼び出し元のFragment
-public class MyFragment extends Fragment implements MyDialogFragment.MyDialog.OnOkClickListener {
+class MyFragment extends Fragment implements MyDialogFragment.MyDialog.OnOkClickListener {
// ダイアログを表示するボタン
private Button mDispDialog;
@@ -84,10 +85,10 @@
mSelectedText = (TextView) v.findViewById(R.id.textSelected);
mDispDialog = (Button) v.findViewById(R.id.btnDispDialog);
- mDispDialog.setOnClickListener(new DialogInterface.OnClickListener() {
+ mDispDialog.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
FragmentManager manager = getActivity().getSupportFragmentManager();
- MyDialog dialog = MyDialog.newInstance();
+ MyDialogFragment.MyDialog dialog = MyDialogFragment.MyDialog.newInstance();
dialog.setTargetFragment(MyFragment.this, 0); // ★★★
dialog.show(manager, "MyDialog");
}
diff --git a/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java b/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
index f0d9653..00cfc02 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
@@ -36,7 +36,7 @@
import com.google.android.gms.maps.model.MarkerOptions;
import org.ntlab.amaryllis.client.Amaryllis;
-import org.ntlab.amaryllis.client.DialogFragment;
+import org.ntlab.amaryllis.client.MyDialogFragment;
import org.ntlab.amaryllis.client.R;
import org.ntlab.amaryllis.client.VoiceActivity;
import org.ntlab.amaryllis.client.entities.SignUpJson;
@@ -112,10 +112,10 @@
dialogButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
//Record();
- FragmentManager manager = getActivity().getSupportFragmentManager();
- MyDialogFragment dialog = MyDialogFragment.newInstance();
- dialog.setTargetFragment(MapsFragment.this, 0);
- dialog.show(manager, "MyDialogFragment");
+ //FragmentManager manager = getActivity().getSupportFragmentManager();
+ //MyDialogFragment dialog = MyDialogFragment.newInstance();
+ //dialog.setTargetFragment(MapsFragment.this, 0);
+ //dialog.show(manager, "MyDialogFragment");
}
@@ -397,7 +397,7 @@
- public static class MyDialogFragment extends DialogFragment {
+ //public static class MyDialogFragment extends DialogFragment {
private DialogFragmentListener dialogFragmentListener;
@@ -411,93 +411,82 @@
}
//
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
-
-
- Fragment targetFragment = this.getTargetFragment();
- try{
- if(targetFragment != null){
- dialogFragmentListener = (DialogFragmentListener)targetFragment;
- }
- }catch (ClassCastException e){
- throw new ClassCastException("DialogFragmentListenerをimplementしていません");
- }
- }
-
- public MyDialogFragment newInstance(Fragment fragment){
- MyDialogFragment instance = new MyDialogFragment();
- instance.setTargetFragment(fragment, 0);
- return instance;
- }
-
- @NonNull
//@Override
- public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-
- AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity())
- .setTitle("購入")
- .setMessage("購入しますか?")
- .setPositiveButton("購入する", new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- dialogFragmentListener.onDialogPositiveButtonClicked();
- }
- })
- .setNegativeButton("やめる", null);
-
- return dialogBuilder.create();
- }
- }
+ //public void onAttach(Context context) {
+ //super.onAttach(context);
+ //Fragment targetFragment = this.getTargetFragment();
+ //try{
+ //if(targetFragment != null){
+ //dialogFragmentListener = (DialogFragmentListener)targetFragment;
+ //}
+ //}catch (ClassCastException e){
+ //throw new ClassCastException("DialogFragmentListenerをimplementしていません");
+ //}
+ //}
+
+ //public MyDialogFragment newInstance(Fragment fragment){
+ //MyDialogFragment instance = new MyDialogFragment();
+ //instance.setTargetFragment(fragment, 0);
+ //return instance;
+ //}
+
+ //@NonNull
+ //@Override
+ //public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+
+ //AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity())
+ //.setTitle("購入")
+ //.setMessage("購入しますか?")
+ //.setPositiveButton("購入する", new DialogInterface.OnClickListener() {
+ //@Override
+ //public void onClick(DialogInterface dialog, int which) {
+ //dialogFragmentListener.onDialogPositiveButtonClicked();
+ //}
+ //})
+ //.setNegativeButton("やめる", null);
+
+ //return dialogBuilder.create();
+ //}
+ //}
-
-
-
-
-
-
- //public class FireMissilesDialogFragment extends DialogFragment {
- //@Override
- //public Dialog onCreateDialog(Bundle savedInstanceState) {
+ //public class FireMissilesDialogFragment extends DialogFragment {
+ //@Override
+ //public Dialog onCreateDialog(Bundle savedInstanceState) {
// Use the Builder class for convenient dialog construction
//AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
//builder.setMessage("R.string.dialog_fire_missiles")
- //.setPositiveButton("R.string.fire", new DialogInterface.OnClickListener() {
- //public void onClick(DialogInterface dialog, int id) {
- // FIRE ZE MISSILES!
- //}
- //})
- //.setNegativeButton("R.string.cancel", new DialogInterface.OnClickListener() {
- //public void onClick(DialogInterface dialog, int id) {
- // User cancelled the dialog
- //}
- //});
+ //.setPositiveButton("R.string.fire", new DialogInterface.OnClickListener() {
+ //public void onClick(DialogInterface dialog, int id) {
+ // FIRE ZE MISSILES!
+ //}
+ //})
+ //.setNegativeButton("R.string.cancel", new DialogInterface.OnClickListener() {
+ //public void onClick(DialogInterface dialog, int id) {
+ // User cancelled the dialog
+ //}
+ //});
// Create the AlertDialog object and return it
//return builder.create();
- //}
- //}
+ //}
+ //}
- //FireMissilesDialogFragment F1 = new FireMissilesDialogFragment();
+ //FireMissilesDialogFragment F1 = new FireMissilesDialogFragment();
+ //private DialogFragment.OnOkButtonClickedListener mListener;
+ //private void Record() {
+ //ダイアログの作成
+ //AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+ //builder.setTitle("mTitle")
+ //.setMessage("mMessage")
+ //.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+ //public void onClick(DialogInterface dialog, int id) {
+ //mListener.onOkButtonClicked();
+ //}
+ //});
+ //}
-
-
- //private DialogFragment.OnOkButtonClickedListener mListener;
- //private void Record() {
- //ダイアログの作成
- //AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
- //builder.setTitle("mTitle")
- //.setMessage("mMessage")
- //.setPositiveButton("OK", new DialogInterface.OnClickListener() {
- //public void onClick(DialogInterface dialog, int id) {
- //mListener.onOkButtonClicked();
- //}
- //});
- //}
-
-}
\ No newline at end of file
+ }
diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml
index a3afe30..2e7bf4a 100644
--- a/app/src/main/res/layout/fragment_list.xml
+++ b/app/src/main/res/layout/fragment_list.xml
@@ -1,14 +1,61 @@
-
+
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file