upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-09-30 16:52:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded project to AndroidX.

Browse Source
This commit is contained in:
Dennis Guse
2019-07-02 22:07:29 +02:00
parent 539285f6cf
commit 0d4d1769f0
39 changed files with 93 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+2
View File
@@ -0,0 +1,2 @@
android.enableJetifier=true
android.useAndroidX=true
myTracks/build.gradle
+31 -31
View File
@@ -1,31 +1,31 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 26
defaultConfig {
applicationId "com.google.android.maps.mytracks"
minSdkVersion 21
targetSdkVersion 26
testApplicationId "com.google.android.maps.mytracks.test"
testInstrumentationRunner "android.test.InstrumentationTestRunner"
}
buildTypes {
release {
minifyEnabled true
proguardFiles 'proguard.cfg', 'proguard-google-api-client.txt'
}
}
}
dependencies {
implementation project(':myTracksLib')
androidTestCompile files('libs/AndroidMockGenerator.jar')
androidTestCompile files('libs/robotium-solo-5.0.1.jar')
implementation 'com.google.android.gms:play-services-location:11.8.0'
implementation 'com.google.android.gms:play-services:11.8.0'
implementation 'com.google.android.gms:play-services-auth:11.8.0'
}
apply plugin: 'com.android.application'
android {
compileSdkVersion 28
defaultConfig {
applicationId "com.google.android.maps.mytracks"
minSdkVersion 21
targetSdkVersion 28
testApplicationId "com.google.android.maps.mytracks.test"
testInstrumentationRunner "android.test.InstrumentationTestRunner"
}
buildTypes {
release {
minifyEnabled true
proguardFiles 'proguard.cfg', 'proguard-google-api-client.txt'
}
}
}
dependencies {
implementation project(':myTracksLib')
androidTestCompile files('libs/AndroidMockGenerator.jar')
androidTestCompile files('libs/robotium-solo-5.0.1.jar')
implementation 'com.google.android.gms:play-services-location:11.8.0'
implementation 'com.google.android.gms:play-services:11.8.0'
implementation 'com.google.android.gms:play-services-auth:11.8.0'
}
myTracks/src/main/java/com/google/android/apps/mytracks/AbstractMyTracksActivity.java
+1 -1
View File
@@ -21,7 +21,7 @@ import com.google.android.apps.mytracks.util.TrackIconUtils;
import android.app.ActionBar;
import android.os.Bundle;
import android.speech.tts.TextToSpeech;
import android.support.v4.app.FragmentActivity;
import androidx.fragment.app.FragmentActivity;
import android.view.Menu;
import android.view.MenuItem;
myTracks/src/main/java/com/google/android/apps/mytracks/ChartValueSeries.java
+1 -1
View File
@@ -22,7 +22,7 @@ import android.graphics.Paint;
import android.graphics.Paint.Align;
import android.graphics.Paint.Style;
import android.graphics.Path;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import com.google.android.apps.mytracks.stats.ExtremityMonitor;
myTracks/src/main/java/com/google/android/apps/mytracks/ChartView.java
+1 -2
View File
@@ -27,7 +27,7 @@ import android.graphics.Paint.Style;
import android.graphics.Path;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import android.view.MotionEvent;
import android.view.VelocityTracker;
import android.view.View;
@@ -35,7 +35,6 @@ import android.view.ViewConfiguration;
import android.widget.Scroller;
import com.google.android.apps.mytracks.content.Waypoint;
import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
import com.google.android.apps.mytracks.stats.ExtremityMonitor;
import com.google.android.apps.mytracks.util.IntentUtils;
import com.google.android.apps.mytracks.util.StringUtils;
myTracks/src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java
+4 -4
View File
@@ -24,10 +24,10 @@ import com.google.android.maps.mytracks.R;
import android.database.Cursor;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;
import android.util.Log;
import java.util.ArrayList;
myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java
+4 -4
View File
@@ -33,10 +33,10 @@ import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.database.Cursor;
import android.os.Bundle;
import android.support.v4.app.LoaderManager.LoaderCallbacks;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import android.support.v4.widget.ResourceCursorAdapter;
import androidx.loader.app.LoaderManager.LoaderCallbacks;
import androidx.loader.content.CursorLoader;
import androidx.loader.content.Loader;
import androidx.cursoradapter.widget.ResourceCursorAdapter;
import android.util.Log;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
myTracks/src/main/java/com/google/android/apps/mytracks/SectionResourceCursorAdapter.java
+1 -1
View File
@@ -21,7 +21,7 @@ import com.google.android.maps.mytracks.R;
import android.content.Context;
import android.database.Cursor;
import android.support.v4.widget.ResourceCursorAdapter;
import androidx.cursoradapter.widget.ResourceCursorAdapter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
myTracks/src/main/java/com/google/android/apps/mytracks/TabsAdapter.java
+4 -4
View File
@@ -18,10 +18,10 @@ package com.google.android.apps.mytracks;
import android.content.Context;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentPagerAdapter;
import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TabHost;
myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java
+2 -2
View File
@@ -48,8 +48,8 @@ import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Bundle;
import android.provider.MediaStore;
import android.support.v4.app.TaskStackBuilder;
import android.support.v4.view.ViewPager;
import androidx.core.app.TaskStackBuilder;
import androidx.viewpager.widget.ViewPager;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MotionEvent;
myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java
+3 -3
View File
@@ -29,9 +29,9 @@ import android.os.Looper;
import android.os.Parcelable;
import android.os.RemoteException;
import android.os.StrictMode;
import android.support.v4.app.LoaderManager.LoaderCallbacks;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import androidx.loader.app.LoaderManager.LoaderCallbacks;
import androidx.loader.content.CursorLoader;
import androidx.loader.content.Loader;
import android.util.Log;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
myTracks/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java
+1 -1
View File
@@ -17,7 +17,7 @@
package com.google.android.apps.mytracks.content;
import android.content.Context;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.apps.mytracks.util.StringUtils;
myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProvider.java
+1 -1
View File
@@ -32,7 +32,7 @@ import android.net.Uri;
import android.os.Binder;
import android.os.ParcelFileDescriptor;
import android.os.Process;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import android.text.TextUtils;
import android.util.Log;
myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java
+1 -1
View File
@@ -21,7 +21,7 @@ import android.database.Cursor;
import android.location.Location;
import android.os.Handler;
import android.os.HandlerThread;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import android.util.Log;
import com.google.android.apps.mytracks.content.MyTracksProviderUtils.LocationIterator;
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/AbstractMyTracksDialogFragment.java
+2 -2
View File
@@ -21,8 +21,8 @@ import com.google.android.apps.mytracks.util.DialogUtils;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
/**
* Abstract My Tracks DialogFragment.
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java
+3 -3
View File
@@ -18,9 +18,9 @@ package com.google.android.apps.mytracks.fragments;
import android.location.Location;
import android.os.Bundle;
import android.support.annotation.VisibleForTesting;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java
+3 -3
View File
@@ -28,9 +28,9 @@ import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.ShareCompat;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
import androidx.core.app.ShareCompat;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java
+1 -1
View File
@@ -29,7 +29,7 @@ import android.content.DialogInterface;
import android.graphics.BitmapFactory;
import android.graphics.BitmapFactory.Options;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import androidx.fragment.app.DialogFragment;
import android.view.View;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/DeleteMarkerDialogFragment.java
+1 -1
View File
@@ -25,7 +25,7 @@ import android.app.Activity;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import androidx.fragment.app.FragmentActivity;
/**
* A DialogFragment to delete marker.
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java
+1 -1
View File
@@ -24,7 +24,7 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import androidx.fragment.app.FragmentActivity;
/**
* A DialogFragment to configure frequency.
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java
+2 -2
View File
@@ -37,8 +37,8 @@ import android.location.Location;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import android.util.Log;
import android.view.Display;
import android.view.LayoutInflater;
myTracks/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java
+2 -2
View File
@@ -35,8 +35,8 @@ import com.google.android.maps.mytracks.R;
import android.location.Location;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MotionEvent;
myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java
+1 -1
View File
@@ -19,7 +19,7 @@ import android.content.Context;
import android.database.Cursor;
import android.location.Location;
import android.net.Uri;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import com.google.android.apps.mytracks.content.DescriptionGenerator;
import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl;
myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java
+1 -1
View File
@@ -18,7 +18,7 @@ package com.google.android.apps.mytracks.io.file.importer;
import android.content.Context;
import android.location.Location;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java
+1 -1
View File
@@ -32,7 +32,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.TaskStackBuilder;
import androidx.core.app.TaskStackBuilder;
import android.util.Log;
import android.widget.Toast;
myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java
+1 -1
View File
@@ -25,7 +25,7 @@ import com.google.android.apps.mytracks.content.Waypoint.WaypointType;
import android.content.Context;
import android.location.Location;
import android.net.Uri;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import java.util.ArrayList;
myTracks/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java
+1 -1
View File
@@ -22,7 +22,7 @@ import android.content.Intent;
import android.content.ServiceConnection;
import android.os.IBinder;
import android.os.RemoteException;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import android.util.Log;
import com.google.android.apps.mytracks.widgets.TrackWidgetProvider;
myTracks/src/main/java/com/google/android/apps/mytracks/services/MyTracksLocationManager.java
+1 -1
View File
@@ -25,7 +25,7 @@ import android.location.LocationManager;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.google.android.apps.mytracks.util.GoogleLocationUtils;
import com.google.android.gms.common.api.GoogleApiClient.ConnectionCallbacks;
myTracks/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java
+4 -4
View File
@@ -31,10 +31,10 @@ import android.os.Handler;
import android.os.IBinder;
import android.os.PowerManager.WakeLock;
import android.os.Process;
import android.support.annotation.NonNull;
import android.support.annotation.VisibleForTesting;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.TaskStackBuilder;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.core.app.NotificationCompat;
import androidx.core.app.TaskStackBuilder;
import android.util.Log;
import com.google.android.apps.mytracks.Constants;
myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTask.java
+1 -1
View File
@@ -21,7 +21,7 @@ import android.media.AudioManager;
import android.speech.tts.TextToSpeech;
import android.speech.tts.TextToSpeech.OnInitListener;
import android.speech.tts.TextToSpeech.OnUtteranceCompletedListener;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
import android.util.Log;
myTracks/src/main/java/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java
+1 -1
View File
@@ -17,7 +17,7 @@
package com.google.android.apps.mytracks.stats;
import android.location.Location;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import android.util.Log;
import com.google.android.apps.mytracks.util.CalorieUtils;
myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java
+1 -1
View File
@@ -23,7 +23,7 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.ColorMatrixColorFilter;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Pair;
import android.view.Menu;
import android.view.MenuItem;
myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackNameUtils.java
+1 -1
View File
@@ -20,7 +20,7 @@ import android.content.Context;
import android.location.Address;
import android.location.Geocoder;
import android.location.Location;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
import com.google.android.maps.mytracks.R;
myTracks/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+1 -1
View File
@@ -37,7 +37,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.SystemClock;
import android.support.v4.app.TaskStackBuilder;
import androidx.core.app.TaskStackBuilder;
import android.view.View;
import android.widget.RemoteViews;
myTracks/src/main/res/layout/marker_detail_activity.xml
+1 -1
View File
@@ -17,7 +17,7 @@ limitations under the License.
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent" >
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/maker_detail_activity_view_pager"
android:layout_height="match_parent"
android:layout_width="match_parent" />
myTracks/src/main/res/layout/track_details_tab.xml
+1 -1
View File
@@ -29,7 +29,7 @@ limitations under the License.
android:layout_height="0dp"
android:layout_weight="0"
android:layout_width="0dp" />
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_height="0dp"
android:layout_weight="1"
myTracks/src/main/res/menu/marker_list.xml
+1 -1
View File
@@ -25,5 +25,5 @@ limitations under the License.
android:id="@+id/marker_list_search"
android:title="@string/menu_search"
app:showAsAction="ifRoom|collapseActionView"
app:actionViewClass="android.widget.SearchView" />
app:actionViewClass="androidx.appcompat.widget.SearchView" />
</menu>
myTracks/src/main/res/menu/search_list.xml
+1 -1
View File
@@ -20,5 +20,5 @@ limitations under the License.
android:id="@+id/search_list_search"
android:title="@string/menu_search"
app:showAsAction="ifRoom|collapseActionView"
app:actionViewClass="android.widget.SearchView" />
app:actionViewClass="androidx.appcompat.widget.SearchView" />
</menu>
myTracks/src/main/res/menu/track_list.xml
+2 -2
View File
@@ -19,8 +19,8 @@ limitations under the License.
android:icon="@drawable/ic_menu_search"
android:id="@+id/track_list_search"
android:title="@string/menu_search"
app:actionViewClass="android.widget.SearchView"
app:showAsAction="ifRoom|collapseActionView" />
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="always" />
<item
android:icon="@drawable/ic_menu_start_gps"
android:id="@+id/track_list_start_gps"