Skip to content
This repository was archived by the owner on Feb 4, 2025. It is now read-only.

[Global Styles] Implements Global Styles API Call #1940

Merged
antonis merged 12 commits into from
Jun 29, 2021
Merged

[Global Styles] Implements Global Styles API Call #1940

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
297da0a
Adds wp-block-editor/v1/settings call
antonis Apr 2, 2021
0c62258
Updates client to consume __experimentalStyles and __experimentalFeat…
antonis May 13, 2021
e961b1b
Updates GSS endpoint
antonis May 14, 2021
60a112e
Updated isFSETheme parameter serialized name
antonis May 21, 2021
daaa004
Temporarily disables site version check for GSS
antonis May 26, 2021
69bb5e1
Fixes missing space lint issue
antonis May 26, 2021
633b80b
Removes rawFeatures (__experimentalFeatures) from props passed to the…
antonis May 27, 2021
f885d7a
Revert "Removes rawFeatures (__experimentalFeatures) from props passe…
antonis Jun 17, 2021
03aa39f
Merge branch 'develop' into add/3163-GSS
antonis Jun 23, 2021
9301527
Enable GSS for WP version >= 5.8
antonis Jun 28, 2021
149a903
Merge branch 'develop' into add/3163-GSS
antonis Jun 28, 2021
b46c343
Updated test mocked WordPress software version to 5.8
antonis Jun 28, 2021
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
Prev Previous commit
Next Next commit
Enable GSS for WP version >= 5.8
  • Loading branch information
@antonis
antonis committed Jun 28, 2021
commit 930152705dcfb9dd970e0984d567499fb933af21
4 changes: 2 additions & 2 deletions fluxc/src/main/java/org/wordpress/android/fluxc/store/EditorThemeStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import org.wordpress.android.fluxc.store.ReactNativeFetchResponse.Error
import org.wordpress.android.fluxc.store.ReactNativeFetchResponse.Success
import org.wordpress.android.fluxc.tools.CoroutineEngine
import org.wordpress.android.util.AppLog
// import org.wordpress.android.util.helpers.Version
import org.wordpress.android.util.helpers.Version
import javax.inject.Inject
import javax.inject.Singleton

Expand Down Expand Up @@ -144,5 +144,5 @@ class EditorThemeStore
}

private fun globalStyleSettingsAvailable(site: SiteModel, gssEnabled: Boolean) =
gssEnabled // && (site.isWPCom || Version(site.softwareVersion) >= Version(GSS_LIMIT_VERSION))
gssEnabled && Version(site.softwareVersion) >= Version(GSS_LIMIT_VERSION)
}