fix conflict update viewbinding-delegate

pengdst · May 27, 2021 · c2c9f4d · c2c9f4d
1 parent 51fbd6e
commit c2c9f4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/io/github/pengdst/viewbindingdelegatesample/MainActivity.kt b/app/src/main/java/io/github/pengdst/viewbindingdelegatesample/MainActivity.kt
@@ -3,7 +3,7 @@ package io.github.pengdst.viewbindingdelegatesample
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import io.github.pengdst.libs.ui.extensions.viewBindings
+import io.github.pengdst.libs.ui.activity.viewbinding.ActivityViewBindingDelegate.Companion.viewBindings
 import io.github.pengdst.viewbindingdelegatesample.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {

diff --git a/app/src/main/java/io/github/pengdst/viewbindingdelegatesample/MainFragment.kt b/app/src/main/java/io/github/pengdst/viewbindingdelegatesample/MainFragment.kt
@@ -5,7 +5,7 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import io.github.pengdst.libs.ui.extensions.viewBindings
+import io.github.pengdst.libs.ui.fragment.viewbinding.FragmentViewBindingDelegate.Companion.viewBindings
 import io.github.pengdst.viewbindingdelegatesample.databinding.FragmentMainBinding
 
 class MainFragment : Fragment() {
@@ -15,7 +15,7 @@ class MainFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         // Inflate the layout for this fragment
         return binding.root
     }