Skip to content

Commit

Permalink
stay safe image added
Browse files Browse the repository at this point in the history
  • Loading branch information
sachinPramodya committed Nov 8, 2020
1 parent d440187 commit 1723c24
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 32 deletions.
19 changes: 10 additions & 9 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,18 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
}
// signingConfigs {
// release {
// keyAlias keystoreProperties['keyAlias']
// keyPassword keystoreProperties['keyPassword']
// storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
// storePassword keystoreProperties['storePassword']
// }
// }
buildTypes {
release {
signingConfig signingConfigs.release
// signingConfig signingConfigs.release
signingConfig signingConfigs.debug
}
}
}
Expand Down
Binary file added assets/images/stay_safe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions assets/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,9 @@
"covid_19_information": "Covid-19 Related Complaints",
"pharmacy_list": "Locate Nearest Pharmacy Delivery Service",
"pharmacy_tab": "Pharmacy",
"scan_qr": "QR Scanner",
"qr_title":"Stay Safe!"
"scan_qr": "Stay Safe QR",
"qr_title":"Stay Safe!",
"qr_instruct":"Scan the QR code"


}
8 changes: 5 additions & 3 deletions assets/lang/si.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
"covid_19_information": "Covid-19 ආශ්\u200Dරිත පැමිණිලි",
"pharmacy_list": "ආසන්නයේ ඇති ෆාමසි සොයා ගැනීමට",
"pharmacy_tab": "ෆාමසි",
"scan_qr": "QR ස්කෑනරය",
"qr_title":"සුවෙන් සිටිමු!"
}
"scan_qr": "සුවෙන් සිටිමු QR",
"qr_title":"සුවෙන් සිටිමු!",
"qr_instruct":"QR කේතය හසුකරගන්න"
}

9 changes: 6 additions & 3 deletions assets/lang/ta.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@
"covid_19_information": "கோவிட் -19 தொடர்புடைய புகார்கள்",
"pharmacy_list": "அருகிலுள்ள மருத்தக விநியோக சேவையைக் கண்டறிக",
"pharmacy_tab": "மருந்தகம்",
"scan_qr": "QR ஸ்கேனர்",
"qr_title":"பாதுகாப்பாக இருப்போம்!"
}
"scan_qr": "பாதுகாப்பாக இரு QR",
"qr_title":"பாதுகாப்பாக இருப்போம்!",
"qr_instruct":"QR குறியீட்டைப் பிடிக்கவும்"
}


42 changes: 27 additions & 15 deletions lib/page/screen/qr_scan_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import 'package:qr_code_scanner/qr_code_scanner.dart';
import 'package:selftrackingapp/page/screen/qr_webview_screen.dart';
import 'package:webview_flutter/webview_flutter.dart';

import '../../app_localizations.dart';

class QrScanScreen extends StatefulWidget {
@override
_QrScanScreenState createState() => _QrScanScreenState();
Expand All @@ -26,6 +28,7 @@ class _QrScanScreenState extends State<QrScanScreen> {

@override
Widget build(BuildContext context) {
double height = MediaQuery.of(context).size.height;
return Scaffold(
body: Column(
children: <Widget>[
Expand All @@ -36,21 +39,30 @@ class _QrScanScreenState extends State<QrScanScreen> {
onQRViewCreated: _onQRViewCreated,
),
),
Expanded(
flex: 1,
child: Center(
child: IconButton(
icon: Icon(Icons.query_builder),
onPressed: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => QrWebviewScreen(
url: 'https://staysafe.gov.lk/',
)));
},
)),
),
Row(
children: <Widget>[
Container(
padding: EdgeInsets.all(10),
height: 100,
width: 100,
color: Colors.white,
child: Image.asset(
"assets/images/stay_safe.png",
fit: BoxFit.cover,
),
),
Expanded(
child: Center(
child: Text(
AppLocalizations.of(context).translate("qr_instruct"),
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(color: Colors.black, fontSize: 20),
),
),
)
],
)
],
),
);
Expand Down
2 changes: 2 additions & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ flutter:
- assets/images/ambulance.svg
- assets/images/add_ic_call_24px.svg
- assets/images/medical_consultion.png
- assets/images/stay_safe.png

# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware.
# For details regarding adding assets from package dependencies, see
Expand Down

0 comments on commit 1723c24

Please sign in to comment.