Skip to content

Commit c14ece7

Browse files
Tweak.
1 parent 2791441 commit c14ece7

6 files changed

Lines changed: 48 additions & 43 deletions

File tree

Template/MobileTemplate/flutter_template/lib/main.dart

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
import 'dart:async';
2+
import 'dart:convert' as convert;
13
import 'package:flutter/material.dart';
4+
5+
// パッケージ
26
import 'package:english_words/english_words.dart';
37
import 'package:shared_preferences/shared_preferences.dart';
48
import 'package:url_launcher/url_launcher.dart';
59

6-
import 'dart:async';
7-
import 'dart:convert' as convert;
8-
910
// Platform呼出
1011
import 'package:flutter/services.dart';
1112

@@ -229,7 +230,7 @@ class _MyHomePageState extends State<MyHomePage> {
229230
});
230231
}
231232

232-
// this._counterのインクリメント
233+
/// this._counterのインクリメント
233234
void _incrementCounter() {
234235
setState(() {
235236
// This call to setState tells the Flutter framework that something has
@@ -243,7 +244,7 @@ class _MyHomePageState extends State<MyHomePage> {
243244
this._setCounterValue();
244245
}
245246

246-
// this._counterのリセット
247+
/// this._counterのリセット
247248
void _resetCounter() {
248249
this._removeCounterValue();
249250
setState(() {
@@ -257,13 +258,6 @@ class _MyHomePageState extends State<MyHomePage> {
257258
});
258259
}
259260

260-
/// english_words
261-
void _englishWords() {
262-
setState(() {
263-
this._display = WordPair.random().asPascalCase;
264-
});
265-
}
266-
267261
/// shared_preferences
268262
/// this._counterの永続化対応
269263
void _getCounterValue() async {
@@ -294,6 +288,13 @@ class _MyHomePageState extends State<MyHomePage> {
294288
});
295289
}
296290

291+
/// english_words
292+
void _englishWords() {
293+
setState(() {
294+
this._display = WordPair.random().asPascalCase;
295+
});
296+
}
297+
297298
/// url_launcher
298299
void _urlLauncher() async {
299300
const url = "https://www.osscons.jp/jo5v2ne7n-537/";

Template/MobileTemplate/flutter_template/lib/message.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:firebase_messaging/firebase_messaging.dart';
21
import 'package:flutter/material.dart';
2+
import 'package:firebase_messaging/firebase_messaging.dart';
33

44
/// Message route arguments.
55
class MessageArguments {

Template/MobileTemplate/flutter_template/lib/message_list.dart

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:firebase_messaging/firebase_messaging.dart';
21
import 'package:flutter/material.dart';
2+
import 'package:firebase_messaging/firebase_messaging.dart';
33

44
import 'message.dart';
55

@@ -18,49 +18,49 @@ class _MessageList extends State<MessageList> {
1818

1919
// ターミネーテッド状態でプッシュ通知からアプリを起動した時のアクションを実装
2020
FirebaseMessaging.instance
21-
.getInitialMessage()
22-
.then((RemoteMessage? message) {
21+
.getInitialMessage()
22+
.then((RemoteMessage? message) {
2323
if (message != null) {
2424
setState(() {
25-
_messages = [..._messages, message];
25+
this._messages = [...this._messages, message];
2626
});
2727
}
2828
});
2929

3030
// Android のフォアグラウンドプッシュ通知受信時アクションを設定
3131
FirebaseMessaging.onMessage.listen((RemoteMessage message) {
3232
setState(() {
33-
_messages = [..._messages, message];
33+
this._messages = [...this._messages, message];
3434
});
3535
});
3636

3737
// バックグラウンド状態でプッシュ通知からアプリを起動した時のアクションを実装する
3838
FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) {
3939
setState(() {
40-
_messages = [..._messages, message];
40+
this._messages = [...this._messages, message];
4141
});
4242
});
4343
}
4444

4545
@override
4646
Widget build(BuildContext context) {
47-
if (_messages.isEmpty) {
47+
if (this._messages.isEmpty) {
4848
return const Text('No messages received');
4949
}
5050

5151
return ListView.builder(
5252
shrinkWrap: true,
53-
itemCount: _messages.length,
53+
itemCount: this._messages.length,
5454
itemBuilder: (context, index) {
55-
RemoteMessage message = _messages[index];
55+
RemoteMessage message = this._messages[index];
5656

5757
return ListTile(
5858
title: Text(
59-
message.messageId ?? 'no RemoteMessage.messageId available'),
59+
message.messageId ?? 'no RemoteMessage.messageId available'),
6060
subtitle:
61-
Text(message.sentTime?.toString() ?? DateTime.now().toString()),
61+
Text(message.sentTime?.toString() ?? DateTime.now().toString()),
6262
onTap: () => Navigator.pushNamed(context, '/message',
63-
arguments: MessageArguments(message, false)),
63+
arguments: MessageArguments(message, false)),
6464
);
6565
});
6666
}

Template/MobileTemplate/flutter_template/lib/meta_card.dart

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,21 @@ class MetaCard extends StatelessWidget {
1111
@override
1212
Widget build(BuildContext context) {
1313
return Container(
14-
width: double.infinity,
15-
margin: const EdgeInsets.only(left: 8, right: 8, top: 8),
16-
child: Card(
17-
child: Padding(
18-
padding: const EdgeInsets.all(16),
19-
child: Column(children: [
20-
Container(
21-
margin: const EdgeInsets.only(bottom: 16),
22-
child:
23-
Text(_title, style: const TextStyle(fontSize: 18))),
24-
_children,
25-
]))));
14+
width: double.infinity,
15+
margin: const EdgeInsets.only(left: 8, right: 8, top: 8),
16+
child: Card(
17+
child: Padding(
18+
padding: const EdgeInsets.all(16),
19+
child: Column(children: [
20+
Container(
21+
margin: const EdgeInsets.only(bottom: 16),
22+
child:
23+
Text(_title, style: const TextStyle(fontSize: 18))
24+
),
25+
this._children,
26+
])
27+
)
28+
)
29+
);
2630
}
2731
}

Template/MobileTemplate/flutter_template/lib/permissions.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:firebase_messaging/firebase_messaging.dart';
21
import 'package:flutter/foundation.dart';
32
import 'package:flutter/material.dart';
3+
import 'package:firebase_messaging/firebase_messaging.dart';
44

55
/// Requests & displays the current user permissions for this device.
66
class Permissions extends StatefulWidget {

Template/MobileTemplate/flutter_template/lib/token_monitor.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:firebase_messaging/firebase_messaging.dart';
21
import 'package:flutter/material.dart';
2+
import 'package:firebase_messaging/firebase_messaging.dart';
33

44
/// Manages & returns the users FCM token.
55
/// Also monitors token refreshes and updates state.
@@ -20,7 +20,7 @@ class _TokenMonitor extends State<TokenMonitor> {
2020
void setToken(String? token) {
2121
print('FCM Token: $token');
2222
setState(() {
23-
_token = token;
23+
this._token = token;
2424
});
2525
}
2626

@@ -32,12 +32,12 @@ class _TokenMonitor extends State<TokenMonitor> {
3232
vapidKey:
3333
'<YOUR_PUBLIC_VAPID_KEY_HERE>')
3434
.then(setToken);
35-
_tokenStream = FirebaseMessaging.instance.onTokenRefresh;
36-
_tokenStream?.listen(setToken);
35+
this._tokenStream = FirebaseMessaging.instance.onTokenRefresh;
36+
this._tokenStream?.listen(setToken);
3737
}
3838

3939
@override
4040
Widget build(BuildContext context) {
41-
return widget._builder(_token ?? "");
41+
return widget._builder(this._token ?? "");
4242
}
4343
}

0 commit comments

Comments
 (0)