Skip to content

Commit

Permalink
Merge branch 'master' into coverity_scan
Browse files Browse the repository at this point in the history
  • Loading branch information
ruleant committed Aug 26, 2014
2 parents edb322a + cac89a7 commit dde20dd
Show file tree
Hide file tree
Showing 26 changed files with 552 additions and 50 deletions.
13 changes: 5 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
language: java
jdk:
- openjdk7
- oraclejdk8
env:
global:
- secure: "mMIHz+I2pZK7I9PvhkTIRDeXJJIZTwigAamHnaId1q9YO7LvBoCKsJCI7pepbK303lTZJqkTgyTti9xSsYjzMIIMT8G+YBfVqoiy6wWOZjwjjZxn5Mw7g3qxRRdpXCc7B7hBBTEiEzC0Bp3QwPQtwdFDlACwgHWsbDLiaweIglg="
Expand All @@ -24,13 +25,13 @@ before_install:
- sudo CFLAGS="-O0" pip install -r ${BUILD_TREND_HOME}/requirements.txt
# download the latest android sdk and unzip
- timestamp.sh install_android_sdk
- wget http://dl.google.com/android/android-sdk_r22.6.2-linux.tgz
- tar -zxf android-sdk_r22.6.2-linux.tgz
- wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz
- tar -zxf android-sdk_r23.0.2-linux.tgz
- export ANDROID_HOME=`pwd`/android-sdk-linux
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
# only update the sdk for the tools and platform-tools and required api level
# (run "android list sdk --extended" to get the full list)
- echo "y" | android update sdk -a --filter tools,platform-tools,build-tools-19.1.0,android-19 --no-ui --force
- echo "y" | android update sdk -a --filter tools,platform-tools,build-tools-20.0.0,android-19 --no-ui --force
# deploy android SDK jar to local maven repository
- $TRAVIS_BUILD_DIR/.utility/deploy-sdk-to-m2-repo.sh
# return to directory where the repository being built has been copied on the worker.
Expand All @@ -47,11 +48,7 @@ after_success:
- timestamp.sh update_javadoc
- mvn clean install javadoc:javadoc -DskipTests=true
- .utility/copy-javadoc-to-gh-pages.sh
after_success:
# analyse build timestamps
- timestamp.sh end
- sync-buildtime-trend-with-gh-pages.sh
after_failure:
after_script:
# analyse build timestamps
- timestamp.sh end
- sync-buildtime-trend-with-gh-pages.sh
Expand Down
61 changes: 61 additions & 0 deletions .utility/crop_scale_screenshot.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
#!/bin/bash
#
# Script to remove top and bottom bar from an Android screenshot.
#
# usage : ./crop_scale_screenshot.sh image.png
#
# Dependency : ImageMagick
#
# Copyright (C) 2014 Dieter Adriaenssens
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

imageFile=$1

# get image properties and save as array (identify returns spaces seperated result)
imageProperties=(`identify $imageFile`)

# image size is 3rd element of the array
imageSize=${imageProperties[2]}

case "$imageSize" in
# xhdpi with onscreen button bar, portrait
"1080x1920") extract="1080x1700+0+75"
resize="400x631"
;;
# xhdpi with onscreen button bar, landscape
"1920x1080") extract="1792x1005+0+75"
resize="713x400"
;;
# hdpi without onscreen button bar, portrait
"480x800") extract="480x762+0+38"
resize="480x762"
;;
# hdpi without onscreen button bar, landscape
"800x480") extract="800x442+0+38"
resize="800x442"
;;
# default, unknown format : don't crop/resize image
*) echo $imageSize
echo "Unknown format, image was not changed."
exit 0
;;
esac

echo "original size : $imageSize"
echo "extraction parameters : $extract"
echo "resize parameters : $resize"

# remove bars and resize image
convert -size $imageSize -extract $extract $imageFile -resize $resize $imageFile
4 changes: 2 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.github.ruleant.getback_gps"
android:versionCode="30"
android:versionName="0.3-dev" >
android:versionCode="40"
android:versionName="0.4-dev" >

<uses-sdk
android:minSdkVersion="8"
Expand Down
9 changes: 8 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
v0.3 (not released yet)
v0.4 (not released yet)
- translated to Italian, thanks to Matteo Regazzi
- translated to Spanish, thanks to alunacast38 and Swyter, J.S.Sebastian
- translated to Korean, thanks to Cho Bkwon
- display in About activity when app was built
- translated to Belarusian, thanks to Kastuś Kašenia

v0.3 (released on 07Jul2014)
- CID 60865 : fix Coverity issue : dereference null return value
- CID 60867 : fix Coverity issue : EC: Comparing incompatible types for equality
- CID 60866, 60868 : fix Coverity issue : Casting from integer values
Expand Down
19 changes: 17 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
GetBack GPS
===========
GetBack GPS for Android
=======================

[![GetBack GPS](http://img.shields.io/badge/release-v0.3-blue.svg)](https://f-droid.org/repository/browse/?fdid=com.github.ruleant.getback_gps)
[![Build Status](https://travis-ci.org/ruleant/getback_gps.svg?branch=master)](https://travis-ci.org/ruleant/getback_gps)
[![Coverity Scan Build Status](https://scan.coverity.com/projects/2277/badge.svg)](https://scan.coverity.com/projects/2277)
[![Coverage Status](https://coveralls.io/repos/ruleant/getback_gps/badge.png?branch=master)](https://coveralls.io/r/ruleant/getback_gps?branch=master)
Expand All @@ -25,6 +26,15 @@ Features
- ‘get back’ mode : indicator pointing to a stored location (showing distance and direction)
- indicate current speed and current bearing
- use built-in sensors to get more accurate and quicker updated bearing
- compass rose indicating North
- detect travel direction and adjust relative direction to destination accordingly

How to get it?
--------------

The [latest version](https://f-droid.org/repository/browse/?fdid=com.github.ruleant.getback_gps) is available on [F-Droid](https://f-droid.org/). Install the apk directly from the F-Droid website, or use the [F-Droid app](https://f-droid.org/FDroid.apk) to keep automaticaly up to date with future releases.

If you want to try out the latest development version, you can get the code from the [git repository](https://f-droid.org/FDroid.apk) and [build the current development version](https://github.com/ruleant/getback_gps/wiki/Development) yourself.


Bugs and feature requests
Expand Down Expand Up @@ -66,6 +76,11 @@ Third party material
See script file for more details.
- license : Apache 2.0

- .utility/remove-incomplete-translations
- Based on scripts/remove-incomplete-mo of the phpMyAdmin project
- origin : https://github.com/phpmyadmin/phpmyadmin/blob/master/scripts/remove-incomplete-mo
- license : GPLv2

- Crouton library
- version : v1.8.1
- website : https://github.com/keyboardsurfer/Crouton
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ apply plugin: 'android'

android {
compileSdkVersion 19
buildToolsVersion "19.1.0"
buildToolsVersion "20.0.0"
}

android {
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.ruleant.getback_gps</groupId>
<artifactId>getback_gps</artifactId>
<version>0.3-dev</version>
<version>0.4-dev</version>
<packaging>apk</packaging>
<name>GetBack GPS</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<pluginRepositories>
<pluginRepository>
Expand Down
71 changes: 71 additions & 0 deletions res/values-be/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="current_speed">Хуткасьць цяпер</string>
<string name="speed_kph">км/г</string>
<string name="current_bearing">Азимут</string>
<string name="distance">Адлегласьць</string>
<string name="direction">Напрамак</string>
<string name="northeast_unit">Пн-Усх</string>
<string name="southeast_unit">Пд-Усх</string>
<string name="southwest_unit">Пд-Зх</string>
<string name="northwest_unit">Пн-Зх</string>
<string name="location_updated">Месца абноўлена</string>
<string name="unknown">Невядомы</string>
<string name="refresh">Абнавіць</string>
<string name="dialog_store_location">Ці хочаш захаваць сваё месцазнахаджаньне?</string>
<string name="no">Не</string>
<string name="store_location">Захаваць месца</string>
<string name="store_location_disabled">Немагчыма захаваць месца, бо невызначана</string>
<string name="location_stored">Месца захавана</string>
<string name="menu_details">Падрабязнасьці месца</string>
<string name="activity_details">Падрабязнасьці</string>
<string name="location_provider">Правайдар месцазнаходжаньня</string>
<string name="provider">Правайдар</string>
<string name="loc_provider_network">Сетка (сотавая або WiFi)</string>
<string name="loc_provider_gps">GPS</string>
<string name="provider_no_support">Правайдар не падтрымліваецца.</string>
<string name="copyright">Права капіяваць</string>
<string name="location">Месца</string>
<string name="stored_location">Захаванае месца</string>
<string name="curr_location">Апошняе месца</string>
<string name="latitude">Шырата</string>
<string name="latitude_north_unit">Пн</string>
<string name="latitude_south_unit">Пд</string>
<string name="longitude">Даўгата</string>
<string name="longitude_east_unit">Усх</string>
<string name="longitude_west_unit">Зх</string>
<string name="altitude">Высата</string>
<string name="speed">Хуткасьць</string>
<string name="bearing">Азімут</string>
<string name="sensor_bearing_offset">Зрух азімута паводле сэнсара</string>
<string name="travel_direction">Напрамак руху</string>
<string name="travel_direction_forward">Проста</string>
<string name="travel_direction_backwards">Назад</string>
<string name="accuracy">Дакладнасьць</string>
<string name="timestamp">Час</string>
<string name="destination">Мэта</string>
<string name="to_dest">Да мэты</string>
<string name="raw">Нефарматавана</string>
<string name="none">Ніякі</string>
<string name="notset">Неўстаноўлены</string>
<string name="loc_updated_recent">Месца нядаўна абноўлена.</string>
<string name="loc_updated_not_recent">Месца даўно не абнаўлялась.</string>
<string name="settings">Налады</string>
<string name="pref_header_general">Агульныя</string>
<string name="pref_header_loc_update">Абнаўленьні месца</string>
<string name="pref_loc_update_dist">Абнаўленьні паводле адлегласьці</string>
<string name="pref_loc_update_time">Абнаўленьні паводле часу</string>
<string name="pref_enable_sensors">Ужыць даступныя сэнсары</string>
<string name="pref_geo_orientation_sensor">Сэнсар арыянтацыї па змоўчаньні</string>
<string name="sensors_enabled">Увамкнёна: хутчэйшае абнаўленьне й дакладнейшы азімут</string>
<string name="sensors_disabled">Вымкнена: ашчаджвае энергію</string>
<string name="disabled">Вымкнена</string>
<string name="about">Пра праґраму</string>
<string name="version">Вэрсыя</string>
<string name="build_time">Скампілявана %s.</string>
<string name="app_website">Наведацца на &lt;a href=%1$s&gt;вэбсайт&lt;/a&gt; па інфармацыю.</string>
<string name="app_desc">Знайдзіце па каардынатах шлях туды, дзе ўжо пабывалі.</string>
<string name="inaccurate_location">Тваё месцазнаходжаньне недакладнае</string>
<string name="notice_no_dest">Захавай месцазнаходжаньне, каб накіравацца</string>
<string name="inaccurate_direction">Прайдзі прама, ў патрэбным кірунку</string>
<string name="notice_destination_reached">Ты на слушным кірунку</string>
</resources>
29 changes: 29 additions & 0 deletions res/values-ca/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="app_desc">Trobeu el camí de tornada a un lloc ja visitat utilitzant coordenades GPS.</string>
<string name="inaccurate_location">La vostra posició actual és aproximada</string>
<string name="notice_no_dest">Deseu la vostra posició per fixar un destí</string>
<string name="inaccurate_direction">Comenceu-vos a moure per obtenir la direcció ajustada del vostre destí</string>
<string name="notice_destination_reached">Heu arribat al vostre destí</string>
<string name="current_speed">Velocitat actual</string>
<string name="speed_kph">km/h</string>
<string name="current_bearing">Rumb actual</string>
<string name="distance">Distància</string>
<string name="direction">Direcció</string>
<string name="northeast_unit">NE</string>
<string name="southeast_unit">SE</string>
<string name="southwest_unit">SO</string>
<string name="northwest_unit">NO</string>
<string name="location_updated">Posició actualitzada</string>
<string name="inaccurate">Aproximat</string>
<string name="destination_reached">En destí</string>
<string name="no_destination">Cap destí fixat</string>
<string name="unknown">Desconegut</string>
<string name="refresh">Actualitzar</string>
<string name="dialog_store_location">Voleu desar la vostra posició actual?</string>
<string name="no">No</string>
<string name="store_location">Desa posició</string>
<string name="store_location_disabled">No es pot desar una posició si aquesta no és la actual</string>
<string name="location_stored">Posició desada</string>
<string name="menu_details">Detalls de la posició</string>
<string name="activity_details">Detalls</string>
</resources>
2 changes: 1 addition & 1 deletion res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<string name="pref_header_loc_update">Placeringsopdatering</string>
<string name="pref_loc_update_dist">Distance baseret opdateringer</string>
<string name="pref_loc_update_time">Tidsbaseret opdateringer</string>
<string name="pref_enable_sensors">Aktiver sensorer (hvis tilgængelig)</string>
<string name="pref_enable_sensors">Brug tilgængelige sensorer</string>
<string name="pref_geo_orientation_sensor">Standard orienteringssensor</string>
<string name="sensors_enabled">Aktiveret: hurtigere opdateret og mere præcis kurs</string>
<string name="sensors_disabled">Inaktiv: sparer strøm</string>
Expand Down
4 changes: 2 additions & 2 deletions res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen vo
\n
Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <a href="http://www.gnu.org/licenses/">www.gnu.org/licenses</a>.</string>
<string name="altitude">Höhe</string>
<string name="current_bearing">Aktueller Kurs</string>
<string name="current_bearing">Aktueller Peilung</string>
<string name="pref_header_loc_update">Standort Aktualisierungen</string>
<string name="pref_loc_update_dist">Entfernungsbasierte Aktualisierung</string>
<string name="pref_loc_update_time">Zeitbasierte Aktualisierung</string>
Expand All @@ -73,5 +73,5 @@ Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Prog
<string name="pref_enable_sensors">Sensoren einschalten (falls verfügbar)</string>
<string name="sensors_disabled">Inaktiv : Stromsparend</string>
<string name="pref_geo_orientation_sensor">Standard Orientierungssensor</string>
<string name="sensors_enabled">Aktiv: Schneller aktualisierte und genauere Position</string>
<string name="sensors_enabled">Aktiv: Schneller aktualisierte und genauere Peilung</string>
</resources>
Loading

0 comments on commit dde20dd

Please sign in to comment.