Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 941f8fba authored by Mario Đanić's avatar Mario Đanić Committed by GitHub
Browse files

Merge pull request #95 from nextcloud/themingWhite 

Add text-color and element-color to capabilities
parents 8d446869 8474fd8e

src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java

+10 −0
Original line number Diff line number Diff line
@@ -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);

                        }

src/com/owncloud/android/lib/resources/status/OCCapability.java

+20 −0
Original line number Diff line number Diff line
@@ -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;

    }