helcel/beans
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 4 Wiki Activity

Create default group and delete group (WIP)

Browse Source
This commit is contained in:
fgerber 2024-03-04 22:35:27 +01:00
parent 18ec8803f8
commit 872f31746e
11 changed files with 102 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/net/helcel/beendroid/activity/adapter/GroupListAdapter.kt
View File

@ -7,11 +7,13 @@ import android.widget.Button
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentActivity
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import net.helcel.beendroid.R
import net.helcel.beendroid.activity.fragment.EditGroupAddFragment
import net.helcel.beendroid.helper.Groups
import net.helcel.beendroid.helper.getContrastColor
import net.helcel.beendroid.helper.groups
import net.helcel.beendroid.helper.saveData
import net.helcel.beendroid.helper.selected_group
class GroupListAdapter(private val activity: FragmentActivity, private val selectDialog: DialogFragment?) : RecyclerView.Adapter<GroupListAdapter.GroupViewHolder>() {
@ -29,7 +31,7 @@ class GroupListAdapter(private val activity: FragmentActivity, private val selec
return groups!!.size()
}
class GroupViewHolder(itemView: View, private val activity: FragmentActivity, private val selectDialog: DialogFragment?) : RecyclerView.ViewHolder(itemView) {
inner class GroupViewHolder(itemView: View, private val activity: FragmentActivity, private val selectDialog: DialogFragment?) : RecyclerView.ViewHolder(itemView) {
private val color: Button = itemView.findViewById(R.id.group_color)
fun bind(entry: Pair<Int, Groups.Group>) {
@ -53,6 +55,25 @@ class GroupListAdapter(private val activity: FragmentActivity, private val selec
selectDialog.dismiss()
}
}
color.setOnLongClickListener {
MaterialAlertDialogBuilder(activity)
.setMessage(R.string.delete_group)
.setPositiveButton(android.R.string.ok) { _, _ ->
// TODO: Remove all countries belonging to that group
// Delete the group
val key = entry.first
val pos = groups!!.findGroupPos(key)
groups!!.deleteGroup(key)
saveData()
this@GroupListAdapter.notifyItemRemoved(pos)
}
.setNegativeButton(android.R.string.cancel) { _, _ -> }
.show()
true
}
}
}
}

8
app/src/main/java/net/helcel/beendroid/activity/adapter/ViewPagerAdapter.kt
View File

@ -8,8 +8,8 @@ import net.helcel.beendroid.activity.fragment.EditGroupFragment
import net.helcel.beendroid.activity.fragment.EditPlaceFragment
private val tabArray = arrayOf(
"Places",
"Groups",
"Places"
)
class ViewPagerAdapter (fragmentManager: FragmentManager, lifecycle: Lifecycle) :
FragmentStateAdapter(fragmentManager, lifecycle) {
@ -24,10 +24,10 @@ class ViewPagerAdapter (fragmentManager: FragmentManager, lifecycle: Lifecycle)
override fun createFragment(position: Int): Fragment {
when (position) {
0 -> return EditGroupFragment()
1 -> return EditPlaceFragment()
0 -> return EditPlaceFragment()
1 -> return EditGroupFragment()
}
return EditGroupFragment()
return EditPlaceFragment()
}
}

70
app/src/main/java/net/helcel/beendroid/activity/fragment/EditGroupAddFragment.kt
View File

@ -23,15 +23,16 @@ import net.helcel.beendroid.helper.saveData
import java.lang.Exception
class EditGroupAddFragment(private val key: Int =0, val onAddCb : (Int)->Unit) : DialogFragment() {
class EditGroupAddFragment(private val key: Int = 0, val onAddCb: (Int) -> Unit) :
DialogFragment() {
private lateinit var colorNameEditText: TextInputEditText
private lateinit var colorEditText: TextInputEditText
private lateinit var colorView : View
private lateinit var colorView: View
private lateinit var colorEditR : Slider
private lateinit var colorEditG : Slider
private lateinit var colorEditB : Slider
private lateinit var colorEditR: Slider
private lateinit var colorEditG: Slider
private lateinit var colorEditB: Slider
private val grp = groups!!.getGroupFromKey(key)
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@ -48,54 +49,68 @@ class EditGroupAddFragment(private val key: Int =0, val onAddCb : (Int)->Unit) :
colorEditG = view.findViewById(R.id.colorG)
colorEditB = view.findViewById(R.id.colorB)
setupSlider(colorEditR,(grp?.color?.color?.red ?: 0)/ 255F)
setupSlider(colorEditG,(grp?.color?.color?.green ?: 0)/ 255F)
setupSlider(colorEditB,(grp?.color?.color?.blue ?: 0)/ 255F)
setupSlider(colorEditR, (grp?.color?.color?.red ?: 0) / 255F)
setupSlider(colorEditG, (grp?.color?.color?.green ?: 0) / 255F)
setupSlider(colorEditB, (grp?.color?.color?.blue ?: 0) / 255F)
setupText(colorEditText,grp)
setupText(colorEditText, grp)
colorView.background = ColorDrawable(grp?.color?.color ?: 0)
colorNameEditText.setText(grp?.name ?: "")
builder.setView(view)
.setPositiveButton("Ok") { _: DialogInterface?, _: Int ->
.setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
val name = colorNameEditText.text.toString()
val color = colorEditText.text.toString()
val key = (if (key!=0) key else groups!!.genKey())
groups!!.setGroup(key,name, ColorDrawable(Color.parseColor("#$color")))
val key = (if (key != 0) key else groups!!.genKey())
groups!!.setGroup(key, name, ColorDrawable(Color.parseColor("#$color")))
saveData()
onAddCb(key)
}
.setNegativeButton(
"Cancel"
) { dialog: DialogInterface, _: Int -> dialog.cancel() }
.setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int ->
dialog.cancel()
}
return builder.create()
}
private fun setupText(s: TextInputEditText, grp: Groups.Group?) {
s.setText( colorToHex6(ColorDrawable(grp?.color?.color ?: 0)).substring(1))
s.addTextChangedListener(EditTextListener(colorEditR, colorEditG, colorEditB, colorEditText, colorView))
s.setText(colorToHex6(ColorDrawable(grp?.color?.color ?: 0)).substring(1))
s.addTextChangedListener(
EditTextListener(
colorEditR,
colorEditG,
colorEditB,
colorEditText,
colorView
)
)
}
private fun setupSlider(s: Slider, v: Float){
private fun setupSlider(s: Slider, v: Float) {
s.valueFrom = 0F
s.valueTo = 1F
s.value = v
s.addOnChangeListener(SliderOnChangeListener( colorEditR, colorEditG, colorEditB,colorEditText, colorView))
s.addOnChangeListener(
SliderOnChangeListener(
colorEditR,
colorEditG,
colorEditB,
colorEditText,
colorView
)
)
}
}
private class EditTextListener(
private val colorEditR: Slider,
private val colorEditG: Slider,
private val colorEditB: Slider,
private val colorEditText: TextInputEditText,
private val colorView: View
): TextWatcher {
) : TextWatcher {
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
@ -105,10 +120,10 @@ private class EditTextListener(
}
override fun afterTextChanged(s: Editable?) {
val col : Color
try{
val col: Color
try {
col = Color.valueOf(Color.parseColor("#${colorEditText.text}"))
}catch (e:Exception){
} catch (e: Exception) {
return
}
@ -126,9 +141,10 @@ private class SliderOnChangeListener(
private val colorEditB: Slider,
private val colorEditText: TextInputEditText,
private val colorView: View
): Slider.OnChangeListener {
) : Slider.OnChangeListener {
override fun onValueChange(slider: Slider, value: Float, fromUser: Boolean) {
val rgb = ColorDrawable(Color.argb(1F,colorEditR.value, colorEditG.value, colorEditB.value))
val rgb =
ColorDrawable(Color.argb(1F, colorEditR.value, colorEditG.value, colorEditB.value))
colorEditText.setText(colorToHex6(rgb).substring(1))
colorView.background = rgb
}

10
app/src/main/java/net/helcel/beendroid/helper/Data.kt
View File

@ -2,7 +2,10 @@ package net.helcel.beendroid.helper
import android.content.Context
import android.content.SharedPreferences
import android.graphics.drawable.ColorDrawable
import androidx.core.content.ContextCompat
import androidx.preference.PreferenceManager
import net.helcel.beendroid.R
import net.helcel.beendroid.countries.GeoLoc
var visits : Visits? = null
@ -24,6 +27,13 @@ fun loadData(ctx: Context, id:Int) {
groups = if(!groupsString.isNullOrEmpty()) groupsSerial.readFrom(groupsString.byteInputStream()) else groupsSerial.defaultValue
visits = if(!visitsString.isNullOrEmpty()) visitsSerial.readFrom(visitsString.byteInputStream()) else visitsSerial.defaultValue
// Add default group "Visited" with app's color if there is no group already
if (groups!!.size() == 0) {
groups!!.setGroup(1, "Visited", ColorDrawable(ContextCompat.getColor(ctx, R.color.blue)))
saveData()
}
}
fun saveData() {

4
app/src/main/java/net/helcel/beendroid/helper/Groups.kt
View File

@ -18,6 +18,10 @@ class Groups(val id: Int, private val grps: HashMap<Int,Group>) {
grps[key] = Group(key,name,col)
}
fun deleteGroup(key: Int) {
grps.remove(key)
}
fun getGroupFromKey(key: Int): Group? {
return grps.getOrDefault(key,null)
}

9
app/src/main/res/drawable/add.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/colorOnBackground"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
</vector>

2
app/src/main/res/drawable/ic_launcher_background.xml
View File

@ -5,6 +5,6 @@
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="?attr/background"
android:fillColor="@color/blue"
android:pathData="M0,0h960v960h-960z" />
</vector>

2
app/src/main/res/drawable/ic_launcher_foreground.xml
View File

@ -5,7 +5,7 @@
android:viewportHeight="1600">
<path
android:fillColor="@color/blue"
android:fillColor="@color/white"
android:fillType="nonZero"
android:pathData="m800,1200q-83,0 -156,-31.5Q571,1137 517,1083 463,1029 431.5,956 400,883 400,800 400,717 431.5,644 463,571 517,517 571,463 644,431.5 717,400 800,400q83,0 156,31.5 73,31.5 127,85.5 54,54 85.5,127 31.5,73 31.5,156 0,83 -31.5,156 -31.5,73 -85.5,127 -54,54 -127,85.5 -73,31.5 -156,31.5zM800,1120q134,0 227,-93 93,-93 93,-227 0,-7 -0.5,-14.5 -0.5,-7.5 -0.5,-12.5 -5,29 -27,48 -22,19 -52,19L960,840Q927,840 903.5,816.5 880,793 880,760L880,720L720,720v-80q0,-33 23.5,-56.5Q767,560 800,560h40v0q0,-23 12.5,-40.5Q865,502 883,491q-20,-5 -40.5,-8 -20.5,-3 -42.5,-3 -134,0 -227,93 -93,93 -93,227 0,0 0,0 0,0 0,0h200q66,0 113,47 47,47 47,113v40L720,1000v110q20,5 39.5,7.5 19.5,2.5 40.5,2.5z"
android:strokeWidth="1"

9
app/src/main/res/layout/fragment_edit_groups.xml
View File

@ -8,20 +8,23 @@
android:id="@+id/list"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:layout_marginEnd="32dp"
android:layout_weight="1"
android:text="@string/group_add"
android:src="@drawable/add"
android:backgroundTint="@color/blue"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/fragment_edit_groups_add.xml
View File

@ -26,7 +26,7 @@
app:layout_constraintEnd_toStartOf="@+id/colorR"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:background="?attr/background"/>
android:background="@color/black"/>
<com.google.android.material.slider.Slider

1
app/src/main/res/values/en.xml
View File

@ -17,6 +17,7 @@
<string name="beendroid_repo">Project repository: https://git.helcel.net/helcel/beendroid\n Feel free to report issues or contribute to the project.</string>
<string name="foss_licenses">Free and open source dependencies and licenses</string>
<string name="about_beendroid">About the BeenDroid application</string>
<string name="delete_group">Do you want to delete this group?</string>
<string name="group_add">Add</string>
<string name="logo">Logo</string>
<string name="name">Name</string>