Skip to content

Process element color theming values #464

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

Merged
tobiasKaminsky merged 1 commit into from
Jul 3, 2020
Merged

Process element color theming values #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ public class GetCapabilitiesRemoteOperation extends RemoteOperation {
private static final String PROPERTY_SERVERCOLOR = "color";
private static final String PROPERTY_SERVERTEXTCOLOR = "color-text";
private static final String PROPERTY_SERVERELEMENTCOLOR = "color-element";
private static final String PROPERTY_SERVERELEMENTCOLOR_BRIGHT = "color-element-bright";
private static final String PROPERTY_SERVERELEMENTCOLOR_DARK = "color-element-dark";
private static final String PROPERTY_SERVERLOGO = "logo";
private static final String PROPERTY_SERVERBACKGROUND = "background";
private static final String PROPERTY_SERVERBACKGROUND_DEFAULT = "background-default";
Expand Down Expand Up @@ -347,6 +349,18 @@ protected RemoteOperationResult run(OwnCloudClient client) {
respTheming.getString(PROPERTY_SERVERTEXTCOLOR) != null) {
capability.setServerTextColor(respTheming.getString(PROPERTY_SERVERTEXTCOLOR));
}
if (respTheming.has(PROPERTY_SERVERELEMENTCOLOR) &&
respTheming.getString(PROPERTY_SERVERTEXTCOLOR) != null) {
capability.setServerElementColor(respTheming.getString(PROPERTY_SERVERTEXTCOLOR));
}
if (respTheming.has(PROPERTY_SERVERELEMENTCOLOR_BRIGHT) &&
respTheming.getString(PROPERTY_SERVERELEMENTCOLOR_BRIGHT) != null) {
capability.setServerElementColorBright(respTheming.getString(PROPERTY_SERVERELEMENTCOLOR_BRIGHT));
}
if (respTheming.has(PROPERTY_SERVERELEMENTCOLOR_DARK) &&
respTheming.getString(PROPERTY_SERVERELEMENTCOLOR_DARK) != null) {
capability.setServerElementColorDark(respTheming.getString(PROPERTY_SERVERELEMENTCOLOR_DARK));
}
if (respTheming.has(PROPERTY_SERVERBACKGROUND_DEFAULT)) {
if (respTheming.getBoolean(PROPERTY_SERVERBACKGROUND_DEFAULT)) {
capability.setServerBackgroundDefault(CapabilityBooleanType.TRUE);
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/owncloud/android/lib/resources/status/OCCapability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ public class OCCapability {
private String serverColor;
private String serverTextColor;
private String serverElementColor;
private String serverElementColorBright;
private String serverElementColorDark;
private String serverLogo;
private String serverBackground;
private CapabilityBooleanType serverBackgroundDefault;
Expand Down Expand Up @@ -123,6 +125,8 @@ public OCCapability() {
serverSlogan = "";
serverColor = "";
serverElementColor = "";
serverElementColorBright = "";
serverElementColorDark = "";
serverTextColor = "";
serverLogo = "";
serverBackground = "";
Expand Down