Skip to content

Domain changed to org.osmtracker #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 3, 2018
Merged

Domain changed to org.osmtracker #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=me.guillaumin.android.osmtracker)
[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/app/me.guillaumin.android.osmtracker)
[<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=org.osmtracker)
[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/app/org.osmtracker)

OSMTracker for Android™ official source code repository is [https://github.com/nguillaumin/osmtracker-android](https://github.com/nguillaumin/osmtracker-android).

Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ android {
buildToolsVersion "22.0.1"

defaultConfig {
applicationId "me.guillaumin.android.osmtracker"
applicationId "org.osmtracker"
minSdkVersion 8
targetSdkVersion 16

testApplicationId "me.guillaumin.android.osmtracker.test"
testApplicationId "org.osmtracker.test"
testInstrumentationRunner "android.test.InstrumentationTestRunner"
}

Expand Down
8 changes: 4 additions & 4 deletions ...mtracker/test/activity/OSMUploadTest.java → ...mtracker/test/activity/OSMUploadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package me.guillaumin.android.osmtracker.test.activity;
package org.osmtracker.test.activity;

import org.osmtracker.activity.OpenStreetMapUpload;

import me.guillaumin.android.osmtracker.activity.OpenStreetMapUpload;
import me.guillaumin.android.osmtracker.test.util.MockData;
import android.test.ActivityInstrumentationTestCase2;

public class OSMUploadTest extends ActivityInstrumentationTestCase2<OpenStreetMapUpload> {

public OSMUploadTest() {
super("me.guillaumin.android.osmtracker", OpenStreetMapUpload.class);
super("org.osmtracker", OpenStreetMapUpload.class);
}

@Override
Expand Down
25 changes: 13 additions & 12 deletions ...racker/test/activity/TrackDetailTest.java → ...racker/test/activity/TrackDetailTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package me.guillaumin.android.osmtracker.test.activity;
package org.osmtracker.test.activity;

import junit.framework.Assert;
import me.guillaumin.android.osmtracker.R;
import me.guillaumin.android.osmtracker.activity.TrackDetail;
import me.guillaumin.android.osmtracker.db.TrackContentProvider;
import me.guillaumin.android.osmtracker.db.TrackContentProvider.Schema;
import me.guillaumin.android.osmtracker.test.util.MockData;

import org.osmtracker.activity.TrackDetail;
import org.osmtracker.db.TrackContentProvider;
import org.osmtracker.db.TrackContentProvider.Schema;
import org.osmtracker.test.util.MockData;

import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.Intent;
Expand All @@ -21,7 +22,7 @@ public class TrackDetailTest extends ActivityInstrumentationTestCase2<TrackDetai
private long trackId;

public TrackDetailTest() {
super("me.guillaumin.android.osmtracker", TrackDetail.class);
super("org.osmtracker", TrackDetail.class);
}

@Override
Expand All @@ -48,11 +49,11 @@ public void testSave() {
Assert.assertEquals("Private", cursor.getString(cursor.getColumnIndex(Schema.COL_OSM_VISIBILITY)));
cursor.close();

((EditText) getActivity().findViewById(R.id.trackdetail_item_name)).setText("test name");
((EditText) getActivity().findViewById(R.id.trackdetail_item_description)).setText("test description");
((EditText) getActivity().findViewById(R.id.trackdetail_item_tags)).setText("test tags");
((Spinner) getActivity().findViewById(R.id.trackdetail_item_osm_visibility)).setSelection(1);
((Button) getActivity().findViewById(R.id.trackdetail_btn_ok)).performClick();
((EditText) getActivity().findViewById(org.osmtracker.R.id.trackdetail_item_name)).setText("test name");
((EditText) getActivity().findViewById(org.osmtracker.R.id.trackdetail_item_description)).setText("test description");
((EditText) getActivity().findViewById(org.osmtracker.R.id.trackdetail_item_tags)).setText("test tags");
((Spinner) getActivity().findViewById(org.osmtracker.R.id.trackdetail_item_osm_visibility)).setSelection(1);
((Button) getActivity().findViewById(org.osmtracker.R.id.trackdetail_btn_ok)).performClick();

cursor = cr.query(
ContentUris.withAppendedId(TrackContentProvider.CONTENT_URI_TRACK, trackId),
Expand Down
14 changes: 7 additions & 7 deletions ...tracker/test/gpx/ExportTrackTaskTest.java → ...tracker/test/gpx/ExportTrackTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.guillaumin.android.osmtracker.test.gpx;
package org.osmtracker.test.gpx;

import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
Expand All @@ -17,11 +17,11 @@
import java.io.InputStream;
import java.io.InputStreamReader;

import me.guillaumin.android.osmtracker.OSMTracker;
import me.guillaumin.android.osmtracker.activity.TrackManager;
import me.guillaumin.android.osmtracker.db.DataHelper;
import me.guillaumin.android.osmtracker.gpx.ExportToStorageTask;
import me.guillaumin.android.osmtracker.test.util.MockData;
import org.osmtracker.OSMTracker;
import org.osmtracker.activity.TrackManager;
import org.osmtracker.db.DataHelper;
import org.osmtracker.gpx.ExportToStorageTask;
import org.osmtracker.test.util.MockData;

public class ExportTrackTaskTest extends ActivityInstrumentationTestCase2<TrackManager> {

Expand All @@ -30,7 +30,7 @@ public class ExportTrackTaskTest extends ActivityInstrumentationTestCase2<TrackM


public ExportTrackTaskTest() {
super("me.guillaumin.android.osmtracker", TrackManager.class);
super("org.osmtracker", TrackManager.class);
}

@Override
Expand Down
9 changes: 4 additions & 5 deletions ...ndroid/osmtracker/test/util/MockData.java → ...va/org/osmtracker/test/util/MockData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package me.guillaumin.android.osmtracker.test.util;
package org.osmtracker.test.util;

import java.util.Calendar;
import java.util.Locale;
import java.util.Random;
import java.util.SimpleTimeZone;
import java.util.TimeZone;
import java.util.UUID;

import me.guillaumin.android.osmtracker.db.DataHelper;
import me.guillaumin.android.osmtracker.db.TrackContentProvider;
import me.guillaumin.android.osmtracker.db.TrackContentProvider.Schema;
import org.osmtracker.db.DataHelper;
import org.osmtracker.db.TrackContentProvider;
import org.osmtracker.db.TrackContentProvider.Schema;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
Expand Down
30 changes: 15 additions & 15 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="me.guillaumin.android.osmtracker"
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.osmtracker"
android:versionName="0.6.11" android:versionCode="37" android:installLocation="auto">

<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
Expand All @@ -11,40 +11,40 @@

<application android:label="@string/app_name" android:description="@string/app_description" android:icon="@drawable/ic_launcher">

<activity android:name=".activity.TrackManager" android:label="@string/app_name">
<activity android:name="org.osmtracker.activity.TrackManager" android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity android:name=".activity.TrackLogger" android:label="@string/tracklogger" android:launchMode="singleTop"/>
<activity android:name=".activity.Preferences" android:label="@string/prefs" />
<activity android:name=".activity.WaypointList" android:label="@string/wplist" />
<activity android:name=".activity.TrackDetail" android:label="@string/trackdetail" />
<activity android:name=".activity.OpenStreetMapUpload" android:label="@string/osm_upload">
<activity android:name="org.osmtracker.activity.TrackLogger" android:label="@string/tracklogger" android:launchMode="singleTop"/>
<activity android:name="org.osmtracker.activity.Preferences" android:label="@string/prefs" />
<activity android:name="org.osmtracker.activity.WaypointList" android:label="@string/wplist" />
<activity android:name="org.osmtracker.activity.TrackDetail" android:label="@string/trackdetail" />
<activity android:name="org.osmtracker.activity.OpenStreetMapUpload" android:label="@string/osm_upload">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.DEFAULT"/>
<data android:host="osm-upload" android:scheme="osmtracker"/>
</intent-filter>
</activity>
<activity android:name=".activity.About" android:label="@string/about" />
<activity android:name=".activity.DisplayTrack" android:label="@string/displaytrack" />
<activity android:name=".activity.DisplayTrackMap" android:label="@string/displaytrackmap" />
<activity android:name="org.osmtracker.activity.About" android:label="@string/about" />
<activity android:name="org.osmtracker.activity.DisplayTrack" android:label="@string/displaytrack" />
<activity android:name="org.osmtracker.activity.DisplayTrackMap" android:label="@string/displaytrackmap" />

<service android:name=".service.gps.GPSLogger" android:exported="false">
<service android:name="org.osmtracker.service.gps.GPSLogger" android:exported="false">
<intent-filter>
<action android:name="me.guillaumin.android.osmtracker.intent.GPS_SERVICE" />
<action android:name="org.osmtracker.intent.GPS_SERVICE" />
</intent-filter>
</service>

<provider android:name=".db.TrackContentProvider"
android:authorities="me.guillaumin.android.osmtracker.provider"
<provider android:name="org.osmtracker.db.TrackContentProvider"
android:authorities="org.osmtracker.provider"
android:exported="false" />

<receiver android:name=".receiver.MediaButtonReceiver" >
<receiver android:name="org.osmtracker.receiver.MediaButtonReceiver" >
<intent-filter>
<action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter>
Expand Down
Loading