Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
icon image, font size, layout fixes
  • Loading branch information
abikaram committed Jan 31, 2023
1 parent 30db517 commit 6eb189d
Show file tree
Hide file tree
Showing 10 changed files with 93 additions and 28 deletions.
22 changes: 17 additions & 5 deletions android/app/build.gradle
View file
Expand Up @@ -25,8 +25,14 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}

android {
compileSdkVersion 29
compileSdkVersion 30

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand All @@ -40,16 +46,22 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.uconn.safer"
minSdkVersion 16
targetSdkVersion 29
targetSdkVersion 30
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}

signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
}
buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.debug
signingConfig signingConfigs.release
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions android/app/src/main/AndroidManifest.xml
View file
@@ -1,7 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.uconn.safer">
<application
android:label="safer"
<uses-permission android:name="android.permission.INTERNET" />
<application
android:label="SAFER"
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
Expand Down
Binary file added assets/images/vehicle.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions lib/screens/safer_main_menu/evacuation.dart
View file
Expand Up @@ -63,6 +63,8 @@ class _EvacuationState extends State<Evacuation> {
padding: const EdgeInsets.all(8),
),
ListTile(
leading: CircleAvatar(
backgroundImage: AssetImage('assets/images/property-risk.png')),
title: RichText(
text: TextSpan(
style: TextStyle(
Expand Down Expand Up @@ -113,6 +115,8 @@ class _EvacuationState extends State<Evacuation> {
padding: const EdgeInsets.all(8),
),
ListTile(
leading: CircleAvatar(
backgroundImage: AssetImage('assets/images/medical.png')),
title: RichText(
text: TextSpan(
style: TextStyle(
Expand Down Expand Up @@ -183,6 +187,8 @@ class _EvacuationState extends State<Evacuation> {
padding: const EdgeInsets.all(8),
),
ListTile(
leading: CircleAvatar(
backgroundImage: AssetImage('assets/images/vehicle.png')),
title: RichText(
text: TextSpan(
style: TextStyle(
Expand Down Expand Up @@ -212,6 +218,8 @@ class _EvacuationState extends State<Evacuation> {
padding: const EdgeInsets.all(8),
),
ListTile(
leading: CircleAvatar(
backgroundImage: AssetImage('assets/images/burger.png')),
title: RichText(
text: TextSpan(
style: TextStyle(
Expand Down Expand Up @@ -241,6 +249,8 @@ class _EvacuationState extends State<Evacuation> {
padding: const EdgeInsets.all(8),
),
ListTile(
leading: CircleAvatar(
backgroundImage: AssetImage('assets/images/tv.png')),
title: RichText(
text: TextSpan(
style: TextStyle(
Expand Down
14 changes: 7 additions & 7 deletions lib/screens/safer_main_menu/personal_safety.dart
View file
Expand Up @@ -37,7 +37,7 @@ class _PersonalSafetyState extends State<PersonalSafety> {
),
ListTile(
leading: CircleAvatar(
backgroundImage: AssetImage('assets/images/ct-map.png')),
backgroundImage: AssetImage('assets/images/house.png')),
title: RichText(
text: TextSpan(
style: TextStyle(
Expand All @@ -62,7 +62,7 @@ class _PersonalSafetyState extends State<PersonalSafety> {
),
ListTile(
leading: CircleAvatar(
backgroundImage: AssetImage('assets/images/ct-map.png')),
backgroundImage: AssetImage('assets/images/power.png')),
title: RichText(
text: TextSpan(
style: TextStyle(
Expand All @@ -88,7 +88,7 @@ class _PersonalSafetyState extends State<PersonalSafety> {
),
ListTile(
leading: CircleAvatar(
backgroundImage: AssetImage('assets/images/ct-map.png')),
backgroundImage: AssetImage('assets/images/property-risk.png')),
title: RichText(
text: TextSpan(
style: TextStyle(
Expand All @@ -114,7 +114,7 @@ class _PersonalSafetyState extends State<PersonalSafety> {
),
ListTile(
leading: CircleAvatar(
backgroundImage: AssetImage('assets/images/ct-map.png')),
backgroundImage: AssetImage('assets/images/storm.png')),
title: RichText(
text: TextSpan(
style: TextStyle(
Expand All @@ -140,7 +140,7 @@ class _PersonalSafetyState extends State<PersonalSafety> {
),
ListTile(
leading: CircleAvatar(
backgroundImage: AssetImage('assets/images/ct-map.png')),
backgroundImage: AssetImage('assets/images/phone.png')),
title: RichText(
text: TextSpan(
style: TextStyle(
Expand All @@ -165,7 +165,7 @@ class _PersonalSafetyState extends State<PersonalSafety> {
),
ListTile(
leading: CircleAvatar(
backgroundImage: AssetImage('assets/images/ct-map.png')),
backgroundImage: AssetImage('assets/images/tv.png')),
title: RichText(
text: TextSpan(
style: TextStyle(
Expand All @@ -191,7 +191,7 @@ class _PersonalSafetyState extends State<PersonalSafety> {
),
ListTile(
leading: CircleAvatar(
backgroundImage: AssetImage('assets/images/ct-map.png')),
backgroundImage: AssetImage('assets/images/home-flooding.png')),
title: RichText(
text: TextSpan(
style: TextStyle(
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/safer_main_menu/property_risk.dart
View file
Expand Up @@ -111,7 +111,7 @@ class _PropertyRiskState extends State<PropertyRisk> {
),
isExpanded: true,
iconSize: 40.0,
items: ['Single Family Home', 'Multiple Living Unit'].map(
items: ['Single Family Home', 'Multiple Dwelling Unit'].map(
(val) {
return DropdownMenuItem<String>(
value: val,
Expand Down
8 changes: 5 additions & 3 deletions lib/screens/safer_main_menu/property_safety.dart
View file
Expand Up @@ -178,12 +178,14 @@ class _PropertySafetyState extends State<PropertySafety> {
text: TextSpan(
style: TextStyle(
color: Colors.blue.withOpacity(1),
fontFamily: 'Raleway'),
fontFamily: 'Raleway',
fontSize: 15,
height: 2),
text: 'Home Flooding Mitigation',
recognizer: TapGestureRecognizer()
..onTap = () {
launch(
'https://www.youtube.com/watch?v=Zgz33tfSu8M');
'https://www.semswa.org/education-outreach/flooding/flood-recovery/6-ways-to-flood-proof/');
},
children: <TextSpan>[
TextSpan(
Expand All @@ -198,7 +200,7 @@ class _PropertySafetyState extends State<PropertySafety> {
recognizer: TapGestureRecognizer()
..onTap = () {
launch(
'https://www.youtube.com/watch?v=g_BkmkqgUMg');
'https://www.ready.gov/floods#during');
}),
TextSpan(
text: '\nHow to survive a flood evacuation?',
Expand Down
33 changes: 30 additions & 3 deletions lib/screens/safer_main_menu/stay_in_touch.dart
View file
Expand Up @@ -19,7 +19,7 @@ class _StayInTouchState extends State<StayInTouch> {
String location = UtilPreferences.getString(Preferences.location);
Map<String, String> townEmergencyLink = {
"Bridgeport":
"https://www.bridgeportct.gov/content/341307/341419/368105.aspx",
"https://www.bridgeportct.gov/content/341307/341425/342901/342995.aspx",
"Milford": "https://www.ci.milford.ct.us/emergency-management-services",
"New Haven":
"https://www.newhavenct.gov/cityservices/emergency_services/default.htm",
Expand Down Expand Up @@ -60,7 +60,8 @@ class _StayInTouchState extends State<StayInTouch> {
text: TextSpan(
style: TextStyle(
color: Colors.blue.withOpacity(1),
fontFamily: 'Raleway'),
fontFamily: 'Raleway',
height: 1.5),
text: 'Facebook',
recognizer: TapGestureRecognizer()
..onTap = () {
Expand All @@ -73,6 +74,27 @@ class _StayInTouchState extends State<StayInTouch> {
..onTap = () {
launch('https://www.twitter.com');
},
),
TextSpan(
text: '\nInstagram',
recognizer: TapGestureRecognizer()
..onTap = () {
launch('https://www.instagram.com');
},
),
TextSpan(
text: '\nReddit',
recognizer: TapGestureRecognizer()
..onTap = () {
launch('https://www.reddit.com');
},
),
TextSpan(
text: '\nTikTok',
recognizer: TapGestureRecognizer()
..onTap = () {
launch('https://www.tiktok.com');
},
)
],
),
Expand Down Expand Up @@ -125,6 +147,10 @@ class _StayInTouchState extends State<StayInTouch> {
color: Colors.blue.withOpacity(1),
fontFamily: 'Raleway'),
),
onTap: () {
launch('https://www.211ct.org/search?page=1&location=Bridgeport%2C%20CT%2C%20USA&service_area='
+ UtilPreferences.getString(Preferences.location));
},
),
Padding(
padding: const EdgeInsets.all(8),
Expand Down Expand Up @@ -178,7 +204,8 @@ class _StayInTouchState extends State<StayInTouch> {
text: TextSpan(
style: TextStyle(
color: Colors.blue.withOpacity(1),
fontFamily: 'Raleway'),
fontFamily: 'Raleway',
height: 1.5),
text: 'Get in Contact with FEMA',
recognizer: TapGestureRecognizer()
..onTap = () {
Expand Down
12 changes: 8 additions & 4 deletions lib/screens/safer_main_menu/storm_tracking.dart
View file
Expand Up @@ -145,7 +145,9 @@ class _StormTrackingState extends State<StormTracking> {
text: TextSpan(
style: TextStyle(
color: Colors.blue.withOpacity(1),
fontFamily: 'Raleway'),
fontFamily: 'Raleway',
fontSize: 15,
height: 2),
text: '- Weather.com',
recognizer: TapGestureRecognizer()
..onTap = () {
Expand Down Expand Up @@ -196,7 +198,9 @@ class _StormTrackingState extends State<StormTracking> {
text: TextSpan(
style: TextStyle(
color: Colors.blue.withOpacity(1),
fontFamily: 'Raleway'),
fontFamily: 'Raleway',
fontSize: 15,
height: 2),
text: '- WTNH (ABC)',
recognizer: TapGestureRecognizer()
..onTap = () {
Expand All @@ -207,14 +211,14 @@ class _StormTrackingState extends State<StormTracking> {
text: '\n- WFSP (CBS)',
recognizer: TapGestureRecognizer()
..onTap = () {
launch('https://www.wfsb.com/weather/maps/');
launch('https://www.wfsb.com/weather/');
}),
TextSpan(
text: '\n- WVIT (NBC)',
recognizer: TapGestureRecognizer()
..onTap = () {
launch(
'https://www.nbcconnecticut.com/weather/severe-weather-alerts/');
'https://www.nbcconnecticut.com/weather/');
}),
],
),
Expand Down
15 changes: 12 additions & 3 deletions lib/screens/safer_main_menu/supplies.dart
View file
Expand Up @@ -242,13 +242,22 @@ class _SuppliesState extends State<Supplies> {
style: TextStyle(
color: Colors.black.withOpacity(1),
fontFamily: 'Raleway'),
text: '\n- Bottled Water',
text: '\n- Stock up Bottled Water',
children: <TextSpan>[
TextSpan(
text: '\n- 5 Gallons each Person',
text: '\n- 5 Gallons of Water each Person',
),
TextSpan(
text: '\n- 5 Gallons each Pet, if needed',
text: '\n- 5 Gallons of Water each Pet, if needed',
),
TextSpan(
text: '\n- Collect water in Rain Barrels',
),
TextSpan(
text: '\n- Fill up the Bathtub, if possible',
),
TextSpan(
text: '\n- Fill Pots & Pans with Water',
),
],
),
Expand Down

0 comments on commit 6eb189d

Please sign in to comment.