diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index c212c12..97f911f 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java index 252ffd3..8254501 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java @@ -1,30 +1,109 @@ +//package org.ntlab.radishforandroidstudio.framework.RWT; +// +//import android.support.annotation.NonNull; +//import android.support.v4.app.Fragment; +//import android.os.Bundle; +//import android.view.LayoutInflater; +//import android.view.MotionEvent; +//import android.view.View; +//import android.view.ViewGroup; +// +//import org.ntlab.radishforandroidstudio.R; +//import org.ntlab.radishforandroidstudio.cactusClient.PlayerActivity; +//import org.ntlab.radishforandroidstudio.framework.event.PadEvent; +//import org.ntlab.radishforandroidstudio.framework.listener.PadListener; +// +//import static android.view.View.*; +// +//public class RWTUIFragment extends Fragment implements OnTouchListener, PadListener { +// PlayerActivity listener = null; +// View v = null; +// +// public RWTUIFragment() { +// } +// +// @Override +// public void onCreate(Bundle savedInstanceState) { +// super.onCreate(savedInstanceState); +// } +// +// @Override +// public View onCreateView(LayoutInflater inflater, ViewGroup container, +// Bundle savedInstanceState) { +// v = inflater.inflate(R.layout.ui_fragment, container, false); +// RWTPad pad = v.findViewById(org.ntlab.radishforandroidstudio.R.id.button3); +// pad.addListener(this); +// +// if (listener != null) { +// listener.onCreateFragmentEvent(this); +// } +// return inflater.inflate(R.layout.ui_fragment, null); +// } +// +// @Override +// public boolean onTouch(View v, MotionEvent event) { +// System.out.println("RWTUIFragment touch"); +// v.performClick(); +// return false; +// } +// +// public void setListener(PlayerActivity activity) { +// listener = activity; +// } +// +// @Override +// public boolean onEvent(PadEvent event) { +// return false; +// } +// public View findViewById(int id) { +// return v.findViewById(id); +// } +//} package org.ntlab.radishforandroidstudio.framework.RWT; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import android.app.Activity; +import android.app.Fragment; import android.os.Bundle; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.PlayerActivity; import org.ntlab.radishforandroidstudio.framework.event.PadEvent; import org.ntlab.radishforandroidstudio.framework.listener.PadListener; +import org.ntlab.radishforandroidstudio.sample.SampleGameActivity; + + +//import android.support.annotation.NonNull; +//import android.support.v4.app.Fragment; +//import android.os.Bundle; +//import android.view.LayoutInflater; +//import android.view.MotionEvent; +//import android.view.View; +//import android.view.ViewGroup; +// +//import org.ntlab.radishforandroidstudio.R; +//import org.ntlab.radishforandroidstudio.cactusClient.PlayerActivity; +//import org.ntlab.radishforandroidstudio.framework.event.PadEvent; +//import org.ntlab.radishforandroidstudio.framework.listener.PadListener; +// +//import static android.view.View.*; import static android.view.View.*; -public class RWTUIFragment extends Fragment implements OnTouchListener, PadListener { +public class RWTUIFragment extends Fragment implements OnTouchListener,PadListener { PlayerActivity listener = null; View v = null; - - public RWTUIFragment() { - } + public RWTUIFragment() {} @Override public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } @Override @@ -43,7 +122,11 @@ @Override public boolean onTouch(View v, MotionEvent event) { System.out.println("RWTUIFragment touch"); - v.performClick(); + return false; + } + + @Override + public boolean onEvent(PadEvent event) { return false; } @@ -51,11 +134,8 @@ listener = activity; } - @Override - public boolean onEvent(PadEvent event) { - return false; - } public View findViewById(int id) { return v.findViewById(id); } + }