Update Category details page

android/src/main/java/com/wbrawner/budget/ui/MainActivity.kt

@@ -23,7 +23,7 @@ class MainActivity : AppCompatActivity() {
                 getString(R.string.title_overview) -> false
                 getString(R.string.title_transactions) -> false
                 getString(R.string.title_profile) -> false
-                getString(R.string.title_budgets) -> false
+                getString(R.string.title_categories) -> false
                 else -> true
             }
             supportActionBar?.setDisplayHomeAsUpEnabled(showHomeAsUp)

android/src/main/java/com/wbrawner/budget/ui/categories/CategoryDetailsFragment.kt

@@ -2,6 +2,7 @@ package com.wbrawner.budget.ui.categories
 
 
 import android.content.Context
+import android.os.Build
 import android.os.Bundle
 import android.view.*
 import android.widget.Toast
@@ -14,6 +15,7 @@ import com.wbrawner.budget.AsyncState
 import com.wbrawner.budget.R
 import com.wbrawner.budget.ui.EXTRA_BUDGET_ID
 import com.wbrawner.budget.ui.EXTRA_CATEGORY_ID
+import com.wbrawner.budget.ui.toAmountSpannable
 import com.wbrawner.budget.ui.transactions.TransactionListFragment
 import kotlinx.android.synthetic.main.fragment_category_details.*
 
@@ -48,7 +50,29 @@ class CategoryDetailsFragment : Fragment() {
                     progressBar.visibility = View.GONE
                     val category = state.data.category
                     activity?.title = category.title
-                    categoryDescription.text = category.description
+                    val tintColor = if (category.expense) R.color.colorTextRed else R.color.colorTextGreen
+                    val colorStateList = with(view.context) {
+                        android.content.res.ColorStateList.valueOf(getColor(tintColor))
+                    }
+                    categoryProgress.progressTintList = colorStateList
+                    categoryProgress.max = category.amount.toInt()
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                        categoryProgress.setProgress(
+                                state.data.balance.toInt(),
+                                true
+                        )
+                    } else {
+                        categoryProgress.progress = state.data.balance.toInt()
+                    }
+                    total.text = category.amount.toAmountSpannable()
+                    balance.text = state.data.balance.toAmountSpannable()
+                    remaining.text = state.data.remaining.toAmountSpannable()
+                    if (category.description.isNullOrBlank()) {
+                        categoryDescription.visibility = View.GONE
+                    } else {
+                        categoryDescription.visibility = View.VISIBLE
+                        categoryDescription.text = category.description
+                    }
                     childFragmentManager.fragments.firstOrNull()?.let {
                         if (it !is TransactionListFragment) return@let
                         it.reloadItems()

android/src/main/java/com/wbrawner/budget/ui/categories/CategoryDetailsViewModel.kt

@@ -23,10 +23,11 @@ class CategoryDetailsViewModel : ViewModel(), AsyncViewModel<CategoryDetails> {
         launch {
             val category = categoryRepo.findById(id)
             val multiplier = if (category.expense) -1 else 1
-            val balance = categoryRepo.getBalance(category.id!!).toInt() * multiplier
+            val balance = categoryRepo.getBalance(category.id!!) * multiplier
             CategoryDetails(
                     category,
-                    balance
+                    balance,
+                    category.amount - balance
             )
         }
     }
@@ -34,5 +35,6 @@ class CategoryDetailsViewModel : ViewModel(), AsyncViewModel<CategoryDetails> {
 
 data class CategoryDetails(
         val category: Category,
-        val balance: Int
+        val balance: Long,
+        val remaining: Long
 )

android/src/main/java/com/wbrawner/budget/ui/categories/CategoryListFragment.kt

@@ -12,7 +12,6 @@ import androidx.navigation.fragment.findNavController
 import com.wbrawner.budget.AllowanceApplication
 import com.wbrawner.budget.R
 import com.wbrawner.budget.common.category.Category
-import com.wbrawner.budget.ui.EXTRA_BUDGET_ID
 import com.wbrawner.budget.ui.EXTRA_CATEGORY_ID
 import com.wbrawner.budget.ui.base.BindableAdapter
 import com.wbrawner.budget.ui.base.BindableData
@@ -23,7 +22,7 @@ class CategoryListFragment : ListWithAddButtonFragment<Category, CategoryListVie
     override val noItemsStringRes: Int = R.string.categories_no_data
     override val viewModel: CategoryListViewModel by viewModels()
     override fun reloadItems() {
-        viewModel.getCategories(arguments?.getLong(EXTRA_BUDGET_ID))
+        viewModel.getCategories()
     }
 
     override fun bindData(data: Category): BindableData<Category> = BindableData(data, CATEGORY_VIEW)

android/src/main/java/com/wbrawner/budget/ui/categories/CategoryListViewModel.kt

@@ -19,7 +19,8 @@ class CategoryListViewModel : ViewModel(), AsyncViewModel<List<Category>> {
     @Inject
     lateinit var categoryRepo: CategoryRepository
 
-    fun getCategories(budgetId: Long? = null) {
+    fun getCategories() {
+        val budgetId = budgetRepo.currentBudget?.id
         if (budgetId == null) {
             state.postValue(AsyncState.Error("Invalid budget ID"))
             return

android/src/main/java/com/wbrawner/budget/ui/transactions/TransactionListFragment.kt

@@ -32,7 +32,7 @@ class TransactionListFragment : ListWithAddButtonFragment<Transaction, Transacti
         get() = mapOf(TRANSACTION_VIEW to { v -> TransactionViewHolder(v, findNavController()) })
 
     override fun reloadItems() {
-        viewModel.getTransactions(arguments?.getLong(EXTRA_CATEGORY_ID))
+        viewModel.getTransactions(categoryId = arguments?.getLong(EXTRA_CATEGORY_ID))
     }
 
     override fun bindData(data: Transaction): BindableData<Transaction> = BindableData(data, TRANSACTION_VIEW)

android/src/main/res/layout/fragment_category_details.xml

@@ -1,52 +1,106 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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_height="match_parent">
 
-    <ScrollView
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/categoryDetails"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fillViewport="true">
+        android:layout_height="match_parent">
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/categoryDescription"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:padding="16dp"
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:padding="16dp"
-                android:id="@+id/categoryDescription"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/totalLabel"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="8dp"
+            android:text="@string/label_total"
+            android:textAlignment="center"
+            android:textAllCaps="true"
+            app:layout_constraintEnd_toStartOf="@+id/balanceLabel"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/categoryDescription" />
 
-            <TextView
-                android:id="@+id/balanceLabel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:text="@string/label_current_balance"
-                android:textAlignment="center" />
+        <TextView
+            android:id="@+id/balanceLabel"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="8dp"
+            android:text="@string/label_balance"
+            android:textAlignment="center"
+            android:textAllCaps="true"
+            app:layout_constraintEnd_toStartOf="@+id/remainingLabel"
+            app:layout_constraintStart_toEndOf="@+id/totalLabel"
+            app:layout_constraintTop_toBottomOf="@+id/categoryDescription" />
 
-            <TextView
-                android:id="@+id/balance"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textAlignment="center"
-                android:textSize="36sp" />
+        <TextView
+            android:id="@+id/remainingLabel"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="8dp"
+            android:text="@string/label_remaining"
+            android:textAlignment="center"
+            android:textAllCaps="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/balanceLabel"
+            app:layout_constraintTop_toBottomOf="@+id/categoryDescription" />
 
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/transactionsFragmentContainer"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
-        </LinearLayout>
-    </ScrollView>
+        <TextView
+            android:id="@+id/total"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:textAlignment="center"
+            app:layout_constraintEnd_toStartOf="@+id/balance"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/totalLabel" />
+
+        <TextView
+            android:id="@+id/balance"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:textAlignment="center"
+            app:layout_constraintEnd_toStartOf="@+id/remaining"
+            app:layout_constraintStart_toEndOf="@+id/total"
+            app:layout_constraintTop_toBottomOf="@+id/balanceLabel" />
+
+        <TextView
+            android:id="@+id/remaining"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:textAlignment="center"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/balance"
+            app:layout_constraintTop_toBottomOf="@+id/remainingLabel" />
+
+        <ProgressBar
+            android:id="@+id/categoryProgress"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@+id/total" />
+
+        <FrameLayout
+            android:id="@+id/transactionsFragmentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/categoryProgress" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <ProgressBar
         android:id="@+id/progressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center" />
-</FrameLayout>
+</FrameLayout>

android/src/main/res/menu/main_navigation.xml

@@ -9,9 +9,9 @@
         android:icon="@drawable/ic_attach_money_black_24dp"
         android:title="@string/title_transactions" />
     <item
-        android:id="@+id/budgetsFragment"
+        android:id="@+id/categoryListFragment"
         android:icon="@drawable/ic_baseline_category_24px"
-        android:title="@string/title_budgets" />
+        android:title="@string/title_categories" />
     <item
         android:id="@+id/profileFragment"
         android:icon="@drawable/ic_person_black_24dp"

android/src/main/res/values/strings.xml

@@ -55,4 +55,7 @@
     <string name="prompt_year">Year</string>
     <string name="archived">Archived</string>
     <string name="title_overview">Overview</string>
+    <string name="label_total">Total</string>
+    <string name="label_balance">Balance</string>
+    <string name="label_remaining">Remaining</string>
 </resources>