OnePoem / OnePoem-App

Go to a project
Toggle navigation Toggle navigation pinning
reason
a3558c1d 1 parent 24f4dc50

repair style

Inline Side-by-side
Showing 3 changed files with 24 additions and 13 deletions
...@@ -12,9 +12,11 @@ class PoemDetailPage extends StatefulWidget { ...@@ -12,9 +12,11 @@ class PoemDetailPage extends StatefulWidget {
12 Key? key, 12 Key? key,
13 this.onPop, 13 this.onPop,
14 required this.poemId, 14 required this.poemId,
15 + this.poemPanelHeight = 0,
15 }) : super(key: key); 16 }) : super(key: key);
16 17
17 final int poemId; 18 final int poemId;
19 + final int poemPanelHeight;
18 final Function? onPop; 20 final Function? onPop;
19 21
20 @override 22 @override
...@@ -54,7 +56,7 @@ class _PoemDetailPageState extends State<PoemDetailPage> { ...@@ -54,7 +56,7 @@ class _PoemDetailPageState extends State<PoemDetailPage> {
54 Container( 56 Container(
55 margin: const EdgeInsets.symmetric( 57 margin: const EdgeInsets.symmetric(
56 vertical: 30.0, horizontal: 20.0), 58 vertical: 30.0, horizontal: 20.0),
57 - height: MediaQuery.of(context).size.height - 200, 59 + height: MediaQuery.of(context).size.height - 140 - widget.poemPanelHeight,
58 width: double.infinity, 60 width: double.infinity,
59 decoration: BoxDecoration( 61 decoration: BoxDecoration(
60 color: Colors.grey.shade200.withOpacity(0.1), 62 color: Colors.grey.shade200.withOpacity(0.1),
...@@ -131,6 +133,23 @@ class _PoemDetailPageState extends State<PoemDetailPage> { ...@@ -131,6 +133,23 @@ class _PoemDetailPageState extends State<PoemDetailPage> {
131 }), 133 }),
132 ), 134 ),
133 ), 135 ),
136 + Container(
137 + width: double.infinity,
138 + alignment: Alignment.center,
139 + child: Row(
140 + mainAxisSize: MainAxisSize.min,
141 + children: [
142 + IconButton(
143 + icon: const Icon(Icons.mic_none, size: 36.0,),
144 + onPressed: () {},
145 + ),
146 + Gaps.hGap16,
147 + IconButton(
148 + icon: const Icon(Icons.camera_alt_outlined, size: 36.0,),
149 + onPressed: () {},
150 + )
151 + ],
152 + ),),
134 ], 153 ],
135 ), 154 ),
136 ), 155 ),
...@@ -138,18 +157,6 @@ class _PoemDetailPageState extends State<PoemDetailPage> { ...@@ -138,18 +157,6 @@ class _PoemDetailPageState extends State<PoemDetailPage> {
138 ), 157 ),
139 ), 158 ),
140 ), 159 ),
141 - // Row(
142 - // children: [
143 - // IconButton(
144 - // icon: const Icon(Icons.mic_none),
145 - // onPressed: () {},
146 - // ),
147 - // IconButton(
148 - // icon: const Icon(Icons.camera_alt_outlined),
149 - // onPressed: () {},
150 - // )
151 - // ],
152 - // ),
153 ], 160 ],
154 ), 161 ),
155 ), 162 ),
......
...@@ -98,6 +98,7 @@ class _PoemPageState extends State<PoemPage> with WidgetsBindingObserver { ...@@ -98,6 +98,7 @@ class _PoemPageState extends State<PoemPage> with WidgetsBindingObserver {
98 tkController.animateToMiddle(); 98 tkController.animateToMiddle();
99 }, 99 },
100 poemId: 1, 100 poemId: 1,
101 + poemPanelHeight: 60,
101 ); 102 );
102 var searchPage = SearchPage( 103 var searchPage = SearchPage(
103 onPop: tkController.animateToMiddle, 104 onPop: tkController.animateToMiddle,
......
...@@ -30,6 +30,7 @@ class HomeActionWidgets extends StatelessWidget { ...@@ -30,6 +30,7 @@ class HomeActionWidgets extends StatelessWidget {
30 icon: const Icon( 30 icon: const Icon(
31 Icons.star_border, 31 Icons.star_border,
32 size: iconSize, 32 size: iconSize,
33 + color: Colors.white,
33 ), 34 ),
34 onPressed: () { 35 onPressed: () {
35 funcStar!(); 36 funcStar!();
...@@ -44,6 +45,7 @@ class HomeActionWidgets extends StatelessWidget { ...@@ -44,6 +45,7 @@ class HomeActionWidgets extends StatelessWidget {
44 icon: const Icon( 45 icon: const Icon(
45 Icons.ios_share, 46 Icons.ios_share,
46 size: iconSize, 47 size: iconSize,
48 + color: Colors.white,
47 ), 49 ),
48 onPressed: () {}, 50 onPressed: () {},
49 ), 51 ),
...@@ -57,6 +59,7 @@ class HomeActionWidgets extends StatelessWidget { ...@@ -57,6 +59,7 @@ class HomeActionWidgets extends StatelessWidget {
57 icon: const Icon( 59 icon: const Icon(
58 Icons.more_horiz, 60 Icons.more_horiz,
59 size: iconSize, 61 size: iconSize,
62 + color: Colors.white,
60 ), 63 ),
61 ), 64 ),
62 ), 65 ),
......