MainActivity: generate dynamic menu from last two weeks

Make the UI more flexible and
slightly easier to understand.

app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt

@@ -162,9 +162,7 @@ class MainActivity : AppCompatActivity() {
             compareBy({ -1 * (eventTypeStats[it] ?: 0) }, { it.ordinal })
         ).filter { it != LunaEvent.Type.UNKNOWN }
 
-        val usedEventCount = eventTypeStats.count { it.value > 0 }
+        fun setupMenu(maxButtonCount: Int, sortedEventTypes: List<LunaEvent.Type>): Int {
-        val maxButtonCount = if (dynamicMenu) { usedEventCount } else { 7 }
-
             val row1 = findViewById<View>(R.id.linear_layout_row1)
             val row1Button1 = findViewById<TextView>(R.id.button1_row1)
             val row1Button2 = findViewById<TextView>(R.id.button2_row1)
@@ -190,7 +188,7 @@ class MainActivity : AppCompatActivity() {
 
             fun show(vararg tvs: TextView) {
                 for (tv in tvs) {
-                val type = eventTypesSorted[showCounter]
+                    val type = sortedEventTypes[showCounter]
                     tv.text = LunaEvent.getHeaderEmoji(applicationContext, type)
                     tv.setOnClickListener { showCreateDialog(type) }
                     tv.visibility = View.VISIBLE
@@ -209,8 +207,15 @@ class MainActivity : AppCompatActivity() {
                 else -> show(row1Button1, row1Button2, row2Button1, row2Button2, row2Button3, row3Button1, row3Button2)
             }
 
+            return showCounter
+        }
+
+        val usedEventCount = eventTypeStats.count { it.value > 0 }
+        val maxButtonCount = if (dynamicMenu) { usedEventCount } else { 7 }
+        val eventsShown = setupMenu(maxButtonCount, eventTypesSorted)
+
         // store left over events for popup menu
-        currentPopupItems = eventTypesSorted.subList(showCounter, eventTypesSorted.size)
+        currentPopupItems = eventTypesSorted.subList(eventsShown, eventTypesSorted.size)
     }
 
     override fun onStart() {

app/src/main/java/it/danieleverducci/lunatracker/StatisticsActivity.kt

@@ -672,6 +672,7 @@ class StatisticsActivity : AppCompatActivity() {
             GraphType.SLEEP_PATTERN -> LunaEvent.Type.SLEEP
         }
 
+
         val events = MainActivity.allEvents.filter { it.type == type }.sortedBy { it.time }
 
         if (events.isEmpty()) {