diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index bd5fd19..3ad325b 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 e329a11..c94e863 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,15 +21,15 @@ - - - - - - + + + + + + + + + diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java new file mode 100644 index 0000000..a39069b --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java @@ -0,0 +1,20 @@ +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 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, container, false); + } +} 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 909b56b..9e21f6f 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java @@ -1,15 +1,40 @@ package org.ntlab.radishforandroidstudio.cactusClient; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v7.app.AppCompatActivity; import org.ntlab.radishforandroidstudio.R; + + public class MainActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + + Fragment fragment; + fragment = new LoginFragment(); + getSupportFragmentManager().beginTransaction() + .replace(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/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 9d26b30..1c8e84f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,10 +10,43 @@ android:id="@+id/textView" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:layout_marginEnd="33dp" + android:layout_marginLeft="25dp" + android:layout_marginRight="33dp" + android:layout_marginStart="25dp" android:text="MainActivity" android:textSize="36sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@+id/fragment_place" + app:layout_constraintEnd_toStartOf="@+id/loginButton" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + +