diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 86dd0b1..44d36cf 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/cactusClient/Cactus.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java index c4a6c46..a21946d 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java @@ -1,10 +1,12 @@ package org.ntlab.radishforandroidstudio.cactusClient; -import android.accounts.Account; + import android.app.Activity; import android.app.Application; import android.os.Bundle; +import org.ntlab.radishforandroidstudio.cactusClient.models.Account; + public class Cactus extends Application { private Account myAccount = null; diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java index fdbc2d5..c246924 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java @@ -7,25 +7,36 @@ import android.view.View; import android.view.ViewGroup; import android.support.v4.app.Fragment; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; import android.widget.Button; +import android.widget.ListView; import android.widget.Toast; import org.ntlab.radishforandroidstudio.R; +import org.ntlab.radishforandroidstudio.cactusClient.Cactus; +import org.ntlab.radishforandroidstudio.cactusClient.models.Account; + +import java.util.ArrayList; public class CharactersFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - String test = getArguments().getString("test"); - Toast.makeText(getActivity(), test, Toast.LENGTH_SHORT).show(); + int position = getArguments().getInt("position"); + + Cactus c = (Cactus) getActivity().getApplication(); + Account account = c.getMyAccount(); + // Inflate the layout for this fragment return inflater.inflate(R.layout.characters_fragment, container, false); } - public void onStart() { - super.onStart(); + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { Button button = (Button) getActivity().findViewById(R.id.chooseInstances); //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ @@ -44,14 +55,25 @@ } }); - Button Nobita = (Button) getActivity().findViewById(R.id.NOBITA); - //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ - Nobita.setOnClickListener(new View.OnClickListener() { + // ListViewに表示するデータ + final ArrayList items = new ArrayList<>(); + items.add("キャラクター1"); + items.add("キャラクター2"); + items.add("キャラクター3"); + + // ListViewをセット + final ArrayAdapter adapter = new ArrayAdapter(this.getContext(), android.R.layout.simple_list_item_1, items); + ListView listView = (ListView) view.findViewById(R.id.list); + 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) { + //ここでサーバーに何番のインスタンスが選ばれたのかを送信して、受け取った値に応じてキャラクターを送信しなければならない + //................................................... + //positionで選ばれたインスタンスわかるで！数字は０からやで！例えば１はデータ２やで！やで FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); transaction.replace(R.id.fragment_place, new PlayerFragment()); @@ -59,6 +81,5 @@ 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 b1dad9c..673fd26 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 @@ -15,7 +15,9 @@ import net.arnx.jsonic.TypeReference; import org.ntlab.radishforandroidstudio.R; +import org.ntlab.radishforandroidstudio.cactusClient.Cactus; import org.ntlab.radishforandroidstudio.cactusClient.connections.LoginFragmentConnection; +import org.ntlab.radishforandroidstudio.cactusClient.models.Account; import org.ntlab.radishforandroidstudio.cactusClient.models.URIAddressedAccount; import org.ntlab.radishforandroidstudio.framework.network.CallBack; @@ -67,7 +69,7 @@ transaction.commit(); // **********************************************************************/ -/* + if (userName.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "ユーザー名が未記入です", Toast.LENGTH_SHORT).show(); return; @@ -84,8 +86,12 @@ URIAddressedAccount lac = JSON.decode(response, new TypeReference(){}); System.out.println("///////////////////////////////////////////////"); System.out.println(response); + Account user = lac.getAccount(); - if(response.contains("\"login\":true,")){ + if(user.isLogin()){ + Cactus c = (Cactus) getActivity().getApplication(); + c.setMyAccount(user); + Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show(); FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); @@ -100,7 +106,7 @@ connection.addFormParam("userID", userName.getText().toString()); connection.addFormParam("userPass", passWord.getText().toString()); connection.doPut(); - */ + } }); diff --git a/app/src/main/res/layout/characters_fragment.xml b/app/src/main/res/layout/characters_fragment.xml index 41c4574..5b021d8 100644 --- a/app/src/main/res/layout/characters_fragment.xml +++ b/app/src/main/res/layout/characters_fragment.xml @@ -7,44 +7,29 @@ android:layout_height="match_parent">