Skip to content

Commit e7d139b

Browse files
Okuro3499Okuro3499
committed
clean up
1 parent 6696e9d commit e7d139b

File tree

1 file changed

+40
-146
lines changed

1 file changed

+40
-146
lines changed

‎app/src/main/java/org/ole/planet/myplanet/ui/resources/ResourcesFragment.kt

+40-146
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import android.content.DialogInterface
55
import android.os.Bundle
66
import android.text.Editable
77
import android.text.TextWatcher
8-
import android.util.Log
98
import android.view.View
109
import android.widget.Button
1110
import android.widget.CheckBox
@@ -40,22 +39,6 @@ import java.util.UUID
4039

4140
class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItemSelected,
4241
ChipDeletedListener, TagClickListener, OnFilterListener {
43-
// private var tvAddToLib: TextView? = null
44-
// private var tvSelected: TextView? = null
45-
// var etSearch: EditText? = null
46-
// private var etTags: EditText? = null
47-
// var adapterLibrary: AdapterResource? = null
48-
// private var flexBoxTags: FlexboxLayout? = null
49-
// lateinit var searchTags: MutableList<RealmTag>
50-
// var config: ChipCloudConfig? = null
51-
// private var clearTags: Button? = null
52-
// private var orderByTitle: Button? = null
53-
// private var orderByDate: Button? = null
54-
// private var selectAll: CheckBox? = null
55-
var map: HashMap<String?, JsonObject>? = null
56-
private var confirmation: AlertDialog? = null
57-
// var filter: ImageButton? = null
58-
5942
private lateinit var tvAddToLib: TextView
6043
private lateinit var tvSelected: TextView
6144
private lateinit var etSearch: EditText
@@ -69,6 +52,8 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
6952
private lateinit var selectAll: CheckBox
7053
private lateinit var filter: ImageButton
7154
private lateinit var adapterLibrary: AdapterResource
55+
var map: HashMap<String?, JsonObject>? = null
56+
private var confirmation: AlertDialog? = null
7257

7358
override fun getLayout(): Int {
7459
return R.layout.fragment_my_library
@@ -78,14 +63,13 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
7863
map = getRatings(mRealm, "resource", model?.id)
7964
val libraryList: List<RealmMyLibrary?> = getList(RealmMyLibrary::class.java).filterIsInstance<RealmMyLibrary?>()
8065
adapterLibrary = AdapterResource(requireActivity(), libraryList, map!!, mRealm)
81-
adapterLibrary?.setRatingChangeListener(this)
82-
adapterLibrary?.setListener(this)
83-
return adapterLibrary!!
66+
adapterLibrary.setRatingChangeListener(this)
67+
adapterLibrary.setListener(this)
68+
return adapterLibrary
8469
}
8570

8671
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
8772
super.onViewCreated(view, savedInstanceState)
88-
Log.d("ResourcesFragment", "onViewCreated")
8973
searchTags = ArrayList()
9074
config = Utilities.getCloudConfig().showClose(R.color.black_overlay)
9175
tvAddToLib = view.findViewById(R.id.tv_add)
@@ -166,79 +150,6 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
166150
}
167151
}
168152

169-
// override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
170-
// super.onViewCreated(view, savedInstanceState)
171-
// searchTags = ArrayList()
172-
// config = Utilities.getCloudConfig().showClose(R.color.black_overlay)
173-
// tvAddToLib = requireView().findViewById(R.id.tv_add)
174-
// etSearch = requireView().findViewById(R.id.et_search)
175-
// etTags = requireView().findViewById(R.id.et_tags)
176-
// clearTags = requireView().findViewById(R.id.btn_clear_tags)
177-
// tvSelected = requireView().findViewById(R.id.tv_selected)
178-
// flexBoxTags = requireView().findViewById(R.id.flexbox_tags)
179-
// selectAll = requireView().findViewById(R.id.selectAll)
180-
// tvDelete = requireView().findViewById(R.id.tv_delete)
181-
// filter = requireView().findViewById(R.id.filter)
182-
// initArrays()
183-
// updateTvDelete()
184-
//
185-
// tvAddToLib?.setOnClickListener {
186-
// if ((selectedItems?.size ?: 0) > 0) {
187-
// confirmation = createAlertDialog()
188-
// confirmation?.show()
189-
// addToMyList()
190-
// selectedItems?.clear()
191-
// tvAddToLib?.isEnabled = false // After clearing selectedItems size is always 0
192-
// checkList()
193-
// }
194-
// }
195-
//
196-
// tvDelete?.setOnClickListener {
197-
// AlertDialog.Builder(this.context)
198-
// .setMessage(R.string.confirm_removal)
199-
// .setPositiveButton(R.string.yes) { _: DialogInterface?, _: Int ->
200-
// deleteSelected(true)
201-
// val newFragment = ResourcesFragment()
202-
// recreateFragment(newFragment)
203-
// }
204-
// .setNegativeButton(R.string.no, null).show()
205-
// }
206-
// etSearch?.addTextChangedListener(object : TextWatcher {
207-
// override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
208-
// override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
209-
// adapterLibrary?.setLibraryList(applyFilter(filterLibraryByTag(etSearch?.text.toString().trim { it <= ' ' }, searchTags)))
210-
// showNoData(tvMessage, adapterLibrary?.itemCount, "resources")
211-
// }
212-
//
213-
// override fun afterTextChanged(s: Editable) {}
214-
// })
215-
// requireView().findViewById<View>(R.id.btn_collections).setOnClickListener {
216-
// val f = CollectionsFragment.getInstance(searchTags, "resources")
217-
// f.setListener(this@ResourcesFragment)
218-
// f.show(childFragmentManager, "")
219-
// }
220-
// showNoData(tvMessage, adapterLibrary?.itemCount, "resources")
221-
// clearTagsButton()
222-
// setupUI(requireView().findViewById(R.id.my_library_parent_layout), requireActivity())
223-
// changeButtonStatus()
224-
// additionalSetup()
225-
// tvFragmentInfo = requireView().findViewById(R.id.tv_fragment_info)
226-
// if (isMyCourseLib) tvFragmentInfo.setText(R.string.txt_myLibrary)
227-
// checkList()
228-
// selectAll?.setOnClickListener {
229-
// updateTvDelete()
230-
// val allSelected = selectedItems?.size == adapterLibrary?.getLibraryList()?.size
231-
// adapterLibrary?.selectAllItems(!allSelected)
232-
// if (allSelected) {
233-
// selectAll?.isChecked = false
234-
// selectAll?.text = getString(R.string.select_all)
235-
// } else {
236-
// selectAll?.isChecked = true
237-
// selectAll?.text = getString(R.string.unselect_all)
238-
// }
239-
// }
240-
// }
241-
242153
private fun updateTvDelete(){
243154
if (selectedItems?.size!! == 0) {
244155
tvDelete?.isEnabled = false
@@ -248,14 +159,14 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
248159
}
249160

250161
private fun checkList() {
251-
if (adapterLibrary?.getLibraryList()?.isEmpty() == true) {
252-
selectAll?.visibility = View.GONE
253-
etSearch?.visibility = View.GONE
254-
tvAddToLib?.visibility = View.GONE
255-
tvSelected?.visibility = View.GONE
162+
if (adapterLibrary.getLibraryList().isEmpty()) {
163+
selectAll.visibility = View.GONE
164+
etSearch.visibility = View.GONE
165+
tvAddToLib.visibility = View.GONE
166+
tvSelected.visibility = View.GONE
256167
requireView().findViewById<View>(R.id.btn_collections).visibility = View.GONE
257168
requireView().findViewById<View>(R.id.filter).visibility = View.GONE
258-
clearTags?.visibility = View.GONE
169+
clearTags.visibility = View.GONE
259170
tvDelete?.visibility = View.GONE
260171
}
261172
}
@@ -292,17 +203,17 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
292203
}
293204

294205
private fun clearTagsButton() {
295-
clearTags?.setOnClickListener {
206+
clearTags.setOnClickListener {
296207
saveSearchActivity()
297208
searchTags.clear()
298-
etSearch?.setText("")
299-
tvSelected?.text = ""
209+
etSearch.setText("")
210+
tvSelected.text = ""
300211
levels.clear()
301212
mediums.clear()
302213
subjects.clear()
303214
languages.clear()
304-
adapterLibrary?.setLibraryList(applyFilter(filterLibraryByTag("", searchTags)))
305-
showNoData(tvMessage, adapterLibrary?.itemCount, "resources")
215+
adapterLibrary.setLibraryList(applyFilter(filterLibraryByTag("", searchTags)))
216+
showNoData(tvMessage, adapterLibrary.itemCount, "resources")
306217
}
307218
}
308219

@@ -313,30 +224,30 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
313224
}
314225

315226
override fun onTagClicked(realmTag: RealmTag) {
316-
flexBoxTags?.removeAllViews()
227+
flexBoxTags.removeAllViews()
317228
val chipCloud = ChipCloud(activity, flexBoxTags, config)
318229
chipCloud.setDeleteListener(this)
319230
if (!searchTags.contains(realmTag)) searchTags.add(realmTag)
320231
chipCloud.addChips(searchTags)
321-
adapterLibrary?.setLibraryList(applyFilter(filterLibraryByTag(etSearch?.text.toString(), searchTags)))
232+
adapterLibrary.setLibraryList(applyFilter(filterLibraryByTag(etSearch.text.toString(), searchTags)))
322233
showTagText(searchTags, tvSelected)
323-
showNoData(tvMessage, adapterLibrary?.itemCount, "resources")
234+
showNoData(tvMessage, adapterLibrary.itemCount, "resources")
324235
}
325236

326237
override fun onTagSelected(tag: RealmTag) {
327238
val li: MutableList<RealmTag> = ArrayList()
328239
li.add(tag)
329240
searchTags = li
330-
tvSelected?.text = "${getString(R.string.selected)}${tag.name}"
331-
adapterLibrary?.setLibraryList(applyFilter(filterLibraryByTag(etSearch?.text.toString(), li)))
332-
showNoData(tvMessage, adapterLibrary?.itemCount, "resources")
241+
tvSelected.text = "${getString(R.string.selected)}${tag.name}"
242+
adapterLibrary.setLibraryList(applyFilter(filterLibraryByTag(etSearch.text.toString(), li)))
243+
showNoData(tvMessage, adapterLibrary.itemCount, "resources")
333244
}
334245

335246
override fun onOkClicked(list: List<RealmTag>?) {
336247
if (list?.isEmpty() == true) {
337248
searchTags.clear()
338-
adapterLibrary?.setLibraryList(applyFilter(filterLibraryByTag(etSearch?.text.toString(), searchTags)))
339-
showNoData(tvMessage, adapterLibrary?.itemCount, "resources")
249+
adapterLibrary.setLibraryList(applyFilter(filterLibraryByTag(etSearch.text.toString(), searchTags)))
250+
showNoData(tvMessage, adapterLibrary.itemCount, "resources")
340251
} else {
341252
for (tag in list ?: emptyList()) {
342253
onTagClicked(tag)
@@ -345,35 +256,35 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
345256
}
346257

347258
private fun changeButtonStatus() {
348-
tvAddToLib?.isEnabled = (selectedItems?.size ?: 0) > 0
349-
if (adapterLibrary?.areAllSelected() == true) {
350-
selectAll?.isChecked = true
351-
selectAll?.text = getString(R.string.unselect_all)
259+
tvAddToLib.isEnabled = (selectedItems?.size ?: 0) > 0
260+
if (adapterLibrary.areAllSelected()) {
261+
selectAll.isChecked = true
262+
selectAll.text = getString(R.string.unselect_all)
352263
} else {
353-
selectAll?.isChecked = false
354-
selectAll?.text = getString(R.string.select_all)
264+
selectAll.isChecked = false
265+
selectAll.text = getString(R.string.select_all)
355266
}
356267
}
357268

358269
override fun chipDeleted(i: Int, s: String) {
359270
searchTags.removeAt(i)
360-
adapterLibrary?.setLibraryList(applyFilter(filterLibraryByTag(etSearch?.text.toString(), searchTags)))
361-
showNoData(tvMessage, adapterLibrary?.itemCount, "resources")
271+
adapterLibrary.setLibraryList(applyFilter(filterLibraryByTag(etSearch.text.toString(), searchTags)))
272+
showNoData(tvMessage, adapterLibrary.itemCount, "resources")
362273
}
363274

364275
override fun filter(subjects: MutableSet<String>, languages: MutableSet<String>, mediums: MutableSet<String>, levels: MutableSet<String>) {
365276
this.subjects = subjects
366277
this.languages = languages
367278
this.mediums = mediums
368279
this.levels = levels
369-
adapterLibrary?.setLibraryList(applyFilter(filterLibraryByTag(etSearch?.text.toString().trim { it <= ' ' }, searchTags)))
370-
showNoData(tvMessage, adapterLibrary?.itemCount, "resources")
280+
adapterLibrary.setLibraryList(applyFilter(filterLibraryByTag(etSearch.text.toString().trim { it <= ' ' }, searchTags)))
281+
showNoData(tvMessage, adapterLibrary.itemCount, "resources")
371282
}
372283

373284
override fun getData(): Map<String, Set<String>> {
374-
val libraryList = adapterLibrary?.getLibraryList()?.filterNotNull()
285+
val libraryList = adapterLibrary.getLibraryList().filterNotNull()
375286
val b: MutableMap<String, Set<String>> = HashMap()
376-
b["languages"] = libraryList?.let { getArrayList(it, "languages").filterNotNull().toSet() }!!
287+
b["languages"] = libraryList.let { getArrayList(it, "languages").filterNotNull().toSet() }
377288
b["subjects"] = libraryList.let { getSubjects(it).toList().toSet() }
378289
b["mediums"] = getArrayList(libraryList, "mediums").filterNotNull().toSet()
379290
b["levels"] = getLevels(libraryList).toList().toSet()
@@ -398,7 +309,7 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
398309
private fun filterApplied(): Boolean {
399310
return !(subjects.isEmpty() && languages.isEmpty()
400311
&& mediums.isEmpty() && levels.isEmpty()
401-
&& searchTags.isEmpty() && "${etSearch?.text}".isEmpty())
312+
&& searchTags.isEmpty() && "${etSearch.text}".isEmpty())
402313
}
403314

404315
private fun saveSearchActivity() {
@@ -409,7 +320,7 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
409320
activity.time = Calendar.getInstance().timeInMillis
410321
activity.createdOn = model?.planetCode!!
411322
activity.parentCode = model?.parentCode!!
412-
activity.text = etSearch?.text.toString()
323+
activity.text = "${etSearch.text}"
413324
activity.type = "resources"
414325
val filter = JsonObject()
415326
filter.add("tags", getTagsArray(searchTags))
@@ -422,23 +333,6 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
422333
}
423334
}
424335

425-
// private fun recreateFragment(fragment: Fragment) {
426-
// if (isMyCourseLib) {
427-
// val args = Bundle()
428-
// args.putBoolean("isMyCourseLib", true)
429-
// fragment.arguments = args
430-
// val transaction = parentFragmentManager.beginTransaction()
431-
// transaction.replace(R.id.fragment_container, fragment)
432-
// transaction.addToBackStack(null)
433-
// transaction.commit()
434-
// } else {
435-
// val transaction = parentFragmentManager.beginTransaction()
436-
// transaction.replace(R.id.fragment_container, fragment)
437-
// transaction.addToBackStack(null)
438-
// transaction.commit()
439-
// }
440-
// }
441-
442336
private fun recreateFragment(fragment: Fragment) {
443337
if (isAdded && activity != null && !requireActivity().isFinishing) {
444338
val transaction = parentFragmentManager.beginTransaction()
@@ -468,7 +362,7 @@ class ResourcesFragment : BaseRecyclerFragment<RealmMyLibrary?>(), OnLibraryItem
468362
f.show(childFragmentManager, "")
469363
bottomSheet.visibility = View.GONE
470364
}
471-
orderByDate?.setOnClickListener { adapterLibrary?.toggleSortOrder() }
472-
orderByTitle?.setOnClickListener { adapterLibrary?.toggleTitleSortOrder() }
365+
orderByDate.setOnClickListener { adapterLibrary.toggleSortOrder() }
366+
orderByTitle.setOnClickListener { adapterLibrary.toggleTitleSortOrder() }
473367
}
474368
}

0 commit comments

Comments
 (0)