diff --git a/app/src/google-services.json b/app/src/google-services.json
new file mode 100644
index 0000000..cc555ea
--- /dev/null
+++ b/app/src/google-services.json
@@ -0,0 +1,29 @@
+{
+ "project_info": {
+ "project_number": "317219128586",
+ "project_id": "oplogy-b6971",
+ "storage_bucket": "oplogy-b6971.appspot.com"
+ },
+ "client": [
+ {
+ "client_info": {
+ "mobilesdk_app_id": "1:317219128586:android:c29583456e8fbd5f12a6f3",
+ "android_client_info": {
+ "package_name": "com.example.oplogy"
+ }
+ },
+ "oauth_client": [],
+ "api_key": [
+ {
+ "current_key": "AIzaSyDaULi2TFHLiscR7DSZBCKS08d76Rtb49c"
+ }
+ ],
+ "services": {
+ "appinvite_service": {
+ "other_platform_oauth_client": []
+ }
+ }
+ }
+ ],
+ "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e0fd57a..134cf3e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,21 +1,19 @@
+xmlns:tools="http://schemas.android.com/tools">
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
+
+
+
-
\ No newline at end of file
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/example/oplogy/Main.java b/app/src/main/java/com/example/oplogy/DialogFragment.java
similarity index 68%
rename from app/src/main/java/com/example/oplogy/Main.java
rename to app/src/main/java/com/example/oplogy/DialogFragment.java
index 1548ebe..530fd14 100644
--- a/app/src/main/java/com/example/oplogy/Main.java
+++ b/app/src/main/java/com/example/oplogy/DialogFragment.java
@@ -1,14 +1,13 @@
package com.example.oplogy;
import androidx.appcompat.app.AppCompatActivity;
-
import android.os.Bundle;
-public class Main extends AppCompatActivity {
+public class DialogFragment extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.main);
+ setContentView(R.layout.dialog_fragment);
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
new file mode 100644
index 0000000..5700f05
--- /dev/null
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -0,0 +1,103 @@
+package com.example.oplogy;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+public class MainActivity extends AppCompatActivity implements View.OnClickListener{
+
+ // ID作成のTextViewとImageView
+ private TextView creatUUID;
+ private ImageView imageUuid;
+ private int previousCreateUUid = 0; //元の画像のインデックス
+
+
+ // セットアップのTextViewとImageView
+ private TextView setUp;
+ private ImageView imageSetup;
+ private int previousSetUp = 0; //元の画像のインデックス
+
+ // セットアップのTextViewとImageView
+ private TextView root;
+ private ImageView imageRoot;
+ private int previousRoot = 0; //元の画像のインデックス
+
+// 未提出・提出済みのボタン
+ private Button notSubmission;
+ private Button submission;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.main);
+// ID作成用のインテント
+ creatUUID = findViewById(R.id.creatUUID);
+ creatUUID.setOnClickListener(this);
+ imageUuid = findViewById(R.id.imageUuid);
+
+
+// セットアップ用のインテント
+ setUp = findViewById(R.id.setUp);
+ setUp.setOnClickListener(this);
+ imageSetup = findViewById(R.id.imageSetup);
+
+// ルート作成用のインテント
+ root = findViewById(R.id.root);
+ root.setOnClickListener(this);
+ imageRoot = findViewById(R.id.imageRoot);
+
+// 未提出のボタンのインテント
+ notSubmission = findViewById(R.id.notSubmission);
+ notSubmission.setOnClickListener(this);
+// 未提出のボタンのインテント
+ submission = findViewById(R.id.submission);
+ submission.setOnClickListener(this);
+
+ }
+
+
+// クリック処理
+ @Override
+ public void onClick(View view) {
+// ID作成のクリック処理
+ if(view == creatUUID){
+ imageUuid.setImageResource(R.drawable.ischecked_uuid);
+ Intent toCreateUUID = new Intent(MainActivity.this, CreateUUID.class);
+ startActivity(toCreateUUID);
+
+ }
+// セットアップのクリック処理
+ if(view == setUp){
+ imageSetup.setImageResource(R.drawable.ischecked_uuid);
+ Intent toSetup = new Intent(MainActivity.this,SetupActivity.class);
+ startActivity(toSetup);
+
+ }
+// ルート作成のクリック処理
+ if(view == root){
+ imageRoot.setImageResource(R.drawable.pin);
+ Intent toRoot = new Intent(MainActivity.this,RootSearchActivity.class);
+ startActivity(toRoot);
+
+ }
+
+ if(view == notSubmission){
+ Intent toNotsubmission = new Intent(MainActivity.this,SubmissionActivity.class);
+ startActivity(toNotsubmission);
+ }
+
+ if(view == submission){
+ Intent toSubmission = new Intent(MainActivity.this,SubmissionActivity.class);
+ startActivity(toSubmission);
+ }
+
+
+ }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/oplogy/NotSubmissionActivity.java b/app/src/main/java/com/example/oplogy/NotSubmissionActivity.java
deleted file mode 100644
index 0043d28..0000000
--- a/app/src/main/java/com/example/oplogy/NotSubmissionActivity.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.example.oplogy;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-
-public class NotSubmissionActivity extends AppCompatActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.not_submission);
- }
-}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/box_root.png b/app/src/main/res/drawable/box_root.png
index d977b0b..e174ad9 100644
Binary files a/app/src/main/res/drawable/box_root.png and b/app/src/main/res/drawable/box_root.png differ
diff --git a/app/src/main/res/drawable/map_icon.png b/app/src/main/res/drawable/map_icon.png
new file mode 100644
index 0000000..845ec89
Binary files /dev/null and b/app/src/main/res/drawable/map_icon.png differ
diff --git a/app/src/main/res/drawable/pin_root.png b/app/src/main/res/drawable/pin.png
similarity index 100%
rename from app/src/main/res/drawable/pin_root.png
rename to app/src/main/res/drawable/pin.png
diff --git a/app/src/main/res/layout/not_submission.xml b/app/src/main/res/layout/dialog_fragment.xml
similarity index 52%
rename from app/src/main/res/layout/not_submission.xml
rename to app/src/main/res/layout/dialog_fragment.xml
index cfb7bba..e8fc551 100644
--- a/app/src/main/res/layout/not_submission.xml
+++ b/app/src/main/res/layout/dialog_fragment.xml
@@ -1,9 +1,10 @@
-
+ tools:context=".DialogFragment">
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 8783a51..2b5113d 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="20"
- tools:context=".Main">
+ tools:context=".MainActivity">