diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 3ad325b..2a85782 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 c94e863..b437570 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/Theme.AppCompat.Light.NoActionBar" > diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java index a39069b..b86e81e 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java @@ -3,9 +3,15 @@ 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; @@ -15,6 +21,54 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment - return inflater.inflate(R.layout.login, container, false); + 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.TOP, 0, 0); + tp.show(); + + } + }); + + + } } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java index 9e21f6f..4b3e368 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java @@ -17,24 +17,9 @@ Fragment fragment; fragment = new LoginFragment(); - getSupportFragmentManager().beginTransaction() - .replace(R.id.fragment_place, fragment) - .commit(); + getSupportFragmentManager().beginTransaction().add(R.id.fragment_place, fragment).commit(); + } - - -// public void ChangeFragment(View view) { -// Fragment fragment; -// //inportに注意：import android.support.v4.app.Fragment; -// -// -// if (view == findViewById(R.id.loginButton)) { -// fragment = new LoginFragment(); -// getSupportFragmentManager().beginTransaction() -// .replace(R.id.fragment_place, fragment) -// .commit(); -// } -// } } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SignUpFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SignUpFragment.java new file mode 100644 index 0000000..8396843 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SignUpFragment.java @@ -0,0 +1,48 @@ +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.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; + +import org.ntlab.radishforandroidstudio.R; + +public class SignUpFragment extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.sign_up_fragment, container, false); + + } + + //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ + @Override + public void onStart() { + super.onStart(); + + Button button = (Button)getActivity().findViewById(R.id.LoginButton2); + 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 LoginFragment()); + transaction.replace(R.id.fragment_place, new LoginFragment()); + + transaction.commit(); + } + }); + + } +} diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test index e69de29..d75fa73 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test @@ -0,0 +1,96 @@ + + + + + + + +