diff --git a/.gitignore b/.gitignore index 94ca90d..ffa2efa 100644 --- a/.gitignore +++ b/.gitignore @@ -39,12 +39,7 @@ captures/ # IntelliJ *.iml -.idea/workspace.xml -.idea/tasks.xml -.idea/gradle.xml -.idea/assetWizardSettings.xml -.idea/dictionaries -.idea/libraries +.idea/ # Android Studio 3 in .gitignore file. .idea/caches .idea/modules.xml diff --git a/app/src/main/java/org/mosad/teapod/ui/library/LibraryFragment.kt b/app/src/main/java/org/mosad/teapod/ui/library/LibraryFragment.kt index 6447fda..de7a134 100644 --- a/app/src/main/java/org/mosad/teapod/ui/library/LibraryFragment.kt +++ b/app/src/main/java/org/mosad/teapod/ui/library/LibraryFragment.kt @@ -4,16 +4,11 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.ArrayAdapter import androidx.fragment.app.Fragment import kotlinx.android.synthetic.main.fragment_library.* -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext +import kotlinx.coroutines.* import org.mosad.teapod.R import org.mosad.teapod.parser.AoDParser -import org.mosad.teapod.ui.components.MediaLinearLayout import org.mosad.teapod.util.CustomAdapter import org.mosad.teapod.util.GUIMedia @@ -23,35 +18,27 @@ class LibraryFragment : Fragment() { private lateinit var adapter : CustomAdapter override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - val root = inflater.inflate(R.layout.fragment_library, container, false) - return root + return inflater.inflate(R.layout.fragment_library, container, false) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - adapter = CustomAdapter(requireContext(),layoutInflater, mediaList)//ArrayAdapter(requireContext(), R.layout.linear_media, R.id.text_title, mediaList) + GlobalScope.launch { + val parser = AoDParser() + mediaList = parser.listAnime() - list_library.adapter = adapter + println("setting adapter") + withContext(Dispatchers.Main) { + adapter = CustomAdapter(requireContext(), mediaList)//ArrayAdapter(requireContext(), R.layout.linear_media, R.id.text_title, mediaList) - text_dashboard.text = "Loading Animes ..." + list_library.adapter = adapter + adapter.notifyDataSetChanged() + } - loadAnimeList() - } - private fun loadAnimeList() = GlobalScope.launch { - - val parser = AoDParser() - mediaList = parser.listAnime() - - text_dashboard.text = "got ${mediaList.size} animes" - - withContext(Dispatchers.Main) { - adapter.notifyDataSetChanged() - println("notifiyed") } - } } \ No newline at end of file diff --git a/app/src/main/java/org/mosad/teapod/ui/library/LibraryViewModel.kt b/app/src/main/java/org/mosad/teapod/ui/library/LibraryViewModel.kt deleted file mode 100644 index 3bb50f4..0000000 --- a/app/src/main/java/org/mosad/teapod/ui/library/LibraryViewModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.mosad.teapod.ui.library - -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel - -class LibraryViewModel : ViewModel() { - - private val _text = MutableLiveData().apply { - value = "This is the library Fragment" - } - val text: LiveData = _text -} \ No newline at end of file diff --git a/app/src/main/java/org/mosad/teapod/util/CustomAdapter.kt b/app/src/main/java/org/mosad/teapod/util/CustomAdapter.kt index e63b19b..645d917 100644 --- a/app/src/main/java/org/mosad/teapod/util/CustomAdapter.kt +++ b/app/src/main/java/org/mosad/teapod/util/CustomAdapter.kt @@ -9,14 +9,13 @@ import android.widget.ImageView import android.widget.TextView import com.bumptech.glide.Glide import org.mosad.teapod.R +import org.mosad.teapod.ui.components.MediaLinearLayout -class CustomAdapter(context: Context, private val layoutInflater: LayoutInflater, private val media: ArrayList) : ArrayAdapter(context, R.layout.linear_media) { +class CustomAdapter(context: Context, private val media: ArrayList) : ArrayAdapter(context, R.layout.linear_media, media) { override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { - println("view") - return if (convertView == null) { - val guiMedia = layoutInflater.inflate(R.layout.linear_media, null) + val guiMedia = LayoutInflater.from(context).inflate(R.layout.linear_media, parent, false) val textTitle = guiMedia.findViewById(R.id.text_title) val imagePoster = guiMedia.findViewById(R.id.image_poster) diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index 607c535..742becf 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -15,28 +15,4 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - \ No newline at end of file