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

chore: update #26

Merged
merged 4 commits into from
Jun 10, 2024
Merged
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
3 changes: 1 addition & 2 deletions example/android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.example">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
1 change: 1 addition & 0 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ allprojects {
repositories {
google()
jcenter()
mavenCentral()
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,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-7.6.3-all.zip
10 changes: 6 additions & 4 deletions example/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,23 @@ pluginManagement {
def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
return flutterSdkPath
}()
}
settings.ext.flutterSdkPath = flutterSdkPath()

includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")

repositories {
google()
jcenter()
mavenCentral()
gradlePluginPortal()
}
}

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.4.2" apply false
id "org.jetbrains.kotlin.android" version "1.7.21" apply false
id "com.android.application" version "7.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
}

include ":app"
68 changes: 34 additions & 34 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@ PODS:
- JPSVolumeButtonHandler
- device_info_plus (0.0.1):
- Flutter
- DKImagePickerController/Core (4.3.4):
- DKImagePickerController/Core (4.3.9):
- DKImagePickerController/ImageDataManager
- DKImagePickerController/Resource
- DKImagePickerController/ImageDataManager (4.3.4)
- DKImagePickerController/PhotoGallery (4.3.4):
- DKImagePickerController/ImageDataManager (4.3.9)
- DKImagePickerController/PhotoGallery (4.3.9):
- DKImagePickerController/Core
- DKPhotoGallery
- DKImagePickerController/Resource (4.3.4)
- DKPhotoGallery (0.0.17):
- DKPhotoGallery/Core (= 0.0.17)
- DKPhotoGallery/Model (= 0.0.17)
- DKPhotoGallery/Preview (= 0.0.17)
- DKPhotoGallery/Resource (= 0.0.17)
- DKImagePickerController/Resource (4.3.9)
- DKPhotoGallery (0.0.19):
- DKPhotoGallery/Core (= 0.0.19)
- DKPhotoGallery/Model (= 0.0.19)
- DKPhotoGallery/Preview (= 0.0.19)
- DKPhotoGallery/Resource (= 0.0.19)
- SDWebImage
- SwiftyGif
- DKPhotoGallery/Core (0.0.17):
- DKPhotoGallery/Core (0.0.19):
- DKPhotoGallery/Model
- DKPhotoGallery/Preview
- SDWebImage
- SwiftyGif
- DKPhotoGallery/Model (0.0.17):
- DKPhotoGallery/Model (0.0.19):
- SDWebImage
- SwiftyGif
- DKPhotoGallery/Preview (0.0.17):
- DKPhotoGallery/Preview (0.0.19):
- DKPhotoGallery/Model
- DKPhotoGallery/Resource
- SDWebImage
- SwiftyGif
- DKPhotoGallery/Resource (0.0.17):
- DKPhotoGallery/Resource (0.0.19):
- SDWebImage
- SwiftyGif
- file_picker (0.0.1):
Expand Down Expand Up @@ -62,17 +62,17 @@ PODS:
- JPSVolumeButtonHandler (1.0.5)
- just_audio (0.0.1):
- Flutter
- libwebp (1.3.1):
- libwebp/demux (= 1.3.1)
- libwebp/mux (= 1.3.1)
- libwebp/sharpyuv (= 1.3.1)
- libwebp/webp (= 1.3.1)
- libwebp/demux (1.3.1):
- libwebp (1.3.2):
- libwebp/demux (= 1.3.2)
- libwebp/mux (= 1.3.2)
- libwebp/sharpyuv (= 1.3.2)
- libwebp/webp (= 1.3.2)
- libwebp/demux (1.3.2):
- libwebp/webp
- libwebp/mux (1.3.1):
- libwebp/mux (1.3.2):
- libwebp/demux
- libwebp/sharpyuv (1.3.1)
- libwebp/webp (1.3.1):
- libwebp/sharpyuv (1.3.2)
- libwebp/webp (1.3.2):
- libwebp/sharpyuv
- Mantle (2.2.0):
- Mantle/extobjc (= 2.2.0)
Expand All @@ -90,10 +90,10 @@ PODS:
- record_darwin (1.0.0):
- Flutter
- FlutterMacOS
- SDWebImage (5.17.0):
- SDWebImage/Core (= 5.17.0)
- SDWebImage/Core (5.17.0)
- SDWebImageWebPCoder (0.13.0):
- SDWebImage (5.19.2):
- SDWebImage/Core (= 5.19.2)
- SDWebImage/Core (5.19.2)
- SDWebImageWebPCoder (0.14.6):
- libwebp (~> 1.0)
- SDWebImage/Core (~> 5.17)
- share_plus (0.0.1):
Expand All @@ -106,7 +106,7 @@ PODS:
- FlutterMacOS
- super_native_extensions (0.0.1):
- Flutter
- SwiftyGif (5.4.4)
- SwiftyGif (5.4.5)
- url_launcher_ios (0.0.1):
- Flutter
- video_compress (0.3.0):
Expand Down Expand Up @@ -209,8 +209,8 @@ SPEC CHECKSUMS:
audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207
camerawesome: 1e06540f60158809bc70f398ed1ac2cf93fe4188
device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e
Expand All @@ -220,26 +220,26 @@ SPEC CHECKSUMS:
irondash_engine_context: 3458bf979b90d616ffb8ae03a150bafe2e860cc9
JPSVolumeButtonHandler: 53110330c9168ed325def93eabff39f0fe3e8082
just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
libwebp: 33dc822fbbf4503668d09f7885bbfedc76c45e96
libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
record_darwin: 1f6619f2abac4d1ca91d3eeab038c980d76f1517
SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
SDWebImageWebPCoder: af09429398d99d524cae2fe00f6f0f6e491ed102
SDWebImage: dfe95b2466a9823cf9f0c6d01217c06550d7b29a
SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
super_native_extensions: 4916b3c627a9c7fffdc48a23a9eca0b1ac228fa7
SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
video_compress: fce97e4fb1dfd88175aa07d2ffc8a2f297f87fbe
video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1

PODFILE CHECKSUM: ef2759a31e8883d6b534c00ef22a7f4104f8de0d

COCOAPODS: 1.15.1
COCOAPODS: 1.15.2
2 changes: 1 addition & 1 deletion example/lib/pages/components/default_flutter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class DefaultFlutter extends StatelessWidget {
TextButton(onPressed: () {}, child: Text("Cancel")),
const Spacer(),
OutlinedButton(onPressed: () {}, child: Text("Reset")),
SizedBox(width: ZetaSpacing.xs),
SizedBox(width: ZetaSpacing.small),
ElevatedButton(onPressed: () {}, child: Text("Next")),
],
),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/pages/utils/theme_color_switch.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class ZetaThemeColorSwitch extends StatelessWidget {
isDense: true,
alignment: Alignment.center,
icon: SizedBox(width: 0),
padding: EdgeInsets.all(ZetaSpacing.xs),
padding: EdgeInsets.all(ZetaSpacing.small),
dropdownColor: zeta.colors.borderDisabled,
items: _themes.entries.map((e) {
var zetaColors = primary(_themes[e.key]!).apply(contrast: zeta.contrast);
Expand Down
2 changes: 1 addition & 1 deletion example/lib/pages/utils/theme_constrast_switch.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ZetaThemeContrastSwitch extends StatelessWidget {
isDense: true,
alignment: Alignment.center,
icon: SizedBox(width: 0),
padding: EdgeInsets.all(ZetaSpacing.xs),
padding: EdgeInsets.all(ZetaSpacing.small),
dropdownColor: zeta.colors.borderDisabled,
items: _themes.map((e) {
final colors = zetaColors(e);
Expand Down
2 changes: 1 addition & 1 deletion example/lib/pages/utils/theme_mode_switch.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ZetaThemeModeSwitch extends StatelessWidget {
alignment: Alignment.center,
icon: SizedBox(width: 0),
dropdownColor: zeta.colors.borderDisabled,
padding: EdgeInsets.all(ZetaSpacing.xs),
padding: EdgeInsets.all(ZetaSpacing.small),
items: _themes.map((e) {
final colors = zetaColors(e).apply(contrast: zeta.contrast);
return DropdownMenuItem<ThemeMode>(
Expand Down
12 changes: 6 additions & 6 deletions lib/src/components/atoms/circle_icon_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class _CircleIconButton extends State<CircleIconButton> {
]
.divide(
const SizedBox(
height: ZetaSpacing.xxs,
height: ZetaSpacing.minimum,
),
)
.toList(),
Expand All @@ -205,22 +205,22 @@ class _CircleIconButton extends State<CircleIconButton> {
double get _iconPadding {
switch (widget.size) {
case ButtonSize.large:
return ZetaSpacing.x5;
return ZetaSpacing.xl_1;
case ButtonSize.medium:
return 15;
case ButtonSize.small:
return ZetaSpacing.x1;
return ZetaSpacing.minimum;
}
}

double get _iconSize {
switch (widget.size) {
case ButtonSize.large:
return ZetaSpacing.x10;
return ZetaSpacing.xl_6;
case ButtonSize.medium:
return ZetaSpacing.x7_5;
return ZetaSpacingBase.x7_5;
case ButtonSize.small:
return ZetaSpacing.x5;
return ZetaSpacing.xl_1;
}
}

Expand Down
32 changes: 19 additions & 13 deletions lib/src/components/molecules/block_table.dart
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ class ZdsBlockTable extends StatefulWidget {

class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
final LinkedScrollControllerGroup _controllers = LinkedScrollControllerGroup();
late final double headerHeight;

late ScrollController _tableHeader;
late ScrollController _tableBody;
Expand All @@ -139,13 +138,20 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
_tableBody = _controllers.addAndGet();

WidgetsBinding.instance.addPostFrameCallback((Duration timeStamp) {
headerHeight = widget.rowHeaderHeight;
buildTable();
});

WidgetsBinding.instance.addObserver(this);
}

TextScaler get _textScaler => MediaQuery.of(context).textScaler;

double get _headerHeight => _textScaler.scale(widget.rowHeaderHeight);

double get _columnWidth => _textScaler.scale(widget.columnWidth);

double get _cellHeight => _textScaler.scale(widget.cellHeight);

@override
void didChangeMetrics() {
WidgetsBinding.instance.addPostFrameCallback((Duration timeStamp) {
Expand Down Expand Up @@ -252,7 +258,7 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
),
alignment: Alignment.center,
width: _getDayColumnWidth(),
height: 28,
height: _textScaler.scale(28),
child: Text(
items[index].text,
style: themeData.textTheme.bodySmall?.copyWith(
Expand Down Expand Up @@ -285,7 +291,7 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
children: <Widget>[
if (row.header != null)
Container(
height: headerHeight,
height: _headerHeight,
width: _getAssocColumnWidth(),
decoration: BoxDecoration(
color: zetaColors.borderDisabled,
Expand Down Expand Up @@ -327,7 +333,7 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
),
alignment: Alignment.center,
width: _getAssocColumnWidth(),
height: widget.cellHeight + widget.cellPadding,
height: _cellHeight + widget.cellPadding,
margin: const EdgeInsets.only(bottom: 1),
child: cellItem.child ??
Text(
Expand Down Expand Up @@ -355,15 +361,15 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
List<Widget> _buildRowElements(int index) {
final List<Widget> cells = <Widget>[];
final List<ZdsBlockTableRow> rows = widget.rows;
final double cellHeight = widget.cellHeight + widget.cellPadding;
final double cellHeight = _cellHeight + widget.cellPadding;
final zetaColors = Zeta.of(context).colors;
for (int j = 0; j < rows[index].data.length; j++) {
final List<Widget> columnWidgets = <Widget>[];

if (rows[index].header != null) {
columnWidgets.add(
Container(
height: headerHeight,
height: _headerHeight,
decoration: BoxDecoration(
color: zetaColors.borderDisabled,
border: Border(
Expand Down Expand Up @@ -447,7 +453,7 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
Container(
alignment: Alignment.center,
width: _getDayColumnWidth(),
height: cellHeight + (rows[index].header != null ? headerHeight : 0),
height: cellHeight + (rows[index].header != null ? _headerHeight : 0),
child: cells[indx],
),
const SizedBox(
Expand Down Expand Up @@ -489,7 +495,7 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
),
alignment: Alignment.center,
width: _getAssocColumnWidth(),
height: 28,
height: _textScaler.scale(28),
).paddingOnly(right: 1);
}

Expand All @@ -503,7 +509,7 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
}

double _firstColMinWidth() {
return widget.columnWidth + 40;
return _columnWidth + 40;
}

double _screenWidthSafe() {
Expand All @@ -515,17 +521,17 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
double _getDayColumnWidth() {
final bool isLandscape = MediaQuery.of(context).orientation == Orientation.landscape;
if (!isLandscape && (!context.isTablet())) {
return widget.columnWidth;
return _columnWidth;
}
double screenWidth = _screenWidthSafe().floorToDouble();
screenWidth -= _firstColMinWidth(); // remove first column
final double suggestedWidth = (screenWidth / 7).floorToDouble();
return suggestedWidth > widget.columnWidth ? suggestedWidth : widget.columnWidth;
return suggestedWidth > _columnWidth ? suggestedWidth : _columnWidth;
}

@override
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
super.debugFillProperties(properties);
properties.add(DoubleProperty('headerHeight', headerHeight));
properties.add(DoubleProperty('headerHeight', _headerHeight));
}
}
Loading