mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Getting closer. Just need to populate the recycler & wrap the menu into constrained box

pull/505/head
PWRxPSYCHO 2022-10-19 16:52:44 -04:00
rodzic 11ea26a22e
commit 87cc382416
2 zmienionych plików z 62 dodań i 49 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

57
app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
Wyświetl plik

@ -14,11 +14,14 @@ import android.view.*
import android.widget.*
import androidx.core.content.ContextCompat
import androidx.fragment.app.activityViewModels
import androidx.recyclerview.widget.LinearLayoutManager
import com.geeksville.mesh.BuildConfig
import com.geeksville.mesh.NodeInfo
import com.geeksville.mesh.R
import com.geeksville.mesh.android.Logging
import com.geeksville.mesh.database.entity.Packet
import com.geeksville.mesh.databinding.AdapterMapMenuSelectionBinding
import com.geeksville.mesh.databinding.MapMenuBinding
import com.geeksville.mesh.databinding.MapViewBinding
import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.model.map.CustomOverlayManager
@ -208,7 +211,7 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
builder.setMultiChoiceItems(
sourceList.toTypedArray(),
selected
) { dialogInterface, i, b ->
) { _, i, b ->
if (b) {
selectedList.add(i)
} else {
@ -216,7 +219,7 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
}
}
builder.setPositiveButton("Clear") { dialogInterface, i ->
builder.setPositiveButton("Clear") { _, _ ->
for (x in selectedList) {
val item = sources[x]
val b = cache!!.purgeCache(item.source)
@ -234,7 +237,7 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
}
builder.setNegativeButton(
"Cancel"
) { dialog, which -> dialog.cancel() }
) { dialog, _ -> dialog.cancel() }
builder.show()
}
@ -405,27 +408,37 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
}
private fun chooseMapStyle() {
/// Prepare dialog and its items
val builder = MaterialAlertDialogBuilder(context!!)
builder.setTitle(getString(R.string.preferences_map_style))
val mapStyles by lazy { resources.getStringArray(R.array.map_styles) }
val mapMenu = MapMenuBinding.inflate(layoutInflater, view as ViewGroup, true)
val layoutManager = LinearLayoutManager(requireContext())
val adapterMenuSelection = AdapterMapMenuSelectionBinding.inflate(layoutInflater)
val adapter = MapStyleAdapter(adapterMenuSelection)
mapMenu.mapLayerRecyclerView.adapter =
adapter.mapStyleAdapater
mapMenu.mapTypeRecyclerView.layoutManager = layoutManager
mapMenu.mapTypeRecyclerView.adapter = adapter.mapLayerAdapater
/// Load preferences and its value
val editor: SharedPreferences.Editor = mPrefs.edit()
val mapStyleInt = mPrefs.getInt(mapStyleId, 1)
debug("mapStyleId from prefs: $mapStyleInt")
builder.setSingleChoiceItems(mapStyles, mapStyleInt) { dialog, which ->
debug("Set mapStyleId pref to $which")
editor.putInt(mapStyleId, which)
editor.apply()
dialog.dismiss()
map.setTileSource(loadOnlineTileSourceBase())
renderDownloadButton()
drawOverlays()
}
val dialog = builder.create()
dialog.show()
// /// Prepare dialog and its items
// val builder = MaterialAlertDialogBuilder(context!!)
// builder.setTitle(getString(R.string.preferences_map_style))
// val mapStyles by lazy { resources.getStringArray(R.array.map_styles) }
//
// /// Load preferences and its value
// val editor: SharedPreferences.Editor = mPrefs.edit()
// val mapStyleInt = mPrefs.getInt(mapStyleId, 1)
// debug("mapStyleId from prefs: $mapStyleInt")
//
// builder.setSingleChoiceItems(mapStyles, mapStyleInt) { dialog, which ->
// debug("Set mapStyleId pref to $which")
// editor.putInt(mapStyleId, which)
// editor.apply()
// dialog.dismiss()
// map.setTileSource(loadOnlineTileSourceBase())
// renderDownloadButton()
// drawOverlays()
// }
// val dialog = builder.create()
// dialog.show()
}
private fun renderDownloadButton() {

54
app/src/main/java/com/geeksville/mesh/ui/MapStyleAdapter.kt
Wyświetl plik

@ -9,35 +9,35 @@ class MapStyleAdapter(itemView: AdapterMapMenuSelectionBinding) :
RecyclerView.ViewHolder(itemView.root) {
val card = itemView.cardview
val text = itemView.textview1
}
private val mapStyleAdapater = object : RecyclerView.Adapter<MapStyleAdapter>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MapStyleAdapter {
val inflater = LayoutInflater.from(parent.context)
val mapMenuBinding = AdapterMapMenuSelectionBinding.inflate(inflater, parent, false)
return MapStyleAdapter(mapMenuBinding)
val mapStyleAdapater = object : RecyclerView.Adapter<MapStyleAdapter>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MapStyleAdapter {
val inflater = LayoutInflater.from(parent.context)
val mapMenuBinding = AdapterMapMenuSelectionBinding.inflate(inflater, parent, false)
return MapStyleAdapter(mapMenuBinding)
}
override fun onBindViewHolder(holder: MapStyleAdapter, position: Int) {
TODO("Not yet implemented")
}
val list = listOf<String>()
override fun getItemCount() = list.size
}
override fun onBindViewHolder(holder: MapStyleAdapter, position: Int) {
TODO("Not yet implemented")
val mapLayerAdapater = object : RecyclerView.Adapter<MapStyleAdapter>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MapStyleAdapter {
val inflater = LayoutInflater.from(parent.context)
val mapMenuBinding = AdapterMapMenuSelectionBinding.inflate(inflater, parent, false)
return MapStyleAdapter(mapMenuBinding)
}
override fun onBindViewHolder(holder: MapStyleAdapter, position: Int) {
TODO("Not yet implemented")
}
val list = listOf<String>()
override fun getItemCount() = list.size
}
val list = listOf<String>()
override fun getItemCount() = list.size
}
private val mapLayerAdapater = object : RecyclerView.Adapter<MapStyleAdapter>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MapStyleAdapter {
val inflater = LayoutInflater.from(parent.context)
val mapMenuBinding = AdapterMapMenuSelectionBinding.inflate(inflater, parent, false)
return MapStyleAdapter(mapMenuBinding)
}
override fun onBindViewHolder(holder: MapStyleAdapter, position: Int) {
TODO("Not yet implemented")
}
val list = listOf<String>()
override fun getItemCount() = list.size
}