Merge branch 'main' into UX-144-color

.github/workflows/on-main.yml

@@ -24,6 +24,8 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           cache: true
+          channel: stable
+          flutter-version: 3.24.x # TODO UX-1347
       - name: Setup flutter
         run: flutter pub get
       - name: Build example app

.github/workflows/on-release.yml

@@ -17,6 +17,8 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           cache: true
+          channel: stable
+          flutter-version: 3.24.x # TODO UX-1347
       - name: Install dependencies
         run: flutter pub get
       - name: Format code
@@ -38,5 +40,4 @@ jobs:
               repo: 'zeta',
               workflow_id: 'deploy.yml',
               ref: 'main',
-              environment: 'stage',
             })

.github/workflows/pull-request.yml

@@ -19,6 +19,8 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           cache: true
+          channel: stable
+          flutter-version: 3.24.x # TODO UX-1347
       - run: dart run build_runner build --delete-conflicting-outputs
       - uses: ZebraDevs/flutter-code-quality@main
         with:
@@ -51,6 +53,8 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           cache: true
+          channel: stable
+          flutter-version: 3.24.x # TODO UX-1347
       - name: Setup flutter
         run: flutter pub get
       - name: Build example app

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.16.0"
+  ".": "0.20.1"
 }

LICENSE

@@ -1,7 +1,21 @@
-Copyright 2024 Zebra Technologies
+MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Copyright (c) 2024 Zebra Technologies Inc.
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

custom_docs/components/Color/flutter.md

@@ -77,7 +77,7 @@ ZetaColors has the following modifiers:
 - positive, onPositive, negative, onNegative, warning, onWarning, info, onInfo
 - surface, onSurface, surfaceDisabled, surfaceHover, surfaceSecondary, surfaceTertiary, surfaceSelectedHover, surfaceSelected
 - background, onBackground
-- textDefault, textSubtle, textDisabled, textInverse,
+- mainDefault, mainSubtle, mainDisabled, textInverse,
 - borderDefault, borderSubtle, borderDisabled, borderSelected,
 - white, black
 - link, linkVisited,

example/.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "761747bfc538b5af34aa0d3fac380f1bc331ec49"
+  revision: "603104015dd692ea3403755b55d07813d5cf8965"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
     - platform: android
-      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
 
   # User provided section
 

example/android/.gitignore

@@ -7,7 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks

example/android/app/build.gradle

@@ -5,43 +5,29 @@ plugins {
     id "dev.flutter.flutter-gradle-plugin"
 }
 
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file("local.properties")
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader("UTF-8") { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
-if (flutterVersionCode == null) {
-    flutterVersionCode = "1"
-}
-
-def flutterVersionName = localProperties.getProperty("flutter.versionName")
-if (flutterVersionName == null) {
-    flutterVersionName = "1.0"
-}
-
 android {
     namespace = "com.zebra.zeta.example"
     compileSdk = flutter.compileSdkVersion
-    ndkVersion = flutter.ndkVersion
+    ndkVersion = "25.1.8937393"
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "com.zebra.zeta.example"
         // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
-        versionCode = flutterVersionCode.toInteger()
-        versionName = flutterVersionName
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
     }
 
     buildTypes {

example/android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

example/android/settings.gradle

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "com.android.application" version "8.3.1" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"

example/ios/Podfile.lock

@@ -6,7 +6,7 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqflite (0.0.3):
+  - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
   - url_launcher_ios (0.0.1):
@@ -16,7 +16,7 @@ DEPENDENCIES:
   - Flutter (from `Flutter`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
+  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
 EXTERNAL SOURCES:
@@ -26,16 +26,16 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  sqflite:
-    :path: ".symlinks/plugins/sqflite/darwin"
+  sqflite_darwin:
+    :path: ".symlinks/plugins/sqflite_darwin/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
+  sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
 
 PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011

example/ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

example/lib/home.dart

@@ -6,7 +6,7 @@ import 'package:zeta_example/pages/components/avatar_example.dart';
 import 'package:zeta_example/pages/components/badges_example.dart';
 import 'package:zeta_example/pages/components/banner_example.dart';
 import 'package:zeta_example/pages/components/bottom_sheet_example.dart';
-import 'package:zeta_example/pages/components/breadcrumbs_example.dart';
+import 'package:zeta_example/pages/components/breadcrumb_example.dart';
 import 'package:zeta_example/pages/components/button_example.dart';
 import 'package:zeta_example/pages/components/chat_item_example.dart';
 import 'package:zeta_example/pages/components/checkbox_example.dart';
@@ -26,6 +26,7 @@ import 'package:zeta_example/pages/components/navigation_rail_example.dart';
 import 'package:zeta_example/pages/components/notification_list_example.dart';
 import 'package:zeta_example/pages/components/phone_input_example.dart';
 import 'package:zeta_example/pages/components/radio_example.dart';
+import 'package:zeta_example/pages/components/range_selector_example.dart';
 import 'package:zeta_example/pages/components/screen_header_bar_example.dart';
 import 'package:zeta_example/pages/components/select_input_example.dart';
 
@@ -67,7 +68,7 @@ final List<Component> components = [
   Component(BannerExample.name, (context) => const BannerExample()),
   Component(BadgesExample.name, (context) => const BadgesExample()),
   Component(BottomSheetExample.name, (context) => const BottomSheetExample()),
-  Component(BreadCrumbsExample.name, (context) => const BreadCrumbsExample()),
+  Component(BreadcrumbExample.name, (context) => const BreadcrumbExample()),
   Component(ButtonExample.name, (context) => const ButtonExample()),
   Component(ChatItemExample.name, (context) => const ChatItemExample()),
   Component(CheckBoxExample.name, (context) => const CheckBoxExample()),
@@ -89,6 +90,7 @@ final List<Component> components = [
   Component(TabsExample.name, (context) => const TabsExample()),
   Component(DialPadExample.name, (context) => const DialPadExample()),
   Component(RadioButtonExample.name, (context) => const RadioButtonExample()),
+  Component(RangeSelectorExample.name, (context) => const RangeSelectorExample()),
   Component(SwitchExample.name, (context) => const SwitchExample()),
   Component(SliderExample.name, (context) => const SliderExample()),
   Component(DateInputExample.name, (context) => const DateInputExample()),
@@ -160,7 +162,7 @@ class _HomeState extends State<Home> {
     final _theme = theme..sort((a, b) => a.name.compareTo(b.name));
     return ExampleScaffold(
       // x-release-please-start-version
-      name: 'zeta_flutter v0.16.0',
+      name: 'zeta_flutter v0.20.1',
       // x-release-please-end
       child: SingleChildScrollView(
         child: Column(

example/lib/pages/components/avatar_example.dart

@@ -18,13 +18,25 @@ class AvatarExample extends StatelessWidget {
     );
 
     return ExampleScaffold(
+      actions: [
+        ZetaAvatar.initials(
+          initials: 'W W',
+          size: ZetaAvatarSize.xxs,
+          backgroundColor: Zeta.of(context).colors.primitives.green,
+        ),
+      ],
       name: AvatarExample.name,
       child: SingleChildScrollView(
         scrollDirection: Axis.horizontal,
         child: SingleChildScrollView(
           padding: EdgeInsets.all(Zeta.of(context).spacing.medium),
           child: Column(
             children: [
+              ZetaAvatar.initials(
+                initials: 'WW',
+                size: ZetaAvatarSize.xxs,
+                backgroundColor: Zeta.of(context).colors.primitives.green,
+              ),
               Column(
                 children: [
                   Text(

example/lib/pages/components/banner_example.dart

@@ -23,7 +23,7 @@ class BannerExample extends StatelessWidget {
                 type: ZetaBannerStatus.primary,
                 title: 'Centered',
                 context: context,
-                titleStart: true,
+                titleCenter: true,
                 leadingIcon: ZetaIcons.info,
               ),
               ZetaBanner(
@@ -35,21 +35,21 @@ class BannerExample extends StatelessWidget {
                 type: ZetaBannerStatus.primary,
                 context: context,
                 title: 'Title left with arrow',
-                titleStart: true,
+                titleCenter: true,
                 trailing: ZetaIcon(ZetaIcons.chevron_right),
               ),
               ZetaBanner(
                 type: ZetaBannerStatus.primary,
                 title: 'Title left + Icon',
-                titleStart: true,
+                titleCenter: true,
                 context: context,
                 leadingIcon: ZetaIcons.info,
               ),
               ZetaBanner(
                 type: ZetaBannerStatus.primary,
                 context: context,
                 title: 'Title left + Icon with Arrow',
-                titleStart: true,
+                titleCenter: true,
                 leadingIcon: ZetaIcons.info,
                 trailing: IconButton(
                   icon: ZetaIcon(ZetaIcons.chevron_right),
@@ -71,7 +71,7 @@ class BannerExample extends StatelessWidget {
                 type: ZetaBannerStatus.positive,
                 context: context,
                 title: 'Centered',
-                titleStart: true,
+                titleCenter: true,
                 leadingIcon: ZetaIcons.info,
                 trailing: IconButton(
                   icon: ZetaIcon(ZetaIcons.chevron_right),
@@ -92,7 +92,7 @@ class BannerExample extends StatelessWidget {
                 type: ZetaBannerStatus.warning,
                 title: 'Centered',
                 context: context,
-                titleStart: true,
+                titleCenter: true,
                 leadingIcon: ZetaIcons.info,
                 trailing: IconButton(
                   icon: ZetaIcon(ZetaIcons.chevron_right),
@@ -113,7 +113,7 @@ class BannerExample extends StatelessWidget {
                 type: ZetaBannerStatus.negative,
                 title: 'Centered',
                 context: context,
-                titleStart: true,
+                titleCenter: true,
                 leadingIcon: ZetaIcons.info,
                 trailing: IconButton(
                   icon: ZetaIcon(ZetaIcons.chevron_right),