Merge branch 'master' into fdroid

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.13.8"
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,40 +1,37 @@
 ---
 name: Bug Report
-about: Create a report to help us improve
+about: Create a bug report to help us improve
 title: '[Bug]: '
 labels: bug
 assignees: ''
 
 ---
 
-*For questions or comments, please use the [Discussions](https://github.com/jithware/brethap/discussions) section. Please complete the sections below:*
+*For questions or comments, please use the [Discussions](https://github.com/jithware/brethap/discussions) section. Please complete **all** the sections below:*
 
-**Describe the bug**
+**Describe the bug:**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
+**Steps to Reproduce:**
+Include all steps to reproduce the behavior. Be specific. If a bug can not be reproduced by the assignee, it will likely not be resolvable.
 1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
+2. Click on '...'
+3. Scroll down to '...'
 4. See error
 
-**Expected behavior**
+**Expected behavior:**
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+**Screenshots:**
+If applicable, [add](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/attaching-files) screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 1.0.1+10]
+**Smartphone:** Detail information about the device the bug occurs on.
+ - Device: [e.g. Pixel 5]
+ - OS: [e.g. Android 14]
+ - Brethap version [e.g. 1.0.1+10]
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 1.0.1+10]
+**Additional context:**
 
-**Additional context**
-Add any other context or screenshots about the problem here.
+[Attach](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/attaching-files) any other context [e.g. .txt file] or screenshots about the problem here. 
+
+*Note: external urls to images or files are not acceptable as they can be temporary or altered, thereby not preserving the integrity of the bug history.*

.github/workflows/flutter.yml

@@ -12,7 +12,7 @@ jobs:
 
     # See https://github.com/subosito/flutter-action 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: subosito/flutter-action@v2
       with:
         flutter-version: '3.13.8'

.gitignore

@@ -52,5 +52,7 @@ brethap.tar.gz
 # Output of flutter test
 downloadsPath/brethap.sessions.csv
 
-# Flutter version management set with: fvm use 3.10.3
-.fvm/flutter_sdk
+# Flutter version management set with: fvm use 3.13.8
+
+# FVM Version Cache
+.fvm/

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,5 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>

docs/flutter_service_worker.js

@@ -36,10 +36,10 @@ const RESOURCES = {"assets/FontManifest.json": "7b2a36307916a9721811788013e65289
 "manifest.json": "7dbb56011187c29a1092f838ef6df339",
 "README.md": "e36fa824f15fa14b5e13c4be30936e63",
 "flutter.js": "6fef97aeca90b426343ba6c5c9dc5d4a",
-"index.html": "1bc3e24008e9791157418d0b881e2f88",
-"/": "1bc3e24008e9791157418d0b881e2f88",
-"main.dart.js": "7482d33bea8bce23ee1acab6b231e414",
-"version.json": "6bd65753696e376b299047f14478f9de"};
+"index.html": "b5277170683580dbd63d8d0973bcd2ea",
+"/": "b5277170683580dbd63d8d0973bcd2ea",
+"main.dart.js": "4e989ad06bf85794ccfb8c9a6321c326",
+"version.json": "109f8e0215fc4dfe10981ce4afff291b"};
 // The application shell files that are downloaded before a service worker can
 // start.
 const CORE = ["main.dart.js",

docs/index.html

@@ -31,7 +31,7 @@
        application. For more information, see:
        https://developers.google.com/web/fundamentals/primers/service-workers -->
   <script>
-    const serviceWorkerVersion = "989146414";
+    const serviceWorkerVersion = "1660253434";
     var scriptLoaded = false;
     function loadMainDartJs() {
       if (scriptLoaded) {

docs/main.dart.js

@@ -50783,7 +50783,7 @@ i.toString
 i=A.qG(f,f,B.QT,f,new A.awA(g),!1,f,A.an(i.gx_(),f,f,f,f,f,f,f,f))
 h=A.aw(a,B.p,s)
 h.toString
-r=A.aiP(A.a([new A.ON(B.IU,o,f),q,m,l,A.we(!0,new A.Kz(B.QM,j,k,p,"Copyright 2023 Jithware. All rights reserved.",A.a([i,A.qG(f,f,B.QP,f,new A.awB(g),!1,f,A.an(h.gyc(),f,f,f,f,f,f,f,f)),A.ht(A.aN8("images/github-qr.png"),f,f)],r),f),B.Y,!0)],r),B.Y,f,!1)
+r=A.aiP(A.a([new A.ON(B.IU,o,f),q,m,l,A.we(!0,new A.Kz(B.QM,j,k,p,"Copyright 2024 Jithware. All rights reserved.",A.a([i,A.qG(f,f,B.QP,f,new A.awB(g),!1,f,A.an(h.gyc(),f,f,f,f,f,f,f,f)),A.ht(A.aN8("images/github-qr.png"),f,f)],r),f),B.Y,!0)],r),B.Y,f,!1)
 if(g.d){s=A.aw(a,B.p,s)
 s.toString
 s=s.gu1(s)}else{s=A.aw(a,B.p,s)

docs/version.json

@@ -1 +1 @@
-{"app_name":"brethap","version":"1.7.24","build_number":"122","package_name":"brethap"}
+{"app_name":"brethap","version":"1.7.25","build_number":"124","package_name":"brethap"}

fastlane/metadata/android/README.md

@@ -11,6 +11,7 @@ git pull
 git checkout fdroid
 git merge --no-ff --no-commit master  # resolve any conflicts here
 git push
+git checkout master
 ```
 
 ## Update a pull request

fastlane/metadata/android/en-US/changelogs/124.txt

@@ -0,0 +1,3 @@
+Release version: 1.7.25+124
+* Update icons
+* Other minor enhancements

images/README.md

@@ -16,4 +16,14 @@ Export to webp
 File->Export As "animated.webp" 
 Export->Lossless, As Animation, Loop forever, Delay 100ms
 Export
+```
+
+Convert to gray
+```
+convert launcher-adaptive.png -colorspace gray launcher-monochrome.png 
+```
+
+Convert to svg
+```
+convert -threshold 0% -negate app_icon.png launcher.svg && sed -i 's/fill="#000000"/fill="#1e88e5"/g' launcher.svg
 ```

integration_test/app_test.dart

@@ -35,7 +35,9 @@ Future<void> main() async {
   testWidgets('Integration test', (WidgetTester tester) async {
     app.main();
 
-    await tester.pump(wait);
+    // Allow splash screen to clear
+    await tester.pump(wait * 3);
+    await tester.pumpAndSettle();
 
     await testHomeWidget(tester);
 

lib/constants.dart

@@ -5,7 +5,7 @@ const String JITHWARE_URL = "http://www.jithware.com",
         "https://www.paypal.com/donate/?hosted_button_id=2ZFSMQ8DGQVFS",
     BUGS_URL = "https://github.com/jithware/brethap/issues",
     HELP_URL = "https://github.com/jithware/brethap#readme",
-    COPYRIGHT = "Copyright 2023 Jithware. All rights reserved.",
+    COPYRIGHT = "Copyright 2024 Jithware. All rights reserved.",
     APP_NAME = "Brethap";
 
 const String DATE_FORMAT = "yyyy-MM-dd h:mm a",

pubspec.lock

@@ -310,10 +310,11 @@ packages:
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
-      name: flutter_launcher_icons
-      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: master
+      resolved-ref: "006cb1ed53f969bf11816cde5b16dd520e1ee40e"
+      url: "https://github.com/fluttercommunity/flutter_launcher_icons.git"
+    source: git
     version: "0.13.1"
   flutter_lints:
     dependency: "direct dev"

pubspec.yaml

@@ -15,11 +15,11 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.7.24+122
+version: 1.7.25+124
 
 environment:
   sdk: ">=3.1.4 <4.0.0"
-  flutter: ^3.13.8
+  flutter: 3.13.8
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -57,7 +57,10 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  flutter_launcher_icons: ^0.13.0
+  flutter_launcher_icons: 
+    git:
+      url: https://github.com/fluttercommunity/flutter_launcher_icons.git
+      ref: master 
   flutter_lints: ^3.0.0
   path_provider_platform_interface: ^2.0.5
   plugin_platform_interface: ^2.1.3
@@ -66,13 +69,15 @@ dev_dependencies:
   hive_generator: ^2.0.0
   build_runner: ^2.1.0
 
-# To build launcher icons run: flutter pub run flutter_launcher_icons:main
+# To build launcher icons run: dart run flutter_launcher_icons
 flutter_icons:
   android: "ic_launcher"
   ios: false
-  image_path: "images/launcher.png"
-  adaptive_icon_foreground: "images/launcher.png"
+  image_path: "images/app_icon.png"
+  # See requirements in https://developer.android.com/develop/ui/views/launch/icon_design_adaptive
+  adaptive_icon_foreground: "images/launcher-adaptive.png"
   adaptive_icon_background: "#ffffff"
+  adaptive_icon_monochrome: "images/launcher-monochrome.png"
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec