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 0599ba9..134cf3e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,36 +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/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/NotSubmissionActivity.java b/app/src/main/java/com/example/oplogy/DialogFragment.java similarity index 65% rename from app/src/main/java/com/example/oplogy/NotSubmissionActivity.java rename to app/src/main/java/com/example/oplogy/DialogFragment.java index 302c03e..530fd14 100644 --- a/app/src/main/java/com/example/oplogy/NotSubmissionActivity.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 NotSubmissionActivity extends AppCompatActivity { +public class DialogFragment extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_not_submission); + 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 index 49ea77b..e5bc0e8 100644 --- a/app/src/main/java/com/example/oplogy/MainActivity.java +++ b/app/src/main/java/com/example/oplogy/MainActivity.java @@ -1,143 +1,91 @@ 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; +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; //元の画像のインデックス -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") + // セットアップのTextViewとImageView + private TextView root; + private ImageView imageRoot; + private int previousRoot = 0; //元の画像のインデックス + // 提出状況のTextViewとImageView + private TextView submission; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); + setContentView(R.layout.main); +// ID作成用のインテント + creatUUID = findViewById(R.id.creatUUID); + creatUUID.setOnClickListener(this); + imageUuid = findViewById(R.id.imageUuid); - textView=findViewById(R.id.showText); - btnShow=findViewById(R.id.btnShow); - btnAdd=findViewById(R.id.btnAdd); +// セットアップ用のインテント + setUp = findViewById(R.id.setUp); + setUp.setOnClickListener(this); + imageSetup = findViewById(R.id.imageSetup); - number=findViewById(R.id.editNumber); - address=findViewById(R.id.editAddress); - date=findViewById(R.id.editDate); - time=findViewById(R.id.editTime); +// ルート作成用のインテント + root = findViewById(R.id.root); + root.setOnClickListener(this); + imageRoot = findViewById(R.id.imageRoot); +// 提出状況のインテント + submission = findViewById(R.id.submission); + submission.setOnClickListener(this); - //データの追加(適当なデータを追加しています。実際にはデータベースに保存したいデータを追加してください。) - - 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) { + 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 == submission){ + Intent toSubmission = new Intent(MainActivity.this,SubmissionActivity.class); + startActivity(toSubmission); + } } -} -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/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/drawable/box_root.png b/app/src/main/res/drawable/box_root.png new file mode 100644 index 0000000..e174ad9 Binary files /dev/null and b/app/src/main/res/drawable/box_root.png differ diff --git a/app/src/main/res/drawable/checked_image.png b/app/src/main/res/drawable/checked_image.png new file mode 100644 index 0000000..750012f Binary files /dev/null and b/app/src/main/res/drawable/checked_image.png differ diff --git a/app/src/main/res/drawable/ischecked_uuid.png b/app/src/main/res/drawable/ischecked_uuid.png new file mode 100644 index 0000000..615e725 Binary files /dev/null and b/app/src/main/res/drawable/ischecked_uuid.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.png b/app/src/main/res/drawable/pin.png new file mode 100644 index 0000000..c5bf4d3 Binary files /dev/null and b/app/src/main/res/drawable/pin.png differ 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 @@ - - - - - - - - -