Skip to content

Commit

Permalink
Merge pull request #23 from canopas/implement-map-view
Browse files Browse the repository at this point in the history
Implement map view
  • Loading branch information
kaushiksaliya authored Jul 19, 2024
2 parents 81fae76 + 0524c35 commit 0f8dc74
Show file tree
Hide file tree
Showing 94 changed files with 8,158 additions and 320 deletions.
6 changes: 5 additions & 1 deletion .github/install_secret_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ env:
GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}
GOOGLE_SERVICES_INFO_JSON_BASE64: ${{ secrets.GOOGLE_SERVICES_INFO_JSON_BASE64 }}
INFO_PLIST_BASE64: ${{ secrets.INFO_PLIST_BASE64 }}
CONFIG_DART_BASE64: ${{ secrets.CONFIG_DART_BASE64 }}

echo $FIREBASE_OPTIONS_BASE64 | base64 -di > lib/firebase_options.dart
echo $GOOGLE_SERVICES_JSON_BASE64 | base64 -di > android/app/google-services.json
echo $GOOGLE_SERVICES_INFO_JSON_BASE64 | base64 -di > ios/Runner/GoogleService-Info.plist
echo $INFO_PLIST_BASE64 | base64 -di > ios/Runner/Info.plist
echo $INFO_PLIST_BASE64 | base64 -di > ios/Runner/Info.plist
cd ../data
echo $CONFIG_DART_BASE64 | base64 -di > lib/config.dart
cd ../app
4 changes: 4 additions & 0 deletions .github/workflows/analyze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@ jobs:
FIREBASE_OPTIONS_BASE64: ${{ secrets.FIREBASE_OPTIONS_BASE64 }}
INFO_PLIST_BASE64: ${{ secrets.INFO_PLIST_BASE64 }}

CONFIG_DART_BASE64: ${{ secrets.CONFIG_DART_BASE64 }}
run: |
cd app
echo $FIREBASE_OPTIONS_BASE64 | base64 -di > lib/firebase_options.dart
echo $INFO_PLIST_BASE64 | base64 -di > ios/Runner/Info.plist
cd ../data
echo $CONFIG_DART_BASE64 | base64 -di > lib/config.dart
cd ..
- name: Install dependencies
run: |
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/android_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,18 @@ jobs:
GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}
GOOGLE_SERVICES_INFO_JSON_BASE64: ${{ secrets.GOOGLE_SERVICES_INFO_JSON_BASE64 }}
INFO_PLIST_BASE64: ${{ secrets.INFO_PLIST_BASE64 }}
CONFIG_DART_BASE64: ${{ secrets.CONFIG_DART_BASE64 }}

run: |
cd app
echo $FIREBASE_OPTIONS_BASE64 | base64 -di > lib/firebase_options.dart
echo $GOOGLE_SERVICES_JSON_BASE64 | base64 -di > android/app/google-services.json
echo $GOOGLE_SERVICES_INFO_JSON_BASE64 | base64 -di > ios/Runner/GoogleService-Info.plist
echo $INFO_PLIST_BASE64 | base64 -di > ios/Runner/Info.plist
cd ../data
echo $CONFIG_DART_BASE64 | base64 -di > lib/config.dart
cd ..
- name: Install Dependencies
Expand All @@ -58,6 +63,7 @@ jobs:
APKSIGN_KEYSTORE_PASS: ${{ secrets.APKSIGN_KEYSTORE_PASS }}
APKSIGN_KEY_ALIAS: ${{ secrets.APKSIGN_KEY_ALIAS }}
APKSIGN_KEY_PASS: ${{ secrets.APKSIGN_KEY_PASS }}
MAPS_API_KEY: ${{ secrets.MAPS_API_KEY }}

run: |
echo $APKSIGN_KEYSTORE_BASE64 | base64 -di > release.keystore
Expand Down
9 changes: 9 additions & 0 deletions app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
id "com.google.gms.google-services"
}

def localProperties = new Properties()
Expand Down Expand Up @@ -51,6 +52,14 @@ android {
versionName flutterVersionName
multiDexEnabled true

def mapsApiKey = System.getenv('MAPS_API_KEY')
if (mapsApiKey != null) {
manifestPlaceholders += [MAPS_API_KEY: mapsApiKey]
} else if (localProperties.containsKey('MAPS_API_KEY')) {
manifestPlaceholders += [MAPS_API_KEY: localProperties.getProperty('MAPS_API_KEY')]
} else {
manifestPlaceholders += [MAPS_API_KEY: '']
}
}

signingConfigs {
Expand Down
17 changes: 17 additions & 0 deletions app/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />

<application
android:label="Your space"
android:name="${applicationName}"
Expand All @@ -25,6 +32,16 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>

<activity
android:name="com.yalantis.ucrop.UCropActivity"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>

<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="${MAPS_API_KEY}" />

<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data
Expand Down
2 changes: 1 addition & 1 deletion app/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.7.10'
ext.kotlin_version = '1.9.0'
repositories {
google()
mavenCentral()
Expand Down
8 changes: 8 additions & 0 deletions app/assets/images/ic_30_battery_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions app/assets/images/ic_50_battery_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions app/assets/images/ic_add_user_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/assets/images/ic_close_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/assets/images/ic_down_arrow_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions app/assets/images/ic_edit_profile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions app/assets/images/ic_empty_battery_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions app/assets/images/ic_full_bettery_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/assets/images/ic_geofence_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/assets/images/ic_location-feed_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/ic_place_marker_icon.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: 5 additions & 0 deletions app/assets/images/ic_places_gym_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/assets/images/ic_places_home_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0f8dc74

Please sign in to comment.