Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update androidsvg and add some Gerrit 3.7 fixes #128

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update androidsvg and add some Gerrit 3.7 fixes #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee3cb06
Update androidsvg to 1.4
luk1337 Mar 19, 2023
17545e3
Add Gerrit 3.7 dashboard filters
luk1337 Mar 19, 2023
2c765fd
Clear query string in UrlHandlerProxyActivity
luk1337 Mar 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/ruesga/rview/UrlHandlerProxyActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
9 changes: 8 additions & 1 deletion app/src/main/java/com/ruesga/rview/fragments/DashboardFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
28 changes: 28 additions & 0 deletions app/src/main/res/values/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
10 changes: 5 additions & 5 deletions gerrit/src/main/java/com/ruesga/rview/gerrit/filter/ChangeQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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 = {
Expand All @@ -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 = {
Expand All @@ -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 = {
Expand All @@ -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) {
Expand Down