diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 35ec0d7..1d1275b 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/views/CharactersFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java index 5680c55..fdbc2d5 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 @@ -8,6 +8,7 @@ import android.view.ViewGroup; import android.support.v4.app.Fragment; import android.widget.Button; +import android.widget.Toast; import org.ntlab.radishforandroidstudio.R; @@ -17,6 +18,8 @@ @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + String test = getArguments().getString("test"); + Toast.makeText(getActivity(), test, Toast.LENGTH_SHORT).show(); // Inflate the layout for this fragment return inflater.inflate(R.layout.characters_fragment, container, false); } 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 9aabc51..d8fed11 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 @@ -58,7 +58,11 @@ FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.fragment_place, new CharactersFragment()); + CharactersFragment fragment = new CharactersFragment(); + Bundle bundle = new Bundle(); + bundle.putSerializable("test","これはテストです"); + fragment.setArguments(bundle); + transaction.replace(R.id.fragment_place, fragment,"characters_fragment"); transaction.commit(); } }); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java index 57064dc..938ade5 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java @@ -11,6 +11,8 @@ import android.widget.EditText; import android.widget.Toast; import net.arnx.jsonic.JSON; +import net.arnx.jsonic.TypeReference; + import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.connections.SignUpFragmentConnection; import org.ntlab.radishforandroidstudio.cactusClient.models.URIAddressedAccount; @@ -79,7 +81,9 @@ public void onResponse(String response) { //通信した時の処理を書くのだよ URIAddressedAccount ac = JSON.decode(response, URIAddressedAccount.class); - System.out.println(ac.getUri()); + URIAddressedAccount ac2 = JSON.decode(response, new TypeReference(){}); + System.out.println("JSON.decode(response, URIAddressedAccount.class);\n"+ac.getUri()); + System.out.println("JSON.decode(response, new TypeReference(){});\n"+ac2.getUri()); System.out.println(response); Toast.makeText(getActivity(),response, Toast.LENGTH_SHORT).show(); } diff --git a/app/src/main/res/layout/login_fragment.xml b/app/src/main/res/layout/login_fragment.xml index b1a3de6..bf988b6 100644 --- a/app/src/main/res/layout/login_fragment.xml +++ b/app/src/main/res/layout/login_fragment.xml @@ -23,7 +23,7 @@ android:layout_height="40dp" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" - android:layout_marginBottom="74dp" + android:layout_marginBottom="84dp" android:text="Login" />