Skip to content

Commit 2e1d697

Browse files
committed
fix 1.12.13+hotfix8 ui
1 parent c8c359d commit 2e1d697

File tree

6 files changed

+32
-14
lines changed

6 files changed

+32
-14
lines changed

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
-->
88
<uses-permission android:name="android.permission.INTERNET"/>
99
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
10+
<uses-permission android:name="android.permission.WAKE_LOCK" />
1011

1112
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
1213
calls FlutterMain.startInitialization(this); in its onCreate method.

lib/page/issue/issue_edit_dIalog.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,12 @@ class _IssueEditDialogState extends State<IssueEditDialog> {
146146
maxLines: 999,
147147
onChanged: widget.onContentChanged,
148148
controller: widget.valueController,
149-
decoration: new InputDecoration.collapsed(
149+
decoration: new InputDecoration(
150150
hintText: GSYLocalizations.i18n(context)
151151
.issue_edit_issue_title_tip,
152152
hintStyle: GSYConstant.middleSubText,
153+
isDense: true,
154+
border: InputBorder.none,
153155
),
154156
style: GSYConstant.middleText,
155157
),

lib/page/search/widget/gsy_search_input_widget.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ class GSYSearchInputWidget extends StatelessWidget {
4141
child: new TextField(
4242
autofocus: false,
4343
controller: controller,
44-
decoration: new InputDecoration.collapsed(
44+
decoration: new InputDecoration(
4545
hintText: GSYLocalizations.i18n(context).repos_issue_search,
4646
hintStyle: GSYConstant.middleSubText,
47+
border: InputBorder.none,
48+
isDense: true,
4749
),
4850
style: GSYConstant.middleText
4951
.copyWith(textBaseline: TextBaseline.alphabetic),

lib/page/welcome_page.dart

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'dart:async';
22

3+
import 'package:google_fonts/google_fonts.dart';
34
import 'package:flare_flutter/flare_actor.dart';
45
import 'package:flutter/material.dart';
56
import 'package:flutter_redux/flutter_redux.dart';
@@ -28,7 +29,7 @@ class _WelcomePageState extends State<WelcomePage> {
2829
bool hadInit = false;
2930

3031
String text = "Welcome";
31-
double fontSize = 46;
32+
double fontSize = 76;
3233

3334
@override
3435
void didChangeDependencies() {
@@ -43,7 +44,7 @@ class _WelcomePageState extends State<WelcomePage> {
4344
new Future.delayed(const Duration(seconds: 1, milliseconds: 500), () {
4445
setState(() {
4546
text = "GSYGithubApp";
46-
fontSize = 41;
47+
fontSize = 60;
4748
});
4849
});
4950
new Future.delayed(const Duration(seconds: 2, milliseconds: 500), () {
@@ -76,12 +77,9 @@ class _WelcomePageState extends State<WelcomePage> {
7677
alignment: Alignment(0.0, 0.3),
7778
child: DiffScaleText(
7879
text: text,
79-
textStyle: TextStyle(
80-
fontFamily: "google_kavivanar",
80+
textStyle: GoogleFonts.akronim().copyWith(
81+
color: GSYColors.primaryDarkValue,
8182
fontSize: fontSize,
82-
//fontStyle: FontStyle.italic,
83-
color: GSYColors.primaryValue,
84-
fontWeight: FontWeight.bold
8583
),
8684
),
8785
),

pubspec.lock

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ packages:
255255
name: flutter_markdown
256256
url: "https://pub.flutter-io.cn"
257257
source: hosted
258-
version: "0.3.2"
258+
version: "0.3.3"
259259
flutter_redux:
260260
dependency: "direct main"
261261
description:
@@ -288,6 +288,13 @@ packages:
288288
dependency: transitive
289289
description: flutter
290290
source: sdk
291+
version: "0.0.0"
292+
flutter_webview_plugin:
293+
dependency: "direct main"
294+
description:
295+
name: flutter_webview_plugin
296+
url: "https://pub.flutter-io.cn"
297+
source: hosted
291298
version: "0.3.10+1"
292299
fluttertoast:
293300
dependency: "direct main"
@@ -310,6 +317,13 @@ packages:
310317
url: "https://pub.flutter-io.cn"
311318
source: hosted
312319
version: "1.2.0"
320+
google_fonts:
321+
dependency: "direct main"
322+
description:
323+
name: google_fonts
324+
url: "https://pub.flutter-io.cn"
325+
source: hosted
326+
version: "0.3.9"
313327
graphql:
314328
dependency: "direct main"
315329
description:
@@ -820,7 +834,7 @@ packages:
820834
name: webview_flutter
821835
url: "https://pub.flutter-io.cn"
822836
source: hosted
823-
version: "0.3.18+1"
837+
version: "0.3.19+8"
824838
xml:
825839
dependency: transitive
826840
description:
@@ -837,4 +851,4 @@ packages:
837851
version: "2.2.0"
838852
sdks:
839853
dart: ">=2.7.0 <3.0.0"
840-
flutter: ">=1.12.13+hotfix.4 <2.0.0"
854+
flutter: ">=1.12.13+hotfix.5 <2.0.0"

pubspec.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@ dependencies:
2727
permission_handler: 3.2.2
2828
scoped_model: ^1.0.1
2929
flutter_webview_plugin: 0.3.10+1
30-
webview_flutter: ^0.3.18+1
30+
webview_flutter: ^0.3.19+8
3131
bezier: ^1.1.2
3232
provider: ^4.0.0
3333
flare_flutter: ^1.8.3
3434
# 固定版本
3535
json_annotation: 3.0.1
3636
package_info: 0.4.0+13
3737
connectivity: 0.4.6+1
38-
flutter_markdown: 0.3.2
38+
flutter_markdown: 0.3.3
3939
rxdart: 0.22.3
4040
device_info: 0.4.1+4
4141
url_launcher: 5.4.1
42+
google_fonts: 0.3.9
4243
android_intent: 0.3.4+8
4344
shared_preferences: 0.5.6
4445
built_value: 6.8.2

0 commit comments

Comments
 (0)