Add Gerrit 3.7 dashboard filters

jruesga · Mar 19, 2023 · de5e7b6 · de5e7b6
1 parent db69b57
commit de5e7b6
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 6 deletions.
diff --git a/app/src/main/java/com/ruesga/rview/fragments/DashboardFragment.java b/app/src/main/java/com/ruesga/rview/fragments/DashboardFragment.java
@@ -99,7 +99,14 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         }
 
         // Dashboard changed between versions just sure to use the proper ones
-        if (ModelHelper.isEqualsOrGreaterVersionThan(account, 3.0d)) {
+        if (ModelHelper.isEqualsOrGreaterVersionThan(account, 3.7d)) {
+            mDefaultDashboardTabs = getResources().getStringArray(R.array.dashboard_titles_3_7);
+            mDefaultDashboardFilters = getResources().getStringArray(R.array.dashboard_filters_3_7);
+            mDefaultDashboardReverse = getResources().getStringArray(
+                    Preferences.isAccountDashboardOngoingSort(getActivity(), account)
+                            ? R.array.dashboard_sort_inverse_3_7
+                            : R.array.dashboard_sort_3_7);
+        } else if (ModelHelper.isEqualsOrGreaterVersionThan(account, 3.0d)) {
             mDefaultDashboardTabs = getResources().getStringArray(R.array.dashboard_titles_3_0);
             mDefaultDashboardFilters = getResources().getStringArray(R.array.dashboard_filters_3_0);
             mDefaultDashboardReverse = getResources().getStringArray(

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -86,6 +86,13 @@
         <item>@string/dashboard_cced</item>
         <item>@string/dashboard_recently_closed</item>
     </string-array>
+    <string-array name="dashboard_titles_3_7" translatable="false">
+        <item>@string/dashboard_your_turn</item>
+        <item>@string/dashboard_outgoing</item>
+        <item>@string/dashboard_incoming</item>
+        <item>@string/dashboard_cced</item>
+        <item>@string/dashboard_recently_closed</item>
+    </string-array>
     <string-array name="dashboard_filters" translatable="false">
         <item>is:open AND owner:self</item>
         <item>is:open AND (reviewer:self AND (-(owner:self)))</item>
@@ -109,6 +116,13 @@
         <item>is:open AND -(is:ignored) AND cc:self</item>
         <item>is:closed AND -(is:ignored) AND (-(is:wip) OR owner:self) AND (owner:self OR reviewer:self OR assignee:self OR cc:self) AND -(age:4w)</item>
     </string-array>
+    <string-array name="dashboard_filters_3_7" translatable="false">
+        <item>attention:self</item>
+        <item>is:open AND owner:self AND (-is:wip)</item>
+        <item>is:open AND (-owner:self) AND (-is:wip) AND reviewer:self</item>
+        <item>is:open AND (-is:wip) AND cc:self</item>
+        <item>is:closed AND ((-is:wip) OR owner:self) AND (owner:self OR reviewer:self OR cc:self)</item>
+    </string-array>
     <string-array name="dashboard_sort" translatable="false">
         <item>true</item>
         <item>false</item>
@@ -127,6 +141,13 @@
         <item>false</item>
         <item>false</item>
     </string-array>
+    <string-array name="dashboard_sort_3_7" translatable="false">
+        <item>true</item>
+        <item>true</item>
+        <item>false</item>
+        <item>false</item>
+        <item>false</item>
+    </string-array>
     <string-array name="dashboard_sort_inverse" translatable="false">
         <item>false</item>
         <item>false</item>
@@ -145,6 +166,13 @@
         <item>false</item>
         <item>false</item>
     </string-array>
+    <string-array name="dashboard_sort_inverse_3_7" translatable="false">
+        <item>false</item>
+        <item>false</item>
+        <item>false</item>
+        <item>false</item>
+        <item>false</item>
+    </string-array>
 
     <string-array name="account_fetched_items_values" translatable="false">
         <item>25</item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -306,6 +306,7 @@
     <string name="dashboard_incoming">Incoming</string>
     <string name="dashboard_cced">CCed</string>
     <string name="dashboard_recently_closed">Recently closed</string>
+    <string name="dashboard_your_turn">Your turn</string>
 
     <!-- Account Settings -->
     <string name="account_settings_title">Settings</string>

diff --git a/gerrit/src/main/java/com/ruesga/rview/gerrit/filter/ChangeQuery.java b/gerrit/src/main/java/com/ruesga/rview/gerrit/filter/ChangeQuery.java
@@ -47,7 +47,7 @@ private static class Label {
             "is", "status", "added", "deleted", "delta", "size", "commentby", "from",
             "reviewedby", "author", "committer", "visibleto", "starredby", "watchedby",
             "draftby", "assignee", "cc", "unresolved", "submittable", "revertof",
-            "hashtag", "extension", "onlyextensions", "directory", "footer"
+            "hashtag", "extension", "onlyextensions", "directory", "footer", "attention"
     };
 
     public static final Class[] FIELDS_TYPES = {
@@ -58,7 +58,7 @@ private static class Label {
             IsType.class, StatusType.class, Relation.class, Relation.class, Relation.class, Relation.class, String.class, String.class,
             String.class, String.class, String.class, String.class, String.class, String.class,
             String.class, String.class, String.class, Relation.class, SubmitRecordStatusType.class, Integer.class,
-            String.class, String.class, String.class, String.class, String.class
+            String.class, String.class, String.class, String.class, String.class, String.class
     };
 
     public static final Class[] SUGGEST_TYPES = {
@@ -69,7 +69,7 @@ private static class Label {
             IsType.class, StatusType.class, null, null, null, null, AccountInfo.class, AccountInfo.class,
             AccountInfo.class, AccountInfo.class, AccountInfo.class, AccountInfo.class, AccountInfo.class, AccountInfo.class,
             AccountInfo.class, AccountInfo.class, AccountInfo.class, Relation.class, SubmitRecordStatusType.class, null,
-            null, null, null, null, null
+            null, null, null, null, null, null
     };
 
     public static final Double[] SUPPORTED_FROM_VERSION = {
@@ -80,7 +80,7 @@ private static class Label {
             null, null, null, null, null, null, null, null,
             null, null, null, null, null, null,
             null, 2.14d, 2.14d, 2.14d, 2.14d, 2.15d,
-            2.15d, 3.0d, 3.0d, 3.0d, 3.0d
+            2.15d, 3.0d, 3.0d, 3.0d, 3.0d, 3.7d
     };
 
     public static final Double[] UNSUPPORTED_FROM_VERSION = {
@@ -91,7 +91,7 @@ private static class Label {
             null, null, null, null, null, null, null, null,
             null, null, null, null, null, null,
             2.15d, null, null, null, null, null,
-            null, null, null, null, null
+            null, null, null, null, null, null
     };
 
     public ChangeQuery age(TimeUnit unit, int value) {