[wip]feat/app UI refresh

app/build.gradle.kts

@@ -95,6 +95,7 @@ dependencies {
     implementation("com.google.android.material:material:1.11.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.gridlayout:gridlayout:1.0.0")
+    implementation("androidx.viewpager2:viewpager2:1.0.0")
     implementation("androidx.navigation:navigation-fragment-ktx:2.7.6")
     implementation("androidx.navigation:navigation-ui-ktx:2.7.6")
 

app/src/main/java/com/electricdreams/numo/feature/baskets/BasketNamesSettingsActivity.kt

@@ -12,6 +12,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.electricdreams.numo.R
+import com.electricdreams.numo.ui.components.EmptyStateHelper
 
 /**
  * Settings activity for configuring preset basket names.
@@ -30,7 +31,7 @@ class BasketNamesSettingsActivity : AppCompatActivity() {
     private lateinit var namesHeader: TextView
     private lateinit var namesCard: LinearLayout
     private lateinit var namesList: LinearLayout
-    private lateinit var emptyState: LinearLayout
+    private lateinit var emptyState: View
     private lateinit var addNameButton: View
     private lateinit var clearAllButton: View
 
@@ -74,7 +75,15 @@ class BasketNamesSettingsActivity : AppCompatActivity() {
             namesHeader.visibility = View.GONE
             namesCard.visibility = View.GONE
             emptyState.visibility = View.VISIBLE
+            EmptyStateHelper.bind(
+                emptyState,
+                R.drawable.ic_label,
+                getString(R.string.basket_names_settings_empty_title),
+                getString(R.string.basket_names_settings_empty_subtitle),
+                "+ Add Name"
+            ) { showAddNameDialog() }
             clearAllButton.visibility = View.GONE
+            addNameButton.visibility = View.GONE
         } else {
             // Show names list
             namesHeader.visibility = View.VISIBLE
@@ -94,10 +103,10 @@ class BasketNamesSettingsActivity : AppCompatActivity() {
                     addDivider()
                 }
             }
+
+            // Show add button only when items exist and can add more
+            addNameButton.visibility = if (basketNamesManager.canAddMore()) View.VISIBLE else View.GONE
         }
-
-        // Update add button visibility
-        addNameButton.visibility = if (basketNamesManager.canAddMore()) View.VISIBLE else View.GONE
     }
 
     private fun bindNameItem(view: View, index: Int, name: String, totalCount: Int) {

app/src/main/java/com/electricdreams/numo/feature/history/PaymentsHistoryActivity.kt

@@ -26,6 +26,7 @@ import com.electricdreams.numo.core.model.Amount
 import com.electricdreams.numo.core.util.CurrencyManager
 import com.electricdreams.numo.core.worker.BitcoinPriceWorker
 import com.electricdreams.numo.databinding.ActivityHistoryBinding
+import com.electricdreams.numo.ui.components.EmptyStateHelper
 import com.electricdreams.numo.feature.autowithdraw.AutoWithdrawManager
 import com.electricdreams.numo.feature.autowithdraw.WithdrawHistoryEntry
 import com.electricdreams.numo.payment.PaymentIntentFactory
@@ -349,7 +350,15 @@ class PaymentsHistoryActivity : AppCompatActivity() {
         adapter.setEntries(currentHistoryList)
 
         val isEmpty = currentHistoryList.isEmpty()
-        binding.emptyView.visibility = if (isEmpty) View.VISIBLE else View.GONE
+        binding.emptyView.root.visibility = if (isEmpty) View.VISIBLE else View.GONE
+        if (isEmpty) {
+            EmptyStateHelper.bind(
+                binding.emptyView.root,
+                R.drawable.ic_receipt,
+                "No Payments Yet",
+                "Payment history will appear here once you start accepting payments"
+            )
+        }
     }
 
     private fun clearAllHistory() {

app/src/main/java/com/electricdreams/numo/feature/history/TokenHistoryActivity.kt

@@ -9,6 +9,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.electricdreams.numo.feature.enableEdgeToEdgeWithPill
 import com.electricdreams.numo.R
+import com.electricdreams.numo.ui.components.EmptyStateHelper
 import com.electricdreams.numo.core.data.model.TokenHistoryEntry
 import com.electricdreams.numo.databinding.ActivityHistoryBinding
 import com.electricdreams.numo.ui.adapter.TokenHistoryAdapter
@@ -59,7 +60,15 @@ class TokenHistoryActivity : AppCompatActivity() {
         adapter.setEntries(history)
 
         val isEmpty = history.isEmpty()
-        binding.emptyView.visibility = if (isEmpty) View.VISIBLE else View.GONE
+        binding.emptyView.root.visibility = if (isEmpty) View.VISIBLE else View.GONE
+        if (isEmpty) {
+            EmptyStateHelper.bind(
+                binding.emptyView.root,
+                R.drawable.ic_receipt,
+                "No Tokens Yet",
+                "Cashu token history will appear here"
+            )
+        }
     }
 
     private fun showClearHistoryConfirmation() {

app/src/main/java/com/electricdreams/numo/feature/items/ItemListActivity.kt

@@ -45,7 +45,6 @@ class ItemListActivity : AppCompatActivity() {
     private lateinit var bottomActions: LinearLayout
     private lateinit var fabAddItem: ImageButton
     private lateinit var doneReorderButton: ImageButton
-    private lateinit var headerDivider: View
     private lateinit var topBar: View
     private lateinit var adapter: ItemAdapter
     private lateinit var itemTouchHelper: ItemTouchHelper
@@ -111,7 +110,6 @@ class ItemListActivity : AppCompatActivity() {
         bottomActions = findViewById(R.id.bottom_actions)
         fabAddItem = findViewById(R.id.fab_add_item)
         doneReorderButton = findViewById(R.id.done_reorder_button)
-        headerDivider = findViewById(R.id.header_divider)
         topBar = findViewById(R.id.top_bar)
         val importCsvButton: Button = findViewById(R.id.import_csv_button)
         val exportCsvButton: Button = findViewById(R.id.export_csv_button)
@@ -209,7 +207,6 @@ class ItemListActivity : AppCompatActivity() {
             emptyView.visibility = View.GONE
             itemsContent.visibility = View.VISIBLE
             fabAddItem.visibility = View.VISIBLE
-            headerDivider.visibility = View.VISIBLE
             topBar.visibility = View.VISIBLE
             topBar.setBackgroundResource(R.color.color_bg_white)
 
@@ -223,7 +220,6 @@ class ItemListActivity : AppCompatActivity() {
             emptyView.visibility = View.VISIBLE
             itemsContent.visibility = View.GONE
             fabAddItem.visibility = View.GONE
-            headerDivider.visibility = View.GONE
             topBar.visibility = View.GONE
 
             // Set navigation bar to match empty state background

app/src/main/java/com/electricdreams/numo/feature/onboarding/AddMintBottomSheet.kt

@@ -0,0 +1,121 @@
+package com.electricdreams.numo.feature.onboarding
+
+import android.app.Dialog
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.EditText
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
+import com.electricdreams.numo.R
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+
+class AddMintBottomSheet : BottomSheetDialogFragment() {
+
+    interface Listener {
+        fun onAddMintUrl(url: String)
+        fun onScanQrCode()
+    }
+
+    private var listener: Listener? = null
+
+    companion object {
+        fun newInstance(listener: Listener): AddMintBottomSheet {
+            return AddMintBottomSheet().apply {
+                this.listener = listener
+            }
+        }
+    }
+
+    override fun getTheme(): Int = R.style.Theme_Numo_BottomSheet
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        dialog.window?.setSoftInputMode(
+            WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+        )
+        dialog.window?.navigationBarColor = android.graphics.Color.parseColor("#0A2540")
+        return dialog
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.bottom_sheet_add_mint, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val urlInput = view.findViewById<EditText>(R.id.mint_url_input)
+        val addButton = view.findViewById<Button>(R.id.add_mint_button)
+        val scanRow = view.findViewById<View>(R.id.scan_qr_button)
+
+        urlInput.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+            override fun afterTextChanged(s: Editable?) {
+                val hasText = s?.toString()?.trim()?.isNotEmpty() == true
+                addButton.isEnabled = hasText
+            }
+        })
+
+        addButton.setOnClickListener {
+            val url = urlInput.text.toString().trim()
+            if (url.isNotEmpty()) {
+                listener?.onAddMintUrl(url)
+            }
+        }
+
+        scanRow.setOnClickListener {
+            listener?.onScanQrCode()
+        }
+
+        setupBottomSheetBehavior()
+    }
+
+    fun setLoading(loading: Boolean) {
+        val view = view ?: return
+        val addButton = view.findViewById<Button>(R.id.add_mint_button)
+        val loadingContainer = view.findViewById<LinearLayout>(R.id.add_mint_loading)
+        val urlInput = view.findViewById<EditText>(R.id.mint_url_input)
+
+        if (loading) {
+            addButton.visibility = View.INVISIBLE
+            loadingContainer.visibility = View.VISIBLE
+            urlInput.isEnabled = false
+        } else {
+            addButton.visibility = View.VISIBLE
+            loadingContainer.visibility = View.GONE
+            urlInput.isEnabled = true
+        }
+    }
+
+    private fun setupBottomSheetBehavior() {
+        dialog?.setOnShowListener { dialogInterface ->
+            val bottomSheetDialog = dialogInterface as BottomSheetDialog
+            val bottomSheet = bottomSheetDialog.findViewById<FrameLayout>(
+                com.google.android.material.R.id.design_bottom_sheet
+            )
+            bottomSheet?.let { sheet ->
+                sheet.setBackgroundColor(
+                    android.graphics.Color.parseColor("#0A2540")
+                )
+                val behavior = BottomSheetBehavior.from(sheet)
+                behavior.state = BottomSheetBehavior.STATE_EXPANDED
+                behavior.skipCollapsed = true
+                behavior.isDraggable = true
+            }
+        }
+    }
+}