Skip to content

Commit

Permalink
update logo and add NOAA map
Browse files Browse the repository at this point in the history
  • Loading branch information
@jvde-github
jvde-github committed Dec 3, 2023
1 parent 410a029 commit 6e126fe
Show file tree
Hide file tree
Showing 17 changed files with 171 additions and 4 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {
applicationId "com.jvdegithub.aiscatcher"
minSdk 23
targetSdk 33
versionCode 87
versionName '0.87'
versionCode 88
versionName '0.88'

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild {
Expand Down
Binary file modified app/src/main/ic_launcher-playstore.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/src/main/jni/AIS-catcher
Submodule AIS-catcher updated 26 files
+1 −1 Application/AIS-catcher.h
+17 −3 Application/Receiver.cpp
+1 −1 Application/Receiver.h
+25 −1 DSP/DSP.cpp
+46 −25 DSP/Model.cpp
+10 −3 DSP/Model.h
+3,876 −3,751 HTML/HTML.cpp
+3,872 −3,748 HTML/HTML_local.cpp
+57 −138 HTML/favicon.cpp
+103 −35 HTML/index.html
+103 −35 HTML/index_local.html
+15 −3 IO/Network.cpp
+8 −1 IO/Network.h
+2 −2 Library/JSONAIS.cpp
+4 −0 Library/Keys.cpp
+4 −0 Library/Keys.h
+2 −1 Library/Message.cpp
+1 −1 Library/Message.h
+5 −1 Library/NMEA.cpp
+4 −0 Library/NMEA.h
+11 −1 Library/TCP.cpp
+1 −1 Library/TCP.h
+5 −0 Library/Utilities.h
+24 −6 README.md
+1 −0 Ships/DB.cpp
+5 −2 Ships/Statistics.h
74 changes: 74 additions & 0 deletions app/src/main/res/drawable/ic_launcher_background.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<vector
android:height="108dp"
android:width="108dp"
android:viewportHeight="108"
android:viewportWidth="108"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z"/>
<path android:fillColor="#00000000" android:pathData="M9,0L9,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,0L19,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M29,0L29,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M39,0L39,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M49,0L49,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M59,0L59,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M69,0L69,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M79,0L79,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M89,0L89,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M99,0L99,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,9L108,9"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,19L108,19"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,29L108,29"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,39L108,39"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,49L108,49"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,59L108,59"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,69L108,69"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,79L108,79"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,89L108,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,99L108,99"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,29L89,29"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,39L89,39"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,49L89,49"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,59L89,59"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,69L89,69"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,79L89,79"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M29,19L29,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M39,19L39,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M49,19L49,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M59,19L59,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M69,19L69,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M79,19L79,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
</vector>
48 changes: 48 additions & 0 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="106.63"
android:viewportHeight="101.41">
<group android:scaleX="0.6"
android:scaleY="0.5706274"
android:translateX="21.326"
android:translateY="21.771338">
<path
android:pathData="m98.12,48.09h-0C98.11,60.45 93.1,71.63 84.98,79.76 76.85,87.88 65.67,92.89 53.31,92.9 40.96,92.89 29.78,87.88 21.65,79.76 13.53,71.63 8.52,60.45 8.51,48.09L0,48.09c-0,14.69 5.99,28.04 15.63,37.68 9.64,9.64 22.99,15.63 37.68,15.63 14.69,0 28.04,-5.99 37.68,-15.63 9.64,-9.64 15.63,-22.99 15.63,-37.68h-8.51"
android:strokeWidth="0.0352778"
android:fillColor="#0857b1"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m53.31,88.07c11.01,0 21.03,-4.49 28.25,-11.72C88.8,69.13 93.29,59.11 93.29,48.09h-8.51v0c-0,8.68 -3.52,16.52 -9.23,22.23 -5.71,5.71 -13.55,9.22 -22.23,9.23 -8.68,-0 -16.52,-3.52 -22.23,-9.23 -5.71,-5.71 -9.22,-13.55 -9.23,-22.23h-8.51c-0,11.01 4.49,21.03 11.72,28.25 7.22,7.23 17.24,11.72 28.25,11.72"
android:strokeWidth="0.0352778"
android:fillColor="#0857b1"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m26.68,48.09c-0,7.34 2.99,14.02 7.81,18.82 4.81,4.81 11.49,7.81 18.82,7.81 7.34,0 14.02,-2.99 18.82,-7.81 4.81,-4.81 7.81,-11.49 7.81,-18.82h-8.51,-0c-0,5 -2.02,9.51 -5.31,12.8 -3.3,3.29 -7.8,5.31 -12.8,5.31 -5,-0 -9.51,-2.02 -12.8,-5.31 -3.29,-3.3 -5.31,-7.8 -5.31,-12.8h-8.51"
android:strokeWidth="0.0352778"
android:fillColor="#0857b1"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m53.31,42.69c2.99,0 5.41,2.42 5.41,5.41 0,2.99 -2.42,5.41 -5.41,5.41 -2.99,0 -5.41,-2.42 -5.41,-5.41 0,-2.99 2.42,-5.41 5.41,-5.41zM53.31,60.93c7.09,0 12.84,-5.75 12.84,-12.84 0,-7.09 -5.75,-12.84 -12.84,-12.84 -7.09,0 -12.84,5.75 -12.84,12.84 0,7.09 5.75,12.84 12.84,12.84"
android:strokeWidth="0.0352778"
android:fillColor="#0857b1"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m53.27,30.11c9.38,0 17.18,6.7 18.64,15.45L92.96,45.56L92.96,24.69c0,0 -24.15,-2.75 -39.69,-8.11 -15.54,5.36 -39.69,8.11 -39.69,8.11v20.88h21.05c1.46,-8.75 9.27,-15.45 18.64,-15.45"
android:strokeWidth="0.0357257"
android:fillColor="#0057b1"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m53.01,13.06 l1.18,0.39c7.44,2.45 16.91,4.36 24.85,5.68L79.04,5.4c0,0 -16.51,-1.93 -26.03,-5.4 -9.52,3.48 -26.03,5.4 -26.03,5.4v13.73c7.94,-1.33 17.42,-3.24 24.85,-5.68l1.18,-0.39"
android:strokeWidth="0.036529"
android:fillColor="#0857b1"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
</group>
</vector>
43 changes: 43 additions & 0 deletions app/src/main/res/drawable/logo.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="106.63dp"
android:height="101.41dp"
android:viewportWidth="106.63"
android:viewportHeight="101.41">
<path
android:pathData="m98.12,48.09h-0C98.11,60.45 93.1,71.63 84.98,79.76 76.85,87.88 65.67,92.89 53.31,92.9 40.96,92.89 29.78,87.88 21.65,79.76 13.53,71.63 8.52,60.45 8.51,48.09L0,48.09c-0,14.69 5.99,28.04 15.63,37.68 9.64,9.64 22.99,15.63 37.68,15.63 14.69,0 28.04,-5.99 37.68,-15.63 9.64,-9.64 15.63,-22.99 15.63,-37.68h-8.51"
android:strokeWidth="0.0352778"
android:fillColor="#0857b1"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m53.31,88.07c11.01,0 21.03,-4.49 28.25,-11.72C88.8,69.13 93.29,59.11 93.29,48.09h-8.51v0c-0,8.68 -3.52,16.52 -9.23,22.23 -5.71,5.71 -13.55,9.22 -22.23,9.23 -8.68,-0 -16.52,-3.52 -22.23,-9.23 -5.71,-5.71 -9.22,-13.55 -9.23,-22.23h-8.51c-0,11.01 4.49,21.03 11.72,28.25 7.22,7.23 17.24,11.72 28.25,11.72"
android:strokeWidth="0.0352778"
android:fillColor="#0857b1"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m26.68,48.09c-0,7.34 2.99,14.02 7.81,18.82 4.81,4.81 11.49,7.81 18.82,7.81 7.34,0 14.02,-2.99 18.82,-7.81 4.81,-4.81 7.81,-11.49 7.81,-18.82h-8.51,-0c-0,5 -2.02,9.51 -5.31,12.8 -3.3,3.29 -7.8,5.31 -12.8,5.31 -5,-0 -9.51,-2.02 -12.8,-5.31 -3.29,-3.3 -5.31,-7.8 -5.31,-12.8h-8.51"
android:strokeWidth="0.0352778"
android:fillColor="#0857b1"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m53.31,42.69c2.99,0 5.41,2.42 5.41,5.41 0,2.99 -2.42,5.41 -5.41,5.41 -2.99,0 -5.41,-2.42 -5.41,-5.41 0,-2.99 2.42,-5.41 5.41,-5.41zM53.31,60.93c7.09,0 12.84,-5.75 12.84,-12.84 0,-7.09 -5.75,-12.84 -12.84,-12.84 -7.09,0 -12.84,5.75 -12.84,12.84 0,7.09 5.75,12.84 12.84,12.84"
android:strokeWidth="0.0352778"
android:fillColor="#0857b1"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m53.27,30.11c9.38,0 17.18,6.7 18.64,15.45L92.96,45.56L92.96,24.69c0,0 -24.15,-2.75 -39.69,-8.11 -15.54,5.36 -39.69,8.11 -39.69,8.11v20.88h21.05c1.46,-8.75 9.27,-15.45 18.64,-15.45"
android:strokeWidth="0.0357257"
android:fillColor="#0057b1"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
<path
android:pathData="m53.01,13.06 l1.18,0.39c7.44,2.45 16.91,4.36 24.85,5.68L79.04,5.4c0,0 -16.51,-1.93 -26.03,-5.4 -9.52,3.48 -26.03,5.4 -26.03,5.4v13.73c7.94,-1.33 17.42,-3.24 24.85,-5.68l1.18,-0.39"
android:strokeWidth="0.036529"
android:fillColor="#0857b1"
android:strokeColor="#00000000"
android:fillType="nonZero"/>
</vector>
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher_round.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher_round.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion app/src/main/res/values/ic_launcher_background.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
<resources>
<color name="ic_launcher_background">#F5F5F5</color>
</resources>

0 comments on commit 6e126fe

Please sign in to comment.