[feature/mdm+branding] Unified Branding with MDM support

doc/CONFIGURATION.json

@@ -314,19 +314,6 @@
     "status" : "debugOnly",
     "type" : "bool"
   },
-  {
-    "autoExpansion" : "none",
-    "category" : "App",
-    "categoryTag" : "app",
-    "classIdentifier" : "app",
-    "className" : "ownCloudAppShared.VendorServices",
-    "defaultValue" : "[email protected]",
-    "description" : "Email address to send feedback to.",
-    "flatIdentifier" : "app.feedback-email",
-    "key" : "feedback-email",
-    "status" : "advanced",
-    "type" : "string"
-  },
   {
     "autoExpansion" : "none",
     "category" : "App",
@@ -353,19 +340,6 @@
     "status" : "advanced",
     "type" : "bool"
   },
-  {
-    "autoExpansion" : "none",
-    "category" : "App",
-    "categoryTag" : "app",
-    "classIdentifier" : "app",
-    "className" : "ownCloudAppShared.VendorServices",
-    "defaultValue" : true,
-    "description" : "Enables/disables the send feedback entry in the settings.",
-    "flatIdentifier" : "app.send-feedback-enabled",
-    "key" : "send-feedback-enabled",
-    "status" : "advanced",
-    "type" : "bool"
-  },
   {
     "autoExpansion" : "none",
     "category" : "App",
@@ -543,6 +517,157 @@
     "status" : "supported",
     "type" : "bool"
   },
+  {
+    "autoExpansion" : "none",
+    "category" : "Branding",
+    "categoryTag" : "branding",
+    "classIdentifier" : "branding",
+    "className" : "Branding",
+    "description" : "App name to use throughout the app.",
+    "flatIdentifier" : "branding.app-name",
+    "key" : "app-name",
+    "status" : "supported",
+    "type" : "string"
+  },
+  {
+    "autoExpansion" : "none",
+    "category" : "Branding",
+    "categoryTag" : "branding",
+    "classIdentifier" : "branding",
+    "className" : "Branding",
+    "defaultValue" : true,
+    "description" : "Controls whether the user can add accounts.",
+    "flatIdentifier" : "branding.can-add-account",
+    "key" : "can-add-account",
+    "status" : "advanced",
+    "type" : "bool"
+  },
+  {
+    "autoExpansion" : "none",
+    "category" : "Branding",
+    "categoryTag" : "branding",
+    "classIdentifier" : "branding",
+    "className" : "Branding",
+    "defaultValue" : true,
+    "description" : "Controls whether the user can edit accounts.",
+    "flatIdentifier" : "branding.can-edit-account",
+    "key" : "can-edit-account",
+    "status" : "advanced",
+    "type" : "bool"
+  },
+  {
+    "autoExpansion" : "none",
+    "category" : "Branding",
+    "categoryTag" : "branding",
+    "classIdentifier" : "branding",
+    "className" : "Branding",
+    "description" : "Organization name to use throughout the app.",
+    "flatIdentifier" : "branding.organization-name",
+    "key" : "organization-name",
+    "status" : "supported",
+    "type" : "string"
+  },
+  {
+    "autoExpansion" : "none",
+    "category" : "Branding",
+    "categoryTag" : "branding",
+    "classIdentifier" : "branding",
+    "className" : "Branding",
+    "description" : "Array of dictionaries, each specifying a static profile.",
+    "flatIdentifier" : "branding.profile-definitions",
+    "key" : "profile-definitions",
+    "status" : "advanced",
+    "type" : "dictionaryArray"
+  },
+  {
+    "autoExpansion" : "none",
+    "category" : "Branding",
+    "categoryTag" : "branding",
+    "classIdentifier" : "branding",
+    "className" : "Branding",
+    "defaultValue" : "[email protected]",
+    "description" : "Email address to send feedback to. Set to `null` to disable this feature.",
+    "flatIdentifier" : "branding.send-feedback-address",
+    "key" : "send-feedback-address",
+    "status" : "advanced",
+    "type" : "string"
+  },
+  {
+    "autoExpansion" : "none",
+    "category" : "Branding",
+    "categoryTag" : "branding",
+    "classIdentifier" : "branding",
+    "className" : "Branding",
+    "description" : "Array of dictionaries, each specifying a theme.",
+    "flatIdentifier" : "branding.theme-definitions",
+    "key" : "theme-definitions",
+    "status" : "advanced",
+    "type" : "dictionaryArray"
+  },
+  {
+    "autoExpansion" : "none",
+    "category" : "Branding",
+    "categoryTag" : "branding",
+    "classIdentifier" : "branding",
+    "className" : "Branding",
+    "description" : "Dictionary defining generic colors that can be used in the definitions.",
+    "flatIdentifier" : "branding.theme-generic-colors",
+    "key" : "theme-generic-colors",
+    "status" : "advanced",
+    "type" : "dictionary"
+  },
+  {
+    "autoExpansion" : "none",
+    "category" : "Branding",
+    "categoryTag" : "branding",
+    "classIdentifier" : "branding",
+    "className" : "Branding",
+    "defaultValue" : "https://doc.owncloud.com/ios-app/",
+    "description" : "URL to documentation for the app. Opened when selecting \"Documentation\" in the settings.",
+    "flatIdentifier" : "branding.url-documentation",
+    "key" : "url-documentation",
+    "status" : "advanced",
+    "type" : "urlString"
+  },
+  {
+    "autoExpansion" : "none",
+    "category" : "Branding",
+    "categoryTag" : "branding",
+    "classIdentifier" : "branding",
+    "className" : "Branding",
+    "defaultValue" : "https://www.owncloud.com/help",
+    "description" : "URL to help for the app. Opened when selecting \"Help\" in the settings.",
+    "flatIdentifier" : "branding.url-help",
+    "key" : "url-help",
+    "status" : "advanced",
+    "type" : "urlString"
+  },
+  {
+    "autoExpansion" : "none",
+    "category" : "Branding",
+    "categoryTag" : "branding",
+    "classIdentifier" : "branding",
+    "className" : "Branding",
+    "defaultValue" : "https://owncloud.org/privacy-policy/",
+    "description" : "URL to privacy information for the app. Opened when selecting \"Privacy\" in the settings.",
+    "flatIdentifier" : "branding.url-privacy",
+    "key" : "url-privacy",
+    "status" : "advanced",
+    "type" : "urlString"
+  },
+  {
+    "autoExpansion" : "none",
+    "category" : "Branding",
+    "categoryTag" : "branding",
+    "classIdentifier" : "branding",
+    "className" : "Branding",
+    "defaultValue" : "https://raw.githubusercontent.com/owncloud/ios-app/master/LICENSE",
+    "description" : "URL to terms of use for the app. Opened when selecting \"Terms Of Use\" in the settings.",
+    "flatIdentifier" : "branding.url-terms-of-use",
+    "key" : "url-terms-of-use",
+    "status" : "advanced",
+    "type" : "urlString"
+  },
   {
     "autoExpansion" : "none",
     "category" : "Connection",

docs/modules/ROOT/pages/ios_mdm_tables.adoc

@@ -173,24 +173,12 @@ tag::app[]
 |Enable/disable review prompt.
 |advanced `candidate`
 
-|app.feedback-email
-|string
-|`[email protected]`
-|Email address to send feedback to.
-|advanced `candidate`
-
 |app.recommend-to-friend-enabled
 |bool
 |`true`
 |Enables/disables the recommend to a friend entry in the settings.
 |advanced `candidate`
 
-|app.send-feedback-enabled
-|bool
-|`true`
-|Enables/disables the send feedback entry in the settings.
-|advanced `candidate`
-
 |app.enable-ui-animations
 |bool
 |`true`
@@ -277,6 +265,92 @@ tag::bookmarks[]
 end::bookmarks[]
 
 
+tag::branding[]
+[cols="1,2,3,4a,5",options=header]
+|=== 
+|Key
+|Type
+|Default
+|Description
+|Status
+
+
+|branding.app-name
+|string
+|
+|App name to use throughout the app.
+|supported `candidate`
+
+|branding.organization-name
+|string
+|
+|Organization name to use throughout the app.
+|supported `candidate`
+
+|branding.can-add-account
+|bool
+|`true`
+|Controls whether the user can add accounts.
+|advanced `candidate`
+
+|branding.can-edit-account
+|bool
+|`true`
+|Controls whether the user can edit accounts.
+|advanced `candidate`
+
+|branding.profile-definitions
+|dictionaryArray
+|
+|Array of dictionaries, each specifying a static profile.
+|advanced `candidate`
+
+|branding.send-feedback-address
+|string
+|`[email protected]`
+|Email address to send feedback to. Set to `null` to disable this feature.
+|advanced `candidate`
+
+|branding.theme-definitions
+|dictionaryArray
+|
+|Array of dictionaries, each specifying a theme.
+|advanced `candidate`
+
+|branding.theme-generic-colors
+|dictionary
+|
+|Dictionary defining generic colors that can be used in the definitions.
+|advanced `candidate`
+
+|branding.url-documentation
+|urlString
+|`https://doc.owncloud.com/ios-app/`
+|URL to documentation for the app. Opened when selecting "Documentation" in the settings.
+|advanced `candidate`
+
+|branding.url-help
+|urlString
+|`https://www.owncloud.com/help`
+|URL to help for the app. Opened when selecting "Help" in the settings.
+|advanced `candidate`
+
+|branding.url-privacy
+|urlString
+|`https://owncloud.org/privacy-policy/`
+|URL to privacy information for the app. Opened when selecting "Privacy" in the settings.
+|advanced `candidate`
+
+|branding.url-terms-of-use
+|urlString
+|`https://raw.githubusercontent.com/owncloud/ios-app/master/LICENSE`
+|URL to terms of use for the app. Opened when selecting "Terms Of Use" in the settings.
+|advanced `candidate`
+
+|===
+end::branding[]
+
+
 tag::connection[]
 [cols="1,2,3,4a,5",options=header]
 |===