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..fd3e695 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,12 @@ 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; @@ -15,6 +18,30 @@ 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(); + } + }); + } } 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..d56721c 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java @@ -23,18 +23,4 @@ } - - -// 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/SighUpFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SighUpFragment.java deleted file mode 100644 index 72dd7ab..0000000 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SighUpFragment.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ntlab.radishforandroidstudio.cactusClient; - - -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import org.ntlab.radishforandroidstudio.R; - -public class SighUpFragment extends Fragment { - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.sigh_up_fragment, container, false); - - } -} 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..cd6e99f --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SignUpFragment.java @@ -0,0 +1,47 @@ +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.commit(); + } + }); + + } +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c5ea249..a3ae61b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,8 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + tools:layout="@layout/activity_main" /> \ No newline at end of file diff --git a/app/src/main/res/layout/login.xml b/app/src/main/res/layout/login.xml deleted file mode 100644 index 17221f5..0000000 --- a/app/src/main/res/layout/login.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - -