Skip to content

Commit a64a462

Browse files
amenkamenk
committed
Merge remote-tracking branch 'origin/main' into develop
2 parents ca336b2 + 5658b59 commit a64a462

File tree

5 files changed

+49
-25
lines changed

5 files changed

+49
-25
lines changed

‎README.md‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# AddisMapTransit
1+
# AddisMapTransit Ethiopian Public Transport Android and iOS app
2+
3+
![AddisMapTransit](https://addismaptransit.com/wp-content/uploads/sites/6/2022/10/AddisMapTransit-New-Logo.png)
24

35
www.AddisMapTransit.com
46

@@ -17,3 +19,24 @@ www.AddisMapTransit.com
1719
height="80">](https://f-droid.org/packages/com.addismaptransit.app/)
1820

1921
or get the APK from the [Releases section](https://github.com/AddisMap/AddisMapTransit/releases/latest)
22+
23+
## Sponsors
24+
25+
Sponsored for a one year term under the [DigitalTransport 4 Africa Innovation Challenge](https://digitaltransport4africa.org/innovation-challenge/) by [WRI](https://wri.org), [AFD FR](https://www.afd.fr/en) - partners:
26+
27+
![DT4A Sponsors](https://addismaptransit.com/wp-content/uploads/sites/6/2022/11/sponsors.png)
28+
29+
FOSS Plan support by [MacStadium](https://macstadium.com) and [BrowserStack](https://browserstack.com)
30+
31+
![FOSS Sponsors](https://addismaptransit.com/wp-content/uploads/sites/6/2022/11/foss-sponsors-1.png)
32+
33+
## Cooperations
34+
35+
[Trufi Association](https://www.trufi-association.org/)
36+
37+
## Stack
38+
39+
* Flutter 3
40+
* Trufi Core
41+
* OpenTripPlanner Backend
42+
* [OpenPlaceGuide Africa](https://africa.tiles.openplaceguide.org/) tileserver

‎ios/Podfile.lock‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
PODS:
2-
- app_review (1.0.1):
3-
- Flutter
42
- device_info_plus (0.0.1):
53
- Flutter
64
- Flutter (1.0.0)
@@ -24,7 +22,6 @@ PODS:
2422
- Flutter
2523

2624
DEPENDENCIES:
27-
- app_review (from `.symlinks/plugins/app_review/ios`)
2825
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
2926
- Flutter (from `Flutter`)
3027
- geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
@@ -40,8 +37,6 @@ SPEC REPOS:
4037
- FMDB
4138

4239
EXTERNAL SOURCES:
43-
app_review:
44-
:path: ".symlinks/plugins/app_review/ios"
4540
device_info_plus:
4641
:path: ".symlinks/plugins/device_info_plus/ios"
4742
Flutter:
@@ -62,9 +57,8 @@ EXTERNAL SOURCES:
6257
:path: ".symlinks/plugins/url_launcher_ios/ios"
6358

6459
SPEC CHECKSUMS:
65-
app_review: 6f51001269c59a2f4a5b5ae68b7d106401152764
6660
device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
67-
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
61+
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
6862
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
6963
geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
7064
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
@@ -74,6 +68,6 @@ SPEC CHECKSUMS:
7468
uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
7569
url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
7670

77-
PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
71+
PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
7872

7973
COCOAPODS: 1.11.3

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -121,7 +121,6 @@
121121
F4145B609DBB86EB1AA43ECA /* Pods-Runner.release.xcconfig */,
122122
5B9510E1C27DF2B00DBD8EF7 /* Pods-Runner.profile.xcconfig */,
123123
);
124-
name = Pods;
125124
path = Pods;
126125
sourceTree = "<group>";
127126
};
@@ -340,7 +339,7 @@
340339
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
341340
GCC_WARN_UNUSED_FUNCTION = YES;
342341
GCC_WARN_UNUSED_VARIABLE = YES;
343-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
342+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
344343
MTL_ENABLE_DEBUG_INFO = NO;
345344
SDKROOT = iphoneos;
346345
SUPPORTED_PLATFORMS = iphoneos;
@@ -356,13 +355,14 @@
356355
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
357356
CLANG_ENABLE_MODULES = YES;
358357
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
358+
DEVELOPMENT_TEAM = 3HM2LUD65B;
359359
ENABLE_BITCODE = NO;
360360
INFOPLIST_FILE = Runner/Info.plist;
361361
LD_RUNPATH_SEARCH_PATHS = (
362362
"$(inherited)",
363363
"@executable_path/Frameworks",
364364
);
365-
PRODUCT_BUNDLE_IDENTIFIER = com.example.trufiApp;
365+
PRODUCT_BUNDLE_IDENTIFIER = com.addismaptransit.iosapp;
366366
PRODUCT_NAME = "$(TARGET_NAME)";
367367
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
368368
SWIFT_VERSION = 5.0;
@@ -417,7 +417,7 @@
417417
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
418418
GCC_WARN_UNUSED_FUNCTION = YES;
419419
GCC_WARN_UNUSED_VARIABLE = YES;
420-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
420+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
421421
MTL_ENABLE_DEBUG_INFO = YES;
422422
ONLY_ACTIVE_ARCH = YES;
423423
SDKROOT = iphoneos;
@@ -466,7 +466,7 @@
466466
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
467467
GCC_WARN_UNUSED_FUNCTION = YES;
468468
GCC_WARN_UNUSED_VARIABLE = YES;
469-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
469+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
470470
MTL_ENABLE_DEBUG_INFO = NO;
471471
SDKROOT = iphoneos;
472472
SUPPORTED_PLATFORMS = iphoneos;
@@ -484,13 +484,14 @@
484484
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
485485
CLANG_ENABLE_MODULES = YES;
486486
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
487+
DEVELOPMENT_TEAM = 3HM2LUD65B;
487488
ENABLE_BITCODE = NO;
488489
INFOPLIST_FILE = Runner/Info.plist;
489490
LD_RUNPATH_SEARCH_PATHS = (
490491
"$(inherited)",
491492
"@executable_path/Frameworks",
492493
);
493-
PRODUCT_BUNDLE_IDENTIFIER = com.example.trufiApp;
494+
PRODUCT_BUNDLE_IDENTIFIER = com.addismaptransit.iosapp;
494495
PRODUCT_NAME = "$(TARGET_NAME)";
495496
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
496497
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -506,13 +507,14 @@
506507
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
507508
CLANG_ENABLE_MODULES = YES;
508509
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
510+
DEVELOPMENT_TEAM = 3HM2LUD65B;
509511
ENABLE_BITCODE = NO;
510512
INFOPLIST_FILE = Runner/Info.plist;
511513
LD_RUNPATH_SEARCH_PATHS = (
512514
"$(inherited)",
513515
"@executable_path/Frameworks",
514516
);
515-
PRODUCT_BUNDLE_IDENTIFIER = com.example.trufiApp;
517+
PRODUCT_BUNDLE_IDENTIFIER = com.addismaptransit.iosapp;
516518
PRODUCT_NAME = "$(TARGET_NAME)";
517519
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
518520
SWIFT_VERSION = 5.0;

‎ios/Runner/Base.lproj/Main.storyboard‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
3+
<device id="retina6_12" orientation="portrait" appearance="light"/>
34
<dependencies>
45
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
7+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
68
</dependencies>
79
<scenes>
810
<!--Flutter View Controller-->
@@ -14,13 +16,14 @@
1416
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
1517
</layoutGuides>
1618
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
17-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
19+
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
1820
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
19-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
21+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2022
</view>
2123
</viewController>
2224
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
2325
</objects>
26+
<point key="canvasLocation" x="-16" y="-41"/>
2427
</scene>
2528
</scenes>
2629
</document>

‎ios/Runner/Info.plist‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>CADisableMinimumFrameDurationOnPhone</key>
6+
<true/>
57
<key>CFBundleDevelopmentRegion</key>
68
<string>$(DEVELOPMENT_LANGUAGE)</string>
79
<key>CFBundleDisplayName</key>
8-
<string>Trufi App</string>
10+
<string>AddisMapTransit</string>
911
<key>CFBundleExecutable</key>
1012
<string>$(EXECUTABLE_NAME)</string>
1113
<key>CFBundleIdentifier</key>
@@ -25,9 +27,9 @@
2527
<key>LSRequiresIPhoneOS</key>
2628
<true/>
2729
<key>NSLocationAlwaysUsageDescription</key>
28-
<string>Trufi app is using your location to display it on a map.</string>
30+
<string>The app uses your location to display it on the map and to find nearby transit options.</string>
2931
<key>NSLocationWhenInUseUsageDescription</key>
30-
<string>Trufi app is using your location to display it on a map.</string>
32+
<string>The app uses your location to display it on the map and to find nearby transit options.</string>
3133
<key>UILaunchStoryboardName</key>
3234
<string>LaunchScreen</string>
3335
<key>UIMainStoryboardFile</key>

0 commit comments

Comments
 (0)