Merge pull request #95 from nextcloud/themingWhite1.0.32

Add text-color and element-color to capabilities

2 files changed, 30 insertions, 0 deletions

diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
index 8d2cc3c8..04799002 100644
--- a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
+++ b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
@@ -107,6 +107,8 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
     private static final String PROPERTY_SERVERNAME = "name";
     private static final String PROPERTY_SERVERSLOGAN = "slogan";
     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_SERVERLOGO = "logo";
     private static final String PROPERTY_SERVERBACKGROUND = "background";
 
@@ -287,6 +289,14 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
                                     respTheming.getString(PROPERTY_SERVERBACKGROUND) != null) {
                                 capability.setServerBackground(respTheming.getString(PROPERTY_SERVERBACKGROUND));
                             }
+                            if (respTheming.has(PROPERTY_SERVERTEXTCOLOR) && 
+                                    respTheming.getString(PROPERTY_SERVERTEXTCOLOR) != null) {
+                                capability.setServerTextColor(respTheming.getString(PROPERTY_SERVERTEXTCOLOR));
+                            }
+                            if (respTheming.has(PROPERTY_SERVERELEMENTCOLOR) && 
+                                    respTheming.getString(PROPERTY_SERVERELEMENTCOLOR) != null) {
+                                capability.setServerElementColor(respTheming.getString(PROPERTY_SERVERELEMENTCOLOR));
+                            }
                             Log_OC.d(TAG, "*** Added " + NODE_THEMING);
                         }
 
diff --git a/src/com/owncloud/android/lib/resources/status/OCCapability.java b/src/com/owncloud/android/lib/resources/status/OCCapability.java
index b2f8b95f..a3f4a4e9 100644
--- a/src/com/owncloud/android/lib/resources/status/OCCapability.java
+++ b/src/com/owncloud/android/lib/resources/status/OCCapability.java
@@ -43,6 +43,8 @@ public class OCCapability {
     private String mServerName;
     private String mServerSlogan;
     private String mServerColor;
+    private String mServerTextColor;
+    private String mServerElementColor;
     private String mServerLogo;
     private String mServerBackground;
 
@@ -90,6 +92,8 @@ public class OCCapability {
         mServerName = "";
         mServerSlogan = "";
         mServerColor = "";
+        mServerElementColor = "";
+        mServerTextColor = "";
         mServerLogo = "";
         mServerBackground = "";
 
@@ -220,6 +224,22 @@ public class OCCapability {
         this.mServerColor = mServerColor;
     }
 
+    public String getServerTextColor() {
+        return mServerTextColor;
+    }
+
+    public void setServerTextColor(String mServerTextColor) {
+        this.mServerTextColor = mServerTextColor;
+    }
+
+    public String getServerElementColor() {
+        return mServerElementColor;
+    }
+
+    public void setServerElementColor(String mServerElementColor) {
+        this.mServerElementColor = mServerElementColor;
+    }
+
     public String getServerSlogan() {
         return mServerSlogan;
     }