diff --git a/app/build.gradle b/app/build.gradle index 2990ca67..a3d81b64 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,7 +40,7 @@ dependencies { implementation "org.ocpsoft.prettytime:prettytime:${libraries.prettytime}" implementation "com.google.android:flexbox:${libraries.flexboxlayout}" implementation "com.github.jruesga:floatingsearchview:${libraries.floatingsearchview}" - implementation ("com.github.BigBadaboom:androidsvg:${libraries.androidsvg}") { + implementation ("com.caverock:androidsvg:${libraries.androidsvg}") { exclude group: 'org.jetbrains', module: 'annotations-java5' } implementation "net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:${libraries.keyboardvisibilityevent}" diff --git a/app/src/main/java/com/ruesga/rview/UrlHandlerProxyActivity.java b/app/src/main/java/com/ruesga/rview/UrlHandlerProxyActivity.java index 732813d5..cee1545e 100644 --- a/app/src/main/java/com/ruesga/rview/UrlHandlerProxyActivity.java +++ b/app/src/main/java/com/ruesga/rview/UrlHandlerProxyActivity.java @@ -57,7 +57,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { } // Check we have something we allow to handle - final Uri uri = getIntent().getData(); + final Uri uri = getIntent().getData().buildUpon().clearQuery().build(); String scheme = uri.getScheme(); if (scheme == null || (!scheme.equals("http") && !scheme.equals("https"))) { finish(); diff --git a/app/src/main/java/com/ruesga/rview/fragments/DashboardFragment.java b/app/src/main/java/com/ruesga/rview/fragments/DashboardFragment.java index 8f1168ea..494f5bb8 100644 --- 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 index 9ac60427..5436f827 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -86,6 +86,13 @@ @string/dashboard_cced @string/dashboard_recently_closed + + @string/dashboard_your_turn + @string/dashboard_outgoing + @string/dashboard_incoming + @string/dashboard_cced + @string/dashboard_recently_closed + is:open AND owner:self is:open AND (reviewer:self AND (-(owner:self))) @@ -109,6 +116,13 @@ is:open AND -(is:ignored) AND cc:self 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) + + attention:self + is:open AND owner:self AND (-is:wip) + is:open AND (-owner:self) AND (-is:wip) AND reviewer:self + is:open AND (-is:wip) AND cc:self + is:closed AND ((-is:wip) OR owner:self) AND (owner:self OR reviewer:self OR cc:self) + true false @@ -127,6 +141,13 @@ false false + + true + true + false + false + false + false false @@ -145,6 +166,13 @@ false false + + false + false + false + false + false + 25 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 06226b78..ad33970d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -306,6 +306,7 @@ Incoming CCed Recently closed + Your turn Settings diff --git a/build.gradle b/build.gradle index e387484e..16a00d53 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ ext { prettytime : '4.0.5.Final', flexboxlayout : '2.0.1', floatingsearchview : '2d435bead5', - androidsvg : '3511e13649', + androidsvg : '1.4', keyboardvisibilityevent : '2.3.0', better_link_movement_method : '2.2.0', aboutlibraries : '8.1.2', 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 index 25380749..0f313659 100644 --- 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) {