Merge pull request #180 from osociety/dev

Dev -> Main

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/flutter_test.yml

@@ -12,6 +12,7 @@ concurrency:
 
 jobs:
   changes:
+    name: 'Detect changes'
     runs-on: ubuntu-latest
     # Required permissions
     permissions:
@@ -45,40 +46,33 @@ jobs:
             - '*.yaml'
           windows:
             - 'windows/**'
-            
-  android-linux-build:
-    name: 'Android / Linux Build'
+  
+  flutter-test:
+    name: 'Flutter Analyze + Test'
     needs: changes
-    if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.android == 'true' || needs.changes.outputs.linux == 'true' || needs.changes.outputs.yaml == 'true' }}
+    if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.yaml == 'true' || needs.changes.outputs.android == 'true' || needs.changes.outputs.linux == 'true' || needs.changes.outputs.macos == 'true' || needs.changes.outputs.windows == 'true' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
       - name: Setup Java JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.2.1
         with:
           distribution: temurin
           java-version: '17'
       - name: Flutter action
-        uses: subosito/flutter-action@v2.8.0
+        uses: subosito/flutter-action@v2.16.0
         with:
           channel: stable
+          cache: true
+          cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
+          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
+          pub-cache-key: "flutter-pub-:os:-:channel:-:version:-:arch:-:hash:"
+          pub-cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
       - name: Flutter version
         run: flutter --version
-      - name: Cache pubspec dependencies
-        uses: actions/[email protected]
-        with:
-          path: |
-            ${{ env.FLUTTER_HOME }}/.pub-cache
-            **/.packages
-            **/.flutter-plugins
-            **/.flutter-plugin-dependencies
-            **/.dart_tool/package_config.json
-          key: build-pubspec-${{ hashFiles('**/pubspec.lock') }}
-          restore-keys: |
-            build-pubspec-
       - name: Cache build runner
-        uses: actions/cache@v2
+        uses: actions/cache@v4.0.2
         with:
           path: |
             **/.dart_tool
@@ -87,17 +81,59 @@ jobs:
             **/*.config.dart
           key: build-runner-${{ hashFiles('**/asset_graph.json', '**/*.dart', '**/pubspec.lock', '**/outputs.json') }}
           restore-keys: |
+            build-runner-${{ hashFiles('**/asset_graph.json', '**/*.dart', '**/pubspec.lock', '**/outputs.json') }}
             build-runner-
       - name: Download pub dependencies
         run: flutter pub get
       - name: Upgrade pub dependencies
         run: flutter pub upgrade
       - name: Run build_runner
-        run: flutter pub run build_runner build --delete-conflicting-outputs
+        run: flutter pub run build_runner build
       - name: Run analyzer
         run: flutter analyze
       - name: Run tests
         run: flutter test
+
+  android-linux-build:
+    name: 'Build Android + Linux'
+    needs: [changes, flutter-test]
+    if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.android == 'true' || needs.changes.outputs.linux == 'true' || needs.changes.outputs.yaml == 'true' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+      - name: Setup Java JDK
+        uses: actions/[email protected]
+        with:
+          distribution: temurin
+          java-version: '17'
+      - name: Flutter action
+        uses: subosito/[email protected]
+        with:
+          channel: stable
+          cache: true
+          cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
+          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
+          pub-cache-key: "flutter-pub-:os:-:channel:-:version:-:arch:-:hash:"
+          pub-cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
+      - name: Cache build runner
+        uses: actions/[email protected]
+        with:
+          path: |
+            **/.dart_tool
+            **/*.g.dart
+            **/*.mocks.dart
+            **/*.config.dart
+          key: build-runner-${{ hashFiles('**/asset_graph.json', '**/*.dart', '**/pubspec.lock', '**/outputs.json') }}
+          restore-keys: |
+            build-runner-${{ hashFiles('**/asset_graph.json', '**/*.dart', '**/pubspec.lock', '**/outputs.json') }}
+            build-runner-
+      - name: Download pub dependencies
+        run: flutter pub get
+      - name: Upgrade pub dependencies
+        run: flutter pub upgrade
+      - name: Run build_runner
+        run: flutter pub run build_runner build
       - name: Build Android
         if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.android == 'true' || needs.changes.outputs.yaml == 'true' }}
         run: |
@@ -112,36 +148,24 @@ jobs:
         run: flutter build linux
 
   macos-build:
-    name: 'Macos Build'
-    needs: changes
+    name: 'Build Macos'
+    needs: [changes, flutter-test]
     if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.macos == 'true' || needs.changes.outputs.yaml == 'true' }}
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-
+        uses: actions/[email protected]
       - name: Flutter action
-        uses: subosito/flutter-action@v2.8.0
+        uses: subosito/flutter-action@v2.16.0
         with:
           channel: stable
-
-      - name: Flutter version
-        run: flutter --version
-
-      - name: Cache pubspec dependencies
-        uses: actions/[email protected]
-        with:
-          path: |
-            ${{ env.FLUTTER_HOME }}/.pub-cache
-            **/.packages
-            **/.flutter-plugins
-            **/.flutter-plugin-dependencies
-            **/.dart_tool/package_config.json
-          key: build-pubspec-${{ hashFiles('**/pubspec.lock') }}
-          restore-keys: |
-            build-pubspec-
+          cache: true
+          cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
+          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
+          pub-cache-key: "flutter-pub-:os:-:channel:-:version:-:arch:-:hash:"
+          pub-cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
       - name: Cache build runner
-        uses: actions/cache@v2
+        uses: actions/cache@v4.0.2
         with:
           path: |
             **/.dart_tool
@@ -150,54 +174,59 @@ jobs:
             **/*.config.dart
           key: build-runner-${{ hashFiles('**/asset_graph.json', '**/*.dart', '**/pubspec.lock', '**/outputs.json') }}
           restore-keys: |
+            build-runner-${{ hashFiles('**/asset_graph.json', '**/*.dart', '**/pubspec.lock', '**/outputs.json') }}
             build-runner-
-
+      - name: Cache pods
+        uses: actions/cache@v3
+        with:
+          path: macos/Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+            ${{ runner.os }}-pods-
       - name: Download pub dependencies
         run: flutter pub get
-
       - name: Upgrade pub dependencies
         run: flutter pub upgrade
-
       - name: Run build_runner
-        run: flutter pub run build_runner build --delete-conflicting-outputs
-
-      - name: Run analyzer
-        run: flutter analyze
-
-      - name: Run tests
-        run: flutter test
-
+        run: flutter pub run build_runner build
       - name: Build macos
         run: flutter build macos
 
   windows-build:
-    name: 'Windows Build'
-    needs: changes
+    name: 'Build Windows'
+    needs: [changes, flutter-test]
     if: ${{ needs.changes.outputs.lib == 'true' || needs.changes.outputs.test == 'true' || needs.changes.outputs.windows == 'true' || needs.changes.outputs.yaml == 'true' }}
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-
+        uses: actions/[email protected]
       - name: Flutter action
-        uses: subosito/flutter-action@v2.8.0
+        uses: subosito/flutter-action@v2.16.0
         with:
           channel: stable
-
+          cache: true
+          cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
+          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
+          pub-cache-key: "flutter-pub-:os:-:channel:-:version:-:arch:-:hash:"
+          pub-cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
+      - name: Cache build runner
+        uses: actions/[email protected]
+        with:
+          path: |
+            **/.dart_tool
+            **/*.g.dart
+            **/*.mocks.dart
+            **/*.config.dart
+          key: build-runner-${{ hashFiles('**/asset_graph.json', '**/*.dart', '**/pubspec.lock', '**/outputs.json') }}
+          restore-keys: |
+            build-runner-${{ hashFiles('**/asset_graph.json', '**/*.dart', '**/pubspec.lock', '**/outputs.json') }}
+            build-runner-
       - name: Download pub dependencies
         run: flutter pub get
-
       - name: Upgrade pub dependencies
         run: flutter pub upgrade
-
       - name: Run build_runner
-        run: flutter pub run build_runner build --delete-conflicting-outputs
-
-      - name: Run analyzer
-        run: flutter analyze
-
-      - name: Run tests
-        run: flutter test
-
+        run: flutter pub run build_runner build
       - name: Build windows
         run: flutter build windows

README.md

@@ -54,6 +54,8 @@ Note: macOS build hasn't been notarized yet.
 
 Drop mail at [email protected]
 
+## Publishing to F-droid
+You can follow this guide to publish your app to f-droid - https://op3nsoc13ty.blogspot.com/2021/06/publish-your-first-flutter-app-to-fdroid.html
 ## How to Contribute
 
 1. Found bug? Open an [issue](https://github.com/git-elliot/vernet/issues)
@@ -62,12 +64,15 @@ Drop mail at [email protected]
 ## Support and Donate
 
 1. Support this project by becoming stargazer of this project.
-2. Buy me a coffee.
+2. Rate our app on [Playstore](https://play.google.com/store/apps/details?id=org.fsociety.vernet.store)
+
+3. Buy me a coffee.
 
     | Librepay | 
     |----------|
     |[![Librepay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/OpenSociety/donate)
 
-3. Support me on Ko-Fi
+4. Support me on Ko-Fi
 
     [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/fs0c13ty)
+

android/fastlane/Fastfile

@@ -31,6 +31,15 @@ platform :android do
 
   desc "Deploy a new version to the Google Play"
   lane :deploy do
+    upload_to_play_store(skip_upload_metadata: true,
+      skip_upload_changelogs: true,
+      skip_upload_images: true,
+      skip_upload_screenshots: true,
+      aab: '../build/app/outputs/bundle/storeRelease/app-store-release.aab')
+  end
+
+  desc "Deploy a new version to the Google Play"
+  lane :deploy_full do
     upload_to_play_store(aab: '../build/app/outputs/bundle/storeRelease/app-store-release.aab')
   end
 end

android/fastlane/README.md

@@ -39,6 +39,14 @@ Submit a new Beta Build to Crashlytics Beta
 
 Deploy a new version to the Google Play
 
+### android deploy_full
+
+```sh
+[bundle exec] fastlane android deploy_full
+```
+
+Deploy a new version to the Google Play
+
 ----
 
 This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.

android/fastlane/metadata/android/ru/changelogs/24.txt

@@ -0,0 +1,3 @@
+Исправление заставки для всех устройств Android.
+Кнопка повторного сканирования добавлена ​​рядом с количеством устройств.
+Обновлен значок для игрового магазина.

android/fastlane/metadata/android/ru/full_description.txt

@@ -0,0 +1,9 @@
+Vernet - сетевой анализатор и инструмент мониторинга.
+
+Возможности
+1. Показывает детали Wi-Fi
+2. Сканирование устройств (или хостов) в сети
+3. Сканирование открытых портов конкретного IP
+4. Показывает подробности провайдера
+
+Vernet - это проект с открытым исходным кодом размещенный на GitHub https://github.com/git-elliot/vernet

android/fastlane/metadata/android/ru/short_description.txt

@@ -0,0 +1 @@
+Сканер хостов и портов. Пинг IP или домена.

android/fastlane/metadata/android/ru/title.txt

@@ -0,0 +1 @@
+Vernet - Анализатор Сети