diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index a3f0973..38b75d5 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7c3c703..0bb4b7c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,15 +21,15 @@ - - - - - - + + + + + + + + + diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java index 8aaabb5..ca7edc3 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java @@ -120,7 +120,7 @@ f.setListener(this); android.view.View uiLayout = (android.view.View)findViewById(org.ntlab.radishforandroidstudio.R.id.ui_layout); uiLayout.setOnTouchListener((RWTUIFragment)f); - transaction.add(org.ntlab.radishforandroidstudio.R.id.ui_layout, f); + // transaction.add(org.ntlab.radishforandroidstudio.R.id.ui_layout, f); transaction.commit(); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java index 3c678f2..30dd729 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java @@ -1,7 +1,6 @@ package org.ntlab.radishforandroidstudio.cactusClient.views; -import android.accounts.Account; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; @@ -9,41 +8,53 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; import android.widget.Button; -import android.widget.EditText; -import android.widget.Toast; - +import android.widget.ListView; import org.ntlab.radishforandroidstudio.R; +import java.util.ArrayList; +import java.util.List; + public class InstancesFragment extends Fragment { + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment return inflater.inflate(R.layout.instances_fragment, container, false); } + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + // ListViewに表示するデータ + final ArrayList items = new ArrayList<>(); + items.add("データ1"); + items.add("データ2"); + items.add("データ3"); - public void onStart() { - super.onStart(); - - Button button = (Button) getActivity().findViewById(R.id.Instance1); - //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ - button.setOnClickListener(new View.OnClickListener() { - + // ListViewをセット + final ArrayAdapter adapter = new ArrayAdapter(this.getContext(), android.R.layout.simple_list_item_1, items); + ListView listView = (ListView) view.findViewById(R.id.list_view); + listView.setAdapter(adapter); + // セルを選択されたら詳細画面フラグメント呼び出す + listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onClick(View v) { - //Toast.makeText(getActivity(), "hoge!", Toast.LENGTH_SHORT).show(); + public void onItemClick(AdapterView parent, View v, int position, long id) { + + //ここでサーバーに何番のインスタンスが選ばれたのかを送信して、受け取った値に応じてキャラクターを送信しなければならない + //................................................... + // FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.fragment_place, new CharactersFragment()); - transaction.commit(); } }); } + } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java index 4cc9675..ab3373a 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java @@ -44,13 +44,10 @@ @Override public void onClick(View v) { //Toast.makeText(getActivity(), "hoge!", Toast.LENGTH_SHORT).show(); - FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.addToBackStack(null); transaction.replace(R.id.fragment_place, new SignUpFragment()); - transaction.commit(); } }); @@ -63,6 +60,15 @@ EditText userName = (EditText)getActivity().findViewById(R.id.inputUserName); EditText passWord = (EditText)getActivity().findViewById(R.id.checkPassword); + /**************************************************************** + テストするなら以下を実行するとパスの入力をしなくても画面遷移します + FragmentManager manager = getFragmentManager(); + FragmentTransaction transaction = manager.beginTransaction(); + + transaction.replace(R.id.fragment_place, new InstancesFragment()); + + transaction.commit(); + **********************************************************************/ if (userName.getText().toString().isEmpty()) { @@ -77,27 +83,15 @@ public void onResponse(String response) { //通信した時の処理を書くのだよ URIAddressedEntity lac = JSON.decode(response, URIAddressedEntity.class); - System.out.println("///////////////////////////////////////////////"); - - - - System.out.println(response); - //Cactus.setMyAccount((Account)lac.getBody()); - - if(response.contains("\"login\":true,")){ Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show(); - FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.fragment_place, new InstancesFragment()); - transaction.commit(); - }else { Toast.makeText(getActivity(),"ログインに失敗しました。", Toast.LENGTH_SHORT).show(); } 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 4ab001a..0cc5ec7 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,8 +1,9 @@ package org.ntlab.radishforandroidstudio.framework.RWT; import android.app.Activity; -import android.app.Fragment; + import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; diff --git a/app/src/main/res/layout/instances_fragment.xml b/app/src/main/res/layout/instances_fragment.xml index eca4d58..bc2ac30 100644 --- a/app/src/main/res/layout/instances_fragment.xml +++ b/app/src/main/res/layout/instances_fragment.xml @@ -6,9 +6,13 @@ android:layout_width="match_parent" android:layout_height="match_parent"> -