From 4e65216874c5e44fe464b69523e635418192cee2 Mon Sep 17 00:00:00 2001 From: it232115 Date: Wed, 5 Jun 2024 16:24:29 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8BActivit?= =?UTF-8?q?y=E3=81=AE=E4=BA=8B=E5=89=8D=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 32 ++++++++++++++----- .../example/oplogy/CreateUuidActivity.java | 14 ++++++++ .../example/oplogy/NotSubmissionActivity.java | 14 ++++++++ .../example/oplogy/RootSearchActivity.java | 14 ++++++++ .../com/example/oplogy/SetupActivity.java | 14 ++++++++ .../example/oplogy/SubmissionActivity.java | 14 ++++++++ .../com/example/oplogy/TutorialActivity.java | 14 ++++++++ .../main/res/layout/activity_create_uuid.xml | 9 ++++++ .../res/layout/activity_not_submimission.xml | 9 ++++++ .../res/layout/activity_not_submission.xml | 9 ++++++ .../main/res/layout/activity_root_search.xml | 9 ++++++ app/src/main/res/layout/activity_setup.xml | 9 ++++++ .../main/res/layout/activity_submission.xml | 9 ++++++ app/src/main/res/layout/activity_tutorial.xml | 9 ++++++ 14 files changed, 171 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/com/example/oplogy/CreateUuidActivity.java create mode 100644 app/src/main/java/com/example/oplogy/NotSubmissionActivity.java create mode 100644 app/src/main/java/com/example/oplogy/RootSearchActivity.java create mode 100644 app/src/main/java/com/example/oplogy/SetupActivity.java create mode 100644 app/src/main/java/com/example/oplogy/SubmissionActivity.java create mode 100644 app/src/main/java/com/example/oplogy/TutorialActivity.java create mode 100644 app/src/main/res/layout/activity_create_uuid.xml create mode 100644 app/src/main/res/layout/activity_not_submimission.xml create mode 100644 app/src/main/res/layout/activity_not_submission.xml create mode 100644 app/src/main/res/layout/activity_root_search.xml create mode 100644 app/src/main/res/layout/activity_setup.xml create mode 100644 app/src/main/res/layout/activity_submission.xml create mode 100644 app/src/main/res/layout/activity_tutorial.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0c525a5..0599ba9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,7 +12,24 @@ android:supportsRtl="true" android:theme="@style/Theme.Oplogy" tools:targetApi="31"> - + + + + + + + android:value="AIzaSyBQ1Ak-I2NL5TP4K59ZI0VgzKk6HNZuusw" /> - - - - + + + + + - - diff --git a/app/src/main/java/com/example/oplogy/CreateUuidActivity.java b/app/src/main/java/com/example/oplogy/CreateUuidActivity.java new file mode 100644 index 0000000..a700f87 --- /dev/null +++ b/app/src/main/java/com/example/oplogy/CreateUuidActivity.java @@ -0,0 +1,14 @@ +package com.example.oplogy; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class CreateUuidActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_create_uuid); + } +} \ 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 new file mode 100644 index 0000000..302c03e --- /dev/null +++ b/app/src/main/java/com/example/oplogy/NotSubmissionActivity.java @@ -0,0 +1,14 @@ +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.activity_not_submission); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/oplogy/RootSearchActivity.java b/app/src/main/java/com/example/oplogy/RootSearchActivity.java new file mode 100644 index 0000000..7714fd2 --- /dev/null +++ b/app/src/main/java/com/example/oplogy/RootSearchActivity.java @@ -0,0 +1,14 @@ +package com.example.oplogy; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class RootSearchActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_root_search); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/oplogy/SetupActivity.java b/app/src/main/java/com/example/oplogy/SetupActivity.java new file mode 100644 index 0000000..f999b42 --- /dev/null +++ b/app/src/main/java/com/example/oplogy/SetupActivity.java @@ -0,0 +1,14 @@ +package com.example.oplogy; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class SetupActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_setup); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/oplogy/SubmissionActivity.java b/app/src/main/java/com/example/oplogy/SubmissionActivity.java new file mode 100644 index 0000000..c1d9ab4 --- /dev/null +++ b/app/src/main/java/com/example/oplogy/SubmissionActivity.java @@ -0,0 +1,14 @@ +package com.example.oplogy; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class SubmissionActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_submission); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/oplogy/TutorialActivity.java b/app/src/main/java/com/example/oplogy/TutorialActivity.java new file mode 100644 index 0000000..ca1408b --- /dev/null +++ b/app/src/main/java/com/example/oplogy/TutorialActivity.java @@ -0,0 +1,14 @@ +package com.example.oplogy; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class TutorialActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_tutorial); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_create_uuid.xml b/app/src/main/res/layout/activity_create_uuid.xml new file mode 100644 index 0000000..39a8f89 --- /dev/null +++ b/app/src/main/res/layout/activity_create_uuid.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_not_submimission.xml b/app/src/main/res/layout/activity_not_submimission.xml new file mode 100644 index 0000000..8dabdd3 --- /dev/null +++ b/app/src/main/res/layout/activity_not_submimission.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_not_submission.xml b/app/src/main/res/layout/activity_not_submission.xml new file mode 100644 index 0000000..cfb7bba --- /dev/null +++ b/app/src/main/res/layout/activity_not_submission.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_root_search.xml b/app/src/main/res/layout/activity_root_search.xml new file mode 100644 index 0000000..7a3f713 --- /dev/null +++ b/app/src/main/res/layout/activity_root_search.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml new file mode 100644 index 0000000..eeacfd1 --- /dev/null +++ b/app/src/main/res/layout/activity_setup.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_submission.xml b/app/src/main/res/layout/activity_submission.xml new file mode 100644 index 0000000..d9cbc15 --- /dev/null +++ b/app/src/main/res/layout/activity_submission.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_tutorial.xml b/app/src/main/res/layout/activity_tutorial.xml new file mode 100644 index 0000000..46791f9 --- /dev/null +++ b/app/src/main/res/layout/activity_tutorial.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file From 455e903026079f0e393121e97f081242beb049ca Mon Sep 17 00:00:00 2001 From: oKikuti Date: Wed, 5 Jun 2024 16:57:59 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E8=8F=8A=E6=B1=A0=20=E3=83=A1=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E4=BD=9C=E6=88=90=E9=96=8B=E5=A7=8B=E3=81=A8?= =?UTF-8?q?=E3=80=81=E5=85=A8=E4=BD=93=E3=81=AE=E5=90=8D=E5=89=8D=E3=81=AE?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 47 +++--- ...reateUuidActivity.java => CreateUUID.java} | 4 +- .../main/java/com/example/oplogy/Main.java | 14 ++ .../java/com/example/oplogy/MainActivity.java | 143 ------------------ .../oplogy/{MapsActivity.java => Maps.java} | 20 +-- .../example/oplogy/NotSubmissionActivity.java | 2 +- .../example/oplogy/RootSearchActivity.java | 2 +- .../com/example/oplogy/SetupActivity.java | 2 +- .../example/oplogy/SubmissionActivity.java | 2 +- .../com/example/oplogy/TutorialActivity.java | 2 +- app/src/main/res/layout/activity_main.xml | 69 --------- .../res/layout/activity_not_submimission.xml | 9 -- ...tivity_create_uuid.xml => create_uuid.xml} | 2 +- app/src/main/res/layout/main.xml | 59 ++++++++ .../layout/{activity_maps.xml => maps.xml} | 2 +- ..._not_submission.xml => not_submission.xml} | 0 ...tivity_root_search.xml => root_search.xml} | 0 .../layout/{activity_setup.xml => setup.xml} | 0 ...activity_submission.xml => submission.xml} | 0 .../{activity_tutorial.xml => tutorial.xml} | 0 20 files changed, 116 insertions(+), 263 deletions(-) rename app/src/main/java/com/example/oplogy/{CreateUuidActivity.java => CreateUUID.java} (66%) create mode 100644 app/src/main/java/com/example/oplogy/Main.java delete mode 100644 app/src/main/java/com/example/oplogy/MainActivity.java rename app/src/main/java/com/example/oplogy/{MapsActivity.java => Maps.java} (66%) delete mode 100644 app/src/main/res/layout/activity_main.xml delete mode 100644 app/src/main/res/layout/activity_not_submimission.xml rename app/src/main/res/layout/{activity_create_uuid.xml => create_uuid.xml} (90%) create mode 100644 app/src/main/res/layout/main.xml rename app/src/main/res/layout/{activity_maps.xml => maps.xml} (91%) rename app/src/main/res/layout/{activity_not_submission.xml => not_submission.xml} (100%) rename app/src/main/res/layout/{activity_root_search.xml => root_search.xml} (100%) rename app/src/main/res/layout/{activity_setup.xml => setup.xml} (100%) rename app/src/main/res/layout/{activity_submission.xml => submission.xml} (100%) rename app/src/main/res/layout/{activity_tutorial.xml => tutorial.xml} (100%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0599ba9..e0fd57a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools" > + tools:targetApi="31" > + + + + + @@ -28,27 +50,12 @@ android:name=".SetupActivity" android:exported="false" /> - - - + android:label="@string/title_activity_maps" > @@ -57,7 +64,7 @@ + android:exported="true" > diff --git a/app/src/main/java/com/example/oplogy/CreateUuidActivity.java b/app/src/main/java/com/example/oplogy/CreateUUID.java similarity index 66% rename from app/src/main/java/com/example/oplogy/CreateUuidActivity.java rename to app/src/main/java/com/example/oplogy/CreateUUID.java index a700f87..5d3aaf9 100644 --- a/app/src/main/java/com/example/oplogy/CreateUuidActivity.java +++ b/app/src/main/java/com/example/oplogy/CreateUUID.java @@ -4,11 +4,11 @@ import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -public class CreateUuidActivity extends AppCompatActivity { +public class CreateUUID extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_create_uuid); + setContentView(R.layout.create_uuid); } } \ 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/Main.java new file mode 100644 index 0000000..1548ebe --- /dev/null +++ b/app/src/main/java/com/example/oplogy/Main.java @@ -0,0 +1,14 @@ +package com.example.oplogy; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class Main extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.main); + } +} \ 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 deleted file mode 100644 index 49ea77b..0000000 --- a/app/src/main/java/com/example/oplogy/MainActivity.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.example.oplogy; - -import android.annotation.SuppressLint; -import android.os.Bundle; -import android.util.Log; -import android.view.View; -import android.widget.Button; -import android.widget.EditText; -import android.widget.TextView; - -import androidx.appcompat.app.AppCompatActivity; - -import com.google.firebase.firestore.FirebaseFirestore; -import com.google.firebase.firestore.QueryDocumentSnapshot; - - - -public class MainActivity extends AppCompatActivity implements View.OnClickListener { - private TextView textView; - private Button btnShow; - private Button btnAdd; - private EditText number; - private EditText address; - private EditText date; - private EditText time; - private FirebaseFirestore db = FirebaseFirestore.getInstance(); - - - Button button; -// TextView textView; - EditText editText; - @SuppressLint("MissingInflatedId") - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - - textView=findViewById(R.id.showText); - btnShow=findViewById(R.id.btnShow); - btnAdd=findViewById(R.id.btnAdd); - - number=findViewById(R.id.editNumber); - address=findViewById(R.id.editAddress); - date=findViewById(R.id.editDate); - time=findViewById(R.id.editTime); - - - //データの追加(適当なデータを追加しています。実際にはデータベースに保存したいデータを追加してください。) - - findViewById(R.id.btnAdd).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - User user = new User(number.getText().toString(), address.getText().toString(),date.getText().toString(),time.getText().toString()); - - - db.collection("users") - .add(user) - .addOnSuccessListener(documentReference -> Log.d("@FB1", "DocumentSnapshot added with ID: " + documentReference.getId())) - .addOnFailureListener(e -> Log.w("@FB1", "Error adding document", e)); - } - }); - - - btnShow.setOnClickListener(v -> { - // ⑤Read Data - // Firestoreのコレクション「users」のドキュメント一覧を取得する - // 非同期で取得処理が動作する。結果を受け取るために処理完了時のリスナーをセットする - db.collection("users").get().addOnCompleteListener(task -> { - String data = ""; - if (task.isSuccessful()) { - for (QueryDocumentSnapshot document : task.getResult()) { - Log.d("@FB1", document.getId() + "=>" + document.getData()); - User user = document.toObject(User.class); - data += user + "\n"; - } - } else { - data = "Error getting documents." + task.getException().getMessage(); - } - textView.setText(data);//編集したデータを画面下部に表示 - }); - - - }); - - - - findViewById(R.id.mapmapcreate).setOnClickListener( - view->{ - - - } - ); - } - - @Override - public void onClick(View v) { - - - } -} -class User { - private String number; - private String address; - private String date; - private String time; - - public User() { - } - - public User(String number, String address, String data, String time) { - this.number = number; - this.address = address; - this.date = data; - this.time = time; - } - //getterとsetter - public String getNumber() { - return number; - } - public String getAddress() { - return address; - } - public String getDate() { - return date; - } - public String getTime() { - return time; - } - public void setNumber(String number) { - this.number = number; - } - public void setAddress(String address) { - this.address = address; - } - public void setDate(String date) { - this.date = date; - } - public void setTime(String time) { - this.time = time; - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/example/oplogy/MapsActivity.java b/app/src/main/java/com/example/oplogy/Maps.java similarity index 66% rename from app/src/main/java/com/example/oplogy/MapsActivity.java rename to app/src/main/java/com/example/oplogy/Maps.java index 267cde1..0a35d6a 100644 --- a/app/src/main/java/com/example/oplogy/MapsActivity.java +++ b/app/src/main/java/com/example/oplogy/Maps.java @@ -10,19 +10,18 @@ import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.MarkerOptions; -import com.example.oplogy.databinding.ActivityMapsBinding; -//import com.google.type.LatLng; +import com.example.oplogy.databinding.MapsBinding; -public class MapsActivity extends FragmentActivity implements OnMapReadyCallback { +public class Maps extends FragmentActivity implements OnMapReadyCallback { private GoogleMap mMap; - private ActivityMapsBinding binding; + private MapsBinding binding; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - binding = ActivityMapsBinding.inflate(getLayoutInflater()); + binding = MapsBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); // Obtain the SupportMapFragment and get notified when the map is ready to be used. @@ -45,13 +44,8 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback mMap = googleMap; // Add a marker in Sydney and move the camera - /// 緯度経度 - LatLng loc = new LatLng(35.17260398479137, 136.88635173557998); - /// マーカーオプションを設定（情報ウィンドウ） - mMap.addMarker(new MarkerOptions().position(loc).title("トライデントコンピュータ専門学校")); - /// 表示位置を地図に指定 - mMap.moveCamera(CameraUpdateFactory.newLatLng(loc)); - /// 地図の倍率を指定 - mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(loc, 17)); + LatLng sydney = new LatLng(-34, 151); + mMap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney")); + mMap.moveCamera(CameraUpdateFactory.newLatLng(sydney)); } } \ 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 index 302c03e..0043d28 100644 --- a/app/src/main/java/com/example/oplogy/NotSubmissionActivity.java +++ b/app/src/main/java/com/example/oplogy/NotSubmissionActivity.java @@ -9,6 +9,6 @@ public class NotSubmissionActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_not_submission); + setContentView(R.layout.not_submission); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/oplogy/RootSearchActivity.java b/app/src/main/java/com/example/oplogy/RootSearchActivity.java index 7714fd2..645f113 100644 --- a/app/src/main/java/com/example/oplogy/RootSearchActivity.java +++ b/app/src/main/java/com/example/oplogy/RootSearchActivity.java @@ -9,6 +9,6 @@ public class RootSearchActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_root_search); + setContentView(R.layout.root_search); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/oplogy/SetupActivity.java b/app/src/main/java/com/example/oplogy/SetupActivity.java index f999b42..13a4902 100644 --- a/app/src/main/java/com/example/oplogy/SetupActivity.java +++ b/app/src/main/java/com/example/oplogy/SetupActivity.java @@ -9,6 +9,6 @@ public class SetupActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_setup); + setContentView(R.layout.setup); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/oplogy/SubmissionActivity.java b/app/src/main/java/com/example/oplogy/SubmissionActivity.java index c1d9ab4..c6e2d7f 100644 --- a/app/src/main/java/com/example/oplogy/SubmissionActivity.java +++ b/app/src/main/java/com/example/oplogy/SubmissionActivity.java @@ -9,6 +9,6 @@ public class SubmissionActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_submission); + setContentView(R.layout.submission); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/oplogy/TutorialActivity.java b/app/src/main/java/com/example/oplogy/TutorialActivity.java index ca1408b..85f207c 100644 --- a/app/src/main/java/com/example/oplogy/TutorialActivity.java +++ b/app/src/main/java/com/example/oplogy/TutorialActivity.java @@ -9,6 +9,6 @@ public class TutorialActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_tutorial); + setContentView(R.layout.tutorial); } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 1d78a77..0000000 --- a/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - -