初回起動時に現在地にフォーカスしてくれない #13

Author: koogawa

app/src/main/AndroidManifest.xml

@@ -23,6 +23,8 @@
             </intent-filter>
         </activity>
         <activity android:name=".ui.alerts.detail.AlertDetailActivity" />
+        <activity android:name=".ui.WebViewActivity" />
+        <meta-data android:name="com.google.android.geo.API_KEY" android:value="YOUR API KEY"/>
     </application>
 
 </manifest>

app/src/main/java/net/lmlab/m_tsunami_android/ui/map/MapFragment.kt

@@ -5,14 +5,13 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.Fragment
 import com.google.android.gms.maps.*
-import androidx.core.app.ActivityCompat.requestPermissions
 import androidx.lifecycle.ViewModelProviders
 import androidx.lifecycle.Observer
 import com.google.android.gms.maps.model.*
@@ -23,6 +22,10 @@ import net.lmlab.m_tsunami_android.ui.WebViewActivity
 
 class MapFragment : Fragment(), OnMapReadyCallback {
 
+    companion object {
+        val REQUEST_LOCATION = 10
+    }
+
     private lateinit var viewModel: MapViewModel
 
     private var routePostions = ArrayList<LatLng>()
@@ -104,11 +107,17 @@ class MapFragment : Fragment(), OnMapReadyCallback {
         mapView.onLowMemory()
     }
 
-    // todo: なぜか呼ばれない
     // 許可を求めるダイアログで何らかのボタンが押されたときに発生するイベント
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        Log.d("m_tsunami_android", "onRequestPermissionsResult")
+        if (requestCode != REQUEST_LOCATION) { return }
+
+        if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+            Toast.makeText(context, R.string.location_permission_denied, Toast.LENGTH_LONG).show()
+            return
+        }
+
+        loadData()
     }
 
     private fun observe() {
@@ -132,7 +141,6 @@ class MapFragment : Fragment(), OnMapReadyCallback {
                         .position(latLng)
                         .title(it.name)
                         .snippet("標高" + it.altitude.toString() + "m " + it.structure + " " + it.floor + "階")
-//                        .icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_GREEN))
                         .icon(icon)
                 )
             }
@@ -173,18 +181,22 @@ class MapFragment : Fragment(), OnMapReadyCallback {
 
     private fun checkPermission() {
         if (ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-            requestPermissions(requireActivity(), arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), 10) //REQUEST_LOCATION
+            requestPermissions(arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), REQUEST_LOCATION)
         } else {
-            // 許可済でないとクラッシュする
-            googleMap.isMyLocationEnabled = true
-
-            viewModel.getLastLocation()
-            viewModel.loadBuildings()
-            viewModel.loadToilets()
-            viewModel.loadWebcams()
+            loadData()
         }
     }
 
+    private fun loadData() {
+        // 許可済でないとクラッシュする
+        googleMap.isMyLocationEnabled = true
+
+        viewModel.getLastLocation()
+        viewModel.loadBuildings()
+        viewModel.loadToilets()
+        viewModel.loadWebcams()
+    }
+
     private fun setMarkersAndRoute(route: Route) {
         val startLatLng = LatLng(route.startLat!!, route.startLng!!)
         val endLatLng = LatLng(route.endLat!!, route.endLng!!)

app/src/main/java/net/lmlab/m_tsunami_android/ui/map/MapViewModel.kt

@@ -92,8 +92,7 @@ class MapViewModel(app: Application): AndroidViewModel(app) {
                     ))
                 } else {
                     val context = getApplication<Application>().applicationContext
-                    Toast.makeText(context, R.string.route_failed, Toast.LENGTH_LONG)
-                        .show()
+                    Toast.makeText(context, R.string.route_failed, Toast.LENGTH_LONG).show()
                 }
             }
 

app/src/main/res/values/strings.xml

@@ -6,4 +6,5 @@
     <string name="title_info">Info</string>
 
     <string name="route_failed">ルートを取得できませんでした</string>
+    <string name="location_permission_denied">現在地を取得するため位置情報の利用を許可してください</string>
 </resources>