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..7b048b8 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java @@ -51,11 +51,11 @@ } //MyAccountの追加 - public Account getMyAccount(){ + public Account getMyAccount() { return myAccount; } - public void setMyAccount(Account ac){ + public void setMyAccount(Account ac) { myAccount = ac; } 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 41f363c..8815056 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 @@ -1,16 +1,15 @@ package org.ntlab.radishforandroidstudio.cactusClient.views; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.support.v4.app.Fragment; import android.widget.Button; import android.widget.Toast; - import org.ntlab.radishforandroidstudio.R; public class CharactersFragment extends Fragment { @@ -37,9 +36,7 @@ FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.framelayout_place, new InstancesFragment()); - 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 f9c40e6..0da159e 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 @@ -12,7 +12,6 @@ import android.widget.ArrayAdapter; import android.widget.ListView; - import org.ntlab.radishforandroidstudio.R; import java.util.ArrayList; @@ -33,6 +32,7 @@ // Inflate the layout for this fragment return inflater.inflate(R.layout.instances_fragment, container, false); } + @Override public void onViewCreated(View view, Bundle savedInstanceState) { // ListViewに表示するデータ @@ -58,9 +58,9 @@ FragmentTransaction transaction = manager.beginTransaction(); CharactersFragment fragment = new CharactersFragment(); Bundle bundle = new Bundle(); - bundle.putSerializable("test","これはテストです"); + bundle.putSerializable("test", "これはテストです"); fragment.setArguments(bundle); - transaction.replace(R.id.framelayout_place, fragment,"characters_fragment"); + transaction.replace(R.id.framelayout_place, fragment, "characters_fragment"); transaction.commit(); } }); 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 31a0b2a..e772b27 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 @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; + import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.connections.LoginFragmentConnection; @@ -28,7 +29,7 @@ public void onStart() { super.onStart(); - Button button = (Button)getActivity().findViewById(R.id.signUP1); + Button button = (Button) getActivity().findViewById(R.id.signUP1); //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ button.setOnClickListener(new View.OnClickListener() { @@ -44,12 +45,12 @@ }); //↑↑↑↑↑画面遷移↑↑↑↑↑↑ - Button loginButton = (Button)getActivity().findViewById(R.id.login); + Button loginButton = (Button) getActivity().findViewById(R.id.login); loginButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - EditText userName = (EditText)getActivity().findViewById(R.id.inputUserName); - EditText passWord = (EditText)getActivity().findViewById(R.id.checkPassword); + EditText userName = (EditText) getActivity().findViewById(R.id.inputUserName); + EditText passWord = (EditText) getActivity().findViewById(R.id.checkPassword); // /**************************************************************** // テストするなら以下を実行するとパスの入力をしなくても画面遷移します diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java index 945fa9f..50b2019 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/StartFragment.java @@ -26,12 +26,12 @@ super.onStart(); Button button = getActivity().findViewById(R.id.start_button); - button.setOnClickListener(new View.OnClickListener(){ + button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.framelayout_place,new LoginFragment()); + transaction.replace(R.id.framelayout_place, new LoginFragment()); transaction.commit(); } });