Browse Source

add ESSE logo in QRCode

pull/6/head
Sun 4 years ago
parent
commit
abf12c17b1
  1. BIN
      assets/logo/logo_40.jpg
  2. 1
      lib/l10n/localizations.dart
  3. 2
      lib/l10n/localizations_en.dart
  4. 2
      lib/l10n/localizations_zh.dart
  5. 4
      lib/pages/friend.dart
  6. 35
      lib/widgets/user_info.dart
  7. 1
      pubspec.yaml

BIN
assets/logo/logo_40.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

1
lib/l10n/localizations.dart

@ -113,6 +113,7 @@ abstract class AppLocalizations { @@ -113,6 +113,7 @@ abstract class AppLocalizations {
// friend
String get myQrcode;
String get qrFriend;
String get friendInfo;
String get scanQr;
String get scanImage;
String get contactCard;

2
lib/l10n/localizations_en.dart

@ -141,6 +141,8 @@ class AppLocalizationsEn extends AppLocalizations { @@ -141,6 +141,8 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get qrFriend => 'Scan for friend';
@override
String get friendInfo => 'Friend Info';
@override
String get scanQr => 'Scan Qrcode';
@override
String get scanImage => 'Scan Image';

2
lib/l10n/localizations_zh.dart

@ -141,6 +141,8 @@ class AppLocalizationsZh extends AppLocalizations { @@ -141,6 +141,8 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get qrFriend => '扫二维码加好友';
@override
String get friendInfo => '好友信息';
@override
String get scanQr => '扫描二维码';
@override
String get scanImage => '识别图片';

4
lib/pages/friend.dart

@ -277,7 +277,7 @@ class _ChatDetailState extends State<ChatDetail> { @@ -277,7 +277,7 @@ class _ChatDetailState extends State<ChatDetail> {
showShadowDialog(
context,
Icons.info,
lang.info,
lang.friendInfo,
UserInfo(
id: 'EH' + this.friend.gid.toUpperCase(),
name: this.friend.name,
@ -349,7 +349,7 @@ class _ChatDetailState extends State<ChatDetail> { @@ -349,7 +349,7 @@ class _ChatDetailState extends State<ChatDetail> {
itemBuilder: (context) {
return <PopupMenuEntry<int>>[
_menuItem(color.primary, 1, Icons.vertical_align_top_rounded, this.friend.isTop ? lang.cancelTop : lang.setTop),
_menuItem(color.primary, 2, Icons.qr_code_rounded, lang.info),
_menuItem(color.primary, 2, Icons.qr_code_rounded, lang.friendInfo),
//_menuItem(color.primary, 3, Icons.turned_in_rounded, lang.remark),
this.friend.isClosed
? _menuItem(color.primary, 5, Icons.send_rounded, lang.addFriend)

35
lib/widgets/user_info.dart

@ -47,13 +47,34 @@ class _UserInfoState extends State<UserInfo> { @@ -47,13 +47,34 @@ class _UserInfoState extends State<UserInfo> {
border: Border.all(color: Color(0x40ADB0BB)),
color: Colors.white,
),
child: Center(
child: QrImage(
data: json.encode(widget.qrInfo),
version: QrVersions.auto,
foregroundColor: Colors.black,
),
),
child: Stack(
alignment:Alignment.center,
children: [
QrImage(
data: json.encode(widget.qrInfo),
version: QrVersions.auto,
foregroundColor: Colors.black,
),
Container(
height: 44,
width: 44,
padding: EdgeInsets.all(2.0),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.0),
border: Border.all(color: Color(0x40ADB0BB)),
color: Colors.white,
),
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.0),
image: DecorationImage(
image: AssetImage('assets/logo/logo_40.jpg'),
),
),
)
),
]
)
),
const SizedBox(height: 20),
Center(child: Text(lang.qrFriend, style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold))),

1
pubspec.yaml

@ -69,6 +69,7 @@ flutter: @@ -69,6 +69,7 @@ flutter:
assets:
- assets/logo/logo_dark.png
- assets/logo/logo_light.png
- assets/logo/logo_40.jpg
- assets/images/background_light.jpg
- assets/images/background_dark.jpg
- assets/images/image_missing.png

Loading…
Cancel
Save