diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..3b1189d
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0ad17cb..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-
diff --git a/app/src/main/java/edu/temple/inclassactivity/ImageDisplayFragment.kt b/app/src/main/java/edu/temple/inclassactivity/ImageDisplayFragment.kt
index 4d09c5b..f116bf7 100644
--- a/app/src/main/java/edu/temple/inclassactivity/ImageDisplayFragment.kt
+++ b/app/src/main/java/edu/temple/inclassactivity/ImageDisplayFragment.kt
@@ -18,6 +18,12 @@ class ImageDisplayFragment : Fragment() {
private lateinit var images: IntArray
+
+ fun setImages(_images : IntArray){
+ images = _images
+ }
+
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
// If we have arguments
@@ -40,7 +46,9 @@ class ImageDisplayFragment : Fragment() {
// The recycler view is the root element of the Fragment's layout
// as such the view argument passed to onViewCreated() is the RecyclerView
with (view as RecyclerView) {
- adapter = CustomRecyclerAdapter(images)
+ if (::images.isInitialized) {
+ adapter = CustomRecyclerAdapter(images)
+ }
layoutManager = GridLayoutManager(requireContext(), 2)
}
}
diff --git a/app/src/main/java/edu/temple/inclassactivity/MainActivity.kt b/app/src/main/java/edu/temple/inclassactivity/MainActivity.kt
index 85bef74..dd5a026 100644
--- a/app/src/main/java/edu/temple/inclassactivity/MainActivity.kt
+++ b/app/src/main/java/edu/temple/inclassactivity/MainActivity.kt
@@ -2,18 +2,73 @@ package edu.temple.inclassactivity
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
+import android.view.View
+import android.widget.Button
+import android.widget.Toast
+import androidx.recyclerview.widget.RecyclerView
+import androidx.lifecycle.ViewModelProvider as ViewModelProvider
+import androidx.lifecycle.ViewModelProvider as ViewModelProvider1
class MainActivity : AppCompatActivity() {
+
+ lateinit var someVar : Array
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
+
+ //if(::someVar.isInitialized)
+
+
+ //val mainViewModel = ViewModelProvider(this)[MainViewModel::class.java]
+
+
// Fetch images into IntArray called imageArray
val typedArray = resources.obtainTypedArray(R.array.image_ids)
val imageArray = IntArray(typedArray.length()) {typedArray.getResourceId(it, 0)}
typedArray.recycle()
+ val myButton = findViewById