Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
DDavidPrime committed Dec 23, 2024
2 parents 2c6a21b + bd8cbe6 commit 85f7015
Show file tree
Hide file tree
Showing 103 changed files with 690 additions and 647 deletions.
4 changes: 4 additions & 0 deletions packages/widget_toolkit/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## [0.2.1]
* Removed deprecated use of `.withOpacity()`
* Updated `copy_with_extension` to `6.0.0`

## [0.2.0]
- Updated dependencies:
* `rxdart` to `0.28.0`
Expand Down
1 change: 1 addition & 0 deletions packages/widget_toolkit/example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ if (flutterVersionName == null) {
}

android {
namespace 'com.primeholding.example'
compileSdkVersion flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
4 changes: 2 additions & 2 deletions packages/widget_toolkit/example/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.2.0" apply false
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
id "com.android.application" version "8.1.0" apply false
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
}

include ":app"
2 changes: 1 addition & 1 deletion packages/widget_toolkit/example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
50 changes: 25 additions & 25 deletions packages/widget_toolkit/example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ packages:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
url: "https://pub.dev"
source: hosted
version: "72.0.0"
version: "76.0.0"
_macros:
dependency: transitive
description: dart
source: sdk
version: "0.3.2"
version: "0.3.3"
analyzer:
dependency: transitive
description:
name: analyzer
sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
url: "https://pub.dev"
source: hosted
version: "6.7.0"
version: "6.11.0"
args:
dependency: transitive
description:
Expand Down Expand Up @@ -146,10 +146,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
url: "https://pub.dev"
source: hosted
version: "1.18.0"
version: "1.19.0"
convert:
dependency: transitive
description:
Expand All @@ -162,10 +162,10 @@ packages:
dependency: transitive
description:
name: copy_with_extension
sha256: fbcf890b0c34aedf0894f91a11a579994b61b4e04080204656b582708b5b1125
sha256: ed472ae80d807094d7a7d7ef67901f8167d18c7998e6db81785a51364aede627
url: "https://pub.dev"
source: hosted
version: "5.0.4"
version: "6.0.0"
crypto:
dependency: transitive
description:
Expand Down Expand Up @@ -342,18 +342,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
url: "https://pub.dev"
source: hosted
version: "10.0.5"
version: "10.0.7"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
url: "https://pub.dev"
source: hosted
version: "3.0.5"
version: "3.0.8"
leak_tracker_testing:
dependency: transitive
description:
Expand Down Expand Up @@ -382,10 +382,10 @@ packages:
dependency: transitive
description:
name: macros
sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
url: "https://pub.dev"
source: hosted
version: "0.1.2-main.4"
version: "0.1.3-main.0"
matcher:
dependency: transitive
description:
Expand Down Expand Up @@ -542,7 +542,7 @@ packages:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
version: "0.0.0"
source_span:
dependency: transitive
description:
Expand All @@ -555,10 +555,10 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
url: "https://pub.dev"
source: hosted
version: "1.11.1"
version: "1.12.0"
stream_channel:
dependency: transitive
description:
Expand All @@ -579,10 +579,10 @@ packages:
dependency: transitive
description:
name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.3.0"
term_glyph:
dependency: transitive
description:
Expand All @@ -595,10 +595,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
url: "https://pub.dev"
source: hosted
version: "0.7.2"
version: "0.7.3"
theme_tailor_annotation:
dependency: transitive
description:
Expand Down Expand Up @@ -723,10 +723,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
url: "https://pub.dev"
source: hosted
version: "14.2.5"
version: "14.3.0"
watcher:
dependency: transitive
description:
Expand Down Expand Up @@ -765,7 +765,7 @@ packages:
path: ".."
relative: true
source: path
version: "0.2.0"
version: "0.2.1"
xml:
dependency: transitive
description:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class DesignSystemColors {
scaffoldBackgroundColor = Colors.black,
highlightColor = Colors.white,
errorTitleColor = Colors.white,
bottomSheetBarrierColor = Colors.black.withOpacity(0.5),
bottomSheetBarrierColor = Colors.black.withValues(alpha: 0.5),
shimmerBaseColor = const Color(0xff9da2a6),
shimmerHighlightColor = const Color(0xffF0F0F2);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'permanent_address_bottom_sheet.dart';

/// [translateError] provide a function which maps the city and street validation
/// errors from the [service] service to the appropriate
/// RxFieldException<String>, which is an ui error with text.
/// RxFieldException`<String>`, which is an ui error with text.
///
/// [service] receives an implementation of the [EditAddressService] class.
/// The API of the class provides methods for the logic for the main save address
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import '../../../language_picker.dart';
/// [getAll] method returns the list of all language that the app will use.
///
/// [getLanguageList] returns the list of all languages and marks the currently
/// selected language as selected in the List<SelectedLanguageModel>.
/// selected language as selected in the List`<SelectedLanguageModel>`.
///
/// [getCurrent] returns the currently selected language.
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class SelectLanguageItem extends StatelessWidget {
Color getPressedInnerBackgroundColor(BuildContext context) =>
(colorStyle?.pressedColor ??
context.widgetToolkitTheme.filledButtonBackgroundColorPressed)
.withOpacity(0.5);
.withValues(alpha: 0.5);

Color getInnerButtonColor(BuildContext context) =>
(state != ButtonStateModel.disabled)
Expand Down Expand Up @@ -229,7 +229,7 @@ class SelectLanguageItem extends StatelessWidget {
BoxShadow(
color: colorStyle?.shadowColor ??
context.languagePickerTheme.boxShadowColor
.withOpacity(0.2),
.withValues(alpha: 0.2),
blurRadius: context.languagePickerTheme.spacingS,
spreadRadius: 0,
offset: const Offset(0, 4),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ class OpenUriBloc extends $OpenUriBloc {
formattedUri = 'file:${args.uri}';
break;
case UriType.https:
default:
formattedUri = args.uri;
if (!formattedUri.startsWith('https:') &&
!formattedUri.startsWith('http:')) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ class InputTextFieldState extends State<InputTextField> {
child: GestureDetector(
onTap: () {
if (currentState == InputTextFieldStateModel.defaultDisabled ||
currentState == InputTextFieldStateModel.disabled) return;
currentState == InputTextFieldStateModel.disabled) {
return;
}

if (currentState != InputTextFieldStateModel.defaultField) {
_focusNode.requestFocus();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class GradientFillButton extends StatelessWidget {
Color getPressedInnerBackgroundColor(BuildContext context) =>
(colorStyle?.pressedColor ??
context.widgetToolkitTheme.filledButtonBackgroundColorPressed)
.withOpacity(0.5);
.withValues(alpha: 0.5);

/// region Builders
Expand All @@ -156,7 +156,7 @@ class GradientFillButton extends StatelessWidget {
borderRadius: BorderRadius.circular(radius),
),
elevation: activeState() ? elevation : 0,
shadowColor: activeGradientColorStart(context).withOpacity(0.2),
shadowColor: activeGradientColorStart(context).withValues(alpha: 0.2),
),
onPressed: (state == ButtonStateModel.loading) ? null : onPressed,
child: text,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ class SmallButton extends StatelessWidget {
//pressed or normal
(colorStyle?.activeGradientColorStart ??
context.widgetToolkitTheme.primaryGradientStart)
.withOpacity(state == ButtonStateModel.pressed ? 0.5 : 1.0)
.withValues(alpha: state == ButtonStateModel.pressed ? 0.5 : 1.0)

//disabled
: context.widgetToolkitTheme.filledButtonTextColorDisabled;

final colorGradientEnd = state != ButtonStateModel.disabled
? (colorStyle?.activeGradientColorEnd ??
context.widgetToolkitTheme.primaryGradientEnd)
.withOpacity(state == ButtonStateModel.pressed ? 0.5 : 1.0)
.withValues(alpha: state == ButtonStateModel.pressed ? 0.5 : 1.0)
: context.widgetToolkitTheme.filledButtonTextColorDisabled;

var gradient = LinearGradient(colors: [
Expand Down
6 changes: 3 additions & 3 deletions packages/widget_toolkit/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: widget_toolkit
description: The Widget Toolkit package consists of several lightweight and customisable UI components that boost productivity and reduce the development time.
version: 0.2.0
version: 0.2.1
repository: https://github.com/Prime-Holding/widget_toolkit/tree/master/packages/widget_toolkit
issue_tracker: https://github.com/orgs/Prime-Holding/projects/6
homepage: https://www.primeholding.com
Expand All @@ -9,7 +9,7 @@ environment:
sdk: ">=3.0.5 <4.0.0"

dependencies:
copy_with_extension: ^5.0.3
copy_with_extension: ^6.0.0
equatable: ^2.0.5
flutter:
sdk: flutter
Expand All @@ -28,7 +28,7 @@ dependencies:
dev_dependencies:
build_runner: ^2.4.6
clean_coverage: ^0.0.3
copy_with_extension_gen: ^5.0.3
copy_with_extension_gen: ^6.0.0
flutter_lints: ^4.0.0
flutter_test:
sdk: flutter
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions packages/widget_toolkit_otp/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## [0.1.1]
* Removed deprecated use of `.withOpacity()`

## [0.1.0]
- Update dependencies:
* `rxbloc` to `0.28.0`
Expand Down
2 changes: 2 additions & 0 deletions packages/widget_toolkit_otp/example/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
*.swp
.DS_Store
.atom/
.build/
.buildlog/
.history
.svn/
.swiftpm/
migrate_working_dir/

# IntelliJ related
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ if (flutterVersionName == null) {
}

android {
namespace 'com.primeholding.otp_example'
compileSdkVersion flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
4 changes: 2 additions & 2 deletions packages/widget_toolkit_otp/example/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.2.0" apply false
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
id "com.android.application" version "8.1.0" apply false
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
}

include ":app"
2 changes: 1 addition & 1 deletion packages/widget_toolkit_otp/example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
3 changes: 0 additions & 3 deletions packages/widget_toolkit_otp/example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ class MyHomePage extends StatelessWidget {

@override
Widget build(BuildContext context) => Scaffold(
appBar: AppBar(
title: const Text('widget_toolkit_otp Example'),
),
body: SafeArea(
child: SmsCodeProvider(
sentNewCodeActivationTime: 2,
Expand Down
Loading

0 comments on commit 85f7015

Please sign in to comment.