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 3, 2022
2 parents 9da30b7 + 7598959 commit 6b11bea
Show file tree
Hide file tree
Showing 76 changed files with 1,179 additions and 1,022 deletions.
15 changes: 10 additions & 5 deletions .travis.yml
@@ -1,20 +1,25 @@
#based on https://raw.github.com/leviwilson/android-travis-ci-example/master/.travis.yml
language: android
os: linux
dist: xenial
android:
components:
- android-28
- build-tools-28.0.3
# enable building on container-based infrastructure
sudo: false
- android-29
- build-tools-29.0.3
env:
global:
# github token
- secure: "mMIHz+I2pZK7I9PvhkTIRDeXJJIZTwigAamHnaId1q9YO7LvBoCKsJCI7pepbK303lTZJqkTgyTti9xSsYjzMIIMT8G+YBfVqoiy6wWOZjwjjZxn5Mw7g3qxRRdpXCc7B7hBBTEiEzC0Bp3QwPQtwdFDlACwgHWsbDLiaweIglg="
# coverity token
- secure: "bbT3Swvy1P0vFgXE5E5Iv9+JU8GG4LZlbwLez2B7s0aOuxEFCnj19M+GAldVAeHCc/z/0Oz+N1p4eRU5OCJY71lZqv5F8ph8ahti7uUylbfoNHM7g1mcmVSNFZ5bgVhnz/RQjEK/o5msqv3UZPRPS023Q5vAbCrftuHOiOiBbCo="
before_install:
- echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
script:
- ./gradlew clean assemble
- ./gradlew clean check assemble
after_success:
# Generate test coverage report with Jacoco and publish on Coveralls
- ./gradlew jacocoTestReport
- ./gradlew coverallsJacoco
# update javadoc on Github Pages (gh-pages)
- ./gradlew generateJavadoc
- .utility/copy-javadoc-to-gh-pages.sh
Expand Down
16 changes: 8 additions & 8 deletions .utility/copy-javadoc-to-gh-pages.sh
Expand Up @@ -27,26 +27,26 @@

# don't update JavaDoc when it is a pull request
# only update Javadoc when master branch is built
if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then

echo -e "Start to publish lastest Javadoc to gh-pages...\n"

cp -R build/docs/javadoc/release $HOME/javadoc-latest
cp -R build/docs/javadoc/release "${HOME}/javadoc-latest"

cd $HOME
git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG} gh-pages > /dev/null
cd "${HOME}"
git clone --quiet --branch=gh-pages "https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}" gh-pages > /dev/null
cd gh-pages

# set git user in gh-pages repo
git config user.email "travis@travis-ci.org"
git config user.email "travis@travis-ci.com"
git config user.name "travis-ci"

git rm -rf ./javadoc
cp -Rf $HOME/javadoc-latest ./javadoc
cp -Rf "${HOME}/javadoc-latest" ./javadoc
git add -f .
git commit -m "Lastest javadoc on successful travis build $TRAVIS_BUILD_NUMBER auto-pushed to gh-pages"
git commit -m "Lastest javadoc on successful travis build ${TRAVIS_BUILD_NUMBER} auto-pushed to gh-pages"
git push -fq origin gh-pages > /dev/null

echo -e "Done magic with auto publishment to gh-pages.\n"

fi
30 changes: 23 additions & 7 deletions .utility/crop_scale_screenshot.sh
Expand Up @@ -21,10 +21,25 @@
# 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

if [ $# -eq 0 ]
then
echo "No parameters supplied!"
echo "Usage $0 inputImage [outputImage]"
exit 0
else
if [ $# -eq 1 ]
then
inputImageFile=$1
outputImageFile=$1
else
inputImageFile=$1
outputImageFile=$2
fi
fi

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

# image size is 3rd element of the array
imageSize=${imageProperties[2]}
Expand All @@ -47,15 +62,16 @@ case "$imageSize" in
resize="800x442"
;;
# default, unknown format : don't crop/resize image
*) echo $imageSize
*) echo "${imageSize}"
echo "Unknown format, image was not changed."
exit 0
;;
esac

echo "original size : $imageSize"
echo "extraction parameters : $extract"
echo "resize parameters : $resize"
echo "original size : ${imageSize}"
echo "extraction parameters : ${extract}"
echo "resize parameters : ${resize}"
echo "output file: ${outputImageFile}"

# remove bars and resize image
convert -size $imageSize -extract $extract $imageFile -resize $resize $imageFile
convert -size "${imageSize}" -extract "${extract}" "${inputImageFile}" -resize "${resize}" "${outputImageFile}"
4 changes: 2 additions & 2 deletions AndroidManifest.xml
@@ -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="70"
android:versionName="0.7" >
android:versionCode="80"
android:versionName="0.8" >

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

Expand Down
25 changes: 25 additions & 0 deletions ChangeLog
@@ -1,3 +1,28 @@
v0.8 (released on 03Jan2022)
- issue #183 : add fastlane metadata
- issue #185 : Fix Hebrew translation not being displayed
- simplify string placeholder notation app_website string
- Fix Indonesian language code (symlink id -> in)
- issue #184 : build against Android SDK 10.0 (API 29)
- improved Spanish translation, thanks to badlop
- issue #186 : add screenshots to fastlane
- upgrade build toolchain to gradle 6.8, gradle for Android plugin 4.1.1
- issue #126, #172: convert unittests to junit5 (Jupiter)
- improved Hindi translation, thanks to Dormin
- export coverity-scan certificate before Travis-ci build
- properly escape variables in bash utility scripts
- cleanup unused constants in tests
- remove shippable config
- PR #192 : Improve GRADLE build Performance
- translated to Indonesian, thanks to Reza Almanda
- improved Spanish translation, thanks to Hur Ezeiza Zaldua
- translated to Basque, thanks to Hur Ezeiza Zaldua
- improved Portuguese translation, thanks to Sérgio Morais, ssantos
- improved Portuguese (Brazil) translation, thanks to Sérgio Morais
- improved Russian translation, thanks to Чтабс
- improved Ukrainian translation, thanks to Tymofii Lytvynenko
- improved Persian translation, thanks to عبدالرئوف عابدی

v0.7 (released on 02Jan2021)
- issue #73 : add form to manually enter a location, thanks to Timotheos Constambeys
- translated to Ukrainian, thanks to Oleksiy
Expand Down
16 changes: 8 additions & 8 deletions README.md
@@ -1,11 +1,11 @@
GetBack GPS for Android
=======================

[![GetBack GPS](https://img.shields.io/badge/release-v0.7-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)
[![GetBack GPS](https://img.shields.io/badge/release-v0.8-blue.svg)](https://f-droid.org/repository/browse/?fdid=com.github.ruleant.getback_gps)
[![Build Status](https://app.travis-ci.com/ruleant/getback_gps.svg?branch=master)](https://app.travis-ci.com/ruleant/getback_gps)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/4b5357e56e194b2fade4282f8dc7c182)](https://app.codacy.com/gh/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)
[![Coverage Status](https://coveralls.io/repos/github/ruleant/getback_gps/badge.svg?branch=master)](https://coveralls.io/github/ruleant/getback_gps?branch=master)

[![Translation status](https://hosted.weblate.org/widgets/getback_gps/-/svg-badge.svg)](https://hosted.weblate.org/engage/getback_gps/)
[![todofy badge](https://todofy.org/b/ruleant/getback_gps)](https://todofy.org/r/ruleant/getback_gps)
Expand All @@ -30,7 +30,7 @@ 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
- a compass rose that points to the North
- detect travel direction and adjust relative direction to destination accordingly

How to get it?
Expand All @@ -51,11 +51,11 @@ Requests for translations to a new language can be made here as well.
Translation
-----------

You can help translating the app to your own language : <https://hosted.weblate.org/projects/getback_gps/strings>.
You can help translating the app to your own language : <https://hosted.weblate.org/engage/getback_gps/>.

[![Translation status](https://hosted.weblate.org/widgets/getback_gps-287x66-grey.png)](https://hosted.weblate.org/engage/getback_gps/?utm_source=widget)
[![Translation status](https://hosted.weblate.org/widgets/getback_gps/-/multi-auto.svg)](https://hosted.weblate.org/engage/getback_gps/)

Is your language not listed? Follow the instructions on the [New translation](https://hosted.weblate.org/projects/getback_gps/strings/#new-lang) tab in Weblate or open an issue in the Github [issue tracker](https://github.com/ruleant/getback_gps/issues).
Is your language not listed? Follow the instructions on the [New translation](https://hosted.weblate.org/new-lang/getback_gps/strings/) tab in Weblate.

Code documentation
------------------
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Expand Up @@ -24,6 +24,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
v.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'Motorola PCS', '--vendorid', '0x22b8', '--productid', '0x2e81']
v.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'Motorola PCS', '--vendorid', '0x22b8', '--productid', '0x2e84']
v.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'Huawei Technologies Co., Ltd.', '--vendorid', '0x12d1', '--productid', '0x107e']
v.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'Samsung Galaxy A51', '--vendorid', '0x04e8', '--productid', '0x6860']
end

# Disable automatic box update checking. If you disable this, then
Expand Down Expand Up @@ -64,6 +65,5 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
ansible.become = true
ansible.playbook = "provisioning/playbook.yml"
ansible.extra_vars = { ansible_python_interpreter:"/usr/bin/python2.7" }
ansible.compatibility_mode = "1.8"
end
end
76 changes: 37 additions & 39 deletions build.gradle
Expand Up @@ -8,41 +8,40 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.1'
classpath 'com.vanniktech:gradle-android-javadoc-plugin:0.3.0'
classpath 'de.mannodermaus.gradle.plugins:android-junit5:1.7.0.0'
}
}

plugins {
id 'jacoco'
id('com.github.nbaztec.coveralls-jacoco') version '1.2.7'
}

apply plugin: 'com.android.application'
apply plugin: 'com.vanniktech.android.javadoc'
apply plugin: "de.mannodermaus.android-junit5"

android {
compileSdkVersion 28
buildToolsVersion "28.0.3"
compileSdkVersion 29
buildToolsVersion "29.0.3"

defaultConfig {
minSdkVersion 14
targetSdkVersion 28
targetSdkVersion 29
}

sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src/java']

resources.srcDirs = ['src/java']
aidl.srcDirs = ['src/java']

renderscript.srcDirs = ['src/java']

res.srcDirs = ['res']
assets.srcDirs = ['assets']
}

// instrumentTest.setRoot('test')
}
lintOptions {
// if true, stop the gradle build if errors are found
Expand Down Expand Up @@ -72,30 +71,29 @@ dependencies {

// Unit tests

// temporarily disable unit tests issue #172
// sourceSets {
// unitTest {
// java.srcDir file('src/test')
// resources.srcDir file('src/test/resources')
// }
//}
//
//dependencies {
// unitTestCompile files("$project.buildDir/classes/debug")
// unitTestCompile 'org.robolectric:robolectric:2.2'
// unitTestCompile 'junit:junit:4.11', 'org.mockito:mockito-core:1.9.5'
// unitTestCompile 'com.google.android:android:4.1.1.4'
//}
//
//configurations {
// unitTestCompile.extendsFrom runtime
// unitTestRuntime.extendsFrom unitTestCompile
//}
//
//task unitTest(type:Test, dependsOn: assemble) {
// description = "run unit tests"
// testClassesDir = project.sourceSets.unitTest.output.classesDir
// classpath = project.sourceSets.unitTest.runtimeClasspath
//}
//
//check.dependsOn unitTest
sourceSets {
unitTest {
java.srcDir file('src/test')
resources.srcDir file('src/test/resources')
}
}

dependencies {
// (Required) Writing and executing Unit Tests on the JUnit Platform.
testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0")

// (Optional) If you need "Parameterized Tests".
testImplementation("org.junit.jupiter:junit-jupiter-params:5.7.0")

// (Optional) If you also have JUnit 4-based tests
testImplementation("junit:junit:4.13")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.7.0")

testCompile files("$project.buildDir/classes/debug")
testCompile 'org.mockito:mockito-core:3.7.7'
}

coverallsJacoco {
reportPath = "build/reports/jacoco/jacocoTestReportRelease/jacocoTestReportRelease.xml"
}
7 changes: 7 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/11.txt
@@ -0,0 +1,7 @@
- determine location based on GPS signal, WiFi or cell phone network :
- use best/most accurate location provider
- get location updates automatically (based on a time interval or change of location) or
- get location on demand (by manually refreshing)
- save a location
- ‘get back’ mode : indicator pointing to a stored location (showing distance and direction)
- indicate current speed and current bearing
4 changes: 4 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/12.txt
@@ -0,0 +1,4 @@
- adds features and license description of third party material to README file
- updates ic_action_refresh.png icon.

Check Changelog for a detailed list of changes: https://github.com/ruleant/getback_gps/blob/master/ChangeLog
7 changes: 7 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/20.txt
@@ -0,0 +1,7 @@
- use built-in sensors to get a quicker updated bearing
- combine sensor and location based bearing to get quicker and more accurate updates
- improved arrow pointing to destination
- translated to German and Romanian
- remove Android permission INTERNET, it is not needed to get WiFi/cell phone based location updates

Check Changelog for a detailed list of changes: https://github.com/ruleant/getback_gps/blob/master/ChangeLog
6 changes: 6 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/30.txt
@@ -0,0 +1,6 @@
- added a compass rose that points to the North
- detect travel direction and adjust relative direction to destination accordingly
- translated to Danish, Portuguese (Brazil), Traditional Chinese and French
- several small improvements

Check Changelog for a detailed list of changes: https://github.com/ruleant/getback_gps/blob/master/ChangeLog
6 changes: 6 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/40.txt
@@ -0,0 +1,6 @@
- add a name to a destination
- compass rose is displayed when the orientation is accurate
- new languages : Italian, Spanish, Korean, Belarusian, Catalan, Russian and Japanese
- minor improvements and bug fixes

Check Changelog for a detailed list of changes: https://github.com/ruleant/getback_gps/blob/master/ChangeLog
4 changes: 4 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/41.txt
@@ -0,0 +1,4 @@
- new languages : Sardinian and Hindi
- completed languages : German and Romanian

Check Changelog for a detailed list of changes: https://github.com/ruleant/getback_gps/blob/master/ChangeLog
4 changes: 4 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/50.txt
@@ -0,0 +1,4 @@
- altitude and height difference to destianation are displayed in interface
- new languages : Croatian, Chinese (China), Estonian, Norwegian Bokmål, Polish

Check Changelog for a detailed list of changes: https://github.com/ruleant/getback_gps/blob/master/ChangeLog
3 changes: 3 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/51.txt
@@ -0,0 +1,3 @@
- improved translation : Polish

Check Changelog for a detailed list of changes: https://github.com/ruleant/getback_gps/blob/master/ChangeLog
4 changes: 4 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/60.txt
@@ -0,0 +1,4 @@
- add support for up to Android SDK 9.0, minimum required version is now Android SDK 4.0
- improved languages : Belarusian, Chinese (Traditional), Danish, Dutch, Estonian, French, German, Norwegian Bokmål, Sardinian, Japanese

Check Changelog for a detailed list of changes: https://github.com/ruleant/getback_gps/blob/master/ChangeLog
4 changes: 4 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/70.txt
@@ -0,0 +1,4 @@
- add form to manually enter a location
- added languages : Ukranian, Turkish, Hungarian, Persian, Portuguese, Hebrew, Kabyle

Check Changelog for a detailed list of changes: https://github.com/ruleant/getback_gps/blob/master/ChangeLog
6 changes: 6 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/80.txt
@@ -0,0 +1,6 @@
- build against Android SDK 10.0 (API 29)
- Fix Hebrew translation not being displayed
- added languages : Basque, Indonesian
- improved languages : Hindi, Persian, Portuguese, Portuguese (Brazil), Russian, Spanish, Ukrainian

Check Changelog for a detailed list of changes: https://github.com/ruleant/getback_gps/blob/master/ChangeLog

0 comments on commit 6b11bea

Please sign in to comment.