Merge branch 'main' into fix-issue-9830

czlucius · Aug 9, 2021 · eba034d · eba034d
2 parents 8e6c040 + d2aa609
commit eba034d
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 7 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -16,7 +16,10 @@ pull_request_rules:
         message: MickeyMoz 💪
       merge:
         method: rebase
-        strict: smart
+        # These PRs are just bumping version or updating suffixes,
+        # and very unlikely to break anything. It's not worth the delay
+        # of rebasing them (sometimes multiple times) before merging.
+        strict: false
   - name: L10N - Auto Merge
     conditions:
       - author=mozilla-l10n-automation-bot
@@ -28,7 +31,10 @@ pull_request_rules:
         message: LGTM 😎
       merge:
         method: rebase
-        strict: smart
+        # These PRs are just bumping version or updating suffixes,
+        # and very unlikely to break anything. It's not worth the delay
+        # of rebasing them (sometimes multiple times) before merging.
+        strict: false
   - name: Release automation
     conditions:
       - author=github-actions[bot]

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -97,6 +97,7 @@ object Dependencies {
     const val androidx_browser = "androidx.browser:browser:${Versions.AndroidX.browser}"
     const val androidx_cardview = "androidx.cardview:cardview:${Versions.AndroidX.cardview}"
     const val androidx_compose_ui = "androidx.compose.ui:ui:${Versions.AndroidX.compose}"
+    const val androidx_compose_ui_graphics = "androidx.compose.ui:ui-graphics:${Versions.AndroidX.compose}"
     const val androidx_compose_ui_test = "androidx.compose.ui:ui-test-junit4:${Versions.AndroidX.compose}"
     const val androidx_compose_ui_test_manifest = "androidx.compose.ui:ui-test-manifest:${Versions.AndroidX.compose}"
     const val androidx_compose_ui_tooling = "androidx.compose.ui:ui-tooling:${Versions.AndroidX.compose}"

diff --git a/buildSrc/src/main/java/Gecko.kt b/buildSrc/src/main/java/Gecko.kt
@@ -9,7 +9,7 @@ object Gecko {
     /**
      * GeckoView Version.
      */
-    const val version = "92.0.20210806132505"
+    const val version = "92.0.20210809093320"
 
     /**
      * GeckoView channel

diff --git a/...pose/awesomebar/src/main/java/mozilla/components/compose/browser/awesomebar/AwesomeBar.kt b/...pose/awesomebar/src/main/java/mozilla/components/compose/browser/awesomebar/AwesomeBar.kt
@@ -7,11 +7,11 @@ package mozilla.components.compose.browser.awesomebar
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import mozilla.components.concept.awesomebar.AwesomeBar
 
 /**
@@ -27,7 +27,7 @@ fun AwesomeBar(
     Column(
         modifier = Modifier
             .fillMaxWidth()
-            .background(Color.White)
+            .background(MaterialTheme.colors.background)
     ) {
         val fetcher = remember { SuggestionFetcher(providers) }
 

diff --git a/...pose/awesomebar/src/main/java/mozilla/components/compose/browser/awesomebar/Suggestion.kt b/...pose/awesomebar/src/main/java/mozilla/components/compose/browser/awesomebar/Suggestion.kt
@@ -38,6 +38,7 @@ internal fun Suggestion(
     Row(
         modifier = Modifier
             .clickable { onSuggestionClicked(suggestion) }
+            .height(56.dp)
             .padding(start = 16.dp, top = 8.dp, bottom = 8.dp, end = 8.dp)
     ) {
         val icon = suggestion.icon
@@ -50,7 +51,9 @@ internal fun Suggestion(
         SuggestionTitleAndDescription(
             title = suggestion.title,
             description = suggestion.description,
-            modifier = Modifier.weight(1f)
+            modifier = Modifier
+                .weight(1f)
+                .align(Alignment.CenterVertically)
         )
         if (suggestion.editSuggestion != null) {
             AutocompleteButton(

diff --git a/components/ui/colors/build.gradle b/components/ui/colors/build.gradle
@@ -21,7 +21,7 @@ android {
 }
 
 dependencies {
-    // None
+    implementation Dependencies.androidx_compose_ui_graphics
 }
 
 apply from: '../../../publish.gradle'

diff --git a/components/ui/colors/src/main/java/mozilla/components/ui/colors/PhotonColors.kt b/components/ui/colors/src/main/java/mozilla/components/ui/colors/PhotonColors.kt
@@ -0,0 +1,109 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.ui.colors
+
+import androidx.compose.ui.graphics.Color
+
+/**
+ * Colors from the [Photon Design System](https://design.firefox.com/photon/visuals/color.html).
+ *
+ * _"Firefox colors are bold, vibrant and attractive. They enhance the experience by providing visual
+ * clues and by bringing attention to primary actions."_
+ */
+@Suppress("MagicNumber") // It's a kind of magic ✨
+object PhotonColors {
+    val Blue40 = Color(0xff45a1ff)
+    val Blue50 = Color(0xff0a84ff)
+    val Blue60 = Color(0xff0060df)
+    val Blue70 = Color(0xff003eaa)
+    val Blue80 = Color(0xff002275)
+    val Blue90 = Color(0xff000f40)
+
+    val Magenta50 = Color(0xffff1ad9)
+    val Magenta60 = Color(0xffed00b5)
+    val Magenta70 = Color(0xffb5007f)
+    val Magenta80 = Color(0xff7d004f)
+    val Magenta90 = Color(0xff440027)
+
+    val Green50 = Color(0xff30e60b)
+    val Green60 = Color(0xff12bc00)
+    val Green70 = Color(0xff058b00)
+    val Green80 = Color(0xff006504)
+    val Green90 = Color(0xff003706)
+
+    val Red50 = Color(0xffff0039)
+    val Red60 = Color(0xffd70022)
+    val Red70 = Color(0xffa4000f)
+    val Red80 = Color(0xff5a0002)
+    val Red90 = Color(0xff3e0200)
+
+    val Yellow50 = Color(0xffffe900)
+    val Yellow60 = Color(0xffd7b600)
+    val Yellow70 = Color(0xffa47f00)
+    val Yellow80 = Color(0xff715100)
+    val Yellow90 = Color(0xff3e2800)
+
+    val Teal50 = Color(0xff00feff)
+    val Teal60 = Color(0xff00c8d7)
+    val Teal70 = Color(0xff008ea4)
+    val Teal80 = Color(0xff005a71)
+    val Teal90 = Color(0xff002d3e)
+
+    val Purple50 = Color(0xff9400ff)
+    val Purple60 = Color(0xff8000d7)
+    val Purple70 = Color(0xff6200a4)
+    val Purple80 = Color(0xff440071)
+    val Purple90 = Color(0xff25003e)
+
+    val Orange50 = Color(0xffff9400)
+    val Orange60 = Color(0xffd76e00)
+    val Orange70 = Color(0xffa44900)
+    val Orange80 = Color(0xff712b00)
+    val Orange90 = Color(0xff3e1300)
+
+    val Ink20 = Color(0xff312A65)
+    val Ink20A48 = Color(0x7A312A65)
+    val Ink30 = Color(0xff2E255D)
+    val Ink50 = Color(0xff291D4F)
+    val Ink60 = Color(0xff271948)
+    val Ink70 = Color(0xff363959)
+    val Ink80 = Color(0xff20123A)
+    val Ink90 = Color(0xff0f1126)
+
+    val Grey10 = Color(0xfff9f9fa)
+    val Grey20 = Color(0xffededf0)
+    val Grey30 = Color(0xffd7d7db)
+    val Grey40 = Color(0xffb1b1b3)
+    val Grey50 = Color(0xff737373)
+    val Grey60 = Color(0xff4a4a4f)
+    val Grey70 = Color(0xff38383d)
+    val Grey80 = Color(0xff2a2a2e)
+    val Grey90 = Color(0xff0c0c0d)
+
+    val LightGrey05 = Color(0xffFBFBFE)
+    val LightGrey10 = Color(0xffF9F9FB)
+    val LightGrey30 = Color(0xffE0E0E6)
+    val LightGrey50 = Color(0xffBFBFC9)
+    val LightGrey60 = Color(0xffAFAFBB)
+    val LightGrey70 = Color(0xff9F9FAD)
+    val LightGrey80 = Color(0xff8F8F9D)
+    val LightGrey90 = Color(0xff80808E)
+
+    val DarkGrey05 = Color(0xff5B5B66)
+    val DarkGrey10 = Color(0xff52525E)
+    val DarkGrey40 = Color(0xff3A3944)
+    val DarkGrey50 = Color(0xff32313C)
+    val DarkGrey80 = Color(0xff1C1B22)
+    val DarkGrey90 = Color(0xff15141A)
+
+    val Violet05 = Color(0xffE7DFFF)
+    val Violet50 = Color(0xff9059FF)
+    val Violet50A32 = Color(0x529059FF)
+    val Violet50A48 = Color(0x7A9059FF)
+    val Violet70 = Color(0xff592ACB)
+    val Violet70A12 = Color(0x1F592ACB)
+
+    val White = Color(0xffffffff)
+}
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
@@ -135,6 +135,11 @@ task-priority:
     by-project:
         "android-components": highest
         "staging-android-components": low
+        # This handles cases where a fork may end up not being named
+        # as one of the explicit names above. Ideally anything forked
+        # from "android-components" would inherit its setting, but
+        # "low" is the safer default
+        default: low
 
 taskgraph:
     register: ac_taskgraph:register