From 0f1128246c92bd2d590258cfe379b3549d355997 Mon Sep 17 00:00:00 2001 From: Mark Murphy Date: Sun, 25 Mar 2018 11:04:07 -0400 Subject: [PATCH] updated to use Support Library fragments --- Introspection/ProcessText/app/build.gradle | 7 +- .../android/processtext/MainActivity.java | 7 +- .../processtext/QuestionsFragment.java | 2 +- KBMouse/CopyPaste/drag/build.gradle | 28 ++-- .../android/dragdrop/MainActivity.java | 6 +- .../dragdrop/ShortcutDialogFragment.java | 2 +- KBMouse/CopyPaste/drop/build.gradle | 10 +- .../android/dragdrop/MainActivity.java | 6 +- .../dragdrop/ShortcutDialogFragment.java | 2 +- KBMouse/HotkeysN/app/build.gradle | 9 +- .../android/kbmouse/hotkeys/MainActivity.java | 6 +- .../hotkeys/ShortcutDialogFragment.java | 2 +- Leaks/AsyncTask/app/build.gradle | 17 ++- .../commonsware/android/async/AsyncDemo.java | 8 +- .../android/async/AsyncDemoFragment.java | 2 +- Leaks/ConfigChange/app/build.gradle | 13 +- .../android/leak/configchange/AsyncDemo.java | 8 +- .../leak/configchange/AsyncDemoFragment.java | 2 +- Leaks/StaticWidgetLC/app/build.gradle | 6 +- .../app/src/main/AndroidManifest.xml | 4 - MapsV2/Animator/app/build.gradle | 7 +- .../mapsv2/animator/AbstractMapActivity.java | 4 +- .../android/mapsv2/animator/MainActivity.java | 6 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MapsV2/Basic/app/build.gradle | 5 +- .../mapsv2/basic/AbstractMapActivity.java | 4 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MapsV2/Bounds/app/build.gradle | 5 +- .../mapsv2/markers/AbstractMapActivity.java | 4 +- .../android/mapsv2/markers/MainActivity.java | 6 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MapsV2/Camera/app/build.gradle | 5 +- .../mapsv2/camera/AbstractMapActivity.java | 4 +- .../android/mapsv2/camera/MainActivity.java | 6 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MapsV2/Drag/app/build.gradle | 5 +- .../mapsv2/drag/AbstractMapActivity.java | 4 +- .../android/mapsv2/drag/MainActivity.java | 6 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MapsV2/FlatMarkers/app/build.gradle | 5 +- .../flatmarkers/AbstractMapActivity.java | 4 +- .../mapsv2/flatmarkers/MainActivity.java | 5 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MapsV2/ImagePopups/app/build.gradle | 5 +- .../imagepopups/AbstractMapActivity.java | 4 +- .../mapsv2/imagepopups/MainActivity.java | 5 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MapsV2/Location/app/build.gradle | 9 +- .../Location/app/src/main/AndroidManifest.xml | 5 +- .../mapsv2/location/AbstractMapActivity.java | 25 +-- .../mapsv2/location/LegalNoticesActivity.java | 34 ----- .../android/mapsv2/location/MainActivity.java | 144 ++++++++++++++---- .../app/src/main/res/layout/activity_main.xml | 2 +- .../app/src/main/res/layout/legal.xml | 12 -- .../app/src/main/res/menu/activity_main.xml | 9 -- .../app/src/main/res/values/strings.xml | 3 +- MapsV2/Markers/app/build.gradle | 5 +- .../mapsv2/markers/AbstractMapActivity.java | 4 +- .../android/mapsv2/markers/MainActivity.java | 5 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MapsV2/Models/app/build.gradle | 5 +- .../mapsv2/model/AbstractMapActivity.java | 4 +- .../android/mapsv2/model/MainActivity.java | 5 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MapsV2/MyLocationMNC/app/build.gradle | 10 +- .../mylocation/AbstractMapActivity.java | 4 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MapsV2/NooYawk/app/build.gradle | 5 +- .../mapsv2/nooyawk/AbstractMapActivity.java | 4 +- .../android/mapsv2/nooyawk/MainActivity.java | 6 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MapsV2/Pager/app/build.gradle | 6 +- .../mapsv2/pager/AbstractMapActivity.java | 4 +- .../android/mapsv2/pager/MainActivity.java | 4 +- .../android/mapsv2/pager/MapPageAdapter.java | 6 +- .../android/mapsv2/pager/PageMapFragment.java | 4 +- MapsV2/Poly/app/build.gradle | 5 +- .../mapsv2/poly/AbstractMapActivity.java | 4 +- .../android/mapsv2/poly/MainActivity.java | 5 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MapsV2/Popups/app/build.gradle | 5 +- .../mapsv2/popups/AbstractMapActivity.java | 4 +- .../android/mapsv2/popups/MainActivity.java | 5 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MapsV2/Taps/app/build.gradle | 5 +- .../mapsv2/taps/AbstractMapActivity.java | 4 +- .../android/mapsv2/taps/MainActivity.java | 6 +- .../app/src/main/res/layout/activity_main.xml | 2 +- MiscSecurity/SigDump/app/build.gradle | 11 +- .../SigDump/app/src/main/AndroidManifest.xml | 6 +- .../signature/dump/ContractListFragment.java | 2 +- .../android/signature/dump/MainActivity.java | 8 +- .../signature/dump/SignatureFragment.java | 8 +- NFC/WebBeam/app/build.gradle | 11 +- .../android/webbeam/BeamFragment.java | 1 - .../android/webbeam/WebBeamActivity.java | 8 +- Notifications/CustomView/app/build.gradle | 9 +- .../okhttp3/progress/DownloadFragment.java | 2 +- .../okhttp3/progress/DownloaderDemo.java | 8 +- Notifications/DownloadNotify/app/build.gradle | 11 +- .../android/downloader/DownloadFragment.java | 4 +- .../android/downloader/DownloaderDemo.java | 8 +- Notifications/Foreground/app/build.gradle | 11 +- .../android/foredown/DownloadFragment.java | 2 +- .../android/foredown/DownloaderDemo.java | 8 +- .../PermissionReporter/app/build.gradle | 20 +-- .../android/permreporter/MainActivity.java | 14 +- .../permreporter/PermissionListFragment.java | 2 +- .../permreporter/PermissionTabAdapter.java | 6 +- Presentation/Fragment/app/build.gradle | 14 +- .../Fragment/app/src/main/AndroidManifest.xml | 3 - .../android/preso/fragment/MainActivity.java | 16 +- .../preso/fragment/PresentationFragment.java | 4 +- Progress/Dialog/app/build.gradle | 11 +- .../android/progdlg/MainActivity.java | 6 +- .../android/progdlg/SampleDialogFragment.java | 2 +- RecyclerView/ExpandableRow/app/build.gradle | 13 +- .../android/databind/basic/MainActivity.java | 8 +- .../databind/basic/RecyclerViewFragment.java | 2 +- RecyclerView/SortedList/app/build.gradle | 14 +- .../app/src/main/AndroidManifest.xml | 4 - .../recyclerview/sorted/MainActivity.java | 8 +- .../sorted/RecyclerViewFragment.java | 2 +- RecyclerView/Transcript/app/build.gradle | 10 +- .../rv/transcript/EventDemoActivity.java | 11 +- .../rv/transcript/EventLogFragment.java | 2 +- .../commonsware/android/rvp/MainActivity.java | 2 +- .../android/rvp/PageController.java | 2 +- RestrictedProfiles/App/app/build.gradle | 18 ++- .../App/app/src/main/AndroidManifest.xml | 4 - .../android/profile/app/MainActivity.java | 6 +- .../profile/app/RestrictionsFragment.java | 2 +- RestrictedProfiles/Device/app/build.gradle | 18 ++- .../Device/app/src/main/AndroidManifest.xml | 4 - .../android/profile/device/MainActivity.java | 6 +- .../profile/device/RestrictionsFragment.java | 2 +- Rx/Lambda/app/build.gradle | 8 +- .../com/commonsware/android/rx/RxDemo.java | 8 +- .../android/rx/RxDemoFragment.java | 2 +- Rx/Observable/app/build.gradle | 16 +- .../com/commonsware/android/rx/RxDemo.java | 8 +- .../android/rx/RxDemoFragment.java | 2 +- 142 files changed, 560 insertions(+), 479 deletions(-) delete mode 100644 MapsV2/Location/app/src/main/java/com/commonsware/android/mapsv2/location/LegalNoticesActivity.java delete mode 100644 MapsV2/Location/app/src/main/res/layout/legal.xml delete mode 100644 MapsV2/Location/app/src/main/res/menu/activity_main.xml diff --git a/Introspection/ProcessText/app/build.gradle b/Introspection/ProcessText/app/build.gradle index 9f84d8f31..cd34a8366 100644 --- a/Introspection/ProcessText/app/build.gradle +++ b/Introspection/ProcessText/app/build.gradle @@ -1,16 +1,17 @@ apply plugin: 'com.android.application' dependencies { + implementation "com.android.support:support-fragment:27.1.0" implementation 'com.squareup.picasso:picasso:2.5.2' implementation 'com.squareup.retrofit:retrofit:1.9.0' } android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 27 } } diff --git a/Introspection/ProcessText/app/src/main/java/com/commonsware/android/processtext/MainActivity.java b/Introspection/ProcessText/app/src/main/java/com/commonsware/android/processtext/MainActivity.java index 703e0937a..184979788 100644 --- a/Introspection/ProcessText/app/src/main/java/com/commonsware/android/processtext/MainActivity.java +++ b/Introspection/ProcessText/app/src/main/java/com/commonsware/android/processtext/MainActivity.java @@ -19,14 +19,15 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; -public class MainActivity extends Activity +public class MainActivity extends FragmentActivity implements QuestionsFragment.Contract { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (getFragmentManager().findFragmentById(android.R.id.content)==null) { + if (getSupportFragmentManager().findFragmentById(android.R.id.content)==null) { String search=null; if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.M) { @@ -40,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) { } } - getFragmentManager() + getSupportFragmentManager() .beginTransaction() .add(android.R.id.content, QuestionsFragment.newInstance(search)) diff --git a/Introspection/ProcessText/app/src/main/java/com/commonsware/android/processtext/QuestionsFragment.java b/Introspection/ProcessText/app/src/main/java/com/commonsware/android/processtext/QuestionsFragment.java index b89725f3e..bacd61d46 100644 --- a/Introspection/ProcessText/app/src/main/java/com/commonsware/android/processtext/QuestionsFragment.java +++ b/Introspection/ProcessText/app/src/main/java/com/commonsware/android/processtext/QuestionsFragment.java @@ -14,8 +14,8 @@ package com.commonsware.android.processtext; -import android.app.ListFragment; import android.os.Bundle; +import android.support.v4.app.ListFragment; import android.text.Html; import android.util.Log; import android.view.LayoutInflater; diff --git a/KBMouse/CopyPaste/drag/build.gradle b/KBMouse/CopyPaste/drag/build.gradle index 574286ea3..7e3dbf9a5 100644 --- a/KBMouse/CopyPaste/drag/build.gradle +++ b/KBMouse/CopyPaste/drag/build.gradle @@ -1,33 +1,29 @@ apply plugin: 'com.android.application' +repositories { + maven { + url "https://s3.amazonaws.com/repo.commonsware.com" + } +} + dependencies { - compile 'com.android.support:recyclerview-v7:25.3.1' - compile 'com.android.support:support-compat:25.3.1' + compile 'com.android.support:recyclerview-v7:27.1.0' + compile 'com.android.support:support-fragment:27.1.0' compile 'com.squareup.picasso:picasso:2.5.2' + compile 'com.commonsware.cwac:provider:0.5.3' } android { - compileSdkVersion 24 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.commonsware.android.dragdrop.dragcopy" minSdkVersion 24 - targetSdkVersion 24 + targetSdkVersion 27 } aaptOptions { noCompress 'jpg' } } - -repositories { - maven { - url "https://s3.amazonaws.com/repo.commonsware.com" - } -} - -dependencies { - compile 'com.commonsware.cwac:provider:0.4.0' -} - diff --git a/KBMouse/CopyPaste/drag/src/main/java/com/commonsware/android/dragdrop/MainActivity.java b/KBMouse/CopyPaste/drag/src/main/java/com/commonsware/android/dragdrop/MainActivity.java index ade82f801..f740439d4 100644 --- a/KBMouse/CopyPaste/drag/src/main/java/com/commonsware/android/dragdrop/MainActivity.java +++ b/KBMouse/CopyPaste/drag/src/main/java/com/commonsware/android/dragdrop/MainActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.dragdrop; -import android.app.Activity; import android.content.ClipData; import android.content.ClipboardManager; import android.graphics.Canvas; @@ -22,6 +21,7 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; @@ -32,7 +32,7 @@ import com.squareup.picasso.Callback; import com.squareup.picasso.Picasso; -public class MainActivity extends Activity implements +public class MainActivity extends FragmentActivity implements View.OnLongClickListener { private static final String AUTHORITY= BuildConfig.APPLICATION_ID+".provider"; @@ -103,7 +103,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { event.isAltPressed() && event.getRepeatCount()==0 && Build.VERSION.SDK_INT<=Build.VERSION_CODES.M) { - new ShortcutDialogFragment().show(getFragmentManager(), + new ShortcutDialogFragment().show(getSupportFragmentManager(), "shortcuts"); return(true); diff --git a/KBMouse/CopyPaste/drag/src/main/java/com/commonsware/android/dragdrop/ShortcutDialogFragment.java b/KBMouse/CopyPaste/drag/src/main/java/com/commonsware/android/dragdrop/ShortcutDialogFragment.java index 2de293b07..e504a21c6 100644 --- a/KBMouse/CopyPaste/drag/src/main/java/com/commonsware/android/dragdrop/ShortcutDialogFragment.java +++ b/KBMouse/CopyPaste/drag/src/main/java/com/commonsware/android/dragdrop/ShortcutDialogFragment.java @@ -17,9 +17,9 @@ import android.annotation.TargetApi; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.os.Build; import android.os.Bundle; +import android.support.v4.app.DialogFragment; @TargetApi(Build.VERSION_CODES.HONEYCOMB) public class ShortcutDialogFragment extends DialogFragment { diff --git a/KBMouse/CopyPaste/drop/build.gradle b/KBMouse/CopyPaste/drop/build.gradle index ec3ece847..9d411f3bc 100644 --- a/KBMouse/CopyPaste/drop/build.gradle +++ b/KBMouse/CopyPaste/drop/build.gradle @@ -1,18 +1,18 @@ apply plugin: 'com.android.application' dependencies { - compile 'com.android.support:recyclerview-v7:25.3.1' - compile 'com.android.support:support-compat:25.3.1' + compile 'com.android.support:recyclerview-v7:27.1.0' + compile 'com.android.support:support-fragment:27.1.0' compile 'com.squareup.picasso:picasso:2.5.2' } android { - compileSdkVersion 24 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.commonsware.android.dragdrop.droppaste" minSdkVersion 24 - targetSdkVersion 24 + targetSdkVersion 27 } } diff --git a/KBMouse/CopyPaste/drop/src/main/java/com/commonsware/android/dragdrop/MainActivity.java b/KBMouse/CopyPaste/drop/src/main/java/com/commonsware/android/dragdrop/MainActivity.java index 734116963..8edfab2e7 100644 --- a/KBMouse/CopyPaste/drop/src/main/java/com/commonsware/android/dragdrop/MainActivity.java +++ b/KBMouse/CopyPaste/drop/src/main/java/com/commonsware/android/dragdrop/MainActivity.java @@ -14,13 +14,13 @@ package com.commonsware.android.dragdrop; -import android.app.Activity; import android.content.ClipData; import android.content.ClipDescription; import android.content.ClipboardManager; import android.net.Uri; import android.os.Build; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.view.DragEvent; import android.view.KeyEvent; import android.view.Menu; @@ -30,7 +30,7 @@ import android.widget.Toast; import com.squareup.picasso.Picasso; -public class MainActivity extends Activity implements +public class MainActivity extends FragmentActivity implements View.OnDragListener { private static final String STATE_IMAGE_URI= BuildConfig.APPLICATION_ID+".IMAGE_URI"; @@ -108,7 +108,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { event.isAltPressed() && event.getRepeatCount()==0 && Build.VERSION.SDK_INT<=Build.VERSION_CODES.M) { - new ShortcutDialogFragment().show(getFragmentManager(), + new ShortcutDialogFragment().show(getSupportFragmentManager(), "shortcuts"); return(true); diff --git a/KBMouse/CopyPaste/drop/src/main/java/com/commonsware/android/dragdrop/ShortcutDialogFragment.java b/KBMouse/CopyPaste/drop/src/main/java/com/commonsware/android/dragdrop/ShortcutDialogFragment.java index 2de293b07..e504a21c6 100644 --- a/KBMouse/CopyPaste/drop/src/main/java/com/commonsware/android/dragdrop/ShortcutDialogFragment.java +++ b/KBMouse/CopyPaste/drop/src/main/java/com/commonsware/android/dragdrop/ShortcutDialogFragment.java @@ -17,9 +17,9 @@ import android.annotation.TargetApi; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.os.Build; import android.os.Bundle; +import android.support.v4.app.DialogFragment; @TargetApi(Build.VERSION_CODES.HONEYCOMB) public class ShortcutDialogFragment extends DialogFragment { diff --git a/KBMouse/HotkeysN/app/build.gradle b/KBMouse/HotkeysN/app/build.gradle index 6f5b52c9d..3a18c88e4 100644 --- a/KBMouse/HotkeysN/app/build.gradle +++ b/KBMouse/HotkeysN/app/build.gradle @@ -1,17 +1,18 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.android.support:recyclerview-v7:24.1.1' + implementation 'com.android.support:support-fragment:27.1.0' + implementation 'com.android.support:recyclerview-v7:27.1.0' implementation 'com.squareup.picasso:picasso:2.5.2' } android { - compileSdkVersion 24 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.commonsware.android.kbmouse.hotkeys.n" minSdkVersion 23 - targetSdkVersion 24 + targetSdkVersion 27 } } diff --git a/KBMouse/HotkeysN/app/src/main/java/com/commonsware/android/kbmouse/hotkeys/MainActivity.java b/KBMouse/HotkeysN/app/src/main/java/com/commonsware/android/kbmouse/hotkeys/MainActivity.java index 604e49753..342102cec 100644 --- a/KBMouse/HotkeysN/app/src/main/java/com/commonsware/android/kbmouse/hotkeys/MainActivity.java +++ b/KBMouse/HotkeysN/app/src/main/java/com/commonsware/android/kbmouse/hotkeys/MainActivity.java @@ -16,7 +16,6 @@ import android.Manifest; import android.annotation.TargetApi; -import android.app.Activity; import android.app.LoaderManager; import android.content.ClipData; import android.content.ContentUris; @@ -29,6 +28,7 @@ import android.os.Bundle; import android.provider.MediaStore; import android.support.v4.app.ActivityCompat; +import android.support.v4.app.FragmentActivity; import android.support.v4.content.ContextCompat; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -47,7 +47,7 @@ import java.util.ArrayList; import java.util.List; -public class MainActivity extends Activity implements +public class MainActivity extends FragmentActivity implements LoaderManager.LoaderCallbacks, View.OnDragListener { private static final String STATE_IN_PERMISSION="inPermission"; private static final int REQUEST_PERMS=137; @@ -240,7 +240,7 @@ else if (event.isCtrlPressed()) { else if (keyCode==KeyEvent.KEYCODE_SLASH && event.isMetaPressed() && Build.VERSION.SDK_INT - - + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/Basic/app/build.gradle b/MapsV2/Basic/app/build.gradle index fa43b104a..b8906acb7 100644 --- a/MapsV2/Basic/app/build.gradle +++ b/MapsV2/Basic/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:11.6.2' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 diff --git a/MapsV2/Basic/app/src/main/java/com/commonsware/android/mapsv2/basic/AbstractMapActivity.java b/MapsV2/Basic/app/src/main/java/com/commonsware/android/mapsv2/basic/AbstractMapActivity.java index ef6eafc02..effe1cdbd 100644 --- a/MapsV2/Basic/app/src/main/java/com/commonsware/android/mapsv2/basic/AbstractMapActivity.java +++ b/MapsV2/Basic/app/src/main/java/com/commonsware/android/mapsv2/basic/AbstractMapActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.mapsv2.basic; -import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -22,11 +21,12 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -abstract public class AbstractMapActivity extends Activity { +abstract public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; protected boolean readyToGo() { diff --git a/MapsV2/Basic/app/src/main/res/layout/activity_main.xml b/MapsV2/Basic/app/src/main/res/layout/activity_main.xml index 1ed02c6ec..cf070530e 100644 --- a/MapsV2/Basic/app/src/main/res/layout/activity_main.xml +++ b/MapsV2/Basic/app/src/main/res/layout/activity_main.xml @@ -2,4 +2,4 @@ android:id="@+id/map" android:layout_width="match_parent" android:layout_height="match_parent" - class="com.google.android.gms.maps.MapFragment"/> + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/Bounds/app/build.gradle b/MapsV2/Bounds/app/build.gradle index fa43b104a..b8906acb7 100644 --- a/MapsV2/Bounds/app/build.gradle +++ b/MapsV2/Bounds/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:11.6.2' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 diff --git a/MapsV2/Bounds/app/src/main/java/com/commonsware/android/mapsv2/markers/AbstractMapActivity.java b/MapsV2/Bounds/app/src/main/java/com/commonsware/android/mapsv2/markers/AbstractMapActivity.java index ba972a03f..ee3f32d05 100644 --- a/MapsV2/Bounds/app/src/main/java/com/commonsware/android/mapsv2/markers/AbstractMapActivity.java +++ b/MapsV2/Bounds/app/src/main/java/com/commonsware/android/mapsv2/markers/AbstractMapActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.mapsv2.markers; -import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -22,11 +21,12 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -abstract public class AbstractMapActivity extends Activity { +abstract public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; protected boolean readyToGo() { diff --git a/MapsV2/Bounds/app/src/main/java/com/commonsware/android/mapsv2/markers/MainActivity.java b/MapsV2/Bounds/app/src/main/java/com/commonsware/android/mapsv2/markers/MainActivity.java index 55deb47a0..392f0cca2 100644 --- a/MapsV2/Bounds/app/src/main/java/com/commonsware/android/mapsv2/markers/MainActivity.java +++ b/MapsV2/Bounds/app/src/main/java/com/commonsware/android/mapsv2/markers/MainActivity.java @@ -18,8 +18,8 @@ import com.google.android.gms.maps.CameraUpdate; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; -import com.google.android.gms.maps.MapFragment; import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.LatLngBounds; import com.google.android.gms.maps.model.Marker; @@ -37,8 +37,8 @@ protected void onCreate(Bundle savedInstanceState) { if (readyToGo()) { setContentView(R.layout.activity_main); - MapFragment mapFrag= - (MapFragment)getFragmentManager().findFragmentById(R.id.map); + SupportMapFragment mapFrag= + (SupportMapFragment)getSupportFragmentManager().findFragmentById(R.id.map); if (savedInstanceState == null) { needsInit=true; diff --git a/MapsV2/Bounds/app/src/main/res/layout/activity_main.xml b/MapsV2/Bounds/app/src/main/res/layout/activity_main.xml index 1ed02c6ec..cf070530e 100644 --- a/MapsV2/Bounds/app/src/main/res/layout/activity_main.xml +++ b/MapsV2/Bounds/app/src/main/res/layout/activity_main.xml @@ -2,4 +2,4 @@ android:id="@+id/map" android:layout_width="match_parent" android:layout_height="match_parent" - class="com.google.android.gms.maps.MapFragment"/> + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/Camera/app/build.gradle b/MapsV2/Camera/app/build.gradle index fa43b104a..b8906acb7 100644 --- a/MapsV2/Camera/app/build.gradle +++ b/MapsV2/Camera/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:11.6.2' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 diff --git a/MapsV2/Camera/app/src/main/java/com/commonsware/android/mapsv2/camera/AbstractMapActivity.java b/MapsV2/Camera/app/src/main/java/com/commonsware/android/mapsv2/camera/AbstractMapActivity.java index 9e9000978..bffb5ed3f 100644 --- a/MapsV2/Camera/app/src/main/java/com/commonsware/android/mapsv2/camera/AbstractMapActivity.java +++ b/MapsV2/Camera/app/src/main/java/com/commonsware/android/mapsv2/camera/AbstractMapActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.mapsv2.camera; -import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -22,11 +21,12 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -abstract public class AbstractMapActivity extends Activity { +abstract public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; protected boolean readyToGo() { diff --git a/MapsV2/Camera/app/src/main/java/com/commonsware/android/mapsv2/camera/MainActivity.java b/MapsV2/Camera/app/src/main/java/com/commonsware/android/mapsv2/camera/MainActivity.java index c2226ba9d..94704b4fd 100644 --- a/MapsV2/Camera/app/src/main/java/com/commonsware/android/mapsv2/camera/MainActivity.java +++ b/MapsV2/Camera/app/src/main/java/com/commonsware/android/mapsv2/camera/MainActivity.java @@ -25,8 +25,8 @@ import com.google.android.gms.maps.GoogleMap.OnCameraMoveListener; import com.google.android.gms.maps.GoogleMap.OnCameraMoveStartedListener; import com.google.android.gms.maps.GoogleMap.OnInfoWindowClickListener; -import com.google.android.gms.maps.MapFragment; import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.CameraPosition; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.Marker; @@ -48,8 +48,8 @@ protected void onCreate(Bundle savedInstanceState) { if (readyToGo()) { setContentView(R.layout.activity_main); - MapFragment mapFrag= - (MapFragment)getFragmentManager().findFragmentById(R.id.map); + SupportMapFragment mapFrag= + (SupportMapFragment)getSupportFragmentManager().findFragmentById(R.id.map); if (savedInstanceState == null) { needsInit=true; diff --git a/MapsV2/Camera/app/src/main/res/layout/activity_main.xml b/MapsV2/Camera/app/src/main/res/layout/activity_main.xml index 1ed02c6ec..cf070530e 100644 --- a/MapsV2/Camera/app/src/main/res/layout/activity_main.xml +++ b/MapsV2/Camera/app/src/main/res/layout/activity_main.xml @@ -2,4 +2,4 @@ android:id="@+id/map" android:layout_width="match_parent" android:layout_height="match_parent" - class="com.google.android.gms.maps.MapFragment"/> + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/Drag/app/build.gradle b/MapsV2/Drag/app/build.gradle index fa43b104a..b8906acb7 100644 --- a/MapsV2/Drag/app/build.gradle +++ b/MapsV2/Drag/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:11.6.2' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 diff --git a/MapsV2/Drag/app/src/main/java/com/commonsware/android/mapsv2/drag/AbstractMapActivity.java b/MapsV2/Drag/app/src/main/java/com/commonsware/android/mapsv2/drag/AbstractMapActivity.java index 9ce3205dc..38b35bfe5 100644 --- a/MapsV2/Drag/app/src/main/java/com/commonsware/android/mapsv2/drag/AbstractMapActivity.java +++ b/MapsV2/Drag/app/src/main/java/com/commonsware/android/mapsv2/drag/AbstractMapActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.mapsv2.drag; -import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -22,11 +21,12 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -abstract public class AbstractMapActivity extends Activity { +abstract public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; protected boolean readyToGo() { diff --git a/MapsV2/Drag/app/src/main/java/com/commonsware/android/mapsv2/drag/MainActivity.java b/MapsV2/Drag/app/src/main/java/com/commonsware/android/mapsv2/drag/MainActivity.java index 103edff62..8c013a0f8 100644 --- a/MapsV2/Drag/app/src/main/java/com/commonsware/android/mapsv2/drag/MainActivity.java +++ b/MapsV2/Drag/app/src/main/java/com/commonsware/android/mapsv2/drag/MainActivity.java @@ -22,8 +22,8 @@ import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap.OnInfoWindowClickListener; import com.google.android.gms.maps.GoogleMap.OnMarkerDragListener; -import com.google.android.gms.maps.MapFragment; import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.Marker; import com.google.android.gms.maps.model.MarkerOptions; @@ -40,8 +40,8 @@ protected void onCreate(Bundle savedInstanceState) { if (readyToGo()) { setContentView(R.layout.activity_main); - MapFragment mapFrag= - (MapFragment)getFragmentManager().findFragmentById(R.id.map); + SupportMapFragment mapFrag= + (SupportMapFragment)getSupportFragmentManager().findFragmentById(R.id.map); if (savedInstanceState == null) { needsInit=true; diff --git a/MapsV2/Drag/app/src/main/res/layout/activity_main.xml b/MapsV2/Drag/app/src/main/res/layout/activity_main.xml index 1ed02c6ec..cf070530e 100644 --- a/MapsV2/Drag/app/src/main/res/layout/activity_main.xml +++ b/MapsV2/Drag/app/src/main/res/layout/activity_main.xml @@ -2,4 +2,4 @@ android:id="@+id/map" android:layout_width="match_parent" android:layout_height="match_parent" - class="com.google.android.gms.maps.MapFragment"/> + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/FlatMarkers/app/build.gradle b/MapsV2/FlatMarkers/app/build.gradle index fa43b104a..b8906acb7 100644 --- a/MapsV2/FlatMarkers/app/build.gradle +++ b/MapsV2/FlatMarkers/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:11.6.2' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 diff --git a/MapsV2/FlatMarkers/app/src/main/java/com/commonsware/android/mapsv2/flatmarkers/AbstractMapActivity.java b/MapsV2/FlatMarkers/app/src/main/java/com/commonsware/android/mapsv2/flatmarkers/AbstractMapActivity.java index 6903fcb90..4f36d75f9 100644 --- a/MapsV2/FlatMarkers/app/src/main/java/com/commonsware/android/mapsv2/flatmarkers/AbstractMapActivity.java +++ b/MapsV2/FlatMarkers/app/src/main/java/com/commonsware/android/mapsv2/flatmarkers/AbstractMapActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.mapsv2.flatmarkers; -import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -22,11 +21,12 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -abstract public class AbstractMapActivity extends Activity { +abstract public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; protected boolean readyToGo() { diff --git a/MapsV2/FlatMarkers/app/src/main/java/com/commonsware/android/mapsv2/flatmarkers/MainActivity.java b/MapsV2/FlatMarkers/app/src/main/java/com/commonsware/android/mapsv2/flatmarkers/MainActivity.java index 4f18888c4..a724aac1d 100644 --- a/MapsV2/FlatMarkers/app/src/main/java/com/commonsware/android/mapsv2/flatmarkers/MainActivity.java +++ b/MapsV2/FlatMarkers/app/src/main/java/com/commonsware/android/mapsv2/flatmarkers/MainActivity.java @@ -20,6 +20,7 @@ import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.MapFragment; import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.MarkerOptions; @@ -34,8 +35,8 @@ protected void onCreate(Bundle savedInstanceState) { if (readyToGo()) { setContentView(R.layout.activity_main); - MapFragment mapFrag= - (MapFragment)getFragmentManager().findFragmentById(R.id.map); + SupportMapFragment mapFrag= + (SupportMapFragment)getSupportFragmentManager().findFragmentById(R.id.map); if (savedInstanceState == null) { needsInit=true; diff --git a/MapsV2/FlatMarkers/app/src/main/res/layout/activity_main.xml b/MapsV2/FlatMarkers/app/src/main/res/layout/activity_main.xml index 1ed02c6ec..cf070530e 100644 --- a/MapsV2/FlatMarkers/app/src/main/res/layout/activity_main.xml +++ b/MapsV2/FlatMarkers/app/src/main/res/layout/activity_main.xml @@ -2,4 +2,4 @@ android:id="@+id/map" android:layout_width="match_parent" android:layout_height="match_parent" - class="com.google.android.gms.maps.MapFragment"/> + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/ImagePopups/app/build.gradle b/MapsV2/ImagePopups/app/build.gradle index 16d389b9b..7deb9a59b 100644 --- a/MapsV2/ImagePopups/app/build.gradle +++ b/MapsV2/ImagePopups/app/build.gradle @@ -1,13 +1,14 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:11.6.2' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' implementation 'com.squareup.picasso:picasso:2.5.2' } android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 diff --git a/MapsV2/ImagePopups/app/src/main/java/com/commonsware/android/mapsv2/imagepopups/AbstractMapActivity.java b/MapsV2/ImagePopups/app/src/main/java/com/commonsware/android/mapsv2/imagepopups/AbstractMapActivity.java index fd88c1b0a..df55b8fc6 100644 --- a/MapsV2/ImagePopups/app/src/main/java/com/commonsware/android/mapsv2/imagepopups/AbstractMapActivity.java +++ b/MapsV2/ImagePopups/app/src/main/java/com/commonsware/android/mapsv2/imagepopups/AbstractMapActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.mapsv2.imagepopups; -import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -22,11 +21,12 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -abstract public class AbstractMapActivity extends Activity { +abstract public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; protected boolean readyToGo() { diff --git a/MapsV2/ImagePopups/app/src/main/java/com/commonsware/android/mapsv2/imagepopups/MainActivity.java b/MapsV2/ImagePopups/app/src/main/java/com/commonsware/android/mapsv2/imagepopups/MainActivity.java index 74cb1be5a..a36bae4ac 100644 --- a/MapsV2/ImagePopups/app/src/main/java/com/commonsware/android/mapsv2/imagepopups/MainActivity.java +++ b/MapsV2/ImagePopups/app/src/main/java/com/commonsware/android/mapsv2/imagepopups/MainActivity.java @@ -23,6 +23,7 @@ import com.google.android.gms.maps.GoogleMap.OnInfoWindowClickListener; import com.google.android.gms.maps.MapFragment; import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.Marker; import com.google.android.gms.maps.model.MarkerOptions; @@ -40,8 +41,8 @@ protected void onCreate(Bundle savedInstanceState) { if (readyToGo()) { setContentView(R.layout.activity_main); - MapFragment mapFrag= - (MapFragment)getFragmentManager().findFragmentById(R.id.map); + SupportMapFragment mapFrag= + (SupportMapFragment)getSupportFragmentManager().findFragmentById(R.id.map); if (savedInstanceState == null) { needsInit=true; diff --git a/MapsV2/ImagePopups/app/src/main/res/layout/activity_main.xml b/MapsV2/ImagePopups/app/src/main/res/layout/activity_main.xml index 1ed02c6ec..cf070530e 100644 --- a/MapsV2/ImagePopups/app/src/main/res/layout/activity_main.xml +++ b/MapsV2/ImagePopups/app/src/main/res/layout/activity_main.xml @@ -2,4 +2,4 @@ android:id="@+id/map" android:layout_width="match_parent" android:layout_height="match_parent" - class="com.google.android.gms.maps.MapFragment"/> + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/Location/app/build.gradle b/MapsV2/Location/app/build.gradle index be8d0d17a..b8906acb7 100644 --- a/MapsV2/Location/app/build.gradle +++ b/MapsV2/Location/app/build.gradle @@ -1,15 +1,16 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:10.2.0' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { - compileSdkVersion 24 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 - targetSdkVersion 22 + targetSdkVersion 27 } } diff --git a/MapsV2/Location/app/src/main/AndroidManifest.xml b/MapsV2/Location/app/src/main/AndroidManifest.xml index 42798dbc1..59aa36f16 100644 --- a/MapsV2/Location/app/src/main/AndroidManifest.xml +++ b/MapsV2/Location/app/src/main/AndroidManifest.xml @@ -16,8 +16,7 @@ + android:label="@string/app_name"> @@ -27,8 +26,6 @@ - - + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/Location/app/src/main/res/layout/legal.xml b/MapsV2/Location/app/src/main/res/layout/legal.xml deleted file mode 100644 index a198c6c02..000000000 --- a/MapsV2/Location/app/src/main/res/layout/legal.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MapsV2/Location/app/src/main/res/menu/activity_main.xml b/MapsV2/Location/app/src/main/res/menu/activity_main.xml deleted file mode 100644 index 61b3897f6..000000000 --- a/MapsV2/Location/app/src/main/res/menu/activity_main.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - \ No newline at end of file diff --git a/MapsV2/Location/app/src/main/res/values/strings.xml b/MapsV2/Location/app/src/main/res/values/strings.xml index 903875033..ac200233c 100644 --- a/MapsV2/Location/app/src/main/res/values/strings.xml +++ b/MapsV2/Location/app/src/main/res/values/strings.xml @@ -17,5 +17,6 @@ The Downtown Club Original home of the Heisman Trophy CommonsWare logo - + Auto-Follow + \ No newline at end of file diff --git a/MapsV2/Markers/app/build.gradle b/MapsV2/Markers/app/build.gradle index 0cd08ed27..18e8ac686 100644 --- a/MapsV2/Markers/app/build.gradle +++ b/MapsV2/Markers/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:11.6.2' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 diff --git a/MapsV2/Markers/app/src/main/java/com/commonsware/android/mapsv2/markers/AbstractMapActivity.java b/MapsV2/Markers/app/src/main/java/com/commonsware/android/mapsv2/markers/AbstractMapActivity.java index ba972a03f..ee3f32d05 100644 --- a/MapsV2/Markers/app/src/main/java/com/commonsware/android/mapsv2/markers/AbstractMapActivity.java +++ b/MapsV2/Markers/app/src/main/java/com/commonsware/android/mapsv2/markers/AbstractMapActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.mapsv2.markers; -import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -22,11 +21,12 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -abstract public class AbstractMapActivity extends Activity { +abstract public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; protected boolean readyToGo() { diff --git a/MapsV2/Markers/app/src/main/java/com/commonsware/android/mapsv2/markers/MainActivity.java b/MapsV2/Markers/app/src/main/java/com/commonsware/android/mapsv2/markers/MainActivity.java index fe657ead7..ef7547e1d 100644 --- a/MapsV2/Markers/app/src/main/java/com/commonsware/android/mapsv2/markers/MainActivity.java +++ b/MapsV2/Markers/app/src/main/java/com/commonsware/android/mapsv2/markers/MainActivity.java @@ -20,6 +20,7 @@ import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.MapFragment; import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.MarkerOptions; @@ -34,8 +35,8 @@ protected void onCreate(Bundle savedInstanceState) { if (readyToGo()) { setContentView(R.layout.activity_main); - MapFragment mapFrag= - (MapFragment)getFragmentManager().findFragmentById(R.id.map); + SupportMapFragment mapFrag= + (SupportMapFragment)getSupportFragmentManager().findFragmentById(R.id.map); if (savedInstanceState == null) { needsInit=true; diff --git a/MapsV2/Markers/app/src/main/res/layout/activity_main.xml b/MapsV2/Markers/app/src/main/res/layout/activity_main.xml index 1ed02c6ec..cf070530e 100644 --- a/MapsV2/Markers/app/src/main/res/layout/activity_main.xml +++ b/MapsV2/Markers/app/src/main/res/layout/activity_main.xml @@ -2,4 +2,4 @@ android:id="@+id/map" android:layout_width="match_parent" android:layout_height="match_parent" - class="com.google.android.gms.maps.MapFragment"/> + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/Models/app/build.gradle b/MapsV2/Models/app/build.gradle index fa43b104a..b8906acb7 100644 --- a/MapsV2/Models/app/build.gradle +++ b/MapsV2/Models/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:11.6.2' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 diff --git a/MapsV2/Models/app/src/main/java/com/commonsware/android/mapsv2/model/AbstractMapActivity.java b/MapsV2/Models/app/src/main/java/com/commonsware/android/mapsv2/model/AbstractMapActivity.java index b67618d16..079f5a81b 100644 --- a/MapsV2/Models/app/src/main/java/com/commonsware/android/mapsv2/model/AbstractMapActivity.java +++ b/MapsV2/Models/app/src/main/java/com/commonsware/android/mapsv2/model/AbstractMapActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.mapsv2.model; -import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -22,11 +21,12 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -abstract public class AbstractMapActivity extends Activity { +abstract public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; protected boolean readyToGo() { diff --git a/MapsV2/Models/app/src/main/java/com/commonsware/android/mapsv2/model/MainActivity.java b/MapsV2/Models/app/src/main/java/com/commonsware/android/mapsv2/model/MainActivity.java index 80a3b0581..4b5d1988a 100644 --- a/MapsV2/Models/app/src/main/java/com/commonsware/android/mapsv2/model/MainActivity.java +++ b/MapsV2/Models/app/src/main/java/com/commonsware/android/mapsv2/model/MainActivity.java @@ -22,6 +22,7 @@ import com.google.android.gms.maps.GoogleMap.OnInfoWindowClickListener; import com.google.android.gms.maps.MapFragment; import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.Marker; import com.google.android.gms.maps.model.MarkerOptions; @@ -39,8 +40,8 @@ protected void onCreate(Bundle savedInstanceState) { if (readyToGo()) { setContentView(R.layout.activity_main); - MapFragment mapFrag= - (MapFragment)getFragmentManager().findFragmentById(R.id.map); + SupportMapFragment mapFrag= + (SupportMapFragment)getSupportFragmentManager().findFragmentById(R.id.map); if (savedInstanceState == null) { needsInit=true; diff --git a/MapsV2/Models/app/src/main/res/layout/activity_main.xml b/MapsV2/Models/app/src/main/res/layout/activity_main.xml index 1ed02c6ec..cf070530e 100644 --- a/MapsV2/Models/app/src/main/res/layout/activity_main.xml +++ b/MapsV2/Models/app/src/main/res/layout/activity_main.xml @@ -2,4 +2,4 @@ android:id="@+id/map" android:layout_width="match_parent" android:layout_height="match_parent" - class="com.google.android.gms.maps.MapFragment"/> + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/MyLocationMNC/app/build.gradle b/MapsV2/MyLocationMNC/app/build.gradle index 078fd25df..18e8ac686 100644 --- a/MapsV2/MyLocationMNC/app/build.gradle +++ b/MapsV2/MyLocationMNC/app/build.gradle @@ -1,16 +1,16 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:10.2.0' - implementation 'com.android.support:support-v4:25.3.1' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { - compileSdkVersion 24 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 27 } } diff --git a/MapsV2/MyLocationMNC/app/src/main/java/com/commonsware/android/mapsv2/mylocation/AbstractMapActivity.java b/MapsV2/MyLocationMNC/app/src/main/java/com/commonsware/android/mapsv2/mylocation/AbstractMapActivity.java index 64b70efa9..3ce53d133 100644 --- a/MapsV2/MyLocationMNC/app/src/main/java/com/commonsware/android/mapsv2/mylocation/AbstractMapActivity.java +++ b/MapsV2/MyLocationMNC/app/src/main/java/com/commonsware/android/mapsv2/mylocation/AbstractMapActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.mapsv2.mylocation; -import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -23,13 +22,14 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.view.Menu; import android.view.MenuItem; import android.widget.Toast; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -public class AbstractMapActivity extends Activity { +public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; @Override diff --git a/MapsV2/MyLocationMNC/app/src/main/res/layout/activity_main.xml b/MapsV2/MyLocationMNC/app/src/main/res/layout/activity_main.xml index 1ed02c6ec..cf070530e 100644 --- a/MapsV2/MyLocationMNC/app/src/main/res/layout/activity_main.xml +++ b/MapsV2/MyLocationMNC/app/src/main/res/layout/activity_main.xml @@ -2,4 +2,4 @@ android:id="@+id/map" android:layout_width="match_parent" android:layout_height="match_parent" - class="com.google.android.gms.maps.MapFragment"/> + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/NooYawk/app/build.gradle b/MapsV2/NooYawk/app/build.gradle index fa43b104a..b8906acb7 100644 --- a/MapsV2/NooYawk/app/build.gradle +++ b/MapsV2/NooYawk/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:11.6.2' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 diff --git a/MapsV2/NooYawk/app/src/main/java/com/commonsware/android/mapsv2/nooyawk/AbstractMapActivity.java b/MapsV2/NooYawk/app/src/main/java/com/commonsware/android/mapsv2/nooyawk/AbstractMapActivity.java index fbf482de3..55131c005 100644 --- a/MapsV2/NooYawk/app/src/main/java/com/commonsware/android/mapsv2/nooyawk/AbstractMapActivity.java +++ b/MapsV2/NooYawk/app/src/main/java/com/commonsware/android/mapsv2/nooyawk/AbstractMapActivity.java @@ -14,7 +14,7 @@ package com.commonsware.android.mapsv2.nooyawk; -import android.app.Activity; +import android.support.v4.app.FragmentActivity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -26,7 +26,7 @@ import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -abstract public class AbstractMapActivity extends Activity { +abstract public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; protected boolean readyToGo() { diff --git a/MapsV2/NooYawk/app/src/main/java/com/commonsware/android/mapsv2/nooyawk/MainActivity.java b/MapsV2/NooYawk/app/src/main/java/com/commonsware/android/mapsv2/nooyawk/MainActivity.java index 801cd8f42..bf73f7b62 100644 --- a/MapsV2/NooYawk/app/src/main/java/com/commonsware/android/mapsv2/nooyawk/MainActivity.java +++ b/MapsV2/NooYawk/app/src/main/java/com/commonsware/android/mapsv2/nooyawk/MainActivity.java @@ -18,7 +18,7 @@ import com.google.android.gms.maps.CameraUpdate; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; -import com.google.android.gms.maps.MapFragment; +import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.model.LatLng; @@ -31,8 +31,8 @@ protected void onCreate(Bundle savedInstanceState) { if (readyToGo()) { setContentView(R.layout.activity_main); - MapFragment mapFrag= - (MapFragment)getFragmentManager().findFragmentById(R.id.map); + SupportMapFragment mapFrag= + (SupportMapFragment)getSupportFragmentManager().findFragmentById(R.id.map); if (savedInstanceState == null) { mapFrag.getMapAsync(this); diff --git a/MapsV2/NooYawk/app/src/main/res/layout/activity_main.xml b/MapsV2/NooYawk/app/src/main/res/layout/activity_main.xml index 1ed02c6ec..cf070530e 100644 --- a/MapsV2/NooYawk/app/src/main/res/layout/activity_main.xml +++ b/MapsV2/NooYawk/app/src/main/res/layout/activity_main.xml @@ -2,4 +2,4 @@ android:id="@+id/map" android:layout_width="match_parent" android:layout_height="match_parent" - class="com.google.android.gms.maps.MapFragment"/> + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/Pager/app/build.gradle b/MapsV2/Pager/app/build.gradle index 7fe52db22..b8906acb7 100644 --- a/MapsV2/Pager/app/build.gradle +++ b/MapsV2/Pager/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:11.6.2' - implementation 'com.android.support:support-v13:27.0.2' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { compileSdkVersion 27 - buildToolsVersion '26.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 diff --git a/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/AbstractMapActivity.java b/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/AbstractMapActivity.java index 5ff05fa47..4e290671f 100644 --- a/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/AbstractMapActivity.java +++ b/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/AbstractMapActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.mapsv2.pager; -import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -22,11 +21,12 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -abstract public class AbstractMapActivity extends Activity { +abstract public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; protected boolean readyToGo() { diff --git a/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/MainActivity.java b/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/MainActivity.java index 90479183c..6186b4372 100644 --- a/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/MainActivity.java +++ b/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/MainActivity.java @@ -26,13 +26,13 @@ protected void onCreate(Bundle savedInstanceState) { if (readyToGo()) { setContentView(R.layout.activity_main); - ViewPager pager=(ViewPager)findViewById(R.id.pager); + ViewPager pager=findViewById(R.id.pager); pager.setAdapter(buildAdapter()); } } private PagerAdapter buildAdapter() { - return(new MapPageAdapter(this, getFragmentManager())); + return(new MapPageAdapter(this, getSupportFragmentManager())); } } diff --git a/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/MapPageAdapter.java b/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/MapPageAdapter.java index 10b4251ca..b64925f86 100644 --- a/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/MapPageAdapter.java +++ b/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/MapPageAdapter.java @@ -15,9 +15,9 @@ package com.commonsware.android.mapsv2.pager; import android.content.Context; -import android.app.Fragment; -import android.app.FragmentManager; -import android.support.v13.app.FragmentStatePagerAdapter; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentStatePagerAdapter; public class MapPageAdapter extends FragmentStatePagerAdapter { Context ctxt=null; diff --git a/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/PageMapFragment.java b/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/PageMapFragment.java index af9d224b4..9f25f98c1 100644 --- a/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/PageMapFragment.java +++ b/MapsV2/Pager/app/src/main/java/com/commonsware/android/mapsv2/pager/PageMapFragment.java @@ -18,12 +18,12 @@ import com.google.android.gms.maps.CameraUpdate; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; -import com.google.android.gms.maps.MapFragment; import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.MarkerOptions; -public class PageMapFragment extends MapFragment implements +public class PageMapFragment extends SupportMapFragment implements OnMapReadyCallback { private boolean needsInit=false; diff --git a/MapsV2/Poly/app/build.gradle b/MapsV2/Poly/app/build.gradle index fa43b104a..b8906acb7 100644 --- a/MapsV2/Poly/app/build.gradle +++ b/MapsV2/Poly/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:11.6.2' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 diff --git a/MapsV2/Poly/app/src/main/java/com/commonsware/android/mapsv2/poly/AbstractMapActivity.java b/MapsV2/Poly/app/src/main/java/com/commonsware/android/mapsv2/poly/AbstractMapActivity.java index 73fb2995d..919910835 100644 --- a/MapsV2/Poly/app/src/main/java/com/commonsware/android/mapsv2/poly/AbstractMapActivity.java +++ b/MapsV2/Poly/app/src/main/java/com/commonsware/android/mapsv2/poly/AbstractMapActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.mapsv2.poly; -import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -22,11 +21,12 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -abstract public class AbstractMapActivity extends Activity { +abstract public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; protected boolean readyToGo() { diff --git a/MapsV2/Poly/app/src/main/java/com/commonsware/android/mapsv2/poly/MainActivity.java b/MapsV2/Poly/app/src/main/java/com/commonsware/android/mapsv2/poly/MainActivity.java index a415c411b..7f0e17aa6 100644 --- a/MapsV2/Poly/app/src/main/java/com/commonsware/android/mapsv2/poly/MainActivity.java +++ b/MapsV2/Poly/app/src/main/java/com/commonsware/android/mapsv2/poly/MainActivity.java @@ -23,6 +23,7 @@ import com.google.android.gms.maps.GoogleMap.OnInfoWindowClickListener; import com.google.android.gms.maps.MapFragment; import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.Marker; import com.google.android.gms.maps.model.MarkerOptions; @@ -40,8 +41,8 @@ protected void onCreate(Bundle savedInstanceState) { if (readyToGo()) { setContentView(R.layout.activity_main); - MapFragment mapFrag= - (MapFragment)getFragmentManager().findFragmentById(R.id.map); + SupportMapFragment mapFrag= + (SupportMapFragment)getSupportFragmentManager().findFragmentById(R.id.map); if (savedInstanceState == null) { needsInit=true; diff --git a/MapsV2/Poly/app/src/main/res/layout/activity_main.xml b/MapsV2/Poly/app/src/main/res/layout/activity_main.xml index 1ed02c6ec..cf070530e 100644 --- a/MapsV2/Poly/app/src/main/res/layout/activity_main.xml +++ b/MapsV2/Poly/app/src/main/res/layout/activity_main.xml @@ -2,4 +2,4 @@ android:id="@+id/map" android:layout_width="match_parent" android:layout_height="match_parent" - class="com.google.android.gms.maps.MapFragment"/> + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/Popups/app/build.gradle b/MapsV2/Popups/app/build.gradle index fa43b104a..b8906acb7 100644 --- a/MapsV2/Popups/app/build.gradle +++ b/MapsV2/Popups/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:11.6.2' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 diff --git a/MapsV2/Popups/app/src/main/java/com/commonsware/android/mapsv2/popups/AbstractMapActivity.java b/MapsV2/Popups/app/src/main/java/com/commonsware/android/mapsv2/popups/AbstractMapActivity.java index a1b3a5a0c..9e4ab75e4 100644 --- a/MapsV2/Popups/app/src/main/java/com/commonsware/android/mapsv2/popups/AbstractMapActivity.java +++ b/MapsV2/Popups/app/src/main/java/com/commonsware/android/mapsv2/popups/AbstractMapActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.mapsv2.popups; -import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -22,11 +21,12 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -abstract public class AbstractMapActivity extends Activity { +abstract public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; protected boolean readyToGo() { diff --git a/MapsV2/Popups/app/src/main/java/com/commonsware/android/mapsv2/popups/MainActivity.java b/MapsV2/Popups/app/src/main/java/com/commonsware/android/mapsv2/popups/MainActivity.java index ad2e624bf..b2ec514ac 100644 --- a/MapsV2/Popups/app/src/main/java/com/commonsware/android/mapsv2/popups/MainActivity.java +++ b/MapsV2/Popups/app/src/main/java/com/commonsware/android/mapsv2/popups/MainActivity.java @@ -22,6 +22,7 @@ import com.google.android.gms.maps.GoogleMap.OnInfoWindowClickListener; import com.google.android.gms.maps.MapFragment; import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.Marker; import com.google.android.gms.maps.model.MarkerOptions; @@ -37,8 +38,8 @@ protected void onCreate(Bundle savedInstanceState) { if (readyToGo()) { setContentView(R.layout.activity_main); - MapFragment mapFrag= - (MapFragment)getFragmentManager().findFragmentById(R.id.map); + SupportMapFragment mapFrag= + (SupportMapFragment)getSupportFragmentManager().findFragmentById(R.id.map); if (savedInstanceState == null) { needsInit=true; diff --git a/MapsV2/Popups/app/src/main/res/layout/activity_main.xml b/MapsV2/Popups/app/src/main/res/layout/activity_main.xml index 1ed02c6ec..cf070530e 100644 --- a/MapsV2/Popups/app/src/main/res/layout/activity_main.xml +++ b/MapsV2/Popups/app/src/main/res/layout/activity_main.xml @@ -2,4 +2,4 @@ android:id="@+id/map" android:layout_width="match_parent" android:layout_height="match_parent" - class="com.google.android.gms.maps.MapFragment"/> + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MapsV2/Taps/app/build.gradle b/MapsV2/Taps/app/build.gradle index fa43b104a..b8906acb7 100644 --- a/MapsV2/Taps/app/build.gradle +++ b/MapsV2/Taps/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.google.android.gms:play-services-maps:11.6.2' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.google.android.gms:play-services-maps:11.8.0' } android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 14 diff --git a/MapsV2/Taps/app/src/main/java/com/commonsware/android/mapsv2/taps/AbstractMapActivity.java b/MapsV2/Taps/app/src/main/java/com/commonsware/android/mapsv2/taps/AbstractMapActivity.java index ea2a36d83..7d30283fc 100644 --- a/MapsV2/Taps/app/src/main/java/com/commonsware/android/mapsv2/taps/AbstractMapActivity.java +++ b/MapsV2/Taps/app/src/main/java/com/commonsware/android/mapsv2/taps/AbstractMapActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.mapsv2.taps; -import android.app.Activity; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; @@ -22,11 +21,12 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v4.app.FragmentActivity; import android.widget.Toast; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -abstract public class AbstractMapActivity extends Activity { +abstract public class AbstractMapActivity extends FragmentActivity { static final String TAG_ERROR_DIALOG_FRAGMENT="errorDialog"; protected boolean readyToGo() { diff --git a/MapsV2/Taps/app/src/main/java/com/commonsware/android/mapsv2/taps/MainActivity.java b/MapsV2/Taps/app/src/main/java/com/commonsware/android/mapsv2/taps/MainActivity.java index 8bd5f60b9..0e324c96c 100644 --- a/MapsV2/Taps/app/src/main/java/com/commonsware/android/mapsv2/taps/MainActivity.java +++ b/MapsV2/Taps/app/src/main/java/com/commonsware/android/mapsv2/taps/MainActivity.java @@ -21,8 +21,8 @@ import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap.OnInfoWindowClickListener; import com.google.android.gms.maps.GoogleMap.OnMarkerClickListener; -import com.google.android.gms.maps.MapFragment; import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.Marker; @@ -40,8 +40,8 @@ protected void onCreate(Bundle savedInstanceState) { if (readyToGo()) { setContentView(R.layout.activity_main); - MapFragment mapFrag= - (MapFragment)getFragmentManager().findFragmentById(R.id.map); + SupportMapFragment mapFrag= + (SupportMapFragment)getSupportFragmentManager().findFragmentById(R.id.map); if (savedInstanceState == null) { needsInit=true; diff --git a/MapsV2/Taps/app/src/main/res/layout/activity_main.xml b/MapsV2/Taps/app/src/main/res/layout/activity_main.xml index 1ed02c6ec..cf070530e 100644 --- a/MapsV2/Taps/app/src/main/res/layout/activity_main.xml +++ b/MapsV2/Taps/app/src/main/res/layout/activity_main.xml @@ -2,4 +2,4 @@ android:id="@+id/map" android:layout_width="match_parent" android:layout_height="match_parent" - class="com.google.android.gms.maps.MapFragment"/> + class="com.google.android.gms.maps.SupportMapFragment"/> diff --git a/MiscSecurity/SigDump/app/build.gradle b/MiscSecurity/SigDump/app/build.gradle index 197560c8a..28a8c3d10 100644 --- a/MiscSecurity/SigDump/app/build.gradle +++ b/MiscSecurity/SigDump/app/build.gradle @@ -1,14 +1,17 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.android.support:support-v13:21.0.3' + implementation 'com.android.support:support-v13:27.1.0' } android { - compileSdkVersion 19 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { - targetSdkVersion 17 + minSdkVersion 15 + targetSdkVersion 27 + versionCode 1 + versionName "1.0" } } diff --git a/MiscSecurity/SigDump/app/src/main/AndroidManifest.xml b/MiscSecurity/SigDump/app/src/main/AndroidManifest.xml index a05958024..a62b92b79 100644 --- a/MiscSecurity/SigDump/app/src/main/AndroidManifest.xml +++ b/MiscSecurity/SigDump/app/src/main/AndroidManifest.xml @@ -4,16 +4,12 @@ android:versionCode="1" android:versionName="1.0"> - + android:label="@string/app_name"> diff --git a/MiscSecurity/SigDump/app/src/main/java/com/commonsware/android/signature/dump/ContractListFragment.java b/MiscSecurity/SigDump/app/src/main/java/com/commonsware/android/signature/dump/ContractListFragment.java index fe86d9f39..d9a17c370 100644 --- a/MiscSecurity/SigDump/app/src/main/java/com/commonsware/android/signature/dump/ContractListFragment.java +++ b/MiscSecurity/SigDump/app/src/main/java/com/commonsware/android/signature/dump/ContractListFragment.java @@ -19,7 +19,7 @@ Portions Copyright (c) 2013 CommonsWare, LLC package com.commonsware.android.signature.dump; import android.app.Activity; -import android.app.ListFragment; +import android.support.v4.app.ListFragment; public class ContractListFragment extends ListFragment { private T contract; diff --git a/MiscSecurity/SigDump/app/src/main/java/com/commonsware/android/signature/dump/MainActivity.java b/MiscSecurity/SigDump/app/src/main/java/com/commonsware/android/signature/dump/MainActivity.java index 33872ef8a..adbe68282 100644 --- a/MiscSecurity/SigDump/app/src/main/java/com/commonsware/android/signature/dump/MainActivity.java +++ b/MiscSecurity/SigDump/app/src/main/java/com/commonsware/android/signature/dump/MainActivity.java @@ -14,7 +14,7 @@ package com.commonsware.android.signature.dump; -import android.app.Activity; +import android.support.v4.app.FragmentActivity; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.Signature; @@ -27,7 +27,7 @@ import java.util.Comparator; import java.util.List; -public class MainActivity extends Activity implements +public class MainActivity extends FragmentActivity implements PackagesFragment.Contract { private PackageManager mgr=null; private SignatureFragment sigDisplay=null; @@ -40,9 +40,9 @@ protected void onCreate(Bundle savedInstanceState) { mgr=getPackageManager(); sigDisplay= - (SignatureFragment)getFragmentManager().findFragmentById(R.id.log); + (SignatureFragment)getSupportFragmentManager().findFragmentById(R.id.log); - panes=(SlidingPaneLayout)findViewById(R.id.panes); + panes=findViewById(R.id.panes); panes.openPane(); } diff --git a/MiscSecurity/SigDump/app/src/main/java/com/commonsware/android/signature/dump/SignatureFragment.java b/MiscSecurity/SigDump/app/src/main/java/com/commonsware/android/signature/dump/SignatureFragment.java index 3a6a4180f..91ddc558c 100644 --- a/MiscSecurity/SigDump/app/src/main/java/com/commonsware/android/signature/dump/SignatureFragment.java +++ b/MiscSecurity/SigDump/app/src/main/java/com/commonsware/android/signature/dump/SignatureFragment.java @@ -14,8 +14,8 @@ package com.commonsware.android.signature.dump; -import android.app.Fragment; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -63,14 +63,14 @@ void show(byte[] raw) { return; } - TextView tv=(TextView)getView().findViewById(R.id.subject); + TextView tv=getView().findViewById(R.id.subject); tv.setText(c.getSubjectDN().toString()); - tv=(TextView)getView().findViewById(R.id.issuer); + tv=getView().findViewById(R.id.issuer); tv.setText(c.getIssuerDN().toString()); - tv=(TextView)getView().findViewById(R.id.valid); + tv=getView().findViewById(R.id.valid); tv.setText(fmt.format(c.getNotBefore()) + " to " + fmt.format(c.getNotAfter())); } diff --git a/NFC/WebBeam/app/build.gradle b/NFC/WebBeam/app/build.gradle index 0ccbc9233..559b06e98 100644 --- a/NFC/WebBeam/app/build.gradle +++ b/NFC/WebBeam/app/build.gradle @@ -1,10 +1,15 @@ apply plugin: 'com.android.application' +dependencies { + implementation 'com.android.support:support-fragment:27.1.0' +} + android { - compileSdkVersion 19 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { - targetSdkVersion 17 + minSdkVersion 14 + targetSdkVersion 27 } } diff --git a/NFC/WebBeam/app/src/main/java/com/commonsware/android/webbeam/BeamFragment.java b/NFC/WebBeam/app/src/main/java/com/commonsware/android/webbeam/BeamFragment.java index 699fcfc8c..ac4038908 100644 --- a/NFC/WebBeam/app/src/main/java/com/commonsware/android/webbeam/BeamFragment.java +++ b/NFC/WebBeam/app/src/main/java/com/commonsware/android/webbeam/BeamFragment.java @@ -21,7 +21,6 @@ import android.view.MenuItem; import android.webkit.WebView; import android.webkit.WebViewClient; -import android.webkit.WebViewFragment; public class BeamFragment extends WebViewFragment { @SuppressLint("SetJavaScriptEnabled") diff --git a/NFC/WebBeam/app/src/main/java/com/commonsware/android/webbeam/WebBeamActivity.java b/NFC/WebBeam/app/src/main/java/com/commonsware/android/webbeam/WebBeamActivity.java index 88c47438d..97a0c32f5 100644 --- a/NFC/WebBeam/app/src/main/java/com/commonsware/android/webbeam/WebBeamActivity.java +++ b/NFC/WebBeam/app/src/main/java/com/commonsware/android/webbeam/WebBeamActivity.java @@ -14,7 +14,6 @@ package com.commonsware.android.webbeam; -import android.app.Activity; import android.content.Intent; import android.nfc.NdefMessage; import android.nfc.NdefRecord; @@ -23,9 +22,10 @@ import android.nfc.NfcEvent; import android.os.Bundle; import android.os.Parcelable; +import android.support.v4.app.FragmentActivity; import java.nio.charset.Charset; -public class WebBeamActivity extends Activity implements +public class WebBeamActivity extends FragmentActivity implements CreateNdefMessageCallback { private static final String MIME_TYPE= "application/vnd.commonsware.sample.webbeam"; @@ -37,12 +37,12 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); beamFragment= - (BeamFragment)getFragmentManager().findFragmentById(android.R.id.content); + (BeamFragment)getSupportFragmentManager().findFragmentById(android.R.id.content); if (beamFragment == null) { beamFragment=new BeamFragment(); - getFragmentManager().beginTransaction() + getSupportFragmentManager().beginTransaction() .add(android.R.id.content, beamFragment) .commit(); } diff --git a/Notifications/CustomView/app/build.gradle b/Notifications/CustomView/app/build.gradle index b3052539e..56af6a0ef 100644 --- a/Notifications/CustomView/app/build.gradle +++ b/Notifications/CustomView/app/build.gradle @@ -1,17 +1,18 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.android.support:support-compat:26.1.0' + implementation 'com.android.support:support-core-utils:27.1.0' + implementation 'com.android.support:support-fragment:27.1.0' implementation 'com.squareup.okhttp3:okhttp:3.8.0' } android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 21 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 1 versionName "1.0" applicationId "com.commonsware.android.okhttp3.progress.custom" diff --git a/Notifications/CustomView/app/src/main/java/com/commonsware/android/okhttp3/progress/DownloadFragment.java b/Notifications/CustomView/app/src/main/java/com/commonsware/android/okhttp3/progress/DownloadFragment.java index c0fa422e5..f37c11510 100644 --- a/Notifications/CustomView/app/src/main/java/com/commonsware/android/okhttp3/progress/DownloadFragment.java +++ b/Notifications/CustomView/app/src/main/java/com/commonsware/android/okhttp3/progress/DownloadFragment.java @@ -14,7 +14,7 @@ package com.commonsware.android.okhttp3.progress; -import android.app.Fragment; +import android.support.v4.app.Fragment; import android.content.Intent; import android.net.Uri; import android.os.Bundle; diff --git a/Notifications/CustomView/app/src/main/java/com/commonsware/android/okhttp3/progress/DownloaderDemo.java b/Notifications/CustomView/app/src/main/java/com/commonsware/android/okhttp3/progress/DownloaderDemo.java index a3c519ccf..962aee008 100644 --- a/Notifications/CustomView/app/src/main/java/com/commonsware/android/okhttp3/progress/DownloaderDemo.java +++ b/Notifications/CustomView/app/src/main/java/com/commonsware/android/okhttp3/progress/DownloaderDemo.java @@ -14,16 +14,16 @@ package com.commonsware.android.okhttp3.progress; -import android.app.Activity; +import android.support.v4.app.FragmentActivity; import android.os.Bundle; -public class DownloaderDemo extends Activity { +public class DownloaderDemo extends FragmentActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (getFragmentManager().findFragmentById(android.R.id.content) == null) { - getFragmentManager().beginTransaction() + if (getSupportFragmentManager().findFragmentById(android.R.id.content) == null) { + getSupportFragmentManager().beginTransaction() .add(android.R.id.content, new DownloadFragment()).commit(); } diff --git a/Notifications/DownloadNotify/app/build.gradle b/Notifications/DownloadNotify/app/build.gradle index 4a6d4b149..c9d83610b 100644 --- a/Notifications/DownloadNotify/app/build.gradle +++ b/Notifications/DownloadNotify/app/build.gradle @@ -1,17 +1,18 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.android.support:support-core-utils:26.1.0' - implementation 'com.commonsware.cwac:provider:0.5.2' + implementation 'com.android.support:support-core-utils:27.1.0' + implementation 'com.android.support:support-fragment:27.1.0' + implementation 'com.commonsware.cwac:provider:0.5.3' } android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 1 versionName "1.0" } diff --git a/Notifications/DownloadNotify/app/src/main/java/com/commonsware/android/downloader/DownloadFragment.java b/Notifications/DownloadNotify/app/src/main/java/com/commonsware/android/downloader/DownloadFragment.java index ed7026c9c..ba0b69aff 100644 --- a/Notifications/DownloadNotify/app/src/main/java/com/commonsware/android/downloader/DownloadFragment.java +++ b/Notifications/DownloadNotify/app/src/main/java/com/commonsware/android/downloader/DownloadFragment.java @@ -14,7 +14,7 @@ package com.commonsware.android.downloader; -import android.app.Fragment; +import android.support.v4.app.Fragment; import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -32,7 +32,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) { View result=inflater.inflate(R.layout.main, parent, false); - b=(Button)result.findViewById(R.id.button); + b=result.findViewById(R.id.button); b.setOnClickListener(this); return(result); diff --git a/Notifications/DownloadNotify/app/src/main/java/com/commonsware/android/downloader/DownloaderDemo.java b/Notifications/DownloadNotify/app/src/main/java/com/commonsware/android/downloader/DownloaderDemo.java index a5e5c760e..cf6008b79 100644 --- a/Notifications/DownloadNotify/app/src/main/java/com/commonsware/android/downloader/DownloaderDemo.java +++ b/Notifications/DownloadNotify/app/src/main/java/com/commonsware/android/downloader/DownloaderDemo.java @@ -14,16 +14,16 @@ package com.commonsware.android.downloader; -import android.app.Activity; +import android.support.v4.app.FragmentActivity; import android.os.Bundle; -public class DownloaderDemo extends Activity { +public class DownloaderDemo extends FragmentActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (getFragmentManager().findFragmentById(android.R.id.content) == null) { - getFragmentManager().beginTransaction() + if (getSupportFragmentManager().findFragmentById(android.R.id.content) == null) { + getSupportFragmentManager().beginTransaction() .add(android.R.id.content, new DownloadFragment()).commit(); } diff --git a/Notifications/Foreground/app/build.gradle b/Notifications/Foreground/app/build.gradle index 4a6d4b149..c9d83610b 100644 --- a/Notifications/Foreground/app/build.gradle +++ b/Notifications/Foreground/app/build.gradle @@ -1,17 +1,18 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.android.support:support-core-utils:26.1.0' - implementation 'com.commonsware.cwac:provider:0.5.2' + implementation 'com.android.support:support-core-utils:27.1.0' + implementation 'com.android.support:support-fragment:27.1.0' + implementation 'com.commonsware.cwac:provider:0.5.3' } android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 1 versionName "1.0" } diff --git a/Notifications/Foreground/app/src/main/java/com/commonsware/android/foredown/DownloadFragment.java b/Notifications/Foreground/app/src/main/java/com/commonsware/android/foredown/DownloadFragment.java index 5a422f11e..bbbe63e84 100644 --- a/Notifications/Foreground/app/src/main/java/com/commonsware/android/foredown/DownloadFragment.java +++ b/Notifications/Foreground/app/src/main/java/com/commonsware/android/foredown/DownloadFragment.java @@ -14,10 +14,10 @@ package com.commonsware.android.foredown; -import android.app.Fragment; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/Notifications/Foreground/app/src/main/java/com/commonsware/android/foredown/DownloaderDemo.java b/Notifications/Foreground/app/src/main/java/com/commonsware/android/foredown/DownloaderDemo.java index fcf84518b..2fa4d299d 100644 --- a/Notifications/Foreground/app/src/main/java/com/commonsware/android/foredown/DownloaderDemo.java +++ b/Notifications/Foreground/app/src/main/java/com/commonsware/android/foredown/DownloaderDemo.java @@ -14,16 +14,16 @@ package com.commonsware.android.foredown; -import android.app.Activity; +import android.support.v4.app.FragmentActivity; import android.os.Bundle; -public class DownloaderDemo extends Activity { +public class DownloaderDemo extends FragmentActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (getFragmentManager().findFragmentById(android.R.id.content) == null) { - getFragmentManager().beginTransaction() + if (getSupportFragmentManager().findFragmentById(android.R.id.content) == null) { + getSupportFragmentManager().beginTransaction() .add(android.R.id.content, new DownloadFragment()).commit(); } diff --git a/Permissions/PermissionReporter/app/build.gradle b/Permissions/PermissionReporter/app/build.gradle index 74f42fb5e..dfb81b499 100644 --- a/Permissions/PermissionReporter/app/build.gradle +++ b/Permissions/PermissionReporter/app/build.gradle @@ -1,18 +1,18 @@ apply plugin: 'com.android.application' dependencies { - implementation 'io.karim:materialtabs:2.0.2' - implementation 'com.android.support:support-v13:25.1.0' - implementation 'io.reactivex.rxjava2:rxjava:2.0.2' - implementation 'io.reactivex.rxjava2:rxandroid:2.0.0' + implementation 'io.karim:materialtabs:2.0.5' + implementation 'com.android.support:support-v13:27.1.0' + implementation 'io.reactivex.rxjava2:rxjava:2.1.7' + implementation 'io.reactivex.rxjava2:rxandroid:2.0.1' } android { - compileSdkVersion 25 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' - defaultConfig { - minSdkVersion 16 - targetSdkVersion 25 - } + defaultConfig { + minSdkVersion 16 + targetSdkVersion 27 + } } diff --git a/Permissions/PermissionReporter/app/src/main/java/com/commonsware/android/permreporter/MainActivity.java b/Permissions/PermissionReporter/app/src/main/java/com/commonsware/android/permreporter/MainActivity.java index aa843e63d..f02a9e489 100644 --- a/Permissions/PermissionReporter/app/src/main/java/com/commonsware/android/permreporter/MainActivity.java +++ b/Permissions/PermissionReporter/app/src/main/java/com/commonsware/android/permreporter/MainActivity.java @@ -14,7 +14,7 @@ package com.commonsware.android.permreporter; -import android.app.Activity; +import android.support.v4.app.FragmentActivity; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.PermissionGroupInfo; @@ -32,7 +32,7 @@ import io.reactivex.functions.Consumer; import io.reactivex.schedulers.Schedulers; -public class MainActivity extends Activity { +public class MainActivity extends FragmentActivity { private Observable observable; private Disposable sub; @@ -41,10 +41,10 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.main); - final ViewPager pager=(ViewPager)findViewById(R.id.pager); - final MaterialTabs tabs=(MaterialTabs)findViewById(R.id.tabs); + final ViewPager pager=findViewById(R.id.pager); + final MaterialTabs tabs=findViewById(R.id.tabs); - observable=(Observable)getLastNonConfigurationInstance(); + observable=(Observable)getLastCustomNonConfigurationInstance(); if (observable==null) { observable=Observable @@ -58,7 +58,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public void accept(PermissionRoster roster) throws Exception { pager.setAdapter(new PermissionTabAdapter(MainActivity.this, - getFragmentManager(), roster)); + getSupportFragmentManager(), roster)); tabs.setViewPager(pager); } }, new Consumer() { @@ -73,7 +73,7 @@ public void accept(Throwable error) throws Exception { }); } - public Object onRetainNonConfigurationInstance() { + public Object onRetainCustomNonConfigurationInstance() { return(observable); } diff --git a/Permissions/PermissionReporter/app/src/main/java/com/commonsware/android/permreporter/PermissionListFragment.java b/Permissions/PermissionReporter/app/src/main/java/com/commonsware/android/permreporter/PermissionListFragment.java index ea6c3346f..1f321c2d1 100644 --- a/Permissions/PermissionReporter/app/src/main/java/com/commonsware/android/permreporter/PermissionListFragment.java +++ b/Permissions/PermissionReporter/app/src/main/java/com/commonsware/android/permreporter/PermissionListFragment.java @@ -14,9 +14,9 @@ package com.commonsware.android.permreporter; -import android.app.ListFragment; import android.content.pm.PermissionInfo; import android.os.Bundle; +import android.support.v4.app.ListFragment; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; diff --git a/Permissions/PermissionReporter/app/src/main/java/com/commonsware/android/permreporter/PermissionTabAdapter.java b/Permissions/PermissionReporter/app/src/main/java/com/commonsware/android/permreporter/PermissionTabAdapter.java index 795c28c94..50bc72b24 100644 --- a/Permissions/PermissionReporter/app/src/main/java/com/commonsware/android/permreporter/PermissionTabAdapter.java +++ b/Permissions/PermissionReporter/app/src/main/java/com/commonsware/android/permreporter/PermissionTabAdapter.java @@ -14,10 +14,10 @@ package com.commonsware.android.permreporter; -import android.app.Fragment; -import android.app.FragmentManager; import android.content.Context; -import android.support.v13.app.FragmentPagerAdapter; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; public class PermissionTabAdapter extends FragmentPagerAdapter { private static final int[] TITLES={ diff --git a/Presentation/Fragment/app/build.gradle b/Presentation/Fragment/app/build.gradle index c0fb048a5..fcc913129 100644 --- a/Presentation/Fragment/app/build.gradle +++ b/Presentation/Fragment/app/build.gradle @@ -1,7 +1,15 @@ apply plugin: 'com.android.application' - android { - compileSdkVersion 19 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' + + defaultConfig { + minSdkVersion 17 + targetSdkVersion 27 + } +} + +dependencies { + implementation 'com.android.support:support-fragment:27.1.0' } diff --git a/Presentation/Fragment/app/src/main/AndroidManifest.xml b/Presentation/Fragment/app/src/main/AndroidManifest.xml index 7543ab31b..36353512d 100644 --- a/Presentation/Fragment/app/src/main/AndroidManifest.xml +++ b/Presentation/Fragment/app/src/main/AndroidManifest.xml @@ -4,9 +4,6 @@ android:versionCode="1" android:versionName="1.0"> - - - diff --git a/RecyclerView/SortedList/app/src/main/java/com/commonsware/android/recyclerview/sorted/MainActivity.java b/RecyclerView/SortedList/app/src/main/java/com/commonsware/android/recyclerview/sorted/MainActivity.java index dae2bc6a7..465952ecd 100644 --- a/RecyclerView/SortedList/app/src/main/java/com/commonsware/android/recyclerview/sorted/MainActivity.java +++ b/RecyclerView/SortedList/app/src/main/java/com/commonsware/android/recyclerview/sorted/MainActivity.java @@ -14,16 +14,16 @@ package com.commonsware.android.recyclerview.sorted; -import android.app.Activity; +import android.support.v4.app.FragmentActivity; import android.os.Bundle; -public class MainActivity extends Activity { +public class MainActivity extends FragmentActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (getFragmentManager().findFragmentById(android.R.id.content) == null) { - getFragmentManager().beginTransaction() + if (getSupportFragmentManager().findFragmentById(android.R.id.content) == null) { + getSupportFragmentManager().beginTransaction() .add(android.R.id.content, new SortedFragment()).commit(); } diff --git a/RecyclerView/SortedList/app/src/main/java/com/commonsware/android/recyclerview/sorted/RecyclerViewFragment.java b/RecyclerView/SortedList/app/src/main/java/com/commonsware/android/recyclerview/sorted/RecyclerViewFragment.java index 44556c2ef..988226656 100644 --- a/RecyclerView/SortedList/app/src/main/java/com/commonsware/android/recyclerview/sorted/RecyclerViewFragment.java +++ b/RecyclerView/SortedList/app/src/main/java/com/commonsware/android/recyclerview/sorted/RecyclerViewFragment.java @@ -14,8 +14,8 @@ package com.commonsware.android.recyclerview.sorted; -import android.app.Fragment; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; diff --git a/RecyclerView/Transcript/app/build.gradle b/RecyclerView/Transcript/app/build.gradle index 2bbb8dc35..2f580fcf3 100644 --- a/RecyclerView/Transcript/app/build.gradle +++ b/RecyclerView/Transcript/app/build.gradle @@ -8,17 +8,17 @@ repositories { dependencies { implementation 'org.greenrobot:eventbus:3.0.0' - implementation 'com.android.support:support-v13:25.1.0' - implementation 'com.android.support:recyclerview-v7:25.1.0' + implementation 'com.android.support:support-v13:27.0.2' + implementation 'com.android.support:recyclerview-v7:27.0.2' } android { - compileSdkVersion 25 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 21 - targetSdkVersion 25 + targetSdkVersion 27 applicationId 'com.commonsware.android.rv.transcript' } } diff --git a/RecyclerView/Transcript/app/src/main/java/com/commonsware/android/rv/transcript/EventDemoActivity.java b/RecyclerView/Transcript/app/src/main/java/com/commonsware/android/rv/transcript/EventDemoActivity.java index fbc05da41..2ee35df91 100644 --- a/RecyclerView/Transcript/app/src/main/java/com/commonsware/android/rv/transcript/EventDemoActivity.java +++ b/RecyclerView/Transcript/app/src/main/java/com/commonsware/android/rv/transcript/EventDemoActivity.java @@ -14,21 +14,22 @@ package com.commonsware.android.rv.transcript; -import android.app.Activity; +import android.annotation.SuppressLint; +import android.support.v4.app.FragmentActivity; import android.app.job.JobInfo; import android.app.job.JobScheduler; import android.content.ComponentName; import android.os.Bundle; -public class EventDemoActivity extends Activity { +public class EventDemoActivity extends FragmentActivity { private static final int JOB_ID=1337; - @Override + @Override @SuppressLint("MissingPermission") public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (getFragmentManager().findFragmentById(android.R.id.content) == null) { - getFragmentManager().beginTransaction() + if (getSupportFragmentManager().findFragmentById(android.R.id.content) == null) { + getSupportFragmentManager().beginTransaction() .add(android.R.id.content, new EventLogFragment()).commit(); diff --git a/RecyclerView/Transcript/app/src/main/java/com/commonsware/android/rv/transcript/EventLogFragment.java b/RecyclerView/Transcript/app/src/main/java/com/commonsware/android/rv/transcript/EventLogFragment.java index 893e75b85..c3e65d889 100644 --- a/RecyclerView/Transcript/app/src/main/java/com/commonsware/android/rv/transcript/EventLogFragment.java +++ b/RecyclerView/Transcript/app/src/main/java/com/commonsware/android/rv/transcript/EventLogFragment.java @@ -14,9 +14,9 @@ package com.commonsware.android.rv.transcript; -import android.app.Fragment; import android.os.Bundle; import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; diff --git a/RecyclerViewPager/DynSnap/app/src/main/java/com/commonsware/android/rvp/MainActivity.java b/RecyclerViewPager/DynSnap/app/src/main/java/com/commonsware/android/rvp/MainActivity.java index 7af96cdb4..e9cd79afd 100644 --- a/RecyclerViewPager/DynSnap/app/src/main/java/com/commonsware/android/rvp/MainActivity.java +++ b/RecyclerViewPager/DynSnap/app/src/main/java/com/commonsware/android/rvp/MainActivity.java @@ -46,7 +46,7 @@ public void onCreate(Bundle savedInstanceState) { adapter=new PageAdapter(pager, getLayoutInflater()); pager.setAdapter(adapter); pager.setHasFixedSize(true); - tabs=(TabLayout)findViewById(R.id.tabs); + tabs=findViewById(R.id.tabs); if (savedInstanceState==null) { for (int i=0; i - - - -