Feature/create trial

app/build.gradle

@@ -3,15 +3,15 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'com.google.gms.google-services' // Google Services Gradle Plugin
     id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'    // Secrets Gradle Plugin
-    id 'androidx.navigation.safeargs.kotlin'    // Navigation Safe Args
+    id "androidx.navigation.safeargs"
 }
 
 android {
     compileSdk 32
 
     defaultConfig {
         applicationId "jp.ac.okinawa_ct.nitoc_ict.aroa"
-        minSdk 31
+        minSdk 26
         targetSdk 32
         versionCode 1
         versionName "1.0"
@@ -42,8 +42,6 @@ dependencies {
     // 基本的なライブラリ
     implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.appcompat:appcompat:1.5.0'
-    implementation 'androidx.activity:activity-ktx:1.5.1'
-    implementation 'androidx.fragment:fragment-ktx:1.5.2'
 
     // レイアウト系
     implementation 'com.google.android.material:material:1.6.1'
@@ -52,27 +50,30 @@ dependencies {
     // ライフサイクル対応コンポーネント
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
     // Navigation
-    def nav_version = "2.5.2"
-    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
-    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
-    implementation "androidx.navigation:navigation-dynamic-features-fragment:$nav_version"
-
-    // Preferences DataStore
-    implementation "androidx.datastore:datastore-preferences:1.0.0"
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.5.1'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     // Google Maps SDK
     implementation 'com.google.android.gms:play-services-maps:18.1.0'
+    implementation "com.google.maps:google-maps-services:0.2.11"
+    implementation 'com.google.maps.android:android-maps-utils:2.2.0'
+
+    //位置情報関係
+    implementation 'com.google.android.gms:play-services-location:16.0.0'
+//    implementation 'com.google.android.libraries.places:places:1.1.0'
 
     // Firebase
     implementation platform('com.google.firebase:firebase-bom:30.2.0')  // Firebase BoM
     implementation 'com.google.firebase:firebase-analytics-ktx' // Firebase Analytics
     implementation 'com.google.firebase:firebase-firestore-ktx' // Firebase FireStore
 
+    implementation "androidx.datastore:datastore-preferences:1.0.0"
+
 }

app/src/main/AndroidManifest.xml

@@ -3,13 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="jp.ac.okinawa_ct.nitoc_ict.aroa">
 
-    <!-- BluetoothLEに対応していないデバイスにはインストール出来ないようにしている -->
-    <uses-feature
-        android:name="android.hardware.bluetooth_le"
-        android:required="true" />
-
-    <!-- Bluetooth関連のパーミッション -->
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
         android:allowBackup="true"
@@ -20,34 +15,22 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AROA"
-        tools:targetApi="32">
+        tools:targetApi="31">
+
         <!-- Google Map API Key -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="${MAPS_API_KEY}" />
 
         <activity
             android:name=".ui.MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:screenOrientation="portrait">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-
-        <activity
-            android:name=".ui.trial_detail.TrialDetailActivity"
-            android:exported="false">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".ui.MainActivity" />
-        </activity>
-
-        <service
-            android:name=".ui.TrialService"
-            android:enabled="true"
-            android:exported="true" />
     </application>
 
 </manifest>

app/src/main/java/jp/ac/okinawa_ct/nitoc_ict/aroa/data/dto/Record.kt

@@ -1,5 +1,7 @@
 package jp.ac.okinawa_ct.nitoc_ict.aroa.data.dto
 
+import java.util.*
+
 /**
  * トライアルの記録を表現するクラス
  *
@@ -9,7 +11,10 @@ package jp.ac.okinawa_ct.nitoc_ict.aroa.data.dto
 sealed class Record {
     abstract val userId: String
     abstract val trialId: String
+    abstract val trialName: String
+    abstract val date: String
     abstract val rank: Int
+    abstract val recordId: String
 
     /**
      * マラソンのトライアルの記録を表現するクラス
@@ -19,8 +24,12 @@ sealed class Record {
     data class MarathonRecord(
         override val userId: String,
         override val trialId: String,
+        override val trialName: String,
+        override val date: String,
+        val distance: Long,
         val time: Long,
         override val rank: Int = -1,
+        override val recordId: String = UUID.randomUUID().toString(),
     ): Record()
 
     /**
@@ -31,7 +40,10 @@ sealed class Record {
     data class DanglingRecord(
         override val userId: String,
         override val trialId: String,
+        override val trialName: String,
+        override val date: String,
         val time: Long,
         override val rank: Int = -1,
+        override val recordId: String,
     ): Record()
 }

app/src/main/java/jp/ac/okinawa_ct/nitoc_ict/aroa/data/dto/Trial.kt

@@ -15,6 +15,7 @@ sealed class Trial {
     abstract val name: String
     abstract val authorUserId: String
     abstract val position: LatLng
+    abstract val createDate: String
     abstract val id: String
 
     /**
@@ -27,6 +28,7 @@ sealed class Trial {
         override val authorUserId: String,
         override val position: LatLng,
         val course: List<LatLng>,
+        override val createDate: String,
         override val id: String = UUID.randomUUID().toString(),
     ) : Trial()
 
@@ -40,6 +42,7 @@ sealed class Trial {
         override val authorUserId: String,
         override val position: LatLng,
         val goalCount: Int,
+        override val createDate: String,
         override val id: String = UUID.randomUUID().toString(),
     ) : Trial()
 }

app/src/main/java/jp/ac/okinawa_ct/nitoc_ict/aroa/data/repository/RecordRepository.kt

@@ -26,7 +26,7 @@ interface RecordRepository {
      * @param startRank 何位から取得するか. 1以上である必要がある。
      * @param maxResult startRankで指定された順位から最大でいくつの[Record]を取得するか
      */
-    fun getRecords(trial: Trial, startRank: Int, maxResult: Int): Flow<Result<List<Record>>>
+    fun getRecords(trialId: String, startRank: Int, maxResult: Int): Flow<Result<List<Record>>>
 
     /**
      * 指定された[Trial]のランキングに[Record]を追加する.すでに同じユーザーの記録がある場合は上書きする
@@ -37,4 +37,8 @@ interface RecordRepository {
      * @return データベースへの送信委成功した時は実際のランキングが保存された[Record]
      */
     fun createOrUpdateRecord(trial: Trial, record: Record): Flow<Result<Record>>
+
+    fun getMyRecords(userId: String): Flow<Result<List<Record>>>
+
+    fun getRecordByTrialIdAndRecordId(trialId: String, recordId: String): Flow<Result<Record>>
 }

app/src/main/java/jp/ac/okinawa_ct/nitoc_ict/aroa/data/repository/RecordRepositoryDummy.kt

@@ -0,0 +1,141 @@
+package jp.ac.okinawa_ct.nitoc_ict.aroa.data.repository
+
+import jp.ac.okinawa_ct.nitoc_ict.aroa.data.dto.Record
+import jp.ac.okinawa_ct.nitoc_ict.aroa.data.dto.Result
+import jp.ac.okinawa_ct.nitoc_ict.aroa.data.dto.Trial
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.*
+
+class RecordRepositoryDummy: RecordRepository {
+    companion object {
+        private val trial1RecordList = mutableListOf<Record>(
+            Record.MarathonRecord(
+                "サイス", "testTrialID_1","沖縄高専外周コース1","2022年10月15日",487,140,2,"testRecordId1"
+            ),
+            Record.MarathonRecord(
+                "知念","testTrialID_1","沖縄高専外周コース1","2022年10月14日",487,150,3,"testRecordId2"
+            ),
+            Record.MarathonRecord(
+                "ひじかた","testTrialID_1","沖縄高専外周コース1","2022年10月13日",487,110,1,"testRecordId3"
+            ),
+        )
+        private val trial2RecordList = mutableListOf<Record>(
+            Record.MarathonRecord(
+                "サイス", "testTrialID_2","沖縄高専外周コース2","2022年10月15日",975,310,2,"testRecordId1"
+            ),
+            Record.MarathonRecord(
+                "知念","testTrialID_2","沖縄高専外周コース2","2022年10月14日",975,340,3,"testRecordId2"
+            ),
+            Record.MarathonRecord(
+                "ひじかた","testTrialID_2","沖縄高専外周コース2","2022年10月13日",975,250,1,"testRecordId3"
+            ),
+        )
+        private val trial3RecordList = mutableListOf<Record>(
+            Record.MarathonRecord(
+                "サイス", "testTrialID_3","沖縄高専外周コース3","2022年10月15日",616,210,2,"testRecordId1"
+            ),
+            Record.MarathonRecord(
+                "知念","testTrialID_3","沖縄高専外周コース3","2022年10月14日",616,290,3,"testRecordId2"
+            ),
+            Record.MarathonRecord(
+                "ひじかた","testTrialID_3","沖縄高専外周コース3","2022年10月13日",616,180,1,"testRecordId3"
+            ),
+        )
+
+        private val myRecordList = mutableListOf<Record>(
+            Record.MarathonRecord(
+                "ひじかた","testTrialID_1","沖縄高専外周コース1","2022年10月13日",487,110,1,"testRecordId1"
+            ),
+            Record.MarathonRecord(
+                "ひじかた","testTrialID_2","沖縄高専外周コース2","2022年10月13日",975,250,1,"testRecordId2"
+            ),
+            Record.MarathonRecord(
+                "ひじかた","testTrialID_3","沖縄高専外周コース3","2022年10月13日",616,180,1,"testRecordId3"
+            ),
+        )
+    }
+
+
+    override fun getRecordByUserId(trial: Trial, userId: String): Flow<Result<Record?>> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getRecords(
+        trialId: String,
+        startRank: Int,
+        maxResult: Int
+    ): Flow<Result<List<Record>>> =
+        flow<Result<List<Record>>> {
+            delay(1000)
+            val comparator : Comparator<Record> = compareBy { it.rank }
+            when(trialId) {
+                trial1RecordList.get(0).trialId -> emit(Result.Success(trial1RecordList.sortedWith(comparator)))
+                trial2RecordList.get(0).trialId -> emit(Result.Success(trial2RecordList.sortedWith(comparator)))
+                trial3RecordList.get(0).trialId -> emit(Result.Success(trial3RecordList.sortedWith(comparator)))
+            }
+        }.catch {
+            when(it) {
+                is Exception -> {
+                    emit(Result.Error(true, it))
+                }
+            }
+        }.onStart {
+            emit(Result.Loading)
+        }.flowOn(Dispatchers.IO)
+
+    override fun createOrUpdateRecord(trial: Trial, record: Record): Flow<Result<Record>> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getMyRecords(userId: String): Flow<Result<List<Record>>> =
+        flow<Result<List<Record>>> {
+            delay(1000)
+            emit(Result.Success(myRecordList))
+        }.catch {
+            when(it) {
+                is Exception -> {
+                    emit(Result.Error(true, it))
+                }
+            }
+        }.onStart {
+            emit(Result.Loading)
+        }.flowOn(Dispatchers.IO)
+
+    override fun getRecordByTrialIdAndRecordId(trialId: String, recordId: String): Flow<Result<Record>> =
+        flow<Result<Record>> {
+            delay(1000)
+            when(trialId) {
+                trial1RecordList.get(0).trialId -> {
+                    for (data in trial1RecordList) {
+                        if (data.recordId == recordId) {
+                            emit(Result.Success(data))
+                        }
+                    }
+                }
+                trial2RecordList.get(0).trialId -> {
+                    for (data in trial2RecordList) {
+                        if (data.recordId == recordId) {
+                            emit(Result.Success(data))
+                        }
+                    }
+                }
+                trial3RecordList.get(0).trialId -> {
+                    for (data in trial3RecordList) {
+                        if (data.recordId == recordId) {
+                            emit(Result.Success(data))
+                        }
+                    }
+                }
+            }
+        }.catch {
+            when(it) {
+                is Exception -> {
+                    emit(Result.Error(true, it))
+                }
+            }
+        }.onStart {
+            emit(Result.Loading)
+        }.flowOn(Dispatchers.IO)
+}
+