Fix Binding AccConfigEditor Activity

nialone · Aug 31, 2021 · 82ac445 · 82ac445
1 parent 6cf4618
commit 82ac445
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/app/src/main/java/mattecarra/accapp/activities/AccConfigEditorActivity.kt b/app/src/main/java/mattecarra/accapp/activities/AccConfigEditorActivity.kt
@@ -10,6 +10,7 @@ import android.app.Activity
 import android.content.Intent
 import android.widget.*
 import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProviders
 import com.afollestad.materialdialogs.WhichButton
 import com.afollestad.materialdialogs.actions.setActionButtonEnabled
@@ -51,12 +52,13 @@ class AccConfigEditorActivity : ScopedAppActivity(), NumberPicker.OnValueChangeL
         finish()
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?)
+    {
         super.onCreate(savedInstanceState)
         val binding = ActivityAccConfigEditorBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        content = ContentAccConfigEditorBinding.inflate(layoutInflater)
+        content = binding.contentAccConfigEditor
 
         // Load preferences
         mPreferences = Preferences(this)
@@ -85,8 +87,8 @@ class AccConfigEditorActivity : ScopedAppActivity(), NumberPicker.OnValueChangeL
                     }
             }
 
-        viewModel = ViewModelProviders.of(this, AccConfigEditorViewModelFactory(application, config)).get(
-            AccConfigEditorViewModel::class.java)
+        viewModel = ViewModelProvider(this, AccConfigEditorViewModelFactory(application, config))
+            .get(AccConfigEditorViewModel::class.java)
 
         initUi()
     }

diff --git a/app/src/main/res/layout/activity_acc_config_editor.xml b/app/src/main/res/layout/activity_acc_config_editor.xml
@@ -27,7 +27,8 @@
                  android:layout_height="match_parent"
                  app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <include layout="@layout/content_acc_config_editor"/>
+        <include layout="@layout/content_acc_config_editor"
+            android:id="@+id/content_acc_config_editor"/>
 
     </FrameLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>