Commit b4412ef6 authored by 关振斌's avatar 关振斌

update: uikit

parent 53a4b750
...@@ -72,10 +72,13 @@ ...@@ -72,10 +72,13 @@
<string>Main</string> <string>Main</string>
<key>UISupportedInterfaceOrientations</key> <key>UISupportedInterfaceOrientations</key>
<array> <array>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
</array> </array>
<key>UISupportedInterfaceOrientations~ipad</key> <key>UISupportedInterfaceOrientations~ipad</key>
<array> <array>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string> <string>UIInterfaceOrientationPortraitUpsideDown</string>
......
...@@ -9,7 +9,8 @@ AppBar transparentAppBar({ ...@@ -9,7 +9,8 @@ AppBar transparentAppBar({
List<Widget>? actions, List<Widget>? actions,
}) { }) {
return AppBar( return AppBar(
backgroundColor: Color.fromARGB(0, 0, 0, 0), // Color.argb(255, 28, 28, 30)
backgroundColor: Color.fromARGB(255, 28, 28, 30),
// elevation: 2, // elevation: 2,
title: title, title: title,
elevation: 0, elevation: 0,
......
...@@ -117,7 +117,8 @@ class ApplicationPage extends GetView<ApplicationController> { ...@@ -117,7 +117,8 @@ class ApplicationPage extends GetView<ApplicationController> {
return Obx(() => BottomNavigationBar( return Obx(() => BottomNavigationBar(
// #363b48 // #363b48
backgroundColor: Color.fromARGB(120, 0, 0, 0), // Color.fromARGB(255, 28, 28, 30)
backgroundColor: Color.fromARGB(255, 28, 28, 30),
// //
// Color.fromARGB(255, 54, 59, 72), // Color.fromARGB(255, 54, 59, 72),
// Color.argb(255, 82, 88, 103) // Color.argb(255, 82, 88, 103)
...@@ -141,87 +142,85 @@ class ApplicationPage extends GetView<ApplicationController> { ...@@ -141,87 +142,85 @@ class ApplicationPage extends GetView<ApplicationController> {
Get.put(HomeController()); Get.put(HomeController());
final homeController = Get.find<HomeController>(); final homeController = Get.find<HomeController>();
return AnimatedAlign( return AnimatedAlign(
duration: Duration(milliseconds: 300), duration: Duration(milliseconds: 300),
alignment: controller.state.showBottomMenu ? Alignment.bottomCenter : const Alignment(0, 2), alignment: controller.state.showBottomMenu
child: Container( ? Alignment.bottomCenter
height: 180, : const Alignment(0, 2),
padding: const EdgeInsets.fromLTRB(20, 20, 20, 100), child: Container(
decoration: BoxDecoration( height: 180,
color: Colors.black.withAlpha(180), padding: const EdgeInsets.fromLTRB(20, 20, 20, 100),
borderRadius: const BorderRadius.all(Radius.circular(20)) decoration: BoxDecoration(
), color: Colors.black.withAlpha(180),
child: Row( borderRadius: const BorderRadius.all(Radius.circular(20))),
mainAxisAlignment: MainAxisAlignment.spaceEvenly, child: Row(
children: [ mainAxisAlignment: MainAxisAlignment.spaceEvenly,
Expanded(child: children: [
Container( Expanded(
height: 44, child: Container(
decoration: BoxDecoration( height: 44,
borderRadius: BorderRadius.circular(22), decoration: BoxDecoration(
gradient: LinearGradient( borderRadius: BorderRadius.circular(22),
begin: Alignment.topCenter, gradient: LinearGradient(
end: Alignment.bottomCenter, begin: Alignment.topCenter,
colors: [Color(0xFFbe6afb),Color(0xFF7965f8)], end: Alignment.bottomCenter,
), colors: [Color(0xFFbe6afb), Color(0xFF7965f8)],
),
child: TextButton(
onPressed: homeController.deleteMessages,
child: Center(
child: Text(
'删除(${homeController.selectedItems.length})',
style: TextStyle(color: Colors.white),
), ),
), ),
)) child: TextButton(
), onPressed: homeController.deleteMessages,
SizedBox(width: 30), child: Center(
Expanded( child: Text(
child: Container( '删除(${homeController.selectedItems.length})',
height: 44, style: TextStyle(color: Colors.white),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22),
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [Color(0xFFbe6afb),Color(0xFF7965f8)],
), ),
), ),
child: TextButton( ))),
onPressed: homeController.shareMessages, SizedBox(width: 30),
child: Center( Expanded(
child: Text( child: Container(
'分享(${homeController.selectedItems.length})', height: 44,
style: TextStyle(color: Colors.white), decoration: BoxDecoration(
), borderRadius: BorderRadius.circular(22),
), gradient: LinearGradient(
)) begin: Alignment.topCenter,
), end: Alignment.bottomCenter,
SizedBox(width: 30), colors: [Color(0xFFbe6afb), Color(0xFF7965f8)],
Expanded( ),
child: Container( ),
height: 44, child: TextButton(
decoration: BoxDecoration( onPressed: homeController.shareMessages,
borderRadius: BorderRadius.circular(22), child: Center(
gradient: LinearGradient( child: Text(
begin: Alignment.topCenter, '分享(${homeController.selectedItems.length})',
end: Alignment.bottomCenter, style: TextStyle(color: Colors.white),
colors: [Color(0xFFbe6afb),Color(0xFF7965f8)],
), ),
), ),
child: TextButton( ))),
onPressed: homeController.cancelShare, SizedBox(width: 30),
child: const Center( Expanded(
child: Text( child: Container(
'取消', height: 44,
style: TextStyle(color: Colors.white), decoration: BoxDecoration(
), borderRadius: BorderRadius.circular(22),
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [Color(0xFFbe6afb), Color(0xFF7965f8)],
),
),
child: TextButton(
onPressed: homeController.cancelShare,
child: const Center(
child: Text(
'取消',
style: TextStyle(color: Colors.white),
), ),
)) ),
), ))),
], ],
), ),
), ),
); );
} }
@override @override
...@@ -233,9 +232,10 @@ class ApplicationPage extends GetView<ApplicationController> { ...@@ -233,9 +232,10 @@ class ApplicationPage extends GetView<ApplicationController> {
children: [ children: [
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( color: Color.fromARGB(255, 28, 28, 30),
image: Image.asset("assets/images/background.png").image, // image: DecorationImage(
fit: BoxFit.cover), // image: Image.asset("assets/images/background.png").image,
// fit: BoxFit.cover),
), ),
child: Scaffold( child: Scaffold(
// resizeToAvoidBottomInset: false, // resizeToAvoidBottomInset: false,
......
...@@ -47,11 +47,9 @@ class _HomePageState extends State<_HomePage> ...@@ -47,11 +47,9 @@ class _HomePageState extends State<_HomePage>
HomeController get controller => Get.find<HomeController>(); HomeController get controller => Get.find<HomeController>();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final cc = controller;//Get.put(HomeController()); final cc = controller; //Get.put(HomeController());
return Obx(() => Scaffold( return Obx(() => Scaffold(
resizeToAvoidBottomInset: false, resizeToAvoidBottomInset: false,
backgroundColor: Color.fromARGB(0, 0, 0, 0), backgroundColor: Color.fromARGB(0, 0, 0, 0),
...@@ -195,7 +193,8 @@ class _HomePageState extends State<_HomePage> ...@@ -195,7 +193,8 @@ class _HomePageState extends State<_HomePage>
isTextInput: cc.state.isInputText, isTextInput: cc.state.isInputText,
inputTextStyle: TextStyle(color: Colors.white), inputTextStyle: TextStyle(color: Colors.white),
inputToolbarStyle: BoxDecoration( inputToolbarStyle: BoxDecoration(
color: Color.fromARGB(120, 0, 0, 0), // 255, 28, 28, 30
color: Color.fromARGB(255, 28, 28, 30),
// Color.fromARGB(0, 54, 59, 72), // Color.fromARGB(0, 54, 59, 72),
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment