kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
revert back to old map style UI
PWRxPSYCHO
rodzic
07cc8ce701
commit
b9ae181ee4
|
|
@ -1,3 +0,0 @@
|
|||
package com.geeksville.mesh.model.map
|
||||
|
||||
data class ChildData(val childTitle: String)
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
package com.geeksville.mesh.model.map
|
||||
|
||||
object Constants {
|
||||
const val PARENT = 0
|
||||
const val CHILD = 1
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
package com.geeksville.mesh.model.map
|
||||
|
||||
data class MapParentData(
|
||||
val title: String? = null,
|
||||
var type:Int = Constants.PARENT,
|
||||
var subList: MutableList<ChildData> = ArrayList(),
|
||||
var isExpanded: Boolean = false
|
||||
)
|
||||
|
|
@ -2,7 +2,6 @@ package com.geeksville.mesh.ui
|
|||
|
||||
import android.app.AlertDialog
|
||||
import android.content.Context
|
||||
import android.content.DialogInterface
|
||||
import android.content.SharedPreferences
|
||||
import android.graphics.Canvas
|
||||
import android.graphics.Color
|
||||
|
|
@ -14,20 +13,15 @@ import android.view.*
|
|||
import android.widget.*
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.fragment.app.activityViewModels
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
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.MapMenuLayoutBinding
|
||||
import com.geeksville.mesh.databinding.MapViewBinding
|
||||
import com.geeksville.mesh.model.UIViewModel
|
||||
import com.geeksville.mesh.model.map.ChildData
|
||||
import com.geeksville.mesh.model.map.CustomOverlayManager
|
||||
import com.geeksville.mesh.model.map.CustomTileSource
|
||||
import com.geeksville.mesh.model.map.MapParentData
|
||||
import com.geeksville.mesh.util.SqlTileWriterExt
|
||||
import com.geeksville.mesh.util.formatAgo
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||
|
|
@ -40,7 +34,6 @@ import org.osmdroid.events.ZoomEvent
|
|||
import org.osmdroid.tileprovider.MapTileProviderBasic
|
||||
import org.osmdroid.tileprovider.cachemanager.CacheManager
|
||||
import org.osmdroid.tileprovider.cachemanager.CacheManager.CacheManagerCallback
|
||||
import org.osmdroid.tileprovider.modules.SqlTileWriter
|
||||
import org.osmdroid.tileprovider.modules.SqliteArchiveTileWriter
|
||||
import org.osmdroid.tileprovider.tilesource.ITileSource
|
||||
import org.osmdroid.tileprovider.tilesource.OnlineTileSourceBase
|
||||
|
|
@ -400,36 +393,18 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
|
|||
val mapStyles by lazy { resources.getStringArray(R.array.map_styles) }
|
||||
|
||||
val builder = MaterialAlertDialogBuilder(context!!)
|
||||
val listData: MutableList<MapParentData> = ArrayList()
|
||||
val parentData: Array<String> = arrayOf("Map Source", "Map Layer")
|
||||
val mapStyleData: MutableList<ChildData> = mutableListOf()
|
||||
mapStyles.forEach { style ->
|
||||
mapStyleData.add(ChildData(style))
|
||||
}
|
||||
val mapLayerData: MutableList<ChildData> = mutableListOf(ChildData("test"))
|
||||
|
||||
val mapStyleObj = MapParentData(title = parentData[0], subList = mapStyleData)
|
||||
val mapLayerObj = MapParentData(title = parentData[1], subList = mapLayerData)
|
||||
listData.add(mapStyleObj)
|
||||
listData.add(mapLayerObj)
|
||||
val exRecycleView = MapMenuLayoutBinding.inflate(layoutInflater)
|
||||
exRecycleView.exRecycle.layoutManager = LinearLayoutManager(context)
|
||||
exRecycleView.exRecycle.adapter = MapMenuRecyclerAdapter(context!!, listData)
|
||||
|
||||
builder.setView(exRecycleView.root)
|
||||
/// 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()
|
||||
// }
|
||||
builder.setSingleChoiceItems(mapStyles, mapStyleInt) { dialog, which ->
|
||||
debug("Set mapStyleId pref to $which")
|
||||
val editor: SharedPreferences.Editor = mPrefs.edit()
|
||||
editor.putInt(mapStyleId, which)
|
||||
editor.apply()
|
||||
dialog.dismiss()
|
||||
map.setTileSource(loadOnlineTileSourceBase())
|
||||
renderDownloadButton()
|
||||
drawOverlays()
|
||||
}
|
||||
val dialog = builder.create()
|
||||
dialog.show()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,109 +0,0 @@
|
|||
package com.geeksville.mesh.ui
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.widget.ImageView
|
||||
import android.widget.TextView
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import com.geeksville.mesh.R
|
||||
import com.geeksville.mesh.model.map.ChildData
|
||||
import com.geeksville.mesh.model.map.Constants
|
||||
import com.geeksville.mesh.model.map.MapParentData
|
||||
|
||||
class MapMenuRecyclerAdapter(var mContext: Context, val list: MutableList<MapParentData>) :
|
||||
RecyclerView.Adapter<RecyclerView.ViewHolder>() {
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
|
||||
|
||||
return if (viewType == Constants.PARENT) {
|
||||
val rowView: View =
|
||||
LayoutInflater.from(parent.context).inflate(R.layout.parent_row, parent, false)
|
||||
GroupViewHolder(rowView)
|
||||
} else {
|
||||
val rowView: View =
|
||||
LayoutInflater.from(parent.context).inflate(R.layout.child_row, parent, false)
|
||||
ChildViewHolder(rowView)
|
||||
}
|
||||
}
|
||||
|
||||
override fun getItemCount(): Int = list.size
|
||||
|
||||
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
|
||||
|
||||
val dataList = list[position]
|
||||
if (dataList.type == Constants.PARENT) {
|
||||
holder as GroupViewHolder
|
||||
holder.apply {
|
||||
parentTV?.text = dataList.title
|
||||
downIV?.setOnClickListener {
|
||||
expandOrCollapseParentItem(dataList, position)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
holder as ChildViewHolder
|
||||
|
||||
holder.apply {
|
||||
val singleService = dataList.subList.first()
|
||||
childTV?.text = singleService.childTitle
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun expandOrCollapseParentItem(singleBoarding: MapParentData, position: Int) {
|
||||
|
||||
if (singleBoarding.isExpanded) {
|
||||
collapseParentRow(position)
|
||||
} else {
|
||||
expandParentRow(position)
|
||||
}
|
||||
}
|
||||
|
||||
private fun expandParentRow(position: Int) {
|
||||
val currentBoardingRow = list[position]
|
||||
val services = currentBoardingRow.subList
|
||||
currentBoardingRow.isExpanded = true
|
||||
var nextPosition = position
|
||||
if (currentBoardingRow.type == Constants.PARENT) {
|
||||
|
||||
services.forEach { service ->
|
||||
val parentModel = MapParentData()
|
||||
parentModel.type = Constants.CHILD
|
||||
val subList: ArrayList<ChildData> = ArrayList()
|
||||
subList.add(service)
|
||||
parentModel.subList = subList
|
||||
list.add(++nextPosition, parentModel)
|
||||
}
|
||||
notifyDataSetChanged()
|
||||
}
|
||||
}
|
||||
|
||||
private fun collapseParentRow(position: Int) {
|
||||
val currentBoardingRow = list[position]
|
||||
val services = currentBoardingRow.subList
|
||||
list[position].isExpanded = false
|
||||
if (list[position].type == Constants.PARENT) {
|
||||
services.forEach { _ ->
|
||||
list.removeAt(position + 1)
|
||||
}
|
||||
notifyDataSetChanged()
|
||||
}
|
||||
}
|
||||
|
||||
override fun getItemViewType(position: Int): Int = list[position].type
|
||||
|
||||
override fun getItemId(position: Int): Long {
|
||||
return position.toLong()
|
||||
}
|
||||
|
||||
class GroupViewHolder(row: View) : RecyclerView.ViewHolder(row) {
|
||||
val parentTV = row.findViewById(R.id.parent_Title) as TextView?
|
||||
val downIV = row.findViewById(R.id.down_iv) as ImageView?
|
||||
}
|
||||
|
||||
class ChildViewHolder(row: View) : RecyclerView.ViewHolder(row) {
|
||||
val childTV = row.findViewById(R.id.child_Title) as TextView?
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:background="@color/colorPrimary"
|
||||
android:layout_height="30dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/child_Title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="14sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.099"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.036" />
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/exRecycle"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:background="@color/colourGrey"
|
||||
android:layout_height="50dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/parent_Title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="20sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.099"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.419" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/down_iv"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@android:drawable/arrow_down_float"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.896"
|
||||
app:layout_constraintStart_toEndOf="@+id/parent_Title"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
Ładowanie…
Reference in New Issue