Update min sdk

billthefarmer · Nov 13, 2023 · 235c4b6 · 235c4b6
1 parent bed4b4d
commit 235c4b6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 39 deletions.
diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,7 @@ android {
 
     defaultConfig {
         applicationId "org.billthefarmer.diary"
-        minSdkVersion 14
+        minSdkVersion 21
         targetSdkVersion 28
         versionName "1.103"
         versionCode 1103

diff --git a/src/main/java/org/billthefarmer/diary/Diary.java b/src/main/java/org/billthefarmer/diary/Diary.java
@@ -632,8 +632,6 @@ public boolean onPrepareOptionsMenu(Menu menu)
         menu.findItem(R.id.cancel).setVisible(changed);
         menu.findItem(R.id.index).setVisible(useIndex);
         menu.findItem(R.id.link).setVisible(useIndex);
-        menu.findItem(R.id.print)
-            .setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP);
 
         // Set up search view
         searchItem = menu.findItem(R.id.search);
@@ -1783,9 +1781,6 @@ private void findAll()
     // print
     private void print()
     {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
-            return;
-
         // Get a PrintManager instance
         PrintManager printManager = (PrintManager)
             getSystemService(PRINT_SERVICE);
@@ -1940,14 +1935,11 @@ private void backup()
                 break;
 
             case DialogInterface.BUTTON_NEUTRAL:
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
-                {
-                    Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
-                    intent.setType(APPLICATION_ZIP);
-                    intent.addCategory(Intent.CATEGORY_OPENABLE);
-                    intent.putExtra(Intent.EXTRA_TITLE, name);
-                    startActivityForResult(intent, CREATE_BACKUP);
-                }
+                Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+                intent.setType(APPLICATION_ZIP);
+                intent.addCategory(Intent.CATEGORY_OPENABLE);
+                intent.putExtra(Intent.EXTRA_TITLE, name);
+                startActivityForResult(intent, CREATE_BACKUP);
                 break;
             }
         });
@@ -1964,8 +1956,7 @@ private void saveAsDialog(String path, int title, int message,
         // Add the buttons
         builder.setPositiveButton(R.string.save, listener);
         builder.setNegativeButton(android.R.string.cancel, listener);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
-            builder.setNeutralButton(R.string.storage, listener);
+        builder.setNeutralButton(R.string.storage, listener);
 
         // Create edit text
         LayoutInflater inflater = (LayoutInflater) builder.getContext()

diff --git a/src/main/java/org/billthefarmer/diary/FileUtils.java b/src/main/java/org/billthefarmer/diary/FileUtils.java
@@ -16,7 +16,6 @@
 
 package org.billthefarmer.diary;
 
-import android.annotation.TargetApi;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.Context;
@@ -477,7 +476,6 @@ public static String getDataColumn(Context context, Uri uri,
      * @see #isLocal(String)
      * @see #getFile(Context, Uri)
      */
-    @TargetApi(19)
     public static String getPath(final Context context, final Uri uri)
     {
 
@@ -493,8 +491,7 @@ public static String getPath(final Context context, final Uri uri)
                  );
 
         // DocumentProvider
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT &&
-            DocumentsContract.isDocumentUri(context, uri))
+        if (DocumentsContract.isDocumentUri(context, uri))
         {
             // ExternalStorageProvider
             if (isExternalStorageDocument(uri))

diff --git a/src/main/res/drawable-v21/toast_frame.xml → src/main/res/drawable/toast_frame.xml b/src/main/res/drawable-v21/toast_frame.xml → src/main/res/drawable/toast_frame.xml
diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
@@ -6,15 +6,15 @@
       replaced by AppBaseTheme from res/values-vXX/styles.xml on newer
       devices.
   -->
-  <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+  <style name="AppBaseTheme" parent="android:Theme.Material.Light.DarkActionBar">
     <!--
         Theme customizations available in newer API levels can go in
         res/values-vXX/styles.xml, while customizations related to
         backward-compatibility can go here.
     -->
   </style>
 
-  <style name="AppDarkBaseTheme" parent="android:Theme.Holo">
+  <style name="AppDarkBaseTheme" parent="android:Theme.Material">
     <!--
         Theme customizations available in newer API levels can go in
         res/values-vXX/styles.xml, while customizations related to