Skip to content

Commit 3dbe878

Browse files
luk1337luk1337
committed
Add Gerrit 3.7 dashboard filters
1 parent ed3506d commit 3dbe878

4 files changed

Lines changed: 42 additions & 6 deletions

File tree

‎app/src/main/java/com/ruesga/rview/fragments/DashboardFragment.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,14 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
9999
}
100100

101101
// Dashboard changed between versions just sure to use the proper ones
102-
if (ModelHelper.isEqualsOrGreaterVersionThan(account, 3.0d)) {
102+
if (ModelHelper.isEqualsOrGreaterVersionThan(account, 3.7d)) {
103+
mDefaultDashboardTabs = getResources().getStringArray(R.array.dashboard_titles_3_7);
104+
mDefaultDashboardFilters = getResources().getStringArray(R.array.dashboard_filters_3_7);
105+
mDefaultDashboardReverse = getResources().getStringArray(
106+
Preferences.isAccountDashboardOngoingSort(getActivity(), account)
107+
? R.array.dashboard_sort_inverse_3_7
108+
: R.array.dashboard_sort_3_7);
109+
} else if (ModelHelper.isEqualsOrGreaterVersionThan(account, 3.0d)) {
103110
mDefaultDashboardTabs = getResources().getStringArray(R.array.dashboard_titles_3_0);
104111
mDefaultDashboardFilters = getResources().getStringArray(R.array.dashboard_filters_3_0);
105112
mDefaultDashboardReverse = getResources().getStringArray(

‎app/src/main/res/values/arrays.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,13 @@
8686
<item>@string/dashboard_cced</item>
8787
<item>@string/dashboard_recently_closed</item>
8888
</string-array>
89+
<string-array name="dashboard_titles_3_7" translatable="false">
90+
<item>@string/dashboard_your_turn</item>
91+
<item>@string/dashboard_outgoing</item>
92+
<item>@string/dashboard_incoming</item>
93+
<item>@string/dashboard_cced</item>
94+
<item>@string/dashboard_recently_closed</item>
95+
</string-array>
8996
<string-array name="dashboard_filters" translatable="false">
9097
<item>is:open AND owner:self</item>
9198
<item>is:open AND (reviewer:self AND (-(owner:self)))</item>
@@ -109,6 +116,13 @@
109116
<item>is:open AND -(is:ignored) AND cc:self</item>
110117
<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>
111118
</string-array>
119+
<string-array name="dashboard_filters_3_7" translatable="false">
120+
<item>attention:self</item>
121+
<item>is:open AND owner:self AND (-is:wip)</item>
122+
<item>is:open AND (-owner:self) AND (-is:wip) AND reviewer:self</item>
123+
<item>is:open AND (-is:wip) AND cc:self</item>
124+
<item>is:closed AND ((-is:wip) OR owner:self) AND (owner:self OR reviewer:self OR cc:self)</item>
125+
</string-array>
112126
<string-array name="dashboard_sort" translatable="false">
113127
<item>true</item>
114128
<item>false</item>
@@ -127,6 +141,13 @@
127141
<item>false</item>
128142
<item>false</item>
129143
</string-array>
144+
<string-array name="dashboard_sort_3_7" translatable="false">
145+
<item>true</item>
146+
<item>true</item>
147+
<item>false</item>
148+
<item>false</item>
149+
<item>false</item>
150+
</string-array>
130151
<string-array name="dashboard_sort_inverse" translatable="false">
131152
<item>false</item>
132153
<item>false</item>
@@ -145,6 +166,13 @@
145166
<item>false</item>
146167
<item>false</item>
147168
</string-array>
169+
<string-array name="dashboard_sort_inverse_3_7" translatable="false">
170+
<item>false</item>
171+
<item>false</item>
172+
<item>false</item>
173+
<item>false</item>
174+
<item>false</item>
175+
</string-array>
148176

149177
<string-array name="account_fetched_items_values" translatable="false">
150178
<item>25</item>

‎app/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@
306306
<string name="dashboard_incoming">Incoming</string>
307307
<string name="dashboard_cced">CCed</string>
308308
<string name="dashboard_recently_closed">Recently closed</string>
309+
<string name="dashboard_your_turn">Your turn</string>
309310

310311
<!-- Account Settings -->
311312
<string name="account_settings_title">Settings</string>

‎gerrit/src/main/java/com/ruesga/rview/gerrit/filter/ChangeQuery.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private static class Label {
4747
"is", "status", "added", "deleted", "delta", "size", "commentby", "from",
4848
"reviewedby", "author", "committer", "visibleto", "starredby", "watchedby",
4949
"draftby", "assignee", "cc", "unresolved", "submittable", "revertof",
50-
"hashtag", "extension", "onlyextensions", "directory", "footer"
50+
"hashtag", "extension", "onlyextensions", "directory", "footer", "attention"
5151
};
5252

5353
public static final Class[] FIELDS_TYPES = {
@@ -58,7 +58,7 @@ private static class Label {
5858
IsType.class, StatusType.class, Relation.class, Relation.class, Relation.class, Relation.class, String.class, String.class,
5959
String.class, String.class, String.class, String.class, String.class, String.class,
6060
String.class, String.class, String.class, Relation.class, SubmitRecordStatusType.class, Integer.class,
61-
String.class, String.class, String.class, String.class, String.class
61+
String.class, String.class, String.class, String.class, String.class, String.class
6262
};
6363

6464
public static final Class[] SUGGEST_TYPES = {
@@ -69,7 +69,7 @@ private static class Label {
6969
IsType.class, StatusType.class, null, null, null, null, AccountInfo.class, AccountInfo.class,
7070
AccountInfo.class, AccountInfo.class, AccountInfo.class, AccountInfo.class, AccountInfo.class, AccountInfo.class,
7171
AccountInfo.class, AccountInfo.class, AccountInfo.class, Relation.class, SubmitRecordStatusType.class, null,
72-
null, null, null, null, null
72+
null, null, null, null, null, null
7373
};
7474

7575
public static final Double[] SUPPORTED_FROM_VERSION = {
@@ -80,7 +80,7 @@ private static class Label {
8080
null, null, null, null, null, null, null, null,
8181
null, null, null, null, null, null,
8282
null, 2.14d, 2.14d, 2.14d, 2.14d, 2.15d,
83-
2.15d, 3.0d, 3.0d, 3.0d, 3.0d
83+
2.15d, 3.0d, 3.0d, 3.0d, 3.0d, 3.7d
8484
};
8585

8686
public static final Double[] UNSUPPORTED_FROM_VERSION = {
@@ -91,7 +91,7 @@ private static class Label {
9191
null, null, null, null, null, null, null, null,
9292
null, null, null, null, null, null,
9393
2.15d, null, null, null, null, null,
94-
null, null, null, null, null
94+
null, null, null, null, null, null
9595
};
9696

9797
public ChangeQuery age(TimeUnit unit, int value) {

0 commit comments

Comments
 (0)