MrOzOn před 5 roky
rodič
revize
e10eb12e0b

+ 3 - 1
app/src/main/res/navigation/nav_graph.xml

@@ -177,8 +177,10 @@
             app:destination="@id/tabMeasureFragment"
             app:enterAnim="@anim/slide_in_right"
             app:exitAnim="@anim/slide_out_left"
+            app:launchSingleTop="true"
             app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right"/>
+            app:popExitAnim="@anim/slide_out_right"
+            app:popUpToInclusive="true" />
     </fragment>
 
 </navigation>

+ 2 - 2
core_api/src/main/java/com/mrozon/core_api/network/HealthDiaryService.kt

@@ -6,8 +6,8 @@ import retrofit2.http.*
 
 interface HealthDiaryService {
     companion object {
-        const val ENDPOINT = "http://10.0.2.2:8000/"
-//        const val ENDPOINT = "https://hdb.mr-ozon-1982.tk/"
+//        const val ENDPOINT = "http://10.0.2.2:8000/"
+        const val ENDPOINT = "https://hdb.mr-ozon-1982.tk/"
     }
 
     @POST("login/")

+ 1 - 1
feature_measure/src/main/java/com/mrozon/feature_measure/presentation/ListMeasureFragment.kt

@@ -132,7 +132,7 @@ class ListMeasureFragment : BaseFragment<FragmentListMeasureBinding>() {
                                     arguments?.let {
                                         val personId = requireArguments().getLong(ARG_PERSON_ID, 0)
                                         val measureTypeId = requireArguments().getLong(ARG_MEASURE_TYPE_ID, 0)
-                                        navigator.navigateToEditMeasure(findNavController(),getString(R.string.add_measure),measure.id, personId, measureTypeId)
+                                        navigator.navigateToEditMeasure(findNavController(),getString(R.string.edit_measure),measure.id, personId, measureTypeId)
                                     }
                                 }
                             })

+ 1 - 0
feature_measure/src/main/res/values/strings.xml

@@ -11,4 +11,5 @@
     <string name="measure_added">Measure added</string>
     <string name="hint_value_added">%s ( in %s)</string>
     <string name="error_value">Incorrect value, needed %s</string>
+    <string name="edit_measure">Edit measure</string>
 </resources>