Bläddra i källkod

add navigation to ListMeasureTypeFragment into main screen

MrOzOn 5 år sedan
förälder
incheckning
ec3a40999d

+ 1 - 0
app/build.gradle

@@ -65,4 +65,5 @@ dependencies {
     implementation project(':feature_splash')
     implementation project(':feature_auth')
     implementation project(':feature_person')
+    implementation project(':feature_measure_type')
 }

+ 5 - 1
app/src/main/java/com/mrozon/healthdiary/presentation/main/MainActivity.kt

@@ -59,7 +59,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(){
         navView = binding.navView
         navController = findNavController(R.id.nav_host_fragment)
         appBarConfiguration = AppBarConfiguration(
-            setOf(R.id.listPersonFragment),
+            setOf(R.id.listPersonFragment, R.id.listMeasureTypeFragment),
             binding.drawerLayout
         )
         setupActionBarWithNavController(navController, appBarConfiguration)
@@ -70,6 +70,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(){
                     if(currentDestinationId!=R.id.listPersonFragment)
                         navController.navigate(R.id.action_global_listPersonFragment)
                 }
+                R.id.show_measure_types -> {
+                    if(currentDestinationId!=R.id.listMeasureTypeFragment)
+                        navController.navigate(R.id.action_global_listMeasureTypeFragment)
+                }
             }
             drawerLayout.closeDrawer(GravityCompat.START)
             true

+ 5 - 0
app/src/main/res/drawable/ic_measure_type_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"/>
+</vector>

+ 5 - 0
app/src/main/res/menu/navigation_menu.xml

@@ -6,4 +6,9 @@
         android:title="@string/list_persons"
         />
 
+    <item android:id="@+id/show_measure_types"
+        android:icon="@drawable/ic_measure_type_24"
+        android:title="@string/list_measure_types"
+        />
+
 </menu>

+ 13 - 0
app/src/main/res/navigation/nav_graph.xml

@@ -115,4 +115,17 @@
         app:popEnterAnim="@anim/slide_in_left"
         app:popExitAnim="@anim/slide_out_right"/>
 
+    <fragment
+        android:id="@+id/listMeasureTypeFragment"
+        android:name="com.mrozon.feature_measure_type.presentation.ListMeasureTypeFragment"
+        tools:layout="@layout/fragment_list_measure_type"
+        android:label="@string/list_measure_types" />
+
+    <action android:id="@+id/action_global_listMeasureTypeFragment"
+        app:destination="@id/listMeasureTypeFragment"
+        app:enterAnim="@anim/slide_in_right"
+        app:exitAnim="@anim/slide_out_left"
+        app:popEnterAnim="@anim/slide_in_left"
+        app:popExitAnim="@anim/slide_out_right"/>
+
 </navigation>

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

@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">HealthDiary</string>
     <string name="list_persons">Persons</string>
+    <string name="list_measure_types">Measure types</string>
 </resources>

+ 1 - 1
feature_measure_type/src/main/java/com/mrozon/feature_measure_type/presentation/ListMeasureTypeFragment.kt

@@ -24,6 +24,6 @@ class ListMeasureTypeFragment: BaseFragment<FragmentListMeasureTypeBinding>() {
     }
 
     override fun subscribeUi() {
-        TODO("Not yet implemented")
+//        TODO("Not yet implemented")
     }
 }

+ 2 - 2
feature_measure_type/src/main/res/layout/item_measure_type.xml

@@ -30,7 +30,7 @@
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
                 android:alpha="0.75"
-                app:load_logo="{measure_type}"
+                app:load_logo="@{measure_type}"
                 android:contentDescription="@string/ivLogo"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -49,7 +49,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Large"
                 android:textColor="#000000"
                 android:textSize="20sp"
-                app:name_with_mark="{measure_type}"
+                app:name_with_mark="@{measure_type}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.0"