[pull] master from apps4av:master

.github/workflows/android.yml

@@ -0,0 +1,49 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Create Google Services JSON File
+      env:
+        GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
+      run: rm -f app/google-services.json && (echo $GOOGLE_SERVICES_JSON | base64 -di > app/google-services.json)
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build
+
+    - name: Sign APK with keystore
+      uses: r0adkll/sign-android-release@v1
+      id: sign_app
+      with:
+        releaseDirectory: app/build/outputs/apk/release
+        signingKeyBase64: ${{ secrets.KEY_STORE }}
+        alias: ${{ secrets.KEY_STORE_ALIAS }}
+        keyStorePassword: ${{ secrets.KEY_STORE_PASS }}
+        keyPassword: ${{ secrets.KEY_STORE_PASS }}
+      env:
+        BUILD_TOOLS_VERSION: "34.0.0"
+
+    - name: Upload release APK
+      uses: actions/upload-artifact@v4
+      with:
+        name: app-release.apk
+        path: ${{steps.sign_app.outputs.signedReleaseFile}}

.github/workflows/weather.yml

@@ -0,0 +1,38 @@
+name: Weather CI
+
+
+on:
+  schedule:
+    - cron: '*/10 * * * *'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-24.04
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.12"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          sudo apt-get update
+          sudo apt-get install --fix-missing gdal-bin python3-gdal imagemagick python3-bs4 libwww-perl libxml-parser-perl
+          pip install regex urllib3
+      - name: Build weather
+        run: |
+          cd extra/mamba && ./put_tenmin.sh
+
+      - name: SSH to mamba
+        uses: appleboy/[email protected]
+        with:
+          host: apps4av.org
+          username: apps4av
+          password: ${{ secrets.MAMBA_PASSWORD }}
+          port: 22
+          strip_components: 2
+          source: "extra/mamba/TFRs.zip,extra/mamba/weather.zip,extra/mamba/conus.zip"
+          target: /home/apps4av/mamba.dreamhosters.com/new

README.md

@@ -1,6 +1,8 @@
 avare
 =====
 
+Note: A more modern multi platofrm version of Avare is available as AvareX on Android Play Store, Apple App Store, Windows App Store, and Linux Snapcraft Store.
+
 Avare Aviation GPS for Android. Avare is pronounced "Ah-vAir" - like "aware" with a "v" and can be manually installed from our servers (see our website).
 
 Download from the Google Play Store: https://play.google.com/store/apps/details?id=com.ds.avare&hl=en

app/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 android {
-    compileSdkVersion 33
-    buildToolsVersion '33.0.2'
+    compileSdk 35
+    buildToolsVersion '34.0.0'
 
     defaultConfig {
         applicationId "com.ds.avare"
-        minSdkVersion 20 // android 5 is minimum
-        targetSdkVersion 33
+        minSdkVersion 20
+        targetSdk 35// android 5 is minimum
     }
 
     compileOptions {
@@ -56,12 +56,12 @@ dependencies {
     implementation 'com.google.firebase:firebase-analytics:17.2.2'
     implementation 'com.google.firebase:firebase-crashlytics:18.2.6'
     implementation 'com.github.mik3y:usb-serial-for-android:3.4.6'
+    implementation 'androidx.exifinterface:exifinterface:1.3.7'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:4.8.1'
     testImplementation 'org.powermock:powermock-module-junit4:1.7.0RC2'
     testImplementation 'org.powermock:powermock-api-mockito2:1.7.0RC2'
     testImplementation 'org.powermock:powermock-classloading-xstream:1.7.0RC2'
     testImplementation 'org.powermock:powermock-module-junit4-rule:1.7.0RC2'
-    testImplementation 'org.robolectric:robolectric:4.3'
     testImplementation 'org.json:json:20220924'
 }

app/src/main/AndroidManifest.xml

@@ -11,8 +11,8 @@ Redistribution and use in source and binary forms, with or without modification,
     *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="381"
-    android:versionName="10.3.1"
+    android:versionCode="405"
+    android:versionName="11.0.5"
     android:installLocation="auto">
 
     <!-- Network State Permissions to detect Internet status -->

app/src/main/assets/help.html

@@ -16,7 +16,7 @@
  <meta name="viewport" content="width=device-width, initial-scale=1">
 
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body>
-<div> <h3 style="text-align: center;">Avare Help</h3>
+<h3 style="text-align: center;">Avare Help</h3>
  <p><B>Donations</b>
  <br/>Apps4Av Inc. is a registered non-profit organization in the state of MA.
  <br/>Avare is an open source project on <a href="http://github.com/apps4av/avare">GitHub</a>. 
@@ -48,7 +48,6 @@
  </form>
 
  <br/>Thank you!
- </p>
 
 <h3 class="western" align="center">Notice</h3>
 <p>ALL GPS applications on any <b>handheld non-certified devices</b> like smartphones and tablets are <em><b>not approved by the FAA for IFR</b></em> flights. None of the operating systems on such devices are tested according to rigorous FAA standards, hence any software running on them is unfit for use as a primary flight navigation tool. It is unwise to solely rely on any such device or any app running on one,
@@ -60,95 +59,58 @@ <h3 class="western" align="center">Notice</h3>
 <p><B>CAUTION</b> - Before flight the user <B>must always ensure</b> that Avare is updated to and thoroughly tested on the latest version, and <b>ensure that all Avare databases and charts are kept current</b>. If Avare and its databases and charts are not of the exact same version, the <B><U>GPS position displayed may be inaccurate</u></b>, because <b>the FAA sometimes changes the format</b> of their materials. <u>Avare does not automatically fetch</u> any databases and charts when they are expired, so it is the user's sole responsibility to update any expired charts and databases. To do so, ensure that your device has an internet connection and then just press the <B>Map, Menu, Preferences, Download,</b> and <b>Update</b> buttons in Avare.</p>
 
 <h3 class="western">Avare Releases</h3>
-<p><b>10.3.1</b></p>
-<ul>
-	<li><p>Fixed FAA weather location changes</li>
-	<li><p>Ability to store ADSB recorded files</li>
-	<li><p>Increased map area size to reduce black borders in track up mode</li>
-	<li><p>Can start camera by pressing the volume button</li>
-	<li><p>SUAs show when pressed on map away from airports</li>
-	</p>
-</ul>
-<p><b>10.3.0</b></p>
-<ul>
-	<li><p>Bug fixes in plan filing</li>
-	</p>
-</ul>
-<p><b>10.2.9</b></p>
+<p><b>11.0.5</b></p>
 <ul>
-	<li><p>Added multi aircraft settings, moved W&B and Lists under the Acft tab</li>
-	</p>
+	<li>Fixed black area at the edges.</li>
 </ul>
-<p><b>10.2.8</b></p>
+<p><b>11.0.4</b></p>
 <ul>
-	<li><p>Added auto pilot control over USB serial</li>
-	</p>
+	<li>Stop bug in plates fixed.</li>
 </ul>
-<p><b>10.2.7</b></p>
+<p><b>11.0.3</b></p>
 <ul>
-	<li><p>Fix plate tagging</li>
-	</p>
+	<li>Fix for Android - 15 screen.</li>
 </ul>
-<p><b>10.2.6</b></p>
+<p><b>11.0.2</b></p>
 <ul>
-	<li><p>Improved help file</li>
-	</p>
+	<li>New LMFS website.</li>
 </ul>
-<p><b>10.2.5</b></p>
+<p><b>11.0.1</b></p>
 <ul>
-	<li><p>Improved audible traffic alerts for traffic</li>
-	</p>
+	<li>Registration with the server is now optional.</li>
 </ul>
-<p><b>10.2.4</b></p>
+<p><b>11.0.0</b></p>
 <ul>
-	<li><p>Stop bug fix on -&gt;D 
-	</p>
+	<li>Charts are divided into regions now. *** Users must re-download all charts for correct operation *** </li>
 </ul>
-<p><b>10.2.3</b></p>
+<p><b>10.3.2</b></p>
 <ul>
-	<li><p>Fix to IO GPS data loss 
-	</p>
+	<li><p>Added Phoenix Flyway</li>
+	<li><p>Volume button for camera is now a setting under UI Settings.</li>
 </ul>
-<p><b>10.2.2</b></p>
-<ul>
-	<li><p>Stop bug fixes 
-	</p>
-</ul>
-<p><b>10.2.1</b></p>
+<p><b>10.3.1</b></p>
 <ul>
-	<li><p>Improved ADS-B traffic display
-	</p>
-	<li><p>Added audible traffic alerts for
-	traffic 
-	</p>
-	<li><p>Improved weather display color 
-	</p>
+	<li><p>Fixed FAA weather location changes</li>
+	<li><p>Ability to store ADSB recorded files</li>
+	<li><p>Increased map area size to reduce black borders in track up mode</li>
+	<li><p>Can start camera by pressing the volume button</li>
+	<li><p>SUAs show when pressed on map away from airports</li>
 </ul>
-<p><b>10.2.0</b></p>
+<p><b>10.3.0</b></p>
 <ul>
-	<li><p>Stop bug fixes 
-	</p>
+	<li><p>Bug fixes in plan filing</li>
 </ul>
-<p><b>10.1.9</b></p>
+<p><b>10.2.9</b></p>
 <ul>
-	<li><p>Stop bug fix 
-	</p>
+	<li><p>Added multi aircraft settings, moved W&B and Lists under the Acft tab</li>
 </ul>
-<p><b>10.1.8</b></p>
+<p><b>10.2.8</b></p>
 <ul>
-	<li><p>Bluetooth and USB connection
-	improvements 
-	</p>
-	<li><p>Changed UI for long-press in Find
-	and Search tabs 
-	</p>
-	<li><p>Improvements in drawing 
-	</p>
+	<li><p>Added auto pilot control over USB serial</li>
 </ul>
-<p><b>10.1.7</b></p>
+<p><b>10.2.7</b></p>
 <ul>
-	<li><p>Stop bug fix 
-	</p>
+	<li><p>Fix plate tagging</li>
 </ul>
 <h3 class="western">Help Categories</h3>
 <p>Below is a list of your choices for Help with Avare (pronounced "Ah-vAir" - like "aware" with a "v"). Nearly all are available <b>Offline</b> (without internet access on your device), such as when you are flying or your device is in Airplane Mode.<br/>
@@ -172,14 +134,14 @@ <h3 class="western">Help Categories</h3>
 <p>• <a href="http://apps4av.com/avare-overview/" target="_blank"><b>Online*</b></a>
 <a href="https://www.apps4av.com/" target="_blank"> - Website &amp; Forum</a></p>
 <p>• <a href="http://aeronav.faa.gov/index.asp?xml=aeronav/applications" target="_blank"><b>Online*</b></a><a href="http://aeronav.faa.gov/index.asp?xml=aeronav/applications" target="_blank"> - FAA Chart Maps</a><br/>
-<p>• <a href="https://tfr.faa.gov/tfr2/list.html"_blank"><b>Online*</b></a><a href="https://tfr.faa.gov/tfr2/list.html" target="_blank"> - FAA TFR List</a>
+<p>• <a href="https://tfr.faa.gov/tfr2/list.html"><b>Online*</b></a><a href="https://tfr.faa.gov/tfr2/list.html" target="_blank"> - FAA TFR List</a>
 </p>
 
 <p>Note: Under the Downloads list on the FAA website, select the chart type for which you'd like to see a map legend. For example, to see a map showing the area covered by each of the FAA Sectional charts, click on the "Sectional Raster Charts" link.</p>
 
 <hr size="1"/>
 
-<h3 class="western" align="center"><a name="0.1_Videos">Avare Intro Videos</h3>
+< class="western" align="center"><a name="0.1_Videos">Avare Intro Videos></a>
 • Intro videos on YouTube at<br/>
 &nbsp; &nbsp; &nbsp; <a href="https://www.youtube.com/channel/UC0OSj8qmkSg01DIilEzxHGg/videos">
 John Wiley's Avare Channel</a>.<br/>
@@ -269,7 +231,7 @@ <h3 class="western" align="center"><a name="0.1_Quick"></a>Quick Start - Intro</
 &nbsp; &nbsp; Note that familiar symbols are used to indicate the various types of Destination codes such as VORs and intersections. Airports have an empty round symbol for example.<br/>
 
 &nbsp; &nbsp; For convenience in selecting VORs, etc., airports are sorted toward the bottom since they can be quickly selected with a long-press in Map view.
-
+</p>
 <p>•<b>Menu</b>, the button on the lower left side of the Map screen, displays a list of additional options and configuration items for Avare. Use your Android Back key or gesture to return to the Map screen.<br/>
 
 &nbsp; &nbsp;≡ The <B>Preferences</b> button for Avare is accessed via the Menu button, atop the following list of buttons for other features and options.<br/>
@@ -660,7 +622,7 @@ <h3 class="western" align="center">TPC and ONC charts </h3>
 TPC and ONC charts are added for World coverage. These charts are
 expired and should not be used for navigation. To find the proper TPC
 chart for your area, see the <a href="http://www.lib.utexas.edu/maps/tpc/">TPC
-Charts Grid while you are online</a>. 
+Charts Grid while you are online</a>.
 </p>
 <hr size="1"/>
 &nbsp; --- End of Avare offline Help file ---

app/src/main/java/com/ds/avare/BaseActivity.java

@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.location.GpsStatus;
 import android.location.Location;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.Window;
 
@@ -21,6 +22,12 @@ public class BaseActivity extends Activity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         Helper.setTheme(this);
+        //apply theme style
+
+        // apply this for android v35 or above, opt out of edge to edge enforcement
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            this.getTheme().applyStyle(R.style.OptOutEdgeToEdgeEnforcement, /* force */ false);
+        }
 
         super.onCreate(savedInstanceState);
 

app/src/main/java/com/ds/avare/LocationActivity.java

@@ -268,6 +268,9 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         // start camera on volume down/up
         PackageManager packman = getPackageManager();
         Intent intent;
+        if(!StorageService.getInstance().getPreferences().cameraButton()) {
+            return false;
+        }
         if (KeyEvent.KEYCODE_VOLUME_DOWN == event.getKeyCode()) {
             intent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
         }