From 496f50b98a6a6b8b0a001d4c7acbc035da08bf54 Mon Sep 17 00:00:00 2001
From: JeanGarf <thierryw777@gmail.com>
Date: Thu, 27 Feb 2020 02:04:16 +0100
Subject: [PATCH 1/4] Correct title in StackedBarChartFragment

---
 .../android/ui/report/barchart/StackedBarChartFragment.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/gnucash/android/ui/report/barchart/StackedBarChartFragment.java b/app/src/main/java/org/gnucash/android/ui/report/barchart/StackedBarChartFragment.java
index 5556c7896..ef501ea3f 100644
--- a/app/src/main/java/org/gnucash/android/ui/report/barchart/StackedBarChartFragment.java
+++ b/app/src/main/java/org/gnucash/android/ui/report/barchart/StackedBarChartFragment.java
@@ -81,7 +81,7 @@ public class StackedBarChartFragment extends BaseReportFragment {
 
     @Override
     public int getTitle() {
-        return R.string.title_cash_flow_report;
+        return R.string.title_bar_chart;
     }
 
     @Override

From ad1c0b9e5849ac1c4515e5627e3af8de6be2d8d5 Mon Sep 17 00:00:00 2001
From: JeanGarf <thierryw777@gmail.com>
Date: Thu, 27 Feb 2020 02:05:28 +0100
Subject: [PATCH 2/4] Use title_cash_flow_report and title_balance_sheet_report
 instead of title_line_chart and title_report_sheet

---
 app/src/main/res/layout/fragment_report_summary.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_report_summary.xml b/app/src/main/res/layout/fragment_report_summary.xml
index dfb9ab9dd..20c239edf 100644
--- a/app/src/main/res/layout/fragment_report_summary.xml
+++ b/app/src/main/res/layout/fragment_report_summary.xml
@@ -49,7 +49,7 @@ limitations under the License.
                 android:layout_weight="1"
                 android:drawableLeft="@drawable/ic_trending_up_white_24dp"
                 android:drawableStart="@drawable/ic_trending_up_white_24dp"
-                android:text="@string/title_line_chart"/>
+                android:text="@string/title_cash_flow_report"/>
 
             <Button android:id="@+id/btn_balance_sheet"
                 android:layout_width="0dp"
@@ -57,7 +57,7 @@ limitations under the License.
                 android:layout_weight="1"
                 android:drawableLeft="@drawable/ic_subject_white_24dp"
                 android:drawableStart="@drawable/ic_subject_white_24dp"
-                android:text="@string/title_report_sheet"/>
+                android:text="@string/title_balance_sheet_report"/>
 
         </TableRow>
     </TableLayout>

From 578022e0fd7a2f0ec4171b259e0f4b46766da683 Mon Sep 17 00:00:00 2001
From: JeanGarf <thierryw777@gmail.com>
Date: Thu, 27 Feb 2020 02:06:46 +0100
Subject: [PATCH 3/4] Fill Map in order to get ReportToolbarSpinner containing
 the 4 charts

---
 .../gnucash/android/ui/report/ReportType.java | 100 +++++++++++++++---
 1 file changed, 83 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/gnucash/android/ui/report/ReportType.java b/app/src/main/java/org/gnucash/android/ui/report/ReportType.java
index d9887e1db..44be1a264 100644
--- a/app/src/main/java/org/gnucash/android/ui/report/ReportType.java
+++ b/app/src/main/java/org/gnucash/android/ui/report/ReportType.java
@@ -39,28 +39,48 @@
 public enum ReportType {
     PIE_CHART(0), BAR_CHART(1), LINE_CHART(2), TEXT(3), NONE(4);
 
+    List<String> mReportNames = null;
+
     Map<String, Class> mReportTypeMap = new HashMap<>();
+
     int mValue = 4;
 
+    /**
+     * Constructor
+     *
+     * @param index
+     */
     ReportType(int index){
+
         mValue = index;
+
         Context context = GnuCashApplication.getAppContext();
-        switch (index){
-            case 0:
-                mReportTypeMap.put(context.getString(R.string.title_pie_chart), PieChartFragment.class);
-                break;
-            case 1:
-                mReportTypeMap.put(context.getString(R.string.title_bar_chart), StackedBarChartFragment.class);
-                break;
-            case 2:
-                mReportTypeMap.put(context.getString(R.string.title_cash_flow_report), CashFlowLineChartFragment.class);
-                break;
-            case 3:
-                mReportTypeMap.put(context.getString(R.string.title_balance_sheet_report), BalanceSheetFragment.class);
-                break;
-            case 4:
-                break;
-        }
+
+//        switch (index){
+//            case 0:
+//                mReportTypeMap.put(context.getString(R.string.title_pie_chart), PieChartFragment.class);
+//                break;
+//            case 1:
+//                mReportTypeMap.put(context.getString(R.string.title_bar_chart), StackedBarChartFragment.class);
+//                break;
+//            case 2:
+//                mReportTypeMap.put(context.getString(R.string.title_cash_flow_report), CashFlowLineChartFragment.class);
+//                break;
+//            case 3:
+//                mReportTypeMap.put(context.getString(R.string.title_balance_sheet_report), BalanceSheetFragment.class);
+//                break;
+//            case 4:
+//                break;
+//        }
+
+        mReportTypeMap.put(context.getString(R.string.title_pie_chart),
+                           PieChartFragment.class);
+        mReportTypeMap.put(context.getString(R.string.title_bar_chart),
+                           StackedBarChartFragment.class);
+        mReportTypeMap.put(context.getString(R.string.title_cash_flow_report),
+                           CashFlowLineChartFragment.class);
+        mReportTypeMap.put(context.getString(R.string.title_balance_sheet_report),
+                           BalanceSheetFragment.class);
     }
 
     /**
@@ -83,8 +103,54 @@ public enum ReportType {
         }
     }
 
+    public static ReportType getReportType(final String name) {
+
+        Context context = GnuCashApplication.getAppContext();
+
+        if (name.equals(context.getString(R.string.title_pie_chart))) {
+
+            return PIE_CHART;
+
+        } else if (name.equals(context.getString(R.string.title_bar_chart))) {
+
+            return BAR_CHART;
+
+        } else if (name.equals(context.getString(R.string.title_cash_flow_report))) {
+
+            return LINE_CHART;
+
+        } else if (name.equals(context.getString(R.string.title_balance_sheet_report))) {
+
+            return TEXT;
+
+        } else {
+
+            return NONE;
+        }
+    }
+
     public List<String> getReportNames(){
-        return new ArrayList<>(mReportTypeMap.keySet());
+
+        Context context = GnuCashApplication.getAppContext();
+
+        if (mReportNames == null) {
+            //
+
+            //
+            mReportNames = new ArrayList<String>();
+
+            mReportNames.add(context.getString(R.string.title_pie_chart));
+            mReportNames.add(context.getString(R.string.title_bar_chart));
+            mReportNames.add(context.getString(R.string.title_cash_flow_report));
+            mReportNames.add(context.getString(R.string.title_balance_sheet_report));
+
+        } else {
+            //  n' pas
+
+            // RAF
+        }
+
+        return mReportNames;
     }
 
     public BaseReportFragment getFragment(String name){

From 7a4e4e5b763429dfad6b9dd1b2899a77c98123a2 Mon Sep 17 00:00:00 2001
From: JeanGarf <thierryw777@gmail.com>
Date: Thu, 27 Feb 2020 17:50:06 +0100
Subject: [PATCH 4/4] Fixes #872 Add a final commit

---
 .../gnucash/android/ui/report/ReportType.java | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/gnucash/android/ui/report/ReportType.java b/app/src/main/java/org/gnucash/android/ui/report/ReportType.java
index 44be1a264..f88cf45b6 100644
--- a/app/src/main/java/org/gnucash/android/ui/report/ReportType.java
+++ b/app/src/main/java/org/gnucash/android/ui/report/ReportType.java
@@ -39,6 +39,7 @@
 public enum ReportType {
     PIE_CHART(0), BAR_CHART(1), LINE_CHART(2), TEXT(3), NONE(4);
 
+    // #872 Use a list to be sure of the sort order which is not guaranted with a hashmap keys
     List<String> mReportNames = null;
 
     Map<String, Class> mReportTypeMap = new HashMap<>();
@@ -56,29 +57,16 @@ public enum ReportType {
 
         Context context = GnuCashApplication.getAppContext();
 
-//        switch (index){
-//            case 0:
-//                mReportTypeMap.put(context.getString(R.string.title_pie_chart), PieChartFragment.class);
-//                break;
-//            case 1:
-//                mReportTypeMap.put(context.getString(R.string.title_bar_chart), StackedBarChartFragment.class);
-//                break;
-//            case 2:
-//                mReportTypeMap.put(context.getString(R.string.title_cash_flow_report), CashFlowLineChartFragment.class);
-//                break;
-//            case 3:
-//                mReportTypeMap.put(context.getString(R.string.title_balance_sheet_report), BalanceSheetFragment.class);
-//                break;
-//            case 4:
-//                break;
-//        }
-
+        // #872 Fill the map with all the items, in order to fill the Report Toolbar Spinner
         mReportTypeMap.put(context.getString(R.string.title_pie_chart),
                            PieChartFragment.class);
+
         mReportTypeMap.put(context.getString(R.string.title_bar_chart),
                            StackedBarChartFragment.class);
+
         mReportTypeMap.put(context.getString(R.string.title_cash_flow_report),
                            CashFlowLineChartFragment.class);
+
         mReportTypeMap.put(context.getString(R.string.title_balance_sheet_report),
                            BalanceSheetFragment.class);
     }