Skip to content

Commit

Permalink
change tab style
Browse files Browse the repository at this point in the history
  • Loading branch information
@kidozh
kidozh committed Dec 2, 2024
1 parent 1fbbc08 commit c2f8a0e
Show file tree
Hide file tree
Showing 4 changed files with 167 additions and 161 deletions.
323 changes: 164 additions & 159 deletions lib/app/MainApp.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:persistent_bottom_nav_bar/persistent_bottom_nav_bar.dart';
import 'package:provider/provider.dart';
import 'package:upgrader/upgrader.dart';

Expand All @@ -62,13 +63,13 @@ class MyApp extends StatelessWidget {
// check the screen size
double width = MediaQuery.sizeOf(context).width;
log("Get screen width ${width}");
if(width >= TwoPaneUtils.mobileScreenSize){
platformName = "android";
//Provider.of<ThemeNotifierProvider>(context, listen: false).setPlatformName("android")
}
else{
platformName = await UserPreferencesUtils.getPlatformPreference();
}
// if(width >= TwoPaneUtils.mobileScreenSize){
// platformName = "android";
// //Provider.of<ThemeNotifierProvider>(context, listen: false).setPlatformName("android")
// }
// else{
// platformName = await UserPreferencesUtils.getPlatformPreference();
// }


double scale = await UserPreferencesUtils.getTypesettingScalePreference();
Expand Down Expand Up @@ -182,12 +183,12 @@ class MyApp extends StatelessWidget {
}
}

if(MediaQuery.sizeOf(context).width >= TwoPaneUtils.mobileScreenSize){
platformName = "android";
initialPlatform = 'android';
targetPlatform = TargetPlatform.android;
//Provider.of<ThemeNotifierProvider>(context, listen: false).setPlatformName("android");
}
// if(MediaQuery.sizeOf(context).width >= TwoPaneUtils.mobileScreenSize){
// platformName = "android";
// initialPlatform = 'android';
// targetPlatform = TargetPlatform.android;
// //Provider.of<ThemeNotifierProvider>(context, listen: false).setPlatformName("android");
// }



Expand Down Expand Up @@ -583,6 +584,8 @@ class _MyHomePageState extends State<MyHomePage> with WidgetsBindingObserver {
initialIndex: 0,
);

var _controller = PersistentTabController(initialIndex: 0);

@override
Widget build(BuildContext context) {
// need to check whether discuz exists in dataset
Expand All @@ -592,163 +595,165 @@ class _MyHomePageState extends State<MyHomePage> with WidgetsBindingObserver {
_bottomNavigationbarIndex = 0;
}
CustomizeColor.updateAndroidNavigationbarColorWithDashboard(context);


return PlatformScaffold(
//iosContentPadding: true,
appBar: PlatformAppBar(
title: Consumer<DiscuzAndUserNotifier>(
builder: (context, value, child) {
if (value.discuz == null) {
return Text(S.of(context).appName);
} else {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
value.discuz!.siteName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
if (value.user == null)
Text(S.of(context).incognitoTitle,
style: TextStyle(fontSize: 12)),
if (value.user != null)
double width = MediaQuery.sizeOf(context).width;
if(true){
return Scaffold(
appBar: AppBar(
title: Consumer<DiscuzAndUserNotifier>(
builder: (context, value, child) {
if (value.discuz == null) {
return Text(S.of(context).appName);
} else {
return Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"${value.user!.username} (${value.user!.uid})",
style: TextStyle(fontSize: 12),
)
],
);
}
},
),
trailingActions: [
DiscuzNotificationAppbarIconWidget(),
PlatformIconButton(
padding: EdgeInsets.symmetric(vertical: 0, horizontal: 0),
onPressed: _triggerSwitchDiscuzDialog,
icon: Icon(
AppPlatformIcons(context).manageDiscuzSolid,
size: 24,
color: Theme.of(context).textTheme.titleSmall?.color,
semanticLabel: S.of(context).selectDiscuzIconTooltip,
),
)
],
automaticallyImplyLeading: true,
leading: Consumer<DiscuzAndUserNotifier>(
builder: (context, value, child) {
if (value.discuz == null) {
return Container();
} else {
return PlatformIconButton(
padding: EdgeInsets.symmetric(vertical: 0, horizontal: 0),

onPressed: () async {
// open drawer
VibrationUtils.vibrateWithClickIfPossible();
await Navigator.push(
context,
platformPageRoute(
context: context,
builder: (context) => DrawerPage()));
},
icon: Icon(AppPlatformIcons(context).menuSolid,
value.discuz!.siteName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
),
if (value.user == null)
Text(S.of(context).incognitoTitle,
style: TextStyle(fontSize: 12),
textAlign: TextAlign.center,
),
if (value.user != null)
Text(
"${value.user!.username} (${value.user!.uid})",
style: TextStyle(fontSize: 12),
textAlign: TextAlign.center,
)
],
);
}
},
),
actions: [
DiscuzNotificationAppbarIconWidget(),
PlatformIconButton(
padding: EdgeInsets.symmetric(vertical: 0, horizontal: 0),
onPressed: _triggerSwitchDiscuzDialog,
icon: Icon(
AppPlatformIcons(context).manageDiscuzSolid,
size: 24,
color: Theme.of(context).textTheme.titleSmall?.color,
semanticLabel: S.of(context).selectDiscuzIconTooltip,
),
)
],
automaticallyImplyLeading: true,
leading: Consumer<DiscuzAndUserNotifier>(
builder: (context, value, child) {
if (value.discuz == null) {
return Container();
} else {
return PlatformIconButton(
padding: EdgeInsets.symmetric(vertical: 0, horizontal: 0),

onPressed: () async {
// open drawer
VibrationUtils.vibrateWithClickIfPossible();
await Navigator.push(
context,
platformPageRoute(
context: context,
builder: (context) => DrawerPage()));
},
icon: Icon(AppPlatformIcons(context).menuSolid,
semanticLabel: S.of(context).menuIconTooltip,
color: Theme.of(context).textTheme.titleSmall?.color,
size: 24,
),
size: 24,
),

);
}
},
);
}
},
),
),
),
body: Consumer<DiscuzAndUserNotifier>(
builder: (context, value, child) {
List<Widget> bodyWidgetList = [
DashboardScreen(
onSelectTid: onSelectTid,
),
// if (!Platform.isIOS)
// ExploreWebsitePage(
// key: ValueKey(0),
// onSelectTid: this.onSelectTid,
// ),
// should not exist any
DiscuzPortalScreen(
key: ValueKey(1),
),
NotificationScreen(
//key: ValueKey(3),
onSelectTid: this.onSelectTid,
),
// FavoriteThreadScreen(),
DiscuzMessageScreen(
key: ValueKey(4),
)
];
if (value.user == null) {
print("Get btm index ${_bottomNavigationbarIndex}");
if (_bottomNavigationbarIndex < 2) {
return bodyWidgetList[_bottomNavigationbarIndex];
body: Consumer<DiscuzAndUserNotifier>(
builder: (context, value, child) {

List<Widget> bodyWidgetList = [
DashboardScreen(
onSelectTid: onSelectTid,
),

// should not exist any
DiscuzPortalScreen(
key: ValueKey(1),
),
NotificationScreen(
//key: ValueKey(3),
onSelectTid: this.onSelectTid,
),
// FavoriteThreadScreen(),
DiscuzMessageScreen(
key: ValueKey(4),
)
];
if (value.user == null) {
print("Get btm index ${_bottomNavigationbarIndex}");
if (_bottomNavigationbarIndex < 2) {
return bodyWidgetList[_bottomNavigationbarIndex];
} else {
setState(() {
_bottomNavigationbarIndex = 0;
});
return bodyWidgetList[_bottomNavigationbarIndex];
}
} else {
setState(() {
_bottomNavigationbarIndex = 0;
});
return bodyWidgetList[_bottomNavigationbarIndex];
}
} else {
return bodyWidgetList[_bottomNavigationbarIndex];
}
},
),
bottomNavBar: PlatformNavBar(
currentIndex: _bottomNavigationbarIndex,
material: (context, _) => MaterialNavBarData(
selectedItemColor: Theme.of(context).colorScheme.primary,
unselectedItemColor: Theme.of(context).unselectedWidgetColor,
elevation: 0),
itemChanged: (index) {
setState(() {
VibrationUtils.vibrateWithClickIfPossible();
_bottomNavigationbarIndex = index;
});
},
items: [
BottomNavigationBarItem(
icon: new Icon(AppPlatformIcons(context).discuzSiteOutlined),
activeIcon: Icon(AppPlatformIcons(context).discuzSiteSolid),
label: S.of(context).dashboard),
// if (!Platform.isIOS)
// BottomNavigationBarItem(
// icon: new Icon(AppPlatformIcons(context).discuzExploreOutlined),
// activeIcon: Icon(AppPlatformIcons(context).discuzExploreSolid),
// label: S.of(context).sitePage),

BottomNavigationBarItem(
icon: new Icon(AppPlatformIcons(context).discuzPortalOutlined),
activeIcon: Icon(AppPlatformIcons(context).discuzPortalSolid),
label: S.of(context).index),
if (user != null)
},
),

bottomNavigationBar: BottomNavigationBar(
elevation: 0,
selectedItemColor: Theme.of(context).colorScheme.primary,
unselectedItemColor: Theme.of(context).disabledColor,
//backgroundColor: Theme.of(context).colorScheme.primaryContainer,
currentIndex: _bottomNavigationbarIndex,
items: [
BottomNavigationBarItem(
icon: new Icon(
AppPlatformIcons(context).discuzNotificationOutlined),
activeIcon:
Icon(AppPlatformIcons(context).discuzNotificationSolid),
label: S.of(context).notification),
if (user != null)
icon: new Icon(AppPlatformIcons(context).discuzSiteOutlined),
activeIcon: Icon(AppPlatformIcons(context).discuzSiteSolid),
label: S.of(context).dashboard),
// if (!Platform.isIOS)
// BottomNavigationBarItem(
// icon: new Icon(AppPlatformIcons(context).discuzExploreOutlined),
// activeIcon: Icon(AppPlatformIcons(context).discuzExploreSolid),
// label: S.of(context).sitePage),

BottomNavigationBarItem(
icon: new Icon(AppPlatformIcons(context).discuzMessageOutlined),
activeIcon: Icon(AppPlatformIcons(context).discuzMessageSolid),
label: S.of(context).chatMessage),
],
),
material: (_, __) => MaterialScaffoldData(),
);
icon: new Icon(AppPlatformIcons(context).discuzPortalOutlined),
activeIcon: Icon(AppPlatformIcons(context).discuzPortalSolid),
label: S.of(context).index),
if (user != null)
BottomNavigationBarItem(
icon: new Icon(
AppPlatformIcons(context).discuzNotificationOutlined),
activeIcon:
Icon(AppPlatformIcons(context).discuzNotificationSolid),
label: S.of(context).notification),
if (user != null)
BottomNavigationBarItem(
icon: new Icon(AppPlatformIcons(context).discuzMessageOutlined),
activeIcon: Icon(AppPlatformIcons(context).discuzMessageSolid),
label: S.of(context).chatMessage),
],
onTap: (index){
VibrationUtils.vibrateWithClickIfPossible();
setState(() {
_bottomNavigationbarIndex = index;
});
},
),
);
}
}

}

class MainTwoPanePage extends StatelessWidget {
Expand Down
2 changes: 1 addition & 1 deletion lib/screen/DashboardScreen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class CupertinoDashboardState extends State<CupertinoDashboardStatefulWidget>{
int _selectedScreenIndex = 0;
@override
Widget build(BuildContext context) {
log("Dash board when loading it ${onSelectTid}");
//log("Dash board when loading it ${onSelectTid}");
return Column(
mainAxisSize: MainAxisSize.max,
children: [
Expand Down
2 changes: 1 addition & 1 deletion lib/widget/ForumThreadWidget.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ class ForumThreadState extends State<ForumThreadStatefulWidget>{
margin: EdgeInsets.only(top: 4),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(8.0)),
color: Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.5),
color: Theme.of(context).colorScheme.secondaryContainer,
),
child: ListView.builder(
physics: new NeverScrollableScrollPhysics(),
Expand Down
1 change: 1 addition & 0 deletions pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ dependencies:
html_unescape: ^2.0.0
language_code: ^0.5.5
web: ^1.1.0
persistent_bottom_nav_bar: ^6.2.1
dev_dependencies:
flutter_test:
sdk: flutter
Expand Down

0 comments on commit c2f8a0e

Please sign in to comment.