Skip to content

Commit

Permalink
Resolve tab animation bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@qianlifeng
qianlifeng committed Apr 18, 2024
1 parent adf3f8e commit 44eb670
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 44 deletions.
35 changes: 3 additions & 32 deletions Wox.UI.Flutter/wox/lib/modules/setting/views/wox_setting_plugin_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,54 +262,25 @@ class WoxSettingPluginView extends GetView<WoxSettingController> {
),
),
Expanded(
// child: material.DefaultTabController(
// length: controller.shouldShowSettingTab() ? 2 : 1,
// child: Column(
// children: [
// material.TabBar(
// isScrollable: true,
// tabAlignment: material.TabAlignment.start,
// labelColor: SettingPrimaryColor,
// indicatorColor: SettingPrimaryColor,
// tabs: [
// const material.Tab(
// child: Text('Description'),
// ),
// if (controller.shouldShowSettingTab())
// const material.Tab(
// child: Text('Settings'),
// )
// ],
// ),
// Expanded(
// child: material.TabBarView(
// children: [
// pluginTabDescription(),
// if (controller.shouldShowSettingTab()) pluginTabSetting(),
// ],
// ),
// ),
// ],
// ),
// ),
child: dt.DynamicTabBarWidget(
isScrollable: true,
showBackIcon: false,
showNextIcon: false,
tabAlignment: material.TabAlignment.start,
onAddTabMoveTo: dt.MoveToTab.idol,
labelColor: SettingPrimaryColor,
indicatorColor: SettingPrimaryColor,
dynamicTabs: [
dt.TabData(
index: 1,
index: 0,
title: const material.Tab(
child: Text('Description'),
),
content: pluginTabDescription(),
),
if (controller.shouldShowSettingTab())
dt.TabData(
index: 2,
index: 1,
title: const material.Tab(
child: Text('Settings'),
),
Expand Down
3 changes: 2 additions & 1 deletion Wox.UI.Flutter/wox/lib/modules/setting/wox_setting_controller.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ class WoxSettingController extends GetxController {

void switchToPluginSettingTab() {
if (shouldShowSettingTab()) {
activePluginTabController.animateTo(1, duration: Duration.zero);
// buggy, ref https://github.com/alihaider78222/dynamic_tabbar/issues/6
// activePluginTabController.animateTo(1, duration: Duration.zero);
}
}

Expand Down
2 changes: 1 addition & 1 deletion Wox.UI.Flutter/wox/macos/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 16208599a12443d53889ba2270a4985981cfb204

COCOAPODS: 1.14.3
COCOAPODS: 1.15.2
2 changes: 1 addition & 1 deletion Wox.UI.Flutter/wox/macos/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
331C80D4294CF70F00263BE5 = {
Expand Down
2 changes: 1 addition & 1 deletion Wox.UI.Flutter/wox/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
48 changes: 40 additions & 8 deletions Wox.UI.Flutter/wox/pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.8.1"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
lints:
dependency: transitive
description:
Expand Down Expand Up @@ -369,18 +393,18 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
math_expressions:
dependency: transitive
description:
Expand All @@ -393,18 +417,18 @@ packages:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
path:
dependency: "direct main"
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
path_parsing:
dependency: transitive
description:
Expand Down Expand Up @@ -754,6 +778,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
vm_service:
dependency: transitive
description:
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "13.0.0"
web:
dependency: transitive
description:
Expand Down

1 comment on commit 44eb670

@qianlifeng
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alihaider78222/dynamic_tabbar#6

Please sign in to comment.