diff --git a/.classpath b/.classpath deleted file mode 100644 index 7e76386..0000000 --- a/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index cca5a2e..368bb5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,37 @@ -/geeksville-release-key.keystore -*.orig -*~ +# Built application files +*.ap_ + +# Files for the Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files bin/ -AndroidManifest.out.* gen/ + +# Gradle files +.gradle/ +build/ +/*/build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Idea +*.iml +*.ipr +*.iws +.idea/ +out/ + +# Mac +.DS_Store +Thumbs.db diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index cf46aa1..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "shared"] - path = shared - url = git@github.com:geeksville/AndroidShared.git diff --git a/.project b/.project deleted file mode 100644 index ad993cf..0000000 --- a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Gaggle - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/README b/README deleted file mode 100644 index 422aaa7..0000000 --- a/README +++ /dev/null @@ -1,19 +0,0 @@ -This is the github repository for the Gaggle Android application for glider projects. - -Includes XC server integration. - - -Developers should start here: https://github.com/geeksville/Gaggle/wiki/Developers-page - -This page describes how to set up your development environment in order to start contributing. - -It shows how to install git (under windows and linux), how to get the Android SDK, Eclipse (if required), and retrieving the source code and associated shared module. It also contains the links to the developer list. - -To contribute to a project, you need to fork the repo. You can find more information about this here: - -https://help.github.com/articles/fork-a-repo - -A list of issues is available here: - -https://github.com/geeksville/Gaggle/issues?page=1&state=open - diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..fdcc50e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,25 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 21 + buildToolsVersion "28.0.3" + + defaultConfig { + applicationId "com.geeksville.gaggle" + minSdkVersion 9 + targetSdkVersion 9 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} + +dependencies { + implementation files('libs/FlurryAgent.jar') + implementation files('libs/osmdroid-android-1.08.jar') + implementation files('libs/slf4j-android-1.5.8.jar') +} diff --git a/libs/FlurryAgent.jar b/app/libs/FlurryAgent.jar similarity index 100% rename from libs/FlurryAgent.jar rename to app/libs/FlurryAgent.jar diff --git a/libs/osmdroid-android-1.08.jar b/app/libs/osmdroid-android-1.08.jar similarity index 100% rename from libs/osmdroid-android-1.08.jar rename to app/libs/osmdroid-android-1.08.jar diff --git a/libs/slf4j-android-1.5.8.jar b/app/libs/slf4j-android-1.5.8.jar similarity index 100% rename from libs/slf4j-android-1.5.8.jar rename to app/libs/slf4j-android-1.5.8.jar diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 96% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml index 4dee581..6b31c38 100644 --- a/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,4 +1,5 @@ + @@ -7,11 +8,10 @@ android:normalScreens="true" android:largeScreens="true" android:anyDensity="true" /> - - + + android:theme="@android:style/Theme.NoTitleBar"> @@ -44,17 +44,17 @@ + + + --> @@ -157,7 +157,11 @@ - + + + + + - + diff --git a/res/menu/logged_flight_optionmenu.xml b/app/src/main/res/menu/logged_flight_optionmenu.xml similarity index 100% rename from res/menu/logged_flight_optionmenu.xml rename to app/src/main/res/menu/logged_flight_optionmenu.xml diff --git a/res/menu/map_optionmenu.xml b/app/src/main/res/menu/map_optionmenu.xml similarity index 74% rename from res/menu/map_optionmenu.xml rename to app/src/main/res/menu/map_optionmenu.xml index fe95b15..d0130e0 100644 --- a/res/menu/map_optionmenu.xml +++ b/app/src/main/res/menu/map_optionmenu.xml @@ -5,6 +5,7 @@ - diff --git a/res/menu/shared_options.xml b/app/src/main/res/menu/shared_options.xml similarity index 100% rename from res/menu/shared_options.xml rename to app/src/main/res/menu/shared_options.xml diff --git a/res/menu/waypoint_context.xml b/app/src/main/res/menu/waypoint_context.xml similarity index 100% rename from res/menu/waypoint_context.xml rename to app/src/main/res/menu/waypoint_context.xml diff --git a/res/menu/waypoint_optionmenu.xml b/app/src/main/res/menu/waypoint_optionmenu.xml similarity index 100% rename from res/menu/waypoint_optionmenu.xml rename to app/src/main/res/menu/waypoint_optionmenu.xml diff --git a/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/res/values-el/arrays.xml b/app/src/main/res/values-el/arrays.xml similarity index 100% rename from res/values-el/arrays.xml rename to app/src/main/res/values-el/arrays.xml diff --git a/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml similarity index 100% rename from res/values-el/strings.xml rename to app/src/main/res/values-el/strings.xml diff --git a/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml similarity index 100% rename from res/values-en/strings.xml rename to app/src/main/res/values-en/strings.xml diff --git a/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml similarity index 100% rename from res/values-es/arrays.xml rename to app/src/main/res/values-es/arrays.xml diff --git a/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml similarity index 100% rename from res/values-es/strings.xml rename to app/src/main/res/values-es/strings.xml diff --git a/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml similarity index 100% rename from res/values-fr/strings.xml rename to app/src/main/res/values-fr/strings.xml diff --git a/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml similarity index 100% rename from res/values-hu/strings.xml rename to app/src/main/res/values-hu/strings.xml diff --git a/res/values-pt/arrays.xml b/app/src/main/res/values-pt/arrays.xml similarity index 100% rename from res/values-pt/arrays.xml rename to app/src/main/res/values-pt/arrays.xml diff --git a/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml similarity index 100% rename from res/values-pt/strings.xml rename to app/src/main/res/values-pt/strings.xml diff --git a/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml similarity index 100% rename from res/values-v11/styles.xml rename to app/src/main/res/values-v11/styles.xml diff --git a/res/values/arrays.xml b/app/src/main/res/values/arrays.xml similarity index 100% rename from res/values/arrays.xml rename to app/src/main/res/values/arrays.xml diff --git a/res/values/attrs.xml b/app/src/main/res/values/attrs.xml similarity index 100% rename from res/values/attrs.xml rename to app/src/main/res/values/attrs.xml diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/res/values/igc_private_key.xml b/app/src/main/res/values/igc_private_key.xml similarity index 100% rename from res/values/igc_private_key.xml rename to app/src/main/res/values/igc_private_key.xml diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 93% rename from res/values/strings.xml rename to app/src/main/res/values/strings.xml index 8fc06a5..6ed7846 100644 --- a/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -231,6 +231,11 @@ please email kevinh@geeksville.com. End Duration Start altitude + End altitude + Max altitude Above launch + Max altitude Above landing + Diff Landing - Launch + Max altitude after launch Max ground speed Average ground speed @@ -292,5 +297,26 @@ please email kevinh@geeksville.com. SkyLines problem GPS Google + View KML file + No application to view KML file + Save track to the list + + Set Start Alt from Google + Set start point altitude from Google + + Set Start Alt manually + Set Start point altitude manually if Google failed + + Draw shadow on KML + Draw shadow on KML track + + + + Start point manual altitude + Use this altitude to correct track altitude + + Track is saved to the list successfully + + \ No newline at end of file diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml similarity index 94% rename from res/xml/preferences.xml rename to app/src/main/res/xml/preferences.xml index a43305c..6a10d13 100644 --- a/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -185,7 +185,24 @@ android:key="launch_dist_y" android:title="@string/launch_distance_vertical" android:summary="@string/launch_distance_horiz_summary" android:defaultValue="7" android:inputType="number" /> - + + + + + + + + + \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/import-summary.txt b/import-summary.txt new file mode 100644 index 0000000..299098f --- /dev/null +++ b/import-summary.txt @@ -0,0 +1,76 @@ +ECLIPSE ANDROID PROJECT IMPORT SUMMARY +====================================== + +Ignored Files: +-------------- +The following files were *not* copied into the new Gradle project; you +should evaluate whether these are still needed in your project and if +so manually move them: + +* .gitignore +* .gitmodules +* .idea\ +* .idea\Gaggle.iml +* .idea\codeStyles\ +* .idea\codeStyles\Project.xml +* .idea\misc.xml +* .idea\modules.xml +* .idea\vcs.xml +* .idea\workspace.xml +* README +* art\ +* art\airplane-48x48.png +* art\altimeter-icon-28x48.png +* art\altimeter-icon.png +* art\arrow.svg +* art\in-flight.svg +* art\paper-airplane-180x120.png +* art\paper-airplane-512x512.png +* art\paper-airplane.svg +* art\waypoint-crosshair.svg +* docs\ +* docs\leonardo-live-http-api.html +* docs\tech_spec_gnss.pdf +* docs\to-do.txt +* released\ +* released\Gaggle-0.91.apk +* released\Gaggle-0.93beta.apk +* released\Gaggle-branch.apk +* webpage\ +* webpage\funkycolors.png +* webpage\gaggle-market-qrcode.png +* webpage\index.html +* webpage\instscreen-small.png +* webpage\instscreen.png +* webpage\mapscreen.png +* webpage\wptscreen.png + +Moved Files: +------------ +Android Gradle projects use a different directory structure than ADT +Eclipse projects. Here's how the projects were restructured: + +* AndroidManifest.xml => app\src\main\AndroidManifest.xml +* assets\ => app\src\main\assets\ +* libs\FlurryAgent.jar => app\libs\FlurryAgent.jar +* libs\osmdroid-android-1.08.jar => app\libs\osmdroid-android-1.08.jar +* libs\slf4j-android-1.5.8.jar => app\libs\slf4j-android-1.5.8.jar +* res\ => app\src\main\res\ +* shared\ => app\src\main\java\ +* src\ => app\src\main\java\ +* src\com\android\vending\billing\IMarketBillingService.aidl => app\src\main\aidl\com\android\vending\billing\IMarketBillingService.aidl + +Next Steps: +----------- +You can now build the project. The Gradle project needs network +connectivity to download dependencies. + +Bugs: +----- +If for some reason your project does not build, and you determine that +it is due to a bug or limitation of the Eclipse to Gradle importer, +please file a bug at http://b.android.com with category +Component-Tools. + +(This import summary is for your information only, and can be deleted +after import once you are satisfied with the results.) diff --git a/project.properties b/project.properties deleted file mode 100644 index 9ae01de..0000000 --- a/project.properties +++ /dev/null @@ -1,13 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Indicates whether an apk should be generated for each density. -split.density=false -# Project target. -target=Google Inc.:Google APIs:10 diff --git a/released/Gaggle-0.91.apk b/released/Gaggle-0.91.apk deleted file mode 100644 index 01a9812..0000000 Binary files a/released/Gaggle-0.91.apk and /dev/null differ diff --git a/released/Gaggle-0.93beta.apk b/released/Gaggle-0.93beta.apk deleted file mode 100644 index b24e443..0000000 Binary files a/released/Gaggle-0.93beta.apk and /dev/null differ diff --git a/released/Gaggle-branch.apk b/released/Gaggle-branch.apk deleted file mode 100644 index 404d174..0000000 Binary files a/released/Gaggle-branch.apk and /dev/null differ diff --git a/res/drawable/arrow.png b/res/drawable/arrow.png deleted file mode 120000 index 16dfb14..0000000 --- a/res/drawable/arrow.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/arrow.png \ No newline at end of file diff --git a/res/drawable/blue.png b/res/drawable/blue.png deleted file mode 120000 index dfcc462..0000000 --- a/res/drawable/blue.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/blue.png \ No newline at end of file diff --git a/res/drawable/blue_dot.png b/res/drawable/blue_dot.png deleted file mode 120000 index c4dcb01..0000000 --- a/res/drawable/blue_dot.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/blue_dot.png \ No newline at end of file diff --git a/res/drawable/flag.png b/res/drawable/flag.png deleted file mode 120000 index 861ce2f..0000000 --- a/res/drawable/flag.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/flag.png \ No newline at end of file diff --git a/res/drawable/hospitals.png b/res/drawable/hospitals.png deleted file mode 120000 index 684796c..0000000 --- a/res/drawable/hospitals.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/hospitals.png \ No newline at end of file diff --git a/res/drawable/icon.png b/res/drawable/icon.png deleted file mode 120000 index 4949842..0000000 --- a/res/drawable/icon.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/icon.png \ No newline at end of file diff --git a/res/drawable/in_flight.png b/res/drawable/in_flight.png deleted file mode 120000 index b7920f3..0000000 --- a/res/drawable/in_flight.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/in_flight.png \ No newline at end of file diff --git a/res/drawable/lz_blue.png b/res/drawable/lz_blue.png deleted file mode 120000 index e7d2d79..0000000 --- a/res/drawable/lz_blue.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/lz_blue.png \ No newline at end of file diff --git a/res/drawable/lz_red.png b/res/drawable/lz_red.png deleted file mode 120000 index 9511d8f..0000000 --- a/res/drawable/lz_red.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/lz_red.png \ No newline at end of file diff --git a/res/drawable/lz_yellow.png b/res/drawable/lz_yellow.png deleted file mode 120000 index e7d0663..0000000 --- a/res/drawable/lz_yellow.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/lz_yellow.png \ No newline at end of file diff --git a/res/drawable/plane_blue.png b/res/drawable/plane_blue.png deleted file mode 120000 index 79756d2..0000000 --- a/res/drawable/plane_blue.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/plane_blue.png \ No newline at end of file diff --git a/res/drawable/plane_red.png b/res/drawable/plane_red.png deleted file mode 120000 index 969131b..0000000 --- a/res/drawable/plane_red.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/plane_red.png \ No newline at end of file diff --git a/res/drawable/plane_yellow.png b/res/drawable/plane_yellow.png deleted file mode 120000 index bd9c780..0000000 --- a/res/drawable/plane_yellow.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/plane_yellow.png \ No newline at end of file diff --git a/res/drawable/rangerstation.png b/res/drawable/rangerstation.png deleted file mode 120000 index 2c3562e..0000000 --- a/res/drawable/rangerstation.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/rangerstation.png \ No newline at end of file diff --git a/res/drawable/red.png b/res/drawable/red.png deleted file mode 120000 index cb0f432..0000000 --- a/res/drawable/red.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/red.png \ No newline at end of file diff --git a/res/drawable/waypoint.png b/res/drawable/waypoint.png deleted file mode 120000 index a6824ba..0000000 --- a/res/drawable/waypoint.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/waypoint.png \ No newline at end of file diff --git a/res/drawable/yellow.png b/res/drawable/yellow.png deleted file mode 120000 index 636db32..0000000 --- a/res/drawable/yellow.png +++ /dev/null @@ -1 +0,0 @@ -../drawable-mdpi/yellow.png \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/shared b/shared deleted file mode 160000 index a15b690..0000000 --- a/shared +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a15b690b6e9447ed7c2015b7885d7270c599ee9b diff --git a/webpage/funkycolors.png b/webpage/funkycolors.png deleted file mode 100644 index 2fc9ce8..0000000 Binary files a/webpage/funkycolors.png and /dev/null differ diff --git a/webpage/gaggle-market-qrcode.png b/webpage/gaggle-market-qrcode.png deleted file mode 100644 index f2b852a..0000000 Binary files a/webpage/gaggle-market-qrcode.png and /dev/null differ diff --git a/webpage/index.html b/webpage/index.html deleted file mode 100644 index cdb1eb8..0000000 --- a/webpage/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - -Gaggle: a tool for glider pilots - - - -If you are on an android phone you can use the following link to download: market://details?id=com.geeksville.gaggle - - - - - diff --git a/webpage/instscreen-small.png b/webpage/instscreen-small.png deleted file mode 100644 index a9f8c2f..0000000 Binary files a/webpage/instscreen-small.png and /dev/null differ diff --git a/webpage/instscreen.png b/webpage/instscreen.png deleted file mode 100644 index 802a138..0000000 Binary files a/webpage/instscreen.png and /dev/null differ diff --git a/webpage/mapscreen.png b/webpage/mapscreen.png deleted file mode 100644 index dd373c0..0000000 Binary files a/webpage/mapscreen.png and /dev/null differ diff --git a/webpage/wptscreen.png b/webpage/wptscreen.png deleted file mode 100644 index 2cc3748..0000000 Binary files a/webpage/wptscreen.png and /dev/null differ