diff --git a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt index 4e7413fd9..a910cef7e 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt @@ -3,7 +3,6 @@ package com.geeksville.mesh.ui import android.app.AlertDialog import android.content.Context import android.content.SharedPreferences -import android.content.res.Resources import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint @@ -23,7 +22,6 @@ import com.geeksville.mesh.databinding.MapViewBinding import com.geeksville.mesh.model.UIViewModel import com.geeksville.mesh.model.map.CustomOverlayManager import com.geeksville.mesh.model.map.CustomTileSource -import com.geeksville.mesh.model.map.NOAAWmsTileSource import com.geeksville.mesh.util.formatAgo import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.floatingactionbutton.FloatingActionButton @@ -49,7 +47,6 @@ import org.osmdroid.views.overlay.* import org.osmdroid.views.overlay.gridlines.LatLonGridlineOverlay2 import java.io.File import kotlin.math.pow -import android.util.DisplayMetrics @AndroidEntryPoint @@ -184,7 +181,6 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener { alertDialog!!.show() } - /** * Clears active tile source cache */ @@ -496,8 +492,6 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener { layer.loadingBackgroundColor = Color.TRANSPARENT layer.loadingLineColor = Color.TRANSPARENT map.overlayManager.add(layer) - } else { - map.overlays.clear() } map.invalidate() } diff --git a/app/src/main/java/com/geeksville/mesh/ui/MapStyleAdapter.kt b/app/src/main/java/com/geeksville/mesh/ui/MapStyleAdapter.kt new file mode 100644 index 000000000..a4131ed38 --- /dev/null +++ b/app/src/main/java/com/geeksville/mesh/ui/MapStyleAdapter.kt @@ -0,0 +1,39 @@ +package com.geeksville.mesh.ui + +import android.R +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.geeksville.mesh.databinding.AdapterMapStyleMenuBinding + + +class MapStyleAdapter(itemView: AdapterMapStyleMenuBinding) { + var list = mutableListOf() + + inner class MyView(view: View) : RecyclerView.ViewHolder(view) { + var textView: TextView + + init { + textView = view.findViewById(R.id.text1) as TextView + } + } + + fun onCreateViewHolder( + parent: ViewGroup, + viewType: Int + ): MapStyleAdapter { + val inflater = LayoutInflater.from(parent.context) + val mapStyleMenuBinding = AdapterMapStyleMenuBinding.inflate(inflater, parent, false) + return MapStyleAdapter(mapStyleMenuBinding) + } + + fun onBindViewHolder(holder: MyView, position: Int) { + holder.textView.text = list[position] + } + + fun getItemCount(): Int { + return list.size + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_map_style_menu.xml b/app/src/main/res/layout/adapter_map_style_menu.xml new file mode 100644 index 000000000..7067e9317 --- /dev/null +++ b/app/src/main/res/layout/adapter_map_style_menu.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/horizontal_item.xml b/app/src/main/res/layout/horizontal_item.xml new file mode 100644 index 000000000..3fe53189d --- /dev/null +++ b/app/src/main/res/layout/horizontal_item.xml @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file