Merge branch 'trunk' into fix/theme_issues_fix

atsign-foundation · May 27, 2024 · 8e792b7 · 8e792b7
2 parents 3960aae + 3afc6db
commit 8e792b7
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 27 deletions.
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
         with:
           egress-policy: audit
 
       - name: 'Checkout Repository'
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@5bbc3ba658137598168acb2ab73b21c432dd411b # v4.2.5
+        uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2
diff --git a/.github/workflows/melos_bootstrap.yaml b/.github/workflows/melos_bootstrap.yaml
@@ -8,7 +8,8 @@ jobs:
   melos-bootstrap:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0
         with:
           channel: "stable"

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -32,12 +32,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -59,14 +59,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4
+        uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
@@ -34,13 +34,16 @@ jobs:
           - at_onboarding_flutter
           - at_sync_ui_flutter
           - at_theme_flutter
+        flutter-channel:
+          - stable
+          - beta
 
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0
         with:
-          channel: "stable"
-      - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+          channel: "${{ matrix.flutter-channel}}"
+      - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
           go-version: 'stable'
           cache-dependency-path: tools/osv-scanner/go.sum
@@ -50,7 +53,11 @@ jobs:
         run: |
           touch example/.env
           flutter pub get
-          flutter analyze --no-fatal-infos
+          if [ "${{ matrix.flutter-channel}}" = "beta" ]; then
+            flutter analyze
+          else
+            flutter analyze --no-fatal-infos
+          fi
 
       # Runs osv-scanner to find any vulnerable Dart dependencies
       # It needs to look at pubspec.lock files, which is why it's

diff --git a/packages/at_common_flutter/example/lib/main.dart b/packages/at_common_flutter/example/lib/main.dart
@@ -25,13 +25,13 @@ class MyApp extends StatelessWidget {
           theme: ThemeData(
             brightness: Brightness.light,
             primaryColor: const Color(0xFFf04924),
-            backgroundColor: Colors.white,
+            colorScheme: ThemeData.light().colorScheme.copyWith(surface: Colors.white),
           ),
           darkTheme: ThemeData(
             brightness: Brightness.dark,
             fontFamily: 'RobotoSlab',
             primaryColor: const Color(0xFFF05E3E),
-            backgroundColor: Colors.black,
+            colorScheme: ThemeData.dark().colorScheme.copyWith(surface: Colors.black),
           ),
           themeMode: snapshot.data,
           title: 'Example App',

diff --git a/packages/at_onboarding_flutter/example/lib/main.dart b/packages/at_onboarding_flutter/example/lib/main.dart
@@ -51,22 +51,17 @@ class _MyAppState extends State<MyApp> {
           theme: ThemeData().copyWith(
             brightness: Brightness.light,
             primaryColor: const Color(0xFFf4533d),
-            colorScheme: ThemeData.light().colorScheme.copyWith(
-                  primary: const Color(0xFFf4533d),
-                ),
-            // ignore: deprecated_member_use
-            backgroundColor: Colors.white,
             scaffoldBackgroundColor: Colors.white,
+            colorScheme: ThemeData.light().colorScheme.copyWith(
+                primary: const Color(0xFFf4533d), surface: Colors.white),
           ),
           darkTheme: ThemeData().copyWith(
             brightness: Brightness.dark,
             primaryColor: Colors.blue,
-            colorScheme: ThemeData.dark().colorScheme.copyWith(
-                  primary: Colors.blue,
-                ),
-            // ignore: deprecated_member_use
-            backgroundColor: Colors.grey[850],
             scaffoldBackgroundColor: Colors.grey[850],
+            colorScheme: ThemeData.dark()
+                .colorScheme
+                .copyWith(primary: Colors.blue, surface: Colors.grey[850]),
           ),
           locale: _currentLocale,
           localizationsDelegates: const [

diff --git a/packages/at_onboarding_flutter/example/lib/switch_atsign.dart b/packages/at_onboarding_flutter/example/lib/switch_atsign.dart
@@ -44,8 +44,7 @@ class _AtSignBottomSheetState extends State<AtSignBottomSheet> {
               child: Container(
                 height: 100,
                 width: screenSize.width,
-                // ignore: deprecated_member_use
-                color: Theme.of(context).backgroundColor,
+                color: Theme.of(context).canvasColor,
                 child: Row(
                   children: [
                     Expanded(
@@ -101,7 +100,7 @@ class _AtSignBottomSheetState extends State<AtSignBottomSheet> {
                               Text(
                                 widget.atSignList[index],
                                 // ignore: deprecated_member_use
-                                style: Theme.of(context).textTheme.bodyText1,
+                                style: Theme.of(context).textTheme.bodyMedium,
                               )
                             ],
                           ),