Skip to content

Commit

Permalink
Fixed #20! Also updated nav version to 2.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
yashovardhan99 committed Feb 7, 2021
1 parent ab503b5 commit dfb4a2d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class CreateNewActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_create_new)
val request = intent.data?.let { uri ->
Timber.d("Request = $uri")
fromUri(uri)
}
handleRequest(request)
Expand Down
19 changes: 7 additions & 12 deletions app/src/main/res/layout/activity_create_new.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/nav_host_fragment_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent">

<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host_fragment_container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="56dp"
app:defaultNavHost="true"
app:navGraph="@navigation/new_activity_nav_graph" />
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_height="match_parent"
android:layout_marginBottom="56dp"
app:defaultNavHost="true"
app:navGraph="@navigation/new_activity_nav_graph" />
16 changes: 8 additions & 8 deletions app/src/main/res/navigation/new_activity_nav_graph.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
android:id="@+id/action_choosePatientFragment_to_chooseActivityFragment"
app:destination="@id/chooseActivityFragment"
app:popUpToInclusive="false" />
<deepLink
android:id="@+id/deepLink4"
app:uri="healersdiary://com.yashovardhan99.healersdiary/activities/new_activity" />
<!-- <deepLink-->
<!-- android:id="@+id/deepLink4"-->
<!-- app:uri="healersdiary://com.yashovardhan99.healersdiary/activities/new_activity" />-->
</fragment>
<fragment
android:id="@+id/chooseActivityFragment"
Expand All @@ -41,9 +41,9 @@
<argument
android:name="amount_due"
app:argType="long" />
<deepLink
android:id="@+id/deepLink3"
app:uri="healersdiary://com.yashovardhan99.healersdiary/activities/new_activity?patient_id={patient_id}" />
<!-- <deepLink-->
<!-- android:id="@+id/deepLink3"-->
<!-- app:uri="healersdiary://com.yashovardhan99.healersdiary/activities/new_activity?patient_id={patient_id}" />-->
</fragment>
<fragment
android:id="@+id/newHealingFragment"
Expand All @@ -61,10 +61,10 @@
app:argType="long" />
</fragment>
<fragment
tools:layout="@layout/fragment_new_payment"
android:id="@+id/newPaymentFragment"
android:name="com.yashovardhan99.healersdiary.create.NewPaymentFragment"
android:label="NewPaymentFragment">
android:label="NewPaymentFragment"
tools:layout="@layout/fragment_new_payment">
<argument
android:name="patient_id"
app:argType="long" />
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/dependencies/Version.kt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ object Version {
const val ktx_core = "1.3.2"
const val lifecycle = "2.2.0"
const val room = "2.3.0-beta01"
const val navigation = "2.3.0"
const val navigation = "2.3.1"
const val paging = "3.0.0-alpha13"
const val datastore = "1.0.0-alpha06"
const val activity = "1.2.0-rc01"
Expand Down

0 comments on commit dfb4a2d

Please sign in to comment.