Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
ruleant committed Jan 14, 2018
2 parents 3f1c7dc + ef4e1e3 commit 1d89d68
Show file tree
Hide file tree
Showing 84 changed files with 1,197 additions and 218 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -11,3 +11,6 @@ out
.gradle/
local.properties
build/
.vagrant/
*console.log
maven-android-sdk-deployer/
20 changes: 8 additions & 12 deletions .travis.yml
Expand Up @@ -2,8 +2,10 @@
language: android
android:
components:
- android-20
- build-tools-21.1.2
- android-23
- build-tools-23.0.1
# enable building on container-based infrastructure
sudo: false
env:
global:
- secure: "mMIHz+I2pZK7I9PvhkTIRDeXJJIZTwigAamHnaId1q9YO7LvBoCKsJCI7pepbK303lTZJqkTgyTti9xSsYjzMIIMT8G+YBfVqoiy6wWOZjwjjZxn5Mw7g3qxRRdpXCc7B7hBBTEiEzC0Bp3QwPQtwdFDlACwgHWsbDLiaweIglg="
Expand All @@ -14,15 +16,9 @@ env:
before_install:
- cd $HOME
# install and initialise build-trend scripts
- if [[ -d buildtime-trend/.git ]]; then cd buildtime-trend; git pull; cd ..; else git clone https://github.com/buildtimetrend/python-client.git buildtime-trend; fi
- if [[ -d buildtime-trend/.git ]]; then cd buildtime-trend; git pull; cd ..; else git clone --recursive https://github.com/buildtimetrend/python-client.git buildtime-trend; fi
- source buildtime-trend/init.sh
- mvn -v
- timestamp.sh install_libs
- sudo apt-get update -qq
- sudo apt-get install -qq python-pip
# install buildtime-trend dependencies using pip
- timestamp.sh install_python_libs
- sudo CFLAGS="-O0" pip install -r ${BUILD_TREND_HOME}/requirements.txt
# deploy android SDK jar to local maven repository
- timestamp.sh deploy_android_sdk
- $TRAVIS_BUILD_DIR/.utility/deploy-sdk-to-m2-repo.sh
Expand All @@ -34,15 +30,14 @@ script:
after_success:
# send code coverage results to coveralls.io
- timestamp.sh coverage
- mvn clean test cobertura:cobertura coveralls:cobertura -B
- mvn clean test cobertura:cobertura coveralls:report -B
# update javadoc on Github Pages (gh-pages)
- timestamp.sh update_javadoc
- mvn clean install javadoc:javadoc -DskipTests=true
- .utility/copy-javadoc-to-gh-pages.sh
after_script:
# analyse build timestamps
- timestamp.sh end
- sync-buildtime-trend-with-gh-pages.sh
addons:
coverity_scan:
project:
Expand All @@ -55,4 +50,5 @@ addons:
notifications:
webhooks:
# parse Travis CI log and send result to Keen.io, using Builtime Trend Service
- http://buildtimetrend-service.herokuapp.com/travis
- https://buildtimetrend.herokuapp.com/travis
- https://buildtimetrend-dev.herokuapp.com/travis
2 changes: 1 addition & 1 deletion .utility/copy-javadoc-to-gh-pages.sh
Expand Up @@ -11,7 +11,7 @@
#
# Copyright (C) 2013 Xiaohao Ma
# Copyright (C) 2013 Ben Limmer
# Copyright (C) 2014-2015 Dieter Adriaenssens
# Copyright (C) 2014-2018 Dieter Adriaenssens
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .utility/crop_scale_screenshot.sh
Expand Up @@ -6,7 +6,7 @@
#
# Dependency : ImageMagick
#
# Copyright (C) 2014-2015 Dieter Adriaenssens
# Copyright (C) 2014-2018 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
Expand Down
6 changes: 3 additions & 3 deletions .utility/deploy-sdk-to-m2-repo.sh
Expand Up @@ -2,7 +2,7 @@
#
# Script to deploy Android SDK jar files to local maven repository.
#
# Copyright (C) 2014-2015 Dieter Adriaenssens
# Copyright (C) 2014-2018 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
Expand All @@ -19,8 +19,8 @@

# deploy android SDK jar to local maven repository
if [[ -d maven-android-sdk-deployer/.git ]]; then cd maven-android-sdk-deployer; git pull; else git clone https://github.com/mosabua/maven-android-sdk-deployer.git; cd maven-android-sdk-deployer; fi
# only deploy SDK 4.4W (API 20)
mvn clean install -pl platforms/android-20
# only deploy SDK 6 (API 23)
mvn clean install -pl platforms/android-23

# return to initial path
cd ..
7 changes: 4 additions & 3 deletions AndroidManifest.xml
@@ -1,12 +1,12 @@
<?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="41"
android:versionName="0.4.1" >
android:versionCode="50"
android:versionName="0.5" >

<uses-sdk
android:minSdkVersion="8"
android:targetSdkVersion="20" />
android:targetSdkVersion="23" />

<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

Expand All @@ -18,6 +18,7 @@

<application
android:allowBackup="true"
android:supportsRtl="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
Expand Down
12 changes: 12 additions & 0 deletions ChangeLog
@@ -1,3 +1,15 @@
v0.5 (released on 14Jan2018)
- translated to Croatian, thanks to Dag Velovic
- build against Android SDK 5.1 (API 22)
- issue #164 : display altitude/height in meters
- issue #31 : save altitude and calculate height difference to destination
- support RTL languages
- translated to Chinese (China), thanks to YFdyh000
- build against Android SDK 6.0 (API 23)
- translated to Estonian, thanks to Kristjan Räts
- translated to Norwegian Bokmål, thanks to Allan Nordhøy
- translated to Polish, thanks to Dominik Danelski

v0.4.1 (released on 08Jan2015)
- translated to Sardinian, thanks to Lu Ca
- translated to Hindi, thanks to Atul Pratap Singh
Expand Down
30 changes: 13 additions & 17 deletions README.md
@@ -1,16 +1,20 @@
GetBack GPS for Android
=======================

[![GetBack GPS](http://img.shields.io/badge/release-v0.4.1-blue.svg)](https://f-droid.org/repository/browse/?fdid=com.github.ruleant.getback_gps)
[![GetBack GPS](http://img.shields.io/badge/release-v0.5-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)
[![Codacy Badge](https://api.codacy.com/project/badge/0040e146618e41ac9c39d04c7b1a3fef)](https://www.codacy.com/app/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)

[![Translation status](http://hosted.weblate.org/widgets/getback_gps-shields-badge.png)](http://hosted.weblate.org/engage/getback_gps/?utm_source=widget)
[![todofy badge](https://todofy.org/b/ruleant/getback_gps)](https://todofy.org/r/ruleant/getback_gps)
[![Stack Share](http://img.shields.io/badge/tech-stack-0690fa.svg?style=flat)](http://stackshare.io/ruleant/getback-gps)

[![Buildtime trend](https://buildtimetrend-service.herokuapp.com/badge/ruleant/getback_gps/latest)](http://ruleant.github.io/getback_gps/buildtime-trend/)
[![Total builds](https://buildtimetrend-service.herokuapp.com/badge/ruleant/getback_gps/builds/month)](http://ruleant.github.io/getback_gps/buildtime-trend/)
[![Passed build jobs](https://buildtimetrend-service.herokuapp.com/badge/ruleant/getback_gps/passed/month)](http://ruleant.github.io/getback_gps/buildtime-trend/)
[![Buildtime trend](https://buildtimetrend-dev.herokuapp.com/badge/ruleant/getback_gps/latest)](http://ruleant.github.io/getback_gps/buildtime-trend/)
[![Total builds](https://buildtimetrend-dev.herokuapp.com/badge/ruleant/getback_gps/builds/month)](http://ruleant.github.io/getback_gps/buildtime-trend/)
[![Passed build jobs](https://buildtimetrend-dev.herokuapp.com/badge/ruleant/getback_gps/passed/month)](http://ruleant.github.io/getback_gps/buildtime-trend/)
[![Days since last failed build job](https://buildtimetrend-dev.herokuapp.com/badge/ruleant/getback_gps/last_fail)](https://buildtimetrend-dev.herokuapp.com/dashboard/ruleant/getback_gps/index.html)

Open Source Android app for finding your way back to a previously visited location using GPS coordinates.

Expand Down Expand Up @@ -38,7 +42,7 @@ 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.
If you want to try out the latest development version, you can get the code from the [git repository](https://github.com/ruleant/getback_gps) and [build the current development version](https://github.com/ruleant/getback_gps/wiki/Development) yourself.


Bugs and feature requests
Expand Down Expand Up @@ -90,23 +94,15 @@ Third party material
- website : https://github.com/keyboardsurfer/Crouton
- license : Apache 2.0

Third party material
--------------------

- res/drawable-*/ic_action_refresh.png
- From the Action Bar Icon Pack, see http://developer.android.com/design/style/iconography.html
- origin : http://developer.android.com/downloads/design/Android_Design_Icons_20131106.zip
- license : Apache 2.0
Credits
-------

- Crouton library
- version : v1.8.1
- website : https://github.com/keyboardsurfer/Crouton
- license : Apache 2.0
Getback GPS for Android was made possible by many contributers and sponsors, see [Credits](https://github.com/ruleant/getback_gps/wiki/Credits).

License
-------

Copyright (C) 2012-2015 Dieter Adriaenssens <ruleant@users.sourceforge.net>
Copyright (C) 2012-2018 Dieter Adriaenssens <ruleant@users.sourceforge.net>

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
Expand Down
60 changes: 60 additions & 0 deletions Vagrantfile
@@ -0,0 +1,60 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# All Vagrant configuration is done here. The most common configuration
# options are documented and commented below. For a complete reference,
# please see the online documentation at vagrantup.com.

# Every Vagrant virtual environment requires a box to build off of.
config.vm.box = "ubuntu/xenial64"

# increase memory of virtualbox
config.vm.provider "virtualbox" do |v|
v.memory = 2048
v.customize ["modifyvm", :id, "--usb", "on"]
v.customize ["modifyvm", :id, "--usbxhci", "on"]
v.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'Google Inc. Nexus 4 (debug)', '--vendorid', '0x18d1', '--productid', '0x4ee2']
v.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'Motorola Moto X4', '--vendorid', '0x22b8', '--productid', '0x2e76']
end

# Disable automatic box update checking. If you disable this, then
# boxes will only be checked for updates when the user runs
# `vagrant box outdated`. This is not recommended.
# config.vm.box_check_update = false

# Create a forwarded port mapping which allows access to a specific port
# within the machine from a port on the host machine. In the example below,
# accessing "localhost:8080" will access port 80 on the guest machine.
# config.vm.network "forwarded_port", guest: 80, host: 8080

# Create a private network, which allows host-only access to the machine
# using a specific IP.
# config.vm.network "private_network", ip: "192.168.33.10"

# Create a public network, which generally matched to bridged network.
# Bridged networks make the machine appear as another physical device on
# your network.
# config.vm.network "public_network"

# If true, then any SSH connections made will enable agent forwarding.
# Default value: false
# config.ssh.forward_agent = true

# Share an additional folder to the guest VM. The first argument is
# the path on the host to the actual folder. The second argument is
# the path on the guest to mount the folder. And the optional third
# argument is a set of non-required options.
# config.vm.synced_folder "../data", "/vagrant_data"

# start Ansible provisioning
config.vm.provision "ansible" do |ansible|
ansible.verbose = "v"
ansible.become = true
ansible.playbook = "provisioning/playbook.yml"
ansible.extra_vars = { ansible_python_interpreter:"/usr/bin/python2.7" }
end
end
6 changes: 3 additions & 3 deletions build.gradle
Expand Up @@ -13,8 +13,8 @@ buildscript {
apply plugin: 'android'

android {
compileSdkVersion 20
buildToolsVersion "21.1.2"
compileSdkVersion 23
buildToolsVersion "23.0.1"
}

android {
Expand Down Expand Up @@ -83,4 +83,4 @@ task unitTest(type:Test, dependsOn: assemble) {
classpath = project.sourceSets.unitTest.runtimeClasspath
}

check.dependsOn unitTest
//check.dependsOn unitTest
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-1.10-bin.zip
12 changes: 6 additions & 6 deletions pom.xml
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.ruleant.getback_gps</groupId>
<artifactId>getback_gps</artifactId>
<version>0.4.1</version>
<version>0.5</version>
<packaging>apk</packaging>
<name>GetBack GPS</name>
<properties>
Expand All @@ -27,7 +27,7 @@
<dependency>
<groupId>android</groupId>
<artifactId>android</artifactId>
<version>4.4W_r1</version>
<version>6.0_r1</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -81,8 +81,8 @@
<configuration>
<release>true</release>
<sdk>
<!-- platform or api level (api level 20 = platform 4.4W) -->
<platform>20</platform>
<!-- platform or api level (api level 23 = platform 6) -->
<platform>23</platform>
</sdk>
<lint>
<skip>false</skip>
Expand All @@ -95,7 +95,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.5.2</version>
<version>2.7</version>
<configuration>
<aggregate>true</aggregate>
<format>xml</format>
Expand All @@ -110,7 +110,7 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>2.2.0</version>
<version>4.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
2 changes: 2 additions & 0 deletions provisioning/files/51-android.rules
@@ -0,0 +1,2 @@
SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="4ee2", GROUP="plugdev"
SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="2e76", GROUP="plugdev", ENV{adb_adbfast}="yes"
19 changes: 19 additions & 0 deletions provisioning/playbook.yml
@@ -0,0 +1,19 @@
---
- hosts: all
tasks:
- name: "Install git"
apt: name=git state=latest

- name: "Install java JDK 8"
apt: name=openjdk-8-jdk state=latest

- name: "Install maven"
apt: name=maven state=latest

- name: "Install udev config file"
copy:
src: files/51-android.rules
dest: /etc/udev/rules.d/51-android.rules
owner: root
group: root
mode: 0644
6 changes: 4 additions & 2 deletions res/layout-land/activity_main.xml
Expand Up @@ -12,7 +12,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/navigationView_ToDest" />
android:layout_toLeftOf="@+id/navigationView_ToDest"
android:layout_toStartOf="@+id/navigationView_ToDest" />

<com.github.ruleant.getback_gps.NavigationView
android:id="@+id/navigationView_ToDest"
Expand All @@ -25,6 +26,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/navigationView_ToDest" />
android:layout_toRightOf="@+id/navigationView_ToDest"
android:layout_toEndOf="@+id/navigationView_ToDest"/>

</RelativeLayout>

0 comments on commit 1d89d68

Please sign in to comment.