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..c5ea249 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,16 +4,18 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".cactusClient.MainActivity">
+ tools:context=".cactusClient.MainActivity"
+ tools:layout_editor_absoluteY="73dp">
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/login.xml b/app/src/main/res/layout/login.xml
new file mode 100644
index 0000000..17221f5
--- /dev/null
+++ b/app/src/main/res/layout/login.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 1a3d812..741b9e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,8 +8,6 @@
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
-
-
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}