- 최종 완료

app/src/main/AndroidManifest.xml

@@ -16,7 +16,8 @@
         <activity
             android:name=".ui.main.SplashActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/FullscreenTheme">
+            android:theme="@style/FullscreenTheme"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/aaron/kakao/hospitalmapfortube/ui/main/MainActivity.kt

@@ -358,15 +358,7 @@ class MainActivity : BindingActivity<ActivityMainBinding, MainViewModel>() {
                     .request()
                     .subscribe({ permissionResult ->
                         if (permissionResult.isGranted) {
-                            LocationUtil.getCurrentLocation(context)?.let {
-                                setMapCenterPoint(
-                                    MapPoint.mapPointWithGeoCoord(
-                                        it.latitude,
-                                        it.longitude
-                                    ), true
-                                )
-                                initMap()
-                            }
+                            initMap()
                         } else {
                             Toast.makeText(
                                 context,

app/src/main/java/com/aaron/kakao/hospitalmapfortube/ui/main/MainViewModel.kt

@@ -31,6 +31,8 @@ class MainViewModel(private val api: MapAPI) : BaseViewModel() {
     val isOilEnabled = ObservableBoolean(false)
     // 새로고침 버튼 활성화 여부
     val isRefreshEnabled = ObservableBoolean(false)
+    // 로딩바 노출 여부
+    val isLoading = ObservableBoolean(false)
     private val locationList = mutableListOf<Document>()
 
     var currentHospitalPage = 1
@@ -52,16 +54,18 @@ class MainViewModel(private val api: MapAPI) : BaseViewModel() {
         if (requests.isNotEmpty()) {
             addToDisposable(
                 Observable.mergeDelayError(getMergeRequest(mapPoint))
+                    .doOnSubscribe { isLoading.set(true) }
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe({
-//                        responseCount++
                         if (it.documents.isNotEmpty()) {
                             locationList.addAll(it.documents)
                             checkEnd(it)
                         }
                     }, {
+                        isLoading.set(false)
                         it.printStackTrace()
                     }, {
+                        isLoading.set(false)
                         if (locationList.isNotEmpty()) {
                             getCategories(locationList, isMore)
                         }

app/src/main/res/layout/activity_main.xml

@@ -95,6 +95,14 @@
             android:textColor="@android:color/white"
             android:text="@string/more"
             android:onClick="@{() -> vm.moreClick()}" />
+        <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:visibility="@{vm.isLoading ? View.VISIBLE : View.GONE}" />
 
     </android.support.constraint.ConstraintLayout>
 </layout>