updated to use Support Library fragments

commonsguy · Mar 25, 2018 · 0f11282 · 0f11282
1 parent 6843ac9
commit 0f11282
Show file tree

Hide file tree

Showing 142 changed files with 560 additions and 479 deletions.
diff --git 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/...ction/ProcessText/app/src/main/java/com/commonsware/android/processtext/MainActivity.java b/...ction/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/.../ProcessText/app/src/main/java/com/commonsware/android/processtext/QuestionsFragment.java b/.../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
@@ -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
@@ -14,14 +14,14 @@
 
 package com.commonsware.android.dragdrop;
 
-import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.graphics.Canvas;
 import android.graphics.Point;
 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/...CopyPaste/drag/src/main/java/com/commonsware/android/dragdrop/ShortcutDialogFragment.java b/...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
@@ -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
@@ -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/...CopyPaste/drop/src/main/java/com/commonsware/android/dragdrop/ShortcutDialogFragment.java b/...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
@@ -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
@@ -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<Cursor>, 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<Build.VERSION_CODES.N) {
-        new ShortcutDialogFragment().show(getFragmentManager(),
+        new ShortcutDialogFragment().show(getSupportFragmentManager(),
           "shortcuts");
 
         return(true);

diff --git a/...ysN/app/src/main/java/com/commonsware/android/kbmouse/hotkeys/ShortcutDialogFragment.java b/...ysN/app/src/main/java/com/commonsware/android/kbmouse/hotkeys/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/Leaks/AsyncTask/app/build.gradle b/Leaks/AsyncTask/app/build.gradle
@@ -1,16 +1,17 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+  implementation 'com.android.support:support-fragment:27.1.0'
+  debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+  releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
 }
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '26.0.2'
+  compileSdkVersion 27
+  buildToolsVersion '27.0.3'
 
-	  defaultConfig {
-        minSdkVersion 15
-		    targetSdkVersion 24
-    }
+  defaultConfig {
+    minSdkVersion 15
+    targetSdkVersion 27
+  }
 }
diff --git a/Leaks/AsyncTask/app/src/main/java/com/commonsware/android/async/AsyncDemo.java b/Leaks/AsyncTask/app/src/main/java/com/commonsware/android/async/AsyncDemo.java
@@ -14,16 +14,16 @@
 
 package com.commonsware.android.async;
 
-import android.app.Activity;
 import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
 
-public class AsyncDemo extends Activity {
+public class AsyncDemo 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 AsyncDemoFragment()).commit();
     }

diff --git a/Leaks/AsyncTask/app/src/main/java/com/commonsware/android/async/AsyncDemoFragment.java b/Leaks/AsyncTask/app/src/main/java/com/commonsware/android/async/AsyncDemoFragment.java
@@ -14,7 +14,7 @@
 
 package com.commonsware.android.async;
 
-import android.app.ListFragment;
+import android.support.v4.app.ListFragment;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.SystemClock;

diff --git a/Leaks/ConfigChange/app/build.gradle b/Leaks/ConfigChange/app/build.gradle
@@ -1,6 +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 {
+        minSdkVersion 14
+        targetSdkVersion 27
+    }
 }
diff --git a/...s/ConfigChange/app/src/main/java/com/commonsware/android/leak/configchange/AsyncDemo.java b/...s/ConfigChange/app/src/main/java/com/commonsware/android/leak/configchange/AsyncDemo.java
@@ -14,16 +14,16 @@
 
 package com.commonsware.android.leak.configchange;
 
-import android.app.Activity;
 import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
 
-public class AsyncDemo extends Activity {
+public class AsyncDemo 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 AsyncDemoFragment()).commit();
     }

diff --git a/...Change/app/src/main/java/com/commonsware/android/leak/configchange/AsyncDemoFragment.java b/...Change/app/src/main/java/com/commonsware/android/leak/configchange/AsyncDemoFragment.java
@@ -14,10 +14,10 @@
 
 package com.commonsware.android.leak.configchange;
 
-import android.app.ListFragment;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.SystemClock;
+import android.support.v4.app.ListFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;