#29 libre flavour

.github/workflows/release.yml

@@ -66,6 +66,9 @@ jobs:
           (cd scripts/; ./apply_flavor_izzy.sh)
           flutter build apk -t lib/main_izzy.dart --flavor izzy --split-per-abi --bundle-sksl-path shaders_3.3.8.sksl.json
           cp build/app/outputs/apk/izzy/release/*.apk outputs
+          (cd scripts/; ./apply_flavor_libre.sh)
+          flutter build apk -t lib/main_libre.dart --flavor libre --bundle-sksl-path shaders_3.3.8.sksl.json
+          cp build/app/outputs/apk/libre/release/*.apk outputs
           rm $AVES_STORE_FILE
         env:
           AVES_STORE_FILE: ${{ github.workspace }}/key.jks

android/app/build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'kotlin-kapt'
 }
 
-def appId = "deckers.thibault.aves"
+def packageName = "deckers.thibault.aves"
 
 // Flutter properties
 
@@ -49,7 +49,7 @@ android {
     }
 
     defaultConfig {
-        applicationId appId
+        applicationId packageName
         // minSdkVersion constraints:
         // - Flutter & other plugins: 16
         // - google_maps_flutter v2.1.1: 20
@@ -63,7 +63,6 @@ android {
         manifestPlaceholders = [googleApiKey: keystoreProperties['googleApiKey'],
                                 huaweiApiKey: keystoreProperties['huaweiApiKey']]
         multiDexEnabled true
-        resValue 'string', 'search_provider', "${appId}.search_provider"
     }
 
     signingConfigs {
@@ -106,16 +105,24 @@ android {
             // generate APK by ABI, but NDK ABI filters are incompatible with split APK generation
             ext.useNdkAbiFilters = false
         }
+
+        libre {
+            // F-Droid
+            applicationIdSuffix ".libre"
+            dimension "store"
+            ext.useCrashlytics = false
+            ext.useHMS = false
+            // generate a universal APK without x86 native libs
+            ext.useNdkAbiFilters = true
+        }
     }
 
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
-            resValue 'string', 'search_provider', "${appId}.debug.search_provider"
         }
         profile {
             applicationIdSuffix ".profile"
-            resValue 'string', 'search_provider', "${appId}.profile.search_provider"
         }
         release {
             signingConfig signingConfigs.release
@@ -124,6 +131,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
 
+        applicationVariants.all { variant ->
+            variant.resValue 'string', 'screen_saver_settings_activity', "${applicationId}/${packageName}.ScreenSaverSettingsActivity"
+            variant.resValue 'string', 'search_provider', "${applicationId}.search_provider"
+        }
+
         android.productFlavors.each { flavor ->
             def tasks = gradle.startParameter.taskNames.toString().toLowerCase()
             if (tasks.contains(flavor.name) && flavor.ext.useNdkAbiFilters) {

android/app/src/debug/res/xml/screen_saver.xml

@@ -1,2 +0,0 @@
-<dream xmlns:android="http://schemas.android.com/apk/res/android"
-    android:settingsActivity="deckers.thibault.aves.debug/deckers.thibault.aves.ScreenSaverSettingsActivity" />

android/app/src/libre/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Aves Libre</string>
+</resources>

android/app/src/libreDebug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Aves Libre [Debug]</string>
+</resources>

android/app/src/libreProfile/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Aves Libre [Profile]</string>
+</resources>

android/app/src/main/res/xml/screen_saver.xml

@@ -1,2 +1,2 @@
 <dream xmlns:android="http://schemas.android.com/apk/res/android"
-    android:settingsActivity="deckers.thibault.aves/deckers.thibault.aves.ScreenSaverSettingsActivity" />
+    android:settingsActivity="@string/screen_saver_settings_activity" />

android/app/src/profile/res/xml/screen_saver.xml

@@ -1,2 +0,0 @@
-<dream xmlns:android="http://schemas.android.com/apk/res/android"
-    android:settingsActivity="deckers.thibault.aves.profile/deckers.thibault.aves.ScreenSaverSettingsActivity" />

android/build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.7.20'
     repositories {
         google()
         mavenCentral()

lib/app_flavor.dart

@@ -1,4 +1,4 @@
-enum AppFlavor { play, huawei, izzy }
+enum AppFlavor { play, huawei, izzy, libre }
 
 extension ExtraAppFlavor on AppFlavor {
   bool get canEnableErrorReporting {
@@ -7,6 +7,7 @@ extension ExtraAppFlavor on AppFlavor {
         return true;
       case AppFlavor.huawei:
       case AppFlavor.izzy:
+      case AppFlavor.libre:
         return false;
     }
   }

lib/main_libre.dart

@@ -0,0 +1,11 @@
+import 'package:aves/app_flavor.dart';
+import 'package:aves/main_common.dart';
+import 'package:aves/widget_common.dart';
+
+const _flavor = AppFlavor.libre;
+
+@pragma('vm:entry-point')
+void main() => mainCommon(_flavor);
+
+@pragma('vm:entry-point')
+void widgetMain() => widgetMainCommon(_flavor);

lib/utils/constants.dart

@@ -223,6 +223,8 @@ class Constants {
     ..._googleMobileServices,
   ];
 
+  static const List<Dependency> _flutterPluginsLibreOnly = [];
+
   static const List<Dependency> _flutterPluginsPlayOnly = [
     ..._googleMobileServices,
     Dependency(
@@ -236,6 +238,7 @@ class Constants {
         ..._flutterPluginsCommon,
         if (flavor == AppFlavor.huawei) ..._flutterPluginsHuaweiOnly,
         if (flavor == AppFlavor.izzy) ..._flutterPluginsIzzyOnly,
+        if (flavor == AppFlavor.libre) ..._flutterPluginsLibreOnly,
         if (flavor == AppFlavor.play) ..._flutterPluginsPlayOnly,
       ];
 

lib/widgets/about/bug_report.dart

@@ -145,9 +145,13 @@ class _BugReportState extends State<BugReport> with FeedbackMixin {
     final androidInfo = await DeviceInfoPlugin().androidInfo;
     final flavor = context.read<AppFlavor>().toString().split('.')[1];
     return [
-      'Aves version: ${packageInfo.version}-$flavor (Build ${packageInfo.buildNumber})',
-      'Flutter version: ${version['frameworkVersion']} (Channel ${version['channel']})',
-      'Android version: ${androidInfo.version.release} (SDK ${androidInfo.version.sdkInt})',
+      'Package: ${packageInfo.packageName}',
+      'Aves version: ${packageInfo.version}-$flavor',
+      'Aves build: ${packageInfo.buildNumber}',
+      'Flutter version: ${version['frameworkVersion']}',
+      'Flutter channel: ${version['channel']}',
+      'Android version: ${androidInfo.version.release}',
+      'Android API: ${androidInfo.version.sdkInt}',
       'Android build: ${androidInfo.display}',
       'Device: ${androidInfo.manufacturer} ${androidInfo.model}',
       'Geocoder: ${device.hasGeocoder ? 'ready' : 'not available'}',

plugins/aves_services_none/.gitignore

@@ -0,0 +1,30 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+.dart_tool/
+.packages
+build/

plugins/aves_services_none/.metadata

@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 52b3dc25f6471c27b2144594abb11c741cb88f57
+  channel: stable
+
+project_type: package

plugins/aves_services_none/analysis_options.yaml

@@ -0,0 +1 @@
+include: ../../analysis_options.yaml

plugins/aves_services_none/lib/aves_services_platform.dart

@@ -0,0 +1,41 @@
+library aves_services_platform;
+
+import 'package:aves_map/aves_map.dart';
+import 'package:aves_services/aves_services.dart';
+import 'package:flutter/widgets.dart';
+import 'package:latlong2/latlong.dart';
+
+class PlatformMobileServices extends MobileServices {
+  @override
+  Future<void> init() async {}
+
+  @override
+  bool get isServiceAvailable => false;
+
+  @override
+  EntryMapStyle get defaultMapStyle => EntryMapStyle.values.first;
+
+  @override
+  List<EntryMapStyle> get mapStyles => [];
+
+  @override
+  Widget buildMap<T>({
+    required AvesMapController? controller,
+    required Listenable clusterListenable,
+    required ValueNotifier<ZoomedBounds> boundsNotifier,
+    required EntryMapStyle style,
+    required TransitionBuilder decoratorBuilder,
+    required ButtonPanelBuilder buttonPanelBuilder,
+    required MarkerClusterBuilder<T> markerClusterBuilder,
+    required MarkerWidgetBuilder<T> markerWidgetBuilder,
+    required MarkerImageReadyChecker<T> markerImageReadyChecker,
+    required ValueNotifier<LatLng?>? dotLocationNotifier,
+    required ValueNotifier<double>? overlayOpacityNotifier,
+    required MapOverlay? overlayEntry,
+    required UserZoomChangeCallback? onUserZoomChange,
+    required MapTapCallback? onMapTap,
+    required MarkerTapCallback<T>? onMarkerTap,
+  }) {
+    return const SizedBox();
+  }
+}

plugins/aves_services_none/pubspec.yaml

@@ -0,0 +1,20 @@
+name: aves_services_platform
+version: 0.0.1
+publish_to: none
+
+environment:
+  sdk: ">=2.18.0 <3.0.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+  aves_map:
+    path: ../aves_map
+  aves_services:
+    path: ../aves_services
+  latlong2:
+
+dev_dependencies:
+  flutter_lints:
+
+flutter:

pubspec.lock

@@ -8,13 +8,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "47.0.0"
-  _flutterfire_internals:
-    dependency: transitive
-    description:
-      name: _flutterfire_internals
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.8"
   analyzer:
     dependency: transitive
     description:
@@ -46,7 +39,7 @@ packages:
   aves_magnifier:
     dependency: "direct main"
     description:
-      path: "packages/aves_magnifier"
+      path: "plugins/aves_magnifier"
       relative: true
     source: path
     version: "0.0.1"
@@ -67,7 +60,7 @@ packages:
   aves_report_platform:
     dependency: "direct main"
     description:
-      path: "plugins/aves_report_crashlytics"
+      path: "plugins/aves_report_console"
       relative: true
     source: path
     version: "0.0.1"
@@ -81,7 +74,7 @@ packages:
   aves_services_platform:
     dependency: "direct main"
     description:
-      path: "plugins/aves_services_google"
+      path: "plugins/aves_services_none"
       relative: true
     source: path
     version: "0.0.1"
@@ -127,20 +120,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.1"
-  cloud_firestore_platform_interface:
-    dependency: transitive
-    description:
-      name: cloud_firestore_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.8.5"
-  cloud_firestore_web:
-    dependency: transitive
-    description:
-      name: cloud_firestore_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.5"
   collection:
     dependency: "direct main"
     description:
@@ -285,41 +264,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.2"
-  firebase_core:
-    dependency: transitive
-    description:
-      name: firebase_core
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.2.0"
-  firebase_core_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_core_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.5.2"
-  firebase_core_web:
-    dependency: transitive
-    description:
-      name: firebase_core_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.1"
-  firebase_crashlytics:
-    dependency: transitive
-    description:
-      name: firebase_crashlytics
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.5"
-  firebase_crashlytics_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_crashlytics_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.3.6"
   flex_color_picker:
     dependency: "direct main"
     description:
@@ -398,13 +342,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.6.13"
-  flutter_plugin_android_lifecycle:
-    dependency: transitive
-    description:
-      name: flutter_plugin_android_lifecycle
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.7"
   flutter_staggered_animations:
     dependency: "direct main"
     description:
@@ -448,41 +385,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
-  google_api_availability:
-    dependency: transitive
-    description:
-      name: google_api_availability
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.1"
-  google_maps_flutter:
-    dependency: transitive
-    description:
-      name: google_maps_flutter
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.2.1"
-  google_maps_flutter_android:
-    dependency: transitive
-    description:
-      name: google_maps_flutter_android
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.3.3"
-  google_maps_flutter_ios:
-    dependency: transitive
-    description:
-      name: google_maps_flutter_ios
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.12"
-  google_maps_flutter_platform_interface:
-    dependency: transitive
-    description:
-      name: google_maps_flutter_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.2.4"
   highlight:
     dependency: transitive
     description:
@@ -652,7 +554,7 @@ packages:
       name: overlay_support
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.1.0"
   package_config:
     dependency: transitive
     description:
@@ -666,7 +568,7 @@ packages:
       name: package_info_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -850,7 +752,7 @@ packages:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   qr:
     dependency: transitive
     description:
@@ -1045,13 +947,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
-  stream_transform:
-    dependency: transitive
-    description:
-      name: stream_transform
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
   streams_channel:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -22,17 +22,17 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   aves_magnifier:
-    path: packages/aves_magnifier
+    path: plugins/aves_magnifier
   aves_map:
     path: plugins/aves_map
   aves_report:
     path: plugins/aves_report
   aves_report_platform:
-    path: plugins/aves_report_crashlytics
+    path: plugins/aves_report_console
   aves_services:
     path: plugins/aves_services
   aves_services_platform:
-    path: plugins/aves_services_google
+    path: plugins/aves_services_none
   charts_flutter:
   collection:
   connectivity_plus:

scripts/apply_flavor_huawei.sh

@@ -7,7 +7,7 @@ PUBSPEC_PATH="pubspec.yaml"
 
 flutter clean
 
-sed -i 's/aves_services_google/aves_services_huawei/g' "$PUBSPEC_PATH"
-sed -i 's/aves_report_crashlytics/aves_report_console/g' "$PUBSPEC_PATH"
+sed -i 's|plugins/aves_services_.*|plugins/aves_services_huawei|g' "$PUBSPEC_PATH"
+sed -i 's|plugins/aves_report_.*|plugins/aves_report_console|g' "$PUBSPEC_PATH"
 
 flutter pub get

scripts/apply_flavor_izzy.sh

@@ -7,7 +7,7 @@ PUBSPEC_PATH="pubspec.yaml"
 
 flutter clean
 
-sed -i 's/aves_services_huawei/aves_services_google/g' "$PUBSPEC_PATH"
-sed -i 's/aves_report_crashlytics/aves_report_console/g' "$PUBSPEC_PATH"
+sed -i 's|plugins/aves_services_.*|plugins/aves_services_google|g' "$PUBSPEC_PATH"
+sed -i 's|plugins/aves_report_.*|plugins/aves_report_console|g' "$PUBSPEC_PATH"
 
 flutter pub get

scripts/apply_flavor_libre.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+if [ ! -d "scripts" ]; then
+  cd ..
+fi
+
+PUBSPEC_PATH="pubspec.yaml"
+
+flutter clean
+
+sed -i 's|plugins/aves_services_.*|plugins/aves_services_none|g' "$PUBSPEC_PATH"
+sed -i 's|plugins/aves_report_.*|plugins/aves_report_console|g' "$PUBSPEC_PATH"
+
+flutter pub get

scripts/apply_flavor_play.sh

@@ -7,7 +7,7 @@ PUBSPEC_PATH="pubspec.yaml"
 
 flutter clean
 
-sed -i 's/aves_services_huawei/aves_services_google/g' "$PUBSPEC_PATH"
-sed -i 's/aves_report_console/aves_report_crashlytics/g' "$PUBSPEC_PATH"
+sed -i 's|plugins/aves_services_.*|plugins/aves_services_google|g' "$PUBSPEC_PATH"
+sed -i 's|plugins/aves_report_.*|plugins/aves_report_crashlytics|g' "$PUBSPEC_PATH"
 
 flutter pub get

scripts/pub_get_all.sh

@@ -5,14 +5,6 @@ fi
 
 flutter pub get
 
-cd packages || exit
-for package in $(ls -d *); do
-  cd $package
-  flutter pub get
-  cd ..
-done
-cd ..
-
 cd plugins || exit
 for plugin in $(ls -d *); do
   cd $plugin

scripts/pub_upgrade_all.sh

@@ -5,14 +5,6 @@ fi
 
 flutter pub upgrade
 
-cd packages || exit
-for package in $(ls -d *); do
-  cd $package
-  flutter pub upgrade
-  cd ..
-done
-cd ..
-
 cd plugins || exit
 for plugin in $(ls -d *); do
   cd $plugin