Skip to content

Commit

Permalink
10.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@apps4av
apps4av committed Jun 24, 2023
1 parent 269a714 commit a0d2888
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Redistribution and use in source and binary forms, with or without modification,
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.ds.avare"
android:versionCode="379"
android:versionName="10.2.9"
android:versionCode="380"
android:versionName="10.3.0"
android:installLocation="auto">

<!-- Network State Permissions to detect Internet status -->
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/assets/help.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ <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.0</b></p>
<ul>
<li><p>Bug fixes in plan filing</li>
</p>
</ul>
<p><b>10.2.9</b></p>
<ul>
<li><p>Added multi aircraft settings, moved W&B and Lists under the Acft tab</li>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/assets/plan.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
document.getElementById("icaoFlightTypeSelection").value,
document.getElementById("icaoNoOfAircraftInput").value,
document.getElementById("icaoAircraftTypeInput").value,
document.getElementById("icaoWakeTurbulenceInput").value,
document.getElementById("icaoWakeTurbulenceSelection").value,
document.getElementById("icaoAircraftEquipmentInput").value,
document.getElementById("icaoDepartureInput").value,
document.getElementById("icaoDepartureDateInput").value,
Expand Down Expand Up @@ -314,7 +314,7 @@
document.getElementById("icaoFlightTypeSelection").value,
document.getElementById("icaoNoOfAircraftInput").value,
document.getElementById("icaoAircraftTypeInput").value,
document.getElementById("icaoWakeTurbulenceInput").value,
document.getElementById("icaoWakeTurbulenceSelection").value,
document.getElementById("icaoAircraftEquipmentInput").value,
document.getElementById("icaoDepartureInput").value,
document.getElementById("icaoDepartureDateInput").value,
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/ds/avare/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class MainActivity extends TabActivity {
public static final int tabNear = 5;
public static final int tabPfd = 6;
public static final int tabThreeD = 7;
public static final int tabChecklist = 8;
public static final int tabAircraft = 8;
public static final int tabIo = 9;

public void setup() {
Expand Down Expand Up @@ -102,7 +102,7 @@ public void setup() {
setupTab(new TextView(this), getString(R.string.ThreeD), new Intent(this, ThreeDActivity.class), getIntent());
}

if (0 != (tabItems & (1 << tabChecklist))) {
if (0 != (tabItems & (1 << tabAircraft))) {
setupTab(new TextView(this), getString(R.string.Aircraft), new Intent(this, AircraftActivity.class), getIntent());
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/ds/avare/content/ContentProviderHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ public static LinkedList<Aircraft> getUserAircraft(Context ctx) {
a.setWake(c.getString(getIndex(c, UserContract.AIRCRAFT_COLUMN_WAKE)));
a.setEquipment(c.getString(getIndex(c, UserContract.AIRCRAFT_COLUMN_EQUIPMENT)));
a.setICao(c.getInt(getIndex(c, UserContract.AIRCRAFT_COLUMN_ICAO)));
a.setCruiseTas(c.getFloat(getIndex(c, UserContract.AIRCRAFT_COLUMN_CRUISE_TAS)));
a.setCruiseTas((int)c.getFloat(getIndex(c, UserContract.AIRCRAFT_COLUMN_CRUISE_TAS)));
a.setSurveillance(c.getString(getIndex(c, UserContract.AIRCRAFT_COLUMN_SURVEILLANCE)));
a.setEndurance(c.getFloat(getIndex(c, UserContract.AIRCRAFT_COLUMN_FUEL_ENDURANCE)));
a.setColor(c.getString(getIndex(c, UserContract.AIRCRAFT_COLUMN_COLOR)));
Expand Down Expand Up @@ -803,7 +803,7 @@ public static Aircraft getUserAircraft(Context ctx, String id) {
a.setWake(c.getString(getIndex(c, UserContract.AIRCRAFT_COLUMN_WAKE)));
a.setEquipment(c.getString(getIndex(c, UserContract.AIRCRAFT_COLUMN_EQUIPMENT)));
a.setICao(c.getInt(getIndex(c, UserContract.AIRCRAFT_COLUMN_ICAO)));
a.setCruiseTas(c.getFloat(getIndex(c, UserContract.AIRCRAFT_COLUMN_CRUISE_TAS)));
a.setCruiseTas((int)c.getFloat(getIndex(c, UserContract.AIRCRAFT_COLUMN_CRUISE_TAS)));
a.setSurveillance(c.getString(getIndex(c, UserContract.AIRCRAFT_COLUMN_SURVEILLANCE)));
a.setEndurance(c.getFloat(getIndex(c, UserContract.AIRCRAFT_COLUMN_FUEL_ENDURANCE)));
a.setColor(c.getString(getIndex(c, UserContract.AIRCRAFT_COLUMN_COLOR)));
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/ds/avare/flight/Aircraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class Aircraft {
private int mICao;
private String mWake;
private String mEquipment;
private float mCruiseTas;
private int mCruiseTas;
private String mSurveillance;
private float mEndurance;
private String mColor;
Expand Down Expand Up @@ -83,7 +83,7 @@ public Aircraft(String json) {
mICao = obj.getInt("icao");
mWake = obj.getString("wake");
mEquipment = obj.getString("equipment");
mCruiseTas = (float)obj.getDouble("cruise_tas");
mCruiseTas = (int)obj.getDouble("cruise_tas");
mSurveillance = obj.getString("surveillance");
mEndurance = (float)obj.getDouble("endurance");
mColor = obj.getString("color");
Expand Down Expand Up @@ -162,11 +162,11 @@ public void setEquipment(String mEquipment) {
this.mEquipment = mEquipment;
}

public float getCruiseTas() {
public int getCruiseTas() {
return mCruiseTas;
}

public void setCruiseTas(float mCruiseTas) {
public void setCruiseTas(int mCruiseTas) {
this.mCruiseTas = mCruiseTas;
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/ds/avare/storage/Preferences.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -883,8 +883,8 @@ public long getTabs() {
mTabs |= 1 << MainActivity.tabNear;
}

if (mPref.getBoolean(mContext.getString(R.string.prefTabChecklist), true)) {
mTabs |= 1 << MainActivity.tabChecklist;
if (mPref.getBoolean(mContext.getString(R.string.prefTabAircraft), true)) {
mTabs |= 1 << MainActivity.tabAircraft;
}

if (mPref.getBoolean(mContext.getString(R.string.prefTabPfd), true)) {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,9 +387,8 @@ Redistribution and use in source and binary forms, with or without modification,
<string name="prefTabFind">&quot;prefTabFind&quot;</string>
<string name="prefTabPlan">&quot;prefTabPlan&quot;</string>
<string name="prefTabNear">&quot;prefTabNear&quot;</string>
<string name="prefTabChecklist">&quot;prefTabChecklist&quot;</string>
<string name="prefTabAircraft">&quot;prefTabAircraft&quot;</string>
<string name="prefTabPfd">&quot;prefTabPfd&quot;</string>
<string name="prefTabWnb">&quot;prefTabWnb&quot;</string>
<string name="prefTabIo">&quot;prefTabIo&quot;</string>

<string name="externalGps">GPSExternalOrInternal</string>
Expand Down Expand Up @@ -628,7 +627,7 @@ Redistribution and use in source and binary forms, with or without modification,
<string name="Preferences">Preferences</string>
<string name="filter_hint">Filter messages</string>
<string name="Io">IO</string>
<string name="IoSummary">Input/Output</string>
<string name="IoSummary">Input/Output.</string>
<string name="WIFI">WiFi</string>
<string name="NoBtDevice">Enable Bluetooth, and pair a device first.</string>
<string name="Export">Export</string>
Expand All @@ -637,5 +636,6 @@ Redistribution and use in source and binary forms, with or without modification,
<string name="weatherNa">Weather not available</string>
<string name="AircraftTailNumber">AircraftTailNumber</string>
<string name="Aircraft">Acft</string>
<string name="AircraftSummary">User defined aircraft.</string>

</resources>
11 changes: 3 additions & 8 deletions app/src/main/res/xml/preferences.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,14 +500,9 @@ authors: zkhan, jlmcgraw
android:title="@string/ThreeD" />
<CheckBoxPreference
android:defaultValue="true"
android:key="@string/prefTabChecklist"
android:summary="@string/ChecklistSummary"
android:title="@string/List" />
<CheckBoxPreference
android:defaultValue="true"
android:key="@string/prefTabWnb"
android:summary="@string/WnbSummary"
android:title="@string/Wnb" />
android:key="@string/prefTabAircraft"
android:summary="@string/AircraftSummary"
android:title="@string/Aircraft" />
<CheckBoxPreference
android:defaultValue="true"
android:key="@string/prefTabIo"
Expand Down

0 comments on commit a0d2888

Please sign in to comment.