Merge branch 'testing'

# Conflicts: # app/src/main/AndroidManifest.xml
rainerblind · Nov 18, 2019 · aaa583f · aaa583f
2 parents 6f308e7 + 3d9464a
commit aaa583f
Show file tree

Hide file tree

Showing 104 changed files with 1,392 additions and 828 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'io.fabric'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         applicationId "com.atrainingtracker"
-        minSdkVersion 14
-        targetSdkVersion 26
+        minSdkVersion 16
+        targetSdkVersion 29
         multiDexEnabled true
     }
 
@@ -59,24 +59,24 @@ dependencies {
     implementation files('libs/pebblekit-3.0.0-eclipse.jar')
     implementation files('libs/antpluginlib_3-5-0.jar')
 
-    implementation 'com.android.support:support-v4:26.1.0'
-    implementation 'com.android.support:preference-v7:26.1.0'
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support:design:26.1.0'
-    implementation 'com.android.support:recyclerview-v7:26.1.0'
-    implementation 'com.google.android.gms:play-services-maps:16.0.0'
-    implementation 'com.google.android.gms:play-services-location:16.0.0'
+    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0-beta01'
+    implementation 'com.google.android.gms:play-services-maps:17.0.0'
+    implementation 'com.google.android.gms:play-services-location:17.0.0'
     // compile 'com.google.android.gms:play-services-auth:10.0.1'
 
     // compile('com.crashlytics.sdk.android:crashlytics:2.9.1@aar') {
     //   transitive = true
     // }
-    implementation 'com.google.firebase:firebase-core:16.0.6'
+    implementation 'com.google.firebase:firebase-core:17.2.0'
 
-    implementation 'com.dropbox.core:dropbox-core-sdk:3.0.2'
+    implementation 'com.dropbox.core:dropbox-core-sdk:3.1.1'
 
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/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.atrainingtracker"
-    android:versionCode="201"
-    android:versionName="4.1.1">
+    android:versionCode="210"
+    android:versionName="4.2">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -34,7 +34,7 @@
             android:name=".trainingtracker.activities.MainActivityWithNavigation"
             android:label="@string/app_name"
             android:launchMode="singleTask"
-            android:theme="@style/Theme.aTrainingTracker.NoActionBar">
+            android:theme="@style/Theme.aTrainingTracker">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -44,22 +44,22 @@
         <activity
             android:name=".trainingtracker.activities.WorkoutDetailsActivity"
             android:label="@string/app_name"
-            android:theme="@style/Theme.aTrainingTracker.NoActionBar"
+            android:theme="@style/Theme.aTrainingTracker"
             android:windowSoftInputMode="stateHidden" />
 
         <activity
             android:name=".trainingtracker.activities.SegmentDetailsActivity"
             android:label="@string/app_name"
             android:launchMode="singleTask"
-            android:theme="@style/Theme.aTrainingTracker.NoActionBar"
+            android:theme="@style/Theme.aTrainingTracker"
             android:windowSoftInputMode="stateHidden" />
 
 
         <activity
             android:name=".trainingtracker.activities.ConfigTrackingViewsActivity"
             android:label="@string/TrackingFragmentConfigActivityLabel"
             android:launchMode="singleTask"
-            android:theme="@style/Theme.aTrainingTracker.NoActionBar"
+            android:theme="@style/Theme.aTrainingTracker"
             android:windowSoftInputMode="stateHidden">
             <intent-filter>
                 <action android:name="com.atrainingtracker.trainingtracker.intent.action.ConfigureAllTrackingViews" />
@@ -71,7 +71,7 @@
             android:name=".trainingtracker.smartwatch.pebble.ConfigPebbleViewsActivity"
             android:label="@string/PebbleConfigActivityLabel"
             android:launchMode="singleTask"
-            android:theme="@style/Theme.aTrainingTracker.NoActionBar"
+            android:theme="@style/Theme.aTrainingTracker"
             android:windowSoftInputMode="stateHidden">
             <intent-filter>
                 <action android:name="com.atrainingtracker.trainingtracker.smartwatch.pebble.ConfigPebbleViewsActivity" />
@@ -98,17 +98,17 @@
         <activity
             android:name=".trainingtracker.onlinecommunities.runkeeper.RunkeeperGetAccessTokenActivity"
             android:label="@string/RunkeeperGetAccessTokenActivityLabel"
-            android:theme="@style/Theme.aTrainingTracker.NoActionBar" />
+            android:theme="@style/Theme.aTrainingTracker" />
 
         <activity
             android:name=".trainingtracker.onlinecommunities.strava.StravaGetAccessTokenActivity"
             android:label="@string/StravaGetAccessTokenActivityLabel"
-            android:theme="@style/Theme.aTrainingTracker.NoActionBar" />
+            android:theme="@style/Theme.aTrainingTracker" />
 
         <activity
             android:name=".trainingtracker.onlinecommunities.trainingpeaks.TrainingpeaksGetAccessTokenActivity"
             android:label="@string/TrainingPeaksGetAccessTokenActivityLabel"
-            android:theme="@style/Theme.aTrainingTracker.NoActionBar" />
+            android:theme="@style/Theme.aTrainingTracker" />
 
 
         <!-- <uses-library android:name="com.dsi.ant.antradio_library" /> -->

diff --git a/app/src/main/java/com/atrainingtracker/banalservice/dialogs/EditSportTypeDialog.java b/app/src/main/java/com/atrainingtracker/banalservice/dialogs/EditSportTypeDialog.java
@@ -26,7 +26,7 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/java/com/atrainingtracker/banalservice/dialogs/InstallANTShitDialog.java b/app/src/main/java/com/atrainingtracker/banalservice/dialogs/InstallANTShitDialog.java
@@ -24,7 +24,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;

diff --git a/app/src/main/java/com/atrainingtracker/banalservice/dialogs/SelectSportTypeDialog.java b/app/src/main/java/com/atrainingtracker/banalservice/dialogs/SelectSportTypeDialog.java
@@ -23,7 +23,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.util.Log;
 import android.widget.ArrayAdapter;
 

diff --git a/.../main/java/com/atrainingtracker/banalservice/fragments/ConfigureFilterDialogFragment.java b/.../main/java/com/atrainingtracker/banalservice/fragments/ConfigureFilterDialogFragment.java
@@ -27,7 +27,7 @@
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
@@ -125,10 +125,10 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         TextView title = new TextView(getActivity());
         // You Can Customise your Title here
         title.setText(R.string.configure_filter);
-        title.setBackgroundColor(getResources().getColor(R.color.my_blue));
+//        title.setBackgroundColor(getResources().getColor(R.color.my_blue));
         title.setPadding(10, 10, 10, 10);
         title.setGravity(Gravity.CENTER);
-        title.setTextColor(getResources().getColor(R.color.my_white));
+//        title.setTextColor(getResources().getColor(R.color.my_white));
         title.setTextSize(20);
 
         builder.setCustomTitle(title);

diff --git a/app/src/main/java/com/atrainingtracker/banalservice/fragments/ControlSportTypeFragment.java b/app/src/main/java/com/atrainingtracker/banalservice/fragments/ControlSportTypeFragment.java
@@ -23,7 +23,9 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -189,57 +191,57 @@ public void updateView() {
         if (banalServiceComm != null) {
             switch (banalServiceComm.getBSportType()) {
                 case RUN:
-                    mTvRun.setTextColor(getResources().getColor(R.color.my_black));
-                    mTvBike.setTextColor(getResources().getColor(R.color.bright_grey));
-                    mTvOther.setTextColor(getResources().getColor(R.color.bright_grey));
+                    mTvRun.setTextColor(ContextCompat.getColor(getActivity(), R.color.color_on_background));
+                    mTvBike.setTextColor(ContextCompat.getColor(getActivity(), R.color.bright_grey));
+                    mTvOther.setTextColor(ContextCompat.getColor(getActivity(), R.color.bright_grey));
 
-                    mIbRun.setImageDrawable(getResources().getDrawable(R.drawable.bsport_run));
-                    mIbBike.setImageDrawable(getResources().getDrawable(R.drawable.bsport_bike_gray));
-                    mIbOther.setImageDrawable(getResources().getDrawable(R.drawable.bsport_other_gray));
+                    mIbRun.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_run));
+                    mIbBike.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_bike_gray));
+                    mIbOther.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_other_gray));
 
                     break;
 
                 case BIKE:
-                    mTvRun.setTextColor(getResources().getColor(R.color.bright_grey));
-                    mTvBike.setTextColor(getResources().getColor(R.color.my_black));
-                    mTvOther.setTextColor(getResources().getColor(R.color.bright_grey));
+                    mTvRun.setTextColor(ContextCompat.getColor(getActivity(), R.color.bright_grey));
+                    mTvBike.setTextColor(ContextCompat.getColor(getActivity(), R.color.color_on_background));
+                    mTvOther.setTextColor(ContextCompat.getColor(getActivity(), R.color.bright_grey));
 
-                    mIbRun.setImageDrawable(getResources().getDrawable(R.drawable.bsport_run_gray));
-                    mIbBike.setImageDrawable(getResources().getDrawable(R.drawable.bsport_bike));
-                    mIbOther.setImageDrawable(getResources().getDrawable(R.drawable.bsport_other_gray));
+                    mIbRun.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_run_gray));
+                    mIbBike.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_bike));
+                    mIbOther.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_other_gray));
 
                     break;
 
                 case UNKNOWN:
-                    mTvRun.setTextColor(getResources().getColor(R.color.bright_grey));
-                    mTvBike.setTextColor(getResources().getColor(R.color.bright_grey));
-                    mTvOther.setTextColor(getResources().getColor(R.color.my_black));
+                    mTvRun.setTextColor(ContextCompat.getColor(getActivity(), R.color.bright_grey));
+                    mTvBike.setTextColor(ContextCompat.getColor(getActivity(), R.color.bright_grey));
+                    mTvOther.setTextColor(ContextCompat.getColor(getActivity(), R.color.color_on_background));
 
-                    mIbRun.setImageDrawable(getResources().getDrawable(R.drawable.bsport_run_gray));
-                    mIbBike.setImageDrawable(getResources().getDrawable(R.drawable.bsport_bike_gray));
-                    mIbOther.setImageDrawable(getResources().getDrawable(R.drawable.bsport_other));
+                    mIbRun.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_run_gray));
+                    mIbBike.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_bike_gray));
+                    mIbOther.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_other));
 
                     break;
 
                 default:
-                    mTvRun.setTextColor(getResources().getColor(R.color.bright_grey));
-                    mTvBike.setTextColor(getResources().getColor(R.color.bright_grey));
-                    mTvOther.setTextColor(getResources().getColor(R.color.bright_grey));
+                    mTvRun.setTextColor(ContextCompat.getColor(getActivity(), R.color.bright_grey));
+                    mTvBike.setTextColor(ContextCompat.getColor(getActivity(), R.color.bright_grey));
+                    mTvOther.setTextColor(ContextCompat.getColor(getActivity(), R.color.bright_grey));
 
-                    mIbRun.setImageDrawable(getResources().getDrawable(R.drawable.bsport_run_gray));
-                    mIbBike.setImageDrawable(getResources().getDrawable(R.drawable.bsport_bike_gray));
-                    mIbOther.setImageDrawable(getResources().getDrawable(R.drawable.bsport_other_gray));
+                    mIbRun.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_run_gray));
+                    mIbBike.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_bike_gray));
+                    mIbOther.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_other_gray));
 
                     break;
             }
         } else {
-            mTvRun.setTextColor(getResources().getColor(R.color.bright_grey));
-            mTvBike.setTextColor(getResources().getColor(R.color.bright_grey));
-            mTvOther.setTextColor(getResources().getColor(R.color.bright_grey));
+            mTvRun.setTextColor(ContextCompat.getColor(getActivity(), R.color.bright_grey));
+            mTvBike.setTextColor(ContextCompat.getColor(getActivity(), R.color.bright_grey));
+            mTvOther.setTextColor(ContextCompat.getColor(getActivity(), R.color.bright_grey));
 
-            mIbRun.setImageDrawable(getResources().getDrawable(R.drawable.bsport_run_gray));
-            mIbBike.setImageDrawable(getResources().getDrawable(R.drawable.bsport_bike_gray));
-            mIbOther.setImageDrawable(getResources().getDrawable(R.drawable.bsport_other_gray));
+            mIbRun.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_run_gray));
+            mIbBike.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_bike_gray));
+            mIbOther.setImageDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.bsport_other_gray));
         }
     }
 

diff --git a/app/src/main/java/com/atrainingtracker/banalservice/fragments/DeviceTypeChoiceFragment.java b/app/src/main/java/com/atrainingtracker/banalservice/fragments/DeviceTypeChoiceFragment.java
@@ -19,7 +19,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
 import android.util.Log;
 import android.view.View;
 import android.widget.ListView;

diff --git a/app/src/main/java/com/atrainingtracker/banalservice/fragments/EditDeviceDialogFragment.java b/app/src/main/java/com/atrainingtracker/banalservice/fragments/EditDeviceDialogFragment.java
@@ -27,7 +27,7 @@
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;

diff --git a/app/src/main/java/com/atrainingtracker/banalservice/fragments/RemoteDevicesFragment.java b/app/src/main/java/com/atrainingtracker/banalservice/fragments/RemoteDevicesFragment.java
@@ -27,7 +27,7 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;

diff --git a/...ava/com/atrainingtracker/banalservice/fragments/RemoteDevicesFragmentTabbedContainer.java b/...ava/com/atrainingtracker/banalservice/fragments/RemoteDevicesFragmentTabbedContainer.java
@@ -22,10 +22,12 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -60,12 +62,12 @@ public class RemoteDevicesFragmentTabbedContainer extends Fragment {
     protected boolean mShowingDialog = false;
     protected boolean mSearching = false;
     /**
-     * The {@link android.support.v4.view.PagerAdapter} that will provide
+     * The {@link PagerAdapter} that will provide
      * fragments for each of the sections. We use a
      * {@link FragmentPagerAdapter} derivative, which
      * will keep every loaded fragment in memory. If this becomes too memory
      * intensive, it may be best to switch to a
-     * {@link android.support.v4.app.FragmentStatePagerAdapter}.
+     * {@link FragmentStatePagerAdapter}.
      */
     SectionsPagerAdapter mSectionsPagerAdapter;
     Protocol mProtocol = null;

diff --git a/.../java/com/atrainingtracker/banalservice/fragments/SetCalibrationFactorDialogFragment.java b/.../java/com/atrainingtracker/banalservice/fragments/SetCalibrationFactorDialogFragment.java
@@ -22,7 +22,7 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;

diff --git a/app/src/main/java/com/atrainingtracker/banalservice/fragments/SportTypeListFragment.java b/app/src/main/java/com/atrainingtracker/banalservice/fragments/SportTypeListFragment.java
@@ -28,9 +28,9 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.ListFragment;
-import android.support.v4.widget.SimpleCursorAdapter;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.fragment.app.ListFragment;
+import androidx.cursoradapter.widget.SimpleCursorAdapter;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;

diff --git a/app/src/main/java/com/atrainingtracker/banalservice/fragments/TrackingModeFragment.java b/app/src/main/java/com/atrainingtracker/banalservice/fragments/TrackingModeFragment.java
@@ -23,7 +23,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/java/com/atrainingtracker/trainingtracker/TrainingApplication.java b/app/src/main/java/com/atrainingtracker/trainingtracker/TrainingApplication.java
@@ -32,9 +32,9 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.widget.Toast;
 

diff --git a/app/src/main/java/com/atrainingtracker/trainingtracker/activities/ConfigViewsActivity.java b/app/src/main/java/com/atrainingtracker/trainingtracker/activities/ConfigViewsActivity.java
@@ -21,10 +21,10 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.WindowManager;