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..8cd37bb 100644 --- a/app/src/main/java/edu/temple/inclassactivity/ImageDisplayFragment.kt +++ b/app/src/main/java/edu/temple/inclassactivity/ImageDisplayFragment.kt @@ -16,6 +16,8 @@ const val IMAGES_KEY = "imageList" class ImageDisplayFragment : Fragment() { + lateinit var someVar : Array + private lateinit var images: IntArray override fun onCreate(savedInstanceState: Bundle?) { @@ -40,17 +42,17 @@ 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 (::someVar.isInitialized) adapter = CustomRecyclerAdapter(images) layoutManager = GridLayoutManager(requireContext(), 2) } } - companion object { - fun newInstance(images: IntArray) = - ImageDisplayFragment().apply { - arguments = Bundle().apply { - putIntArray(IMAGES_KEY, images) - } + fun setImages(newImages : IntArray) { + images = newImages + + view?.run { + (this as RecyclerView).adapter = CustomRecyclerAdapter(newImages) } + } + } -} \ No newline at end of file diff --git a/app/src/main/java/edu/temple/inclassactivity/MainActivity.kt b/app/src/main/java/edu/temple/inclassactivity/MainActivity.kt index 85bef74..67a9186 100644 --- a/app/src/main/java/edu/temple/inclassactivity/MainActivity.kt +++ b/app/src/main/java/edu/temple/inclassactivity/MainActivity.kt @@ -2,18 +2,34 @@ package edu.temple.inclassactivity import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import android.widget.Button class MainActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + + // 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() + findViewById