Skip to content

Commit 5658b59

Browse files
authored
Merge pull request #5 from AddisMap/develop
Develop
2 parents 8ccc1c6 + 8d4ea94 commit 5658b59

File tree

15 files changed

+154
-147
lines changed

15 files changed

+154
-147
lines changed

DEVELOPMENT.md

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# Development
22

3+
## TrufiCore
4+
5+
Based on Trufi Core https://github.com/AddisMap/trufi-core/releases/
6+
7+
* Tag new Trufi Core release, update pubspec.yaml
8+
39
## Stack
410

5-
* Flutter 3.3.x
11+
* Flutter 3.3.3
612
* Africa Tiles
713
* For Android and iOS
814

@@ -15,7 +21,7 @@ git clone https://github.com/trufi-association/osm-search-data-export.git
1521
cd osm-search-data-export
1622
docker build . --tag osm-search-data-export:latest
1723
docker run --volume /tmp:/data osm-search-data-export --input overpass --bbox "8.82,38.63,9.11,38.91" --output json-compact --outpath /data/search.json
18-
cp /tmp/search.json ../AddisMapTransit/assets/data/ search.json
24+
cp /tmp/search.json ../AddisMapTransit/assets/data/search.json
1925
```
2026

2127
## Fastlane
@@ -50,17 +56,24 @@ Screenshot 6 - Show routes
5056
5. Rotate Device
5157

5258
Save android/fastlane/metadata/android/en-US/images/tenInchScreenshots + sevenInchScreenshots
53-
Screenshot 1 - Airport Parking -> Bandira -> Routes and Map overview
59+
60+
For iOS:
61+
62+
BrowserStack -> TestFlight -> Sign In
63+
* iPhone 11 Pro Max (6.5" screen)
64+
* iPhone 8 Plus (5.5" screen)
65+
* iPad Pro 12.9 2021 (6th gen)
66+
* iPad Pro 12.9 2017 (2th gen)
5467

5568
### Building compact APK for GitHub Release
5669

5770
`flutter build apk --analyze-size --target-platform android-arm`
5871

59-
# iOS
72+
## iOS
6073

6174
We are developing at MacStadium.com (thank you!)
6275

63-
## Installation on a fresh MacMini
76+
### Installation on a fresh MacMini
6477

6578
* Install Xcode via App Store (Free)
6679
* Also run `xcode-select --install` to install Cmdline tools
@@ -80,12 +93,13 @@ We are developing at MacStadium.com (thank you!)
8093
* open ios/Runner.xcworkspace
8194
* Select or create development signing certificate
8295

83-
## Archiving
96+
### Archiving
8497

8598
In Xcode:
8699

87100
* Product -> Destination -> Any iOS Device
88101
* Product -> Archive
89-
* In Xcode, Window -> Organizer -> Archives
102+
* Opens the uploader, click next, next, next ...
103+
* Publish via https://appstoreconnect.apple.com/
90104

91105

android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ if (keystorePropertiesFile.exists()) {
3333

3434
android {
3535
compileSdkVersion 33
36+
ndkVersion flutter.ndkVersion
3637

3738
compileOptions {
3839
sourceCompatibility JavaVersion.VERSION_1_8

android/app/src/debug/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.addismaptransit.app">
3-
<!-- Flutter needs it to communicate with the running application
3+
<!-- The INTERNET permission is required for development. Specifically,
4+
the Flutter tool needs it to communicate with the running application
45
to allow setting breakpoints, to provide hot reload, etc.
56
-->
67
<uses-permission android:name="android.permission.INTERNET"/>

android/app/src/main/res/values-night/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
44
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
55
<!-- Show a splash screen on the activity. Automatically removed when
6-
Flutter draws its first frame -->
6+
the Flutter engine draws its first frame -->
77
<item name="android:windowBackground">@drawable/launch_background</item>
88
</style>
99
<!-- Theme applied to the Android Window as soon as the process has started.

android/app/src/main/res/values/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
44
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
55
<!-- Show a splash screen on the activity. Automatically removed when
6-
Flutter draws its first frame -->
6+
the Flutter engine draws its first frame -->
77
<item name="android:windowBackground">@drawable/launch_background</item>
88
</style>
99
<!-- Theme applied to the Android Window as soon as the process has started.

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
ext.kotlin_version = '1.6.10'
2+
ext.kotlin_version = '1.7.20'
33
repositories {
44
google()
55
mavenCentral()
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
9+
classpath 'com.android.tools.build:gradle:7.1.2'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- Updated Search Data
2+
- Notification Function
3+
- More Amharic Translations

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

assets/data/search.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

assets/images/drawer-bg.jpg

78.9 KB
Loading

0 commit comments

Comments
 (0)