Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Publish packages to pub.dev #1796

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 1 addition & 5 deletions modules/auth/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ dependencies:
ref: ensemble-v1.1.12
path: modules/ensemble

ensemble_ts_interpreter:
git:
url: https://github.com/EnsembleUI/ensemble.git
ref: main
path: modules/ensemble_ts_interpreter
ensemble_ts_interpreter: ^1.0.1

get_it: ^8.0.0
google_sign_in: ^6.1.4
Expand Down
6 changes: 1 addition & 5 deletions modules/camera/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@ dependencies:
url: https://github.com/EnsembleUI/ensemble.git
ref: ensemble-v1.1.12
path: modules/ensemble
ensemble_ts_interpreter:
git:
url: https://github.com/EnsembleUI/ensemble.git
ref: main
path: modules/ensemble_ts_interpreter
ensemble_ts_interpreter: ^1.0.1

collection: ^1.17.1
geolocator: ^9.0.2
Expand Down
6 changes: 1 addition & 5 deletions modules/chat/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ dependencies:
ref: ensemble-v1.1.12
path: modules/ensemble

ensemble_ts_interpreter:
git:
url: https://github.com/EnsembleUI/ensemble.git
ref: main
path: modules/ensemble_ts_interpreter
ensemble_ts_interpreter: ^1.0.1

web_socket_client: 0.1.0
yaml: ^3.1.2
Expand Down
4 changes: 2 additions & 2 deletions modules/device_preview/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Since Device Preview is a simple Dart package, you have to declare it as any oth

```yaml
dependencies:
device_preview: <latest version>
ensemble_device_preview: <latest version>
```

### Add DevicePreview
Expand All @@ -47,7 +47,7 @@ Wrap your app's root widget in a `DevicePreview` and make sure to :
> Make sure to override the previous properties as described. If not defined, `MediaQuery` won't be simulated for the selected device.

```dart
import 'package:device_preview/device_preview.dart';
import 'package:ensemble_device_preview/ensemble_device_preview.dart';

void main() => runApp(
DevicePreview(
Expand Down
2 changes: 1 addition & 1 deletion modules/device_preview/example/lib/basic.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:device_preview/device_preview.dart';
import 'package:ensemble_device_preview/ensemble_device_preview.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';

Expand Down
2 changes: 1 addition & 1 deletion modules/device_preview/example/lib/custom_plugin.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:device_preview/device_preview.dart';
import 'package:ensemble_device_preview/ensemble_device_preview.dart';
import 'package:flutter/material.dart';

class CustomPlugin extends StatelessWidget {
Expand Down
2 changes: 1 addition & 1 deletion modules/device_preview/example/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:device_preview/device_preview.dart';
import 'package:ensemble_device_preview/ensemble_device_preview.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';

Expand Down
2 changes: 1 addition & 1 deletion modules/device_preview/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ environment:
# the latest version available on pub.dev. To see which dependencies have newer
# versions available, run `flutter pub outdated`.
dependencies:
device_preview:
ensemble_device_preview:
path: ../
flutter:
sdk: flutter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ export 'src/state/store.dart';
export 'src/storage/file/file.dart';
export 'src/storage/preferences/preferences.dart';
export 'src/storage/storage.dart';
export 'src/storage/file/file.dart';

export 'src/locales/locales.dart';
export 'src/locales/default_locales.dart';
Expand Down
22 changes: 11 additions & 11 deletions modules/device_preview/lib/src/device_preview.dart
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import 'dart:async';

import 'package:device_frame/device_frame.dart';
import 'package:device_preview/src/state/state.dart';
import 'package:device_preview/src/state/store.dart';
import 'package:device_preview/src/storage/storage.dart';
import 'package:device_preview/src/utilities/assert_inherited_media_query.dart';
import 'package:device_preview/src/utilities/media_query_observer.dart';
import 'package:device_preview/src/views/theme.dart';
import 'package:device_preview/src/views/tool_panel/sections/accessibility.dart';
import 'package:device_preview/src/views/tool_panel/sections/device.dart';
import 'package:device_preview/src/views/tool_panel/sections/settings.dart';
import 'package:device_preview/src/views/tool_panel/sections/system.dart';
import 'package:device_preview/src/views/tool_panel/tool_panel.dart';
import 'package:ensemble_device_preview/src/state/state.dart';
import 'package:ensemble_device_preview/src/state/store.dart';
import 'package:ensemble_device_preview/src/storage/storage.dart';
import 'package:ensemble_device_preview/src/utilities/assert_inherited_media_query.dart';
import 'package:ensemble_device_preview/src/utilities/media_query_observer.dart';
import 'package:ensemble_device_preview/src/views/theme.dart';
import 'package:ensemble_device_preview/src/views/tool_panel/sections/accessibility.dart';
import 'package:ensemble_device_preview/src/views/tool_panel/sections/device.dart';
import 'package:ensemble_device_preview/src/views/tool_panel/sections/settings.dart';
import 'package:ensemble_device_preview/src/views/tool_panel/sections/system.dart';
import 'package:ensemble_device_preview/src/views/tool_panel/tool_panel.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
Expand Down
2 changes: 1 addition & 1 deletion modules/device_preview/lib/src/state/custom_device.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dart:ui';

import 'package:device_preview/device_preview.dart';
import 'package:ensemble_device_preview/ensemble_device_preview.dart';
import 'package:flutter/material.dart';

import 'state.dart';
Expand Down
2 changes: 1 addition & 1 deletion modules/device_preview/lib/src/state/state.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:device_preview/device_preview.dart';
import 'package:ensemble_device_preview/ensemble_device_preview.dart';
import 'package:flutter/widgets.dart';
import 'package:freezed_annotation/freezed_annotation.dart';

Expand Down
4 changes: 2 additions & 2 deletions modules/device_preview/lib/src/state/store.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import 'package:device_frame/device_frame.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';

import '../../device_preview.dart';
import '../../ensemble_device_preview.dart';
import '../storage/storage.dart';
import 'custom_device.dart';
import 'state.dart';
import '../../device_preview.dart' as device_preview;
import '../../ensemble_device_preview.dart' as device_preview;

/// The store is a container for the current [state] of the device preview.
///
Expand Down
2 changes: 1 addition & 1 deletion modules/device_preview/lib/src/storage/file/file_io.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:convert';
import 'dart:io';

import 'package:device_preview/src/state/state.dart';
import 'package:ensemble_device_preview/src/state/state.dart';

import '../storage.dart';

Expand Down
2 changes: 1 addition & 1 deletion modules/device_preview/lib/src/storage/file/file_mock.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:device_preview/src/state/state.dart';
import 'package:ensemble_device_preview/src/state/state.dart';

import '../storage.dart';

Expand Down
2 changes: 1 addition & 1 deletion modules/device_preview/lib/src/storage/file/file_web.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dart:developer';

import 'package:device_preview/src/state/state.dart';
import 'package:ensemble_device_preview/src/state/state.dart';

import '../storage.dart';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dart:convert';

import 'package:device_preview/src/state/state.dart';
import 'package:ensemble_device_preview/src/state/state.dart';
import 'package:shared_preferences/shared_preferences.dart';

import '../storage.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:device_preview/src/state/state.dart';
import 'package:ensemble_device_preview/src/state/state.dart';

import '../storage.dart';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import 'dart:async';
import 'dart:convert' show jsonDecode, jsonEncode;
import 'dart:html' as html;
import 'package:device_preview/src/state/state.dart';
import 'package:ensemble_device_preview/src/state/state.dart';

import '../storage.dart';

Expand Down
2 changes: 1 addition & 1 deletion modules/device_preview/lib/src/storage/storage.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:device_preview/src/state/state.dart';
import 'package:ensemble_device_preview/src/state/state.dart';

import 'preferences/preferences.dart';

Expand Down
6 changes: 3 additions & 3 deletions modules/device_preview/lib/src/views/large.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:device_preview/src/state/store.dart';
import 'package:device_preview/src/views/theme.dart';
import 'package:device_preview/src/views/tool_panel/tool_panel.dart';
import 'package:ensemble_device_preview/src/state/store.dart';
import 'package:ensemble_device_preview/src/views/theme.dart';
import 'package:ensemble_device_preview/src/views/tool_panel/tool_panel.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
Expand Down
4 changes: 2 additions & 2 deletions modules/device_preview/lib/src/views/small.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:device_preview/src/state/store.dart';
import 'package:device_preview/src/views/theme.dart';
import 'package:ensemble_device_preview/src/state/store.dart';
import 'package:ensemble_device_preview/src/views/theme.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:provider/provider.dart';
Expand Down
144 changes: 95 additions & 49 deletions modules/device_preview/lib/src/views/theme.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:device_preview/src/state/state.dart';
import 'package:ensemble_device_preview/src/state/state.dart';
import 'package:flutter/material.dart';

extension ThemeBackgroundExtension on DevicePreviewBackgroundThemeData {
Expand Down Expand Up @@ -36,30 +36,53 @@ extension ThemeToolbarExtension on DevicePreviewToolBarThemeData {
activeTickMarkColor: accentColor,
inactiveTickMarkColor: accentColor,
overlayColor: accentColor.withOpacity(0.12),
), checkboxTheme: CheckboxThemeData(
fillColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) { return null; }
if (states.contains(MaterialState.selected)) { return accentColor; }
return null;
}),
), radioTheme: RadioThemeData(
fillColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) { return null; }
if (states.contains(MaterialState.selected)) { return accentColor; }
return null;
}),
), switchTheme: SwitchThemeData(
thumbColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) { return null; }
if (states.contains(MaterialState.selected)) { return accentColor; }
return null;
}),
trackColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) { return null; }
if (states.contains(MaterialState.selected)) { return accentColor; }
return null;
}),
),
),
checkboxTheme: CheckboxThemeData(
fillColor: MaterialStateProperty.resolveWith<Color?>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return accentColor;
}
return null;
}),
),
radioTheme: RadioThemeData(
fillColor: MaterialStateProperty.resolveWith<Color?>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return accentColor;
}
return null;
}),
),
switchTheme: SwitchThemeData(
thumbColor: MaterialStateProperty.resolveWith<Color?>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return accentColor;
}
return null;
}),
trackColor: MaterialStateProperty.resolveWith<Color?>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return accentColor;
}
return null;
}),
),
);
case DevicePreviewToolBarThemeData.light:
final base = ThemeData.light();
Expand All @@ -84,30 +107,53 @@ extension ThemeToolbarExtension on DevicePreviewToolBarThemeData {
activeTickMarkColor: accentColor,
inactiveTickMarkColor: accentColor,
overlayColor: accentColor.withOpacity(0.12),
), checkboxTheme: CheckboxThemeData(
fillColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) { return null; }
if (states.contains(MaterialState.selected)) { return accentColor; }
return null;
}),
), radioTheme: RadioThemeData(
fillColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) { return null; }
if (states.contains(MaterialState.selected)) { return accentColor; }
return null;
}),
), switchTheme: SwitchThemeData(
thumbColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) { return null; }
if (states.contains(MaterialState.selected)) { return accentColor; }
return null;
}),
trackColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) { return null; }
if (states.contains(MaterialState.selected)) { return accentColor; }
return null;
}),
),
),
checkboxTheme: CheckboxThemeData(
fillColor: MaterialStateProperty.resolveWith<Color?>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return accentColor;
}
return null;
}),
),
radioTheme: RadioThemeData(
fillColor: MaterialStateProperty.resolveWith<Color?>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return accentColor;
}
return null;
}),
),
switchTheme: SwitchThemeData(
thumbColor: MaterialStateProperty.resolveWith<Color?>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return accentColor;
}
return null;
}),
trackColor: MaterialStateProperty.resolveWith<Color?>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return accentColor;
}
return null;
}),
),
);
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:device_preview/src/state/store.dart';
import 'package:ensemble_device_preview/src/state/store.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:provider/provider.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:device_preview/src/state/store.dart';
import 'package:device_preview/src/views/tool_panel/sections/subsections/device_model.dart';
import 'package:device_preview/src/views/tool_panel/widgets/device_type_icon.dart';
import 'package:device_preview/src/views/tool_panel/widgets/target_platform_icon.dart';
import 'package:ensemble_device_preview/src/state/store.dart';
import 'package:ensemble_device_preview/src/views/tool_panel/sections/subsections/device_model.dart';
import 'package:ensemble_device_preview/src/views/tool_panel/widgets/device_type_icon.dart';
import 'package:ensemble_device_preview/src/views/tool_panel/widgets/target_platform_icon.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:provider/provider.dart';
Expand Down
Loading