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/README.md b/README.md new file mode 100644 index 0000000..06ac5fa --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# InClassFragmentActivity diff --git a/app/src/main/java/edu/temple/inclassactivity/ImageDisplayFragment.kt b/app/src/main/java/edu/temple/inclassactivity/ImageDisplayFragment.kt index 4d09c5b..473c755 100644 --- a/app/src/main/java/edu/temple/inclassactivity/ImageDisplayFragment.kt +++ b/app/src/main/java/edu/temple/inclassactivity/ImageDisplayFragment.kt @@ -4,11 +4,13 @@ package edu.temple.inclassactivity +import android.media.Image import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.core.content.res.TypedArrayUtils import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -40,11 +42,18 @@ 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) } } - + fun setImage (temp : IntArray) { + images = temp + (view as RecyclerView).adapter = CustomRecyclerAdapter(images) + } companion object { fun newInstance(images: IntArray) = ImageDisplayFragment().apply { diff --git a/app/src/main/java/edu/temple/inclassactivity/MainActivity.kt b/app/src/main/java/edu/temple/inclassactivity/MainActivity.kt index 85bef74..203ac36 100644 --- a/app/src/main/java/edu/temple/inclassactivity/MainActivity.kt +++ b/app/src/main/java/edu/temple/inclassactivity/MainActivity.kt @@ -2,8 +2,12 @@ package edu.temple.inclassactivity import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import androidx.fragment.app.Fragment class MainActivity : AppCompatActivity() { + + //lateinit var someVar : Array + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) @@ -15,5 +19,14 @@ class MainActivity : AppCompatActivity() { // Attach an instance of ImageDisplayFragment using factory method + val fragmentTemp : Fragment = ImageDisplayFragment.newInstance(imageArray) + + /* + supportFragmentManager + .beginTransaction() + .add(R.id.fragmentContainerView, fragmentTemp) + //.add(R.id.fragmentContainerView, ImageDisplayFragment()) + .commit() + */ } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d548e41..b8f404e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,4 +5,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".MainActivity"> + + \ No newline at end of file