From 4e20d0006fd21722d940a5c4ca94f8813ac6f9e8 Mon Sep 17 00:00:00 2001 From: nemukemo Date: Sun, 14 Jul 2024 01:12:56 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=9E=E3=83=83=E3=83=97=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=81=AE=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/oplogy/FirestoreReception.java | 5 ++- .../main/java/com/example/oplogy/Maps.java | 31 ++++++++++++------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/example/oplogy/FirestoreReception.java b/app/src/main/java/com/example/oplogy/FirestoreReception.java index 0d69f20..006c41b 100644 --- a/app/src/main/java/com/example/oplogy/FirestoreReception.java +++ b/app/src/main/java/com/example/oplogy/FirestoreReception.java @@ -27,8 +27,11 @@ public class FirestoreReception { //ClassIdを引数にデータの作成を行う public void getDocumentsByClassId(int classId) { myDataList.clear(); - CollectionReference collectionRef = db.collection("testDistinct"); + //pixel6a + CollectionReference collectionRef = db.collection("test0711Data"); + //xiaomi +// CollectionReference collectionRef = db.collection("testDistinct"); // classIdが引数のものを取得する collectionRef.whereEqualTo("classId", classId).get() .addOnCompleteListener(new OnCompleteListener() { diff --git a/app/src/main/java/com/example/oplogy/Maps.java b/app/src/main/java/com/example/oplogy/Maps.java index d94af0a..b6867c1 100644 --- a/app/src/main/java/com/example/oplogy/Maps.java +++ b/app/src/main/java/com/example/oplogy/Maps.java @@ -42,9 +42,6 @@ import java.util.Map; public class Maps extends FragmentActivity implements OnMapReadyCallback, View.OnClickListener, GoogleMap.OnMarkerClickListener { - ImageView backMain; - private GoogleMap mMap; - private LinearLayout locationsName; //GoogleMapAPiで使用可能な色 private static final int[] COLORS = new int[]{Color.parseColor("#007FFF"), // HUE_AZURE Color.parseColor("#0000FF"), // HUE_BLUE @@ -57,13 +54,14 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O Color.parseColor("#8A2BE2"), // HUE_VIOLET Color.parseColor("#FFFF00") // HUE_YELLOW }; - private int colorIndex = 0; private final List latLngList = new ArrayList<>(); private final List nameList = new ArrayList<>(); private final List colorList = new ArrayList<>(); - private final Map dateMap = new HashMap<>(); - + ImageView backMain; + private GoogleMap mMap; + private LinearLayout locationsName; + private int colorIndex = 0; @Override protected void onCreate(Bundle savedInstanceState) { @@ -213,11 +211,22 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O //家庭訪問のscheduleを7桁の整数から○月〇日●時〇分(6041200→06月12日05時20分)に変換 private String formatSchedule(String schedule) { - String monthString = "0" + schedule.substring(0, 1); - String dayString = schedule.substring(1, 3); - String hourString = schedule.substring(3, 5); - String minuteString = schedule.substring(5, 7); - return monthString + "月" + dayString + "日" + hourString + "時" + minuteString + "分"; + Log.d("Maps", "schedule: " + schedule); + if (schedule.length() != 7) { + schedule = "0" + schedule; + String monthString = schedule.substring(0, 2); + String dayString = schedule.substring(2, 4); + String hourString = "0" + schedule.substring(4, 5); + String minuteString = schedule.substring(5, 7); + return monthString + "月" + dayString + "日" + hourString + "時" + minuteString + "分"; + } else { + String monthString = "0" + schedule.substring(0, 1); + String dayString = schedule.substring(1, 3); + String hourString = schedule.substring(3, 5); + String minuteString = schedule.substring(5, 7); + return monthString + "月" + dayString + "日" + hourString + "時" + minuteString + "分"; + + } } // 共有プリファレンスからMyDataListを取得するメソッド -- 2.45.1 From 060934e22f1873acec3b9c4c7021ceacd7bc9558 Mon Sep 17 00:00:00 2001 From: nemukemo Date: Mon, 15 Jul 2024 13:05:54 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=94=E4=B8=AD=E7=B5=8C=E9=81=8E?= =?UTF-8?q?=E3=81=A7=E3=81=99=E3=81=8C=E3=83=8A=E3=83=93=E3=82=B2=E3=83=BC?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=90=E3=83=BC=E3=82=92=E5=AE=9F?= =?UTF-8?q?=E8=A3=85=E3=81=97=E3=81=A6=E3=81=84=E3=81=BE=E3=81=99=20?= =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=B0=E3=83=A1=E3=83=B3=E3=83=88=E3=81=A9?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=97=E3=82=8D=E3=81=A3=E3=81=A6=E3=82=93?= =?UTF-8?q?=E3=81=AD=E3=82=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 3 + app/src/main/res/layout/main.xml | 86 +++++++++++------------ app/src/main/res/menu/bottom_nav_menu.xml | 15 ++++ 3 files changed, 60 insertions(+), 44 deletions(-) create mode 100644 app/src/main/res/menu/bottom_nav_menu.xml diff --git a/app/build.gradle b/app/build.gradle index cae72cc..1c335be 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,3 +60,6 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:4.9.3' implementation 'com.google.code.gson:gson:2.8.9' // Gsonライブラリの追加 } +dependencies { + implementation 'com.google.android.material:material:1.5.0' +} diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index e7d57c6..67f2e23 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -7,27 +7,28 @@ android:orientation="vertical" android:weightSum="20" tools:context=".MainActivity"> + + + android:layout_weight="2" /> - + + android:orientation="horizontal" + android:weightSum="2"> + android:src="@drawable/checked_image" /> + android:textSize="50dp" /> - + + android:orientation="horizontal" + android:weightSum="2"> + android:src="@drawable/checked_image" /> + android:text="セットアップ" + android:textSize="40dp" + android:textStyle="bold" /> + android:layout_weight="3" /> - + + android:layout_weight="3" + android:orientation="horizontal" + android:weightSum="2"> + android:src="@drawable/pin" /> + android:text="ルート表示" + android:textSize="40dp" + android:textStyle="bold" /> - + + android:layout_weight="3" + android:orientation="horizontal" + android:weightSum="2"> + android:src="@drawable/submission" /> + android:text="提出状況" + android:textSize="40dp" + android:textStyle="bold" /> - - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml new file mode 100644 index 0000000..6f4688c --- /dev/null +++ b/app/src/main/res/menu/bottom_nav_menu.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file -- 2.45.1