Achmad Setyabudi Susilo
d5c0d395c5
Main moved ahead with the home-polish (#29/#32/#33), category HSV color picker (#30), and category lock-icon fix (#31) PRs. The only conflicts were in ExpenseListScreen.kt: - Imports: main added AppBar + EmptyStateIllustration. The branch had already removed AppBar (replaced by SearchToolbar) and replaced the inline text empty state. Resolution: keep the branch's AppBarTitle/SearchToolbar/TabText set, drop AppBar (no longer used), add EmptyStateIllustration. - ExpensesTabContent empty state: main replaced the Box+Text 'No expenses yet' with EmptyStateIllustration. Resolution: use EmptyStateIllustration (consistent with main's new design) but keep the branch's three-way message selection (no results vs no data). For visual consistency between the two tabs, also swap RecurringTabContent's empty state to EmptyStateIllustration. No behavioral change for the recurring case — same per-tab vs no-results message selection, same strings, just rendered through the shared component. All other files (build.gradle.kts, libs.versions.toml, HomeScreen, SettingsScreen, CategoryScreen, EmptyStateIllustration.kt, strings.xml) auto-merged cleanly.