From 5bb1a225baa41b6175db5affe094207751f8b102 Mon Sep 17 00:00:00 2001 From: oKikuti Date: Fri, 7 Jun 2024 13:12:21 +0900 Subject: [PATCH] =?UTF-8?q?=E8=8F=8A=E6=B1=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit インテント繋げました --- app/src/google-services.json | 29 +++++ app/src/main/AndroidManifest.xml | 110 ++++++++---------- .../oplogy/{Main.java => DialogFragment.java} | 5 +- .../java/com/example/oplogy/MainActivity.java | 103 ++++++++++++++++ .../example/oplogy/NotSubmissionActivity.java | 14 --- app/src/main/res/drawable/box_root.png | Bin 2245 -> 2145 bytes app/src/main/res/drawable/map_icon.png | Bin 0 -> 14639 bytes .../res/drawable/{pin_root.png => pin.png} | Bin ...not_submission.xml => dialog_fragment.xml} | 9 +- app/src/main/res/layout/main.xml | 4 +- 10 files changed, 192 insertions(+), 82 deletions(-) create mode 100644 app/src/google-services.json rename app/src/main/java/com/example/oplogy/{Main.java => DialogFragment.java} (68%) create mode 100644 app/src/main/java/com/example/oplogy/MainActivity.java delete mode 100644 app/src/main/java/com/example/oplogy/NotSubmissionActivity.java create mode 100644 app/src/main/res/drawable/map_icon.png rename app/src/main/res/drawable/{pin_root.png => pin.png} (100%) rename app/src/main/res/layout/{not_submission.xml => dialog_fragment.xml} (52%) 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 d977b0b32c95c386c6e0bce73f337bcfb495d7bb..e174ad905bb923217bab89f33df1136485c4d7b0 100644 GIT binary patch literal 2145 zcmeAS@N?(olHy`uVBq!ia0y~yVB8DD`#IQvB4?g)`U5G(;vjb?hIQv;UIIBR>5jgR z3=A9lx&I`x0{NT;9+AZi4BWyX%*Zfnjsyb(`!`P)$B>G+w>LIs%`KHU@UTWQOZUcI zCy%b#!JHa%I+9u4UtU`nEuOz%XUiA1R}aFD_-?wsQ~g5M4Q`ER3QHcmQ1Ilc)2b<- zz_M@h{m(ql_q?~B_w@Kr{>K)13=RjMec@%eKJNwN1jQKmY!XUDe;ev-iu{&iBiH=(TwJjhmKsk!!at z7j4K+Dc@*e6{GikS*dQtJr)J$FAOIHY#EGP_#1dGG7kv1CsF2j=AN4FxpN;+zM54X zmHznLwQKV6_7xv4|GasV{W51lSzDsS|KAe#_f&oTIs5v0``PCUrBda&P`tmNZ zNf&>A`uBH!eZ|K|t20?=Y<)k^uC{2y{(6J8n>Y4d{Je+Lp!ogy^Z7o?;wnQWa)(3; z9ChU2FC|9fh%RwtY|eAoqBmy33&t~ZU&PKzlv)37d(4|RGV|Aj-M(xkUA}F5_Vy<`t-DZovl@r&-0r%Vs-lXrk~!M8Owe01!FVlzot@qO?DNm}k7;^dk>44y_T2kxuP1M05-8ddGfz*fd-F!MpLOgF9D#!e zcihdKb?n5^tkSyear1jhvui%Rxw-!Ha{v1KIcD;G!Uw`;olUF1zpv)!)4zZJKD5Z~ zUHtS@$;OB|y{14P-n_O#US7Wb_sec^`ySDR)vh5 z;?Xb|O#`E8U~s2_BkxRnlbQY=t*!qv|C?5q8SURL0&IFP Nc)I$ztaD0e0ssP66;=QM 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 0000000000000000000000000000000000000000..845ec898e68dc8bcee2f24f48e904fe929951418 GIT binary patch literal 14639 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 - + 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">