Skip to content

Commit 176feca

Browse files
committed
style(home): improve layout
减少了溢出情况 Signed-off-by: OctagonalStar <[email protected]>
1 parent 7ca4f7c commit 176feca

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

lib/main.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ class _MyHomePageState extends State<MyHomePage> {
102102
children: [
103103
// 侧边导航栏
104104
NavigationRail(
105+
minWidth: MediaQuery.of(context).size.width * 0.05,
105106
selectedIndex: currentIndex,
106107
onDestinationSelected: (int index) {
107108
_onNavigationTapped(index);

lib/pages/home_page.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ class HomePage extends StatelessWidget {
2323
mainAxisAlignment: MainAxisAlignment.center,
2424
children: [
2525
Container(
26-
width: mediaQuery.size.width * 0.32,
26+
width: mediaQuery.size.width * 0.30,
2727
height: mediaQuery.size.height * 0.18,
28-
margin: EdgeInsets.all(8.0),
28+
margin: EdgeInsets.all(4.0),
2929
padding: EdgeInsets.all(16.0),
3030
decoration: BoxDecoration(
3131
color: themeColor.secondaryContainer.withAlpha(150),
@@ -56,9 +56,9 @@ class HomePage extends StatelessWidget {
5656
),
5757
),
5858
Container(
59-
width: mediaQuery.size.width * 0.56,
59+
width: mediaQuery.size.width * 0.50,
6060
height: mediaQuery.size.height * 0.18,
61-
margin: EdgeInsets.all(8.0),
61+
margin: EdgeInsets.all(4.0),
6262
padding: EdgeInsets.all(16.0),
6363
decoration: BoxDecoration(
6464
color: themeColor.secondaryContainer.withAlpha(150),
@@ -86,9 +86,9 @@ class HomePage extends StatelessWidget {
8686
mainAxisAlignment: MainAxisAlignment.center,
8787
children: [
8888
Container(
89-
width: mediaQuery.size.width * 0.54,
89+
width: mediaQuery.size.width * 0.50,
9090
height: mediaQuery.size.height * 0.18,
91-
margin: EdgeInsets.all(8.0),
91+
margin: EdgeInsets.all(4.0),
9292
decoration: BoxDecoration(
9393
borderRadius: BorderRadius.circular(25.0),
9494
),
@@ -114,9 +114,9 @@ class HomePage extends StatelessWidget {
114114
),
115115
),
116116
Container(
117-
width: mediaQuery.size.width * 0.34,
117+
width: mediaQuery.size.width * 0.35,
118118
height: mediaQuery.size.height * 0.18,
119-
margin: EdgeInsets.all(8.0),
119+
margin: EdgeInsets.all(4.0),
120120
decoration: BoxDecoration(
121121
borderRadius: BorderRadius.circular(25.0),
122122
),

lib/pages/learning_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class LearningPage extends StatelessWidget {
4949
style: ElevatedButton.styleFrom(
5050
backgroundColor: Theme.of(context).colorScheme.onPrimary.withAlpha(150),
5151
shadowColor: Colors.transparent,
52-
fixedSize: Size(mediaQuery.size.width * 0.4, mediaQuery.size.height * 0.2),
52+
fixedSize: Size(mediaQuery.size.width * 0.35, mediaQuery.size.height * 0.2),
5353
shape: RoundedRectangleBorder(
5454
borderRadius: BorderRadiusGeometry.vertical(bottom: Radius.circular(25.0)),
5555
),

lib/pages/test_page.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class TestPage extends StatelessWidget {
5454
),
5555
ElevatedButton.icon(
5656
icon: Icon(Icons.multitrack_audio, size: 36.0),
57-
label: Text('自主\n听写', style: TextStyle(fontSize: 34.0)),
57+
label: FittedBox(child: Text('自主\n听写', style: TextStyle(fontSize: 34.0))),
5858
style: ElevatedButton.styleFrom(
5959
backgroundColor: Theme.of(context).colorScheme.onPrimary.withAlpha(150),
6060
fixedSize: Size(mediaQuery.size.width * 0.42, mediaQuery.size.height * 0.45,),
@@ -78,9 +78,9 @@ class TestPage extends StatelessWidget {
7878
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
7979
children: [
8080
Container(
81-
width: mediaQuery.size.width * 0.58,
81+
width: mediaQuery.size.width * 0.50,
8282
height: mediaQuery.size.height * 0.16,
83-
margin: EdgeInsets.all(8.0),
83+
margin: EdgeInsets.all(4.0),
8484
decoration: BoxDecoration(
8585
borderRadius: StaticsVar.br,
8686
),
@@ -111,9 +111,9 @@ class TestPage extends StatelessWidget {
111111
),
112112
),
113113
Container(
114-
width: mediaQuery.size.width * 0.32,
114+
width: mediaQuery.size.width * 0.30,
115115
height: mediaQuery.size.height * 0.16,
116-
margin: EdgeInsets.all(8.0),
116+
margin: EdgeInsets.all(4.0),
117117
decoration: BoxDecoration(
118118
borderRadius: StaticsVar.br,
119119
),

0 commit comments

Comments
 (0)