Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit ee048c6

Browse files
committed
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # lib/controller/index.dart # lib/main.dart # lib/page/home.dart # readme.md
2 parents 3bf97d3 + 42d1024 commit ee048c6

File tree

7 files changed

+87
-7
lines changed

7 files changed

+87
-7
lines changed

‎lib/components/widget_comp.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class IndexState extends State<Index> {
5050
backgroundImage: NetworkImage(
5151
info.avatarUrl,
5252
),
53-
radius: 35,
53+
radius: 30,
5454
),
5555
title: Text(
5656
info.name,

‎lib/page/app_login/index.dart‎

Lines changed: 81 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
22
import 'dart:math' as math;
33
import 'package:efox_flutter/lang/index.dart' show AppLocalizations;
44
import 'package:efox_flutter/store/index.dart' show Store, UserModel;
5+
import './text.dart' as Content;
56

67
class Index extends StatefulWidget {
78
Index({Key key}) : super(key: key);
@@ -23,9 +24,87 @@ class _IndexState extends State<Index> {
2324
*/
2425
renderOverlay(String text) {
2526
_overlayEntry?.remove();
27+
Size _size = MediaQuery.of(context).size;
2628
_overlayState = Overlay.of(context);
2729
_overlayEntry = OverlayEntry(builder: (context) {
28-
return Center(child: Text(text));
30+
return Scaffold(
31+
backgroundColor: Colors.transparent,
32+
body: GestureDetector(
33+
child: Stack(
34+
children: <Widget>[
35+
Opacity(
36+
opacity: 0.75,
37+
child: Container(
38+
decoration: BoxDecoration(
39+
color: Colors.black,
40+
),
41+
),
42+
),
43+
SizedBox.expand(
44+
child: Center(
45+
child: SizedBox(
46+
height: _size.height / 1.3,
47+
width: _size.width / 1.3,
48+
child: Container(
49+
padding: EdgeInsets.all(20),
50+
decoration: BoxDecoration(
51+
color: Colors.white,
52+
borderRadius: BorderRadius.circular(20),
53+
boxShadow: [
54+
BoxShadow(
55+
color: Colors.grey,
56+
blurRadius: 2,
57+
// offset: Offset(0, 1),
58+
),
59+
],
60+
),
61+
child: Column(
62+
children: <Widget>[
63+
Text(
64+
"说明",
65+
style: TextStyle(
66+
color: Colors.black,
67+
fontSize: 22,
68+
),
69+
),
70+
SizedBox(
71+
height: 10,
72+
),
73+
Expanded(
74+
child: SingleChildScrollView(
75+
child: Text(
76+
text,
77+
textAlign: TextAlign.left,
78+
style: TextStyle(
79+
color: Colors.black,
80+
fontSize: 16,
81+
),
82+
),
83+
),
84+
),
85+
FlatButton(
86+
textColor: Theme.of(context).primaryColor,
87+
onPressed: () {
88+
beforeDispose();
89+
},
90+
child: Padding(
91+
padding: EdgeInsets.all(10),
92+
child: Text("确定"),
93+
),
94+
),
95+
],
96+
),
97+
),
98+
),
99+
),
100+
),
101+
],
102+
),
103+
onTap: () {
104+
beforeDispose();
105+
},
106+
),
107+
);
29108
});
30109
_overlayState.insert(_overlayEntry);
31110
}
@@ -165,7 +244,7 @@ class _IndexState extends State<Index> {
165244
),
166245
),
167246
onTap: () {
168-
renderOverlay(" Text 1");
247+
renderOverlay(Content.loginText);
169248
},
170249
),
171250
SizedBox(

‎lib/page/app_login/text.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
const loginText = 'a1sd56a1sd56as1d';

‎lib/page/mine/index.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class _IndexState extends State<Index> {
113113
),
114114
ListTile(
115115
onTap: () {
116-
Store.value<ConfigModel>(context).$setIsPro();
116+
Store.value<ConfigModel>(context).setIsPro();
117117
},
118118
leading: Icon(Icons.verified_user),
119119
title: Text(Store.value<ConfigModel>(context).isPro

‎lib/store/models/config_state_model.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ConfigModel extends ConfigInfo with ChangeNotifier {
3232
notifyListeners();
3333
}
3434

35-
Future $setIsPro() async {
35+
Future setIsPro() async {
3636
isPro = !isPro;
3737
notifyListeners();
3838
}

‎lib/widget/scrollview/nestedscrollview/index.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'demo.dart' as Demo;
55
class Index extends StatefulWidget {
66
static String title = 'NestedScrollView';
77
static String mdUrl = 'docs/widget/scrollview/nestedscrollview/index.md';
8-
static String originCodeUrl = 'https://docs.flutter.io/flutter/widgets/Scrollbar-class.html';
8+
static String originCodeUrl = 'https://docs.flutter.io/flutter/material/Scrollbar-class.html';
99

1010
@override
1111
_IndexState createState() => new _IndexState();

‎lib/widget/scrollview/scrollbar/index.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'demo.dart' as Demo;
55
class Index extends StatefulWidget {
66
static String title = 'Scrollbar';
77
static String mdUrl = 'docs/widget/scrollview/scrollbar/index.md';
8-
static String originCodeUrl = 'https://docs.flutter.io/flutter/widgets/Scrollbar-class.html';
8+
static String originCodeUrl = 'https://docs.flutter.io/flutter/material/Scrollbar-class.html';
99

1010
@override
1111
_IndexState createState() => new _IndexState();

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /