Skip to content

Commit 5bfacfd

Browse files
committed
Add new material 3 slider
1 parent 5f92ea1 commit 5bfacfd

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

app/android/Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ GEM
1010
artifactory (3.0.17)
1111
atomos (0.1.3)
1212
aws-eventstream (1.3.2)
13-
aws-partitions (1.1068.0)
14-
aws-sdk-core (3.220.1)
13+
aws-partitions (1.1072.0)
14+
aws-sdk-core (3.220.2)
1515
aws-eventstream (~> 1, >= 1.3.0)
1616
aws-partitions (~> 1, >= 1.992.0)
1717
aws-sigv4 (~> 1.9)

app/lib/theme.dart

+9-7
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,15 @@ ThemeData getThemeData(String name, bool dark,
4545
);
4646
}
4747
return theme.copyWith(
48-
tabBarTheme: const TabBarTheme(
49-
tabAlignment: TabAlignment.center,
50-
),
51-
dropdownMenuTheme: DropdownMenuThemeData(
52-
inputDecorationTheme: defaultDropdownInputDecorationTheme(),
53-
),
54-
);
48+
tabBarTheme: const TabBarTheme(
49+
tabAlignment: TabAlignment.center,
50+
),
51+
dropdownMenuTheme: DropdownMenuThemeData(
52+
inputDecorationTheme: defaultDropdownInputDecorationTheme(),
53+
),
54+
sliderTheme: theme.sliderTheme.copyWith(
55+
year2023: false,
56+
));
5557
}
5658

5759
InputDecorationTheme defaultDropdownInputDecorationTheme() {

app/pubspec.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -1390,8 +1390,8 @@ packages:
13901390
dependency: "direct main"
13911391
description:
13921392
path: api
1393-
ref: eee55730332b63fef9632e66d01e01d08819ab24
1394-
resolved-ref: eee55730332b63fef9632e66d01e01d08819ab24
1393+
ref: "03a9375e73b377f5f52591927ae14e97c8d51022"
1394+
resolved-ref: "03a9375e73b377f5f52591927ae14e97c8d51022"
13951395
url: "https://github.com/LinwoodDev/Swamp.git"
13961396
source: git
13971397
version: "1.0.0"

app/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ dependencies:
9191
swamp_api:
9292
git:
9393
url: https://github.com/LinwoodDev/Swamp.git
94-
ref: eee55730332b63fef9632e66d01e01d08819ab24
94+
ref: 03a9375e73b377f5f52591927ae14e97c8d51022
9595
path: api
9696
lw_file_system:
9797
git:

metadata/en-US/changelogs/132.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
* Add safe area around navigator
22
* Add tooltips to the close icon button
33
* Add swamp collaboration system in collaboration experiment
4+
* Add new material 3 slider
45
* Fix spacing in file preview on android ([#814](https://github.com/LinwoodDev/Butterfly/issues/814))
56
* Fix temporary tool not being removed ([#809](https://github.com/LinwoodDev/Butterfly/issues/809))
67
* Fix editable list tile subtitle not aligned with title

0 commit comments

Comments
 (0)