diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java deleted file mode 100644 index 6a9f619..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient; - - -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.Gravity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; -import android.widget.EditText; -import android.widget.Toast; - -import org.ntlab.radishforandroidstudio.R; - -public class LoginFragment extends Fragment { - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.login_fragment, container, false); - - } - - - @Override - public void onStart() { - super.onStart(); - - Button button = (Button)getActivity().findViewById(R.id.signUP1); - - - //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ - button.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - //Toast.makeText(getActivity(), "hoge!", Toast.LENGTH_SHORT).show(); - - FragmentManager manager = getFragmentManager(); - FragmentTransaction transaction = manager.beginTransaction(); - - transaction.replace(R.id.fragment_place, new SignUpFragment()); - - transaction.commit(); - } - }); - //↑↑↑↑↑画面遷移↑↑↑↑↑↑ - - 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.inputPassword); - - CharSequence userNameText = userName.getText(); - CharSequence passWordText = passWord.getText(); - - - Toast tp = Toast.makeText(getActivity(), passWordText, Toast.LENGTH_SHORT); - tp.setGravity(Gravity.BOTTOM, 0, 0); - tp.show(); - - } - }); - - - - } -} 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 new file mode 100644 index 0000000..4fd821e --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java @@ -0,0 +1,70 @@ +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.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import org.ntlab.radishforandroidstudio.R; + +public class LoginFragment extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.login_fragment, container, false); + + } + + + @Override + public void onStart() { + super.onStart(); + + Button button = (Button)getActivity().findViewById(R.id.signUP1); + //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ + button.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View v) { + //Toast.makeText(getActivity(), "hoge!", Toast.LENGTH_SHORT).show(); + + FragmentManager manager = getFragmentManager(); + FragmentTransaction transaction = manager.beginTransaction(); + + transaction.replace(R.id.fragment_place, new SignUpFragment()); + + transaction.commit(); + } + }); + //↑↑↑↑↑画面遷移↑↑↑↑↑↑ + + 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.inputPassword); + + CharSequence userNameText = userName.getText(); + CharSequence passWordText = passWord.getText(); + + + Toast tp = Toast.makeText(getActivity(), passWordText, Toast.LENGTH_SHORT); + tp.setGravity(Gravity.BOTTOM, 0, 0); + tp.show(); + + } + }); + + } +} 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 b43ec83..f63aaea 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 @@ -1,17 +1,17 @@ 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.widget.Button; + 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.widget.Button; -import org.ntlab.radishforandroidstudio.R; -import org.ntlab.radishforandroidstudio.cactusClient.LoginFragment; + import org.ntlab.radishforandroidstudio.R; + import org.ntlab.radishforandroidstudio.cactusClient.LoginFragment; public class SignUpFragment extends Fragment { diff --git a/app/src/main/res/layout/sign_up_fragment.xml b/app/src/main/res/layout/sign_up_fragment.xml index 17563da..3eb3002 100644 --- a/app/src/main/res/layout/sign_up_fragment.xml +++ b/app/src/main/res/layout/sign_up_fragment.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/background_light" - tools:context=".cactusClient.SignUpFragment"> + tools:context=".cactusClient.views.SignUpFragment">