refactor: Remove SDK 21 (Lollipop) checks

We rose the minsdk already
itachi1706 · May 17, 2024 · 419d361 · 419d361
1 parent d88bee8
commit 419d361
Show file tree

Hide file tree

Showing 45 changed files with 46 additions and 93 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -87,8 +87,7 @@
             android:configChanges="orientation|keyboardHidden|screenSize|uiMode"
             android:label="@string/s_egg_name"
             android:enabled="false"
-            android:exported="true"
-            tools:targetApi="lollipop" /> <!-- This is only accessible > API 21 -->
+            android:exported="true" />
         <!-- Homescreen widget also showing paint chips (may be affected by the exact position in
              the workspace) -->
         <receiver

diff --git a/app/src/main/java/com/itachi1706/droideggs/IceCreamSandwichEgg/Nyandroid.java b/app/src/main/java/com/itachi1706/droideggs/IceCreamSandwichEgg/Nyandroid.java
@@ -35,7 +35,6 @@
 
 import java.util.Random;
 
-@TargetApi(16)
 public class Nyandroid extends AppCompatActivity {
 
     final static boolean DEBUG = false;
@@ -82,6 +81,7 @@ public FlyingCat(Context context, AttributeSet as) {
                 if (DEBUG) setBackgroundColor(0x80FF0000);
             }
 
+            @Override
             public String toString() {
                 return String.format("<cat (%.1f, %.1f) (%d x %d)>",
                         getX(), getY(), getWidth(), getHeight());

diff --git a/app/src/main/java/com/itachi1706/droideggs/IceCreamSandwichEgg/PlatLogoActivityICS.java b/app/src/main/java/com/itachi1706/droideggs/IceCreamSandwichEgg/PlatLogoActivityICS.java
@@ -16,22 +16,21 @@
 
 package com.itachi1706.droideggs.IceCreamSandwichEgg;
 
-import android.annotation.TargetApi;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Vibrator;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 import android.widget.ImageView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.itachi1706.droideggs.R;
 
-@TargetApi(16)
 public class PlatLogoActivityICS extends AppCompatActivity {
 
     Toast mToast;

diff --git a/app/src/main/java/com/itachi1706/droideggs/JellyBeanEgg/PlatLogoActivityJELLYBEAN.java b/app/src/main/java/com/itachi1706/droideggs/JellyBeanEgg/PlatLogoActivityJELLYBEAN.java
@@ -16,15 +16,13 @@
 
 package com.itachi1706.droideggs.JellyBeanEgg;
 
-import android.annotation.TargetApi;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.View;
@@ -34,9 +32,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.itachi1706.droideggs.R;
 
-@TargetApi(16)
 public class PlatLogoActivityJELLYBEAN extends AppCompatActivity {
 
     Toast mToast;

diff --git a/app/src/main/java/com/itachi1706/droideggs/KitKatEgg/DessertCaseDream.java b/app/src/main/java/com/itachi1706/droideggs/KitKatEgg/DessertCaseDream.java
@@ -16,15 +16,12 @@
 
 package com.itachi1706.droideggs.KitKatEgg;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.service.dreams.DreamService;
 
 /**
  * Created by Kenneth on 1/6/2015
  * for DroidEggs in package com.itachi1706.droideggs.KitKatEgg
  */
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)  //API 17
 public class DessertCaseDream extends DreamService {
 
     private DessertCaseView mView;

diff --git a/app/src/main/java/com/itachi1706/droideggs/KitKatEgg/DessertCaseView.java b/app/src/main/java/com/itachi1706/droideggs/KitKatEgg/DessertCaseView.java
@@ -20,7 +20,6 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -53,7 +52,6 @@
  * Created by Kenneth on 1/6/2015
  * for DroidEggs in package com.itachi1706.droideggs.KitKatEgg
  */
-@TargetApi(18)
 public class DessertCaseView extends FrameLayout {
     private static final String TAG = DessertCaseView.class.getSimpleName();
 

diff --git a/app/src/main/java/com/itachi1706/droideggs/KitKatEgg/PlatLogoActivityKITKAT.java b/app/src/main/java/com/itachi1706/droideggs/KitKatEgg/PlatLogoActivityKITKAT.java
@@ -16,7 +16,6 @@
 
 package com.itachi1706.droideggs.KitKatEgg;
 
-import android.annotation.TargetApi;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -25,8 +24,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.text.AllCapsTransformationMethod;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.View;
@@ -37,9 +34,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.text.AllCapsTransformationMethod;
+
 import com.itachi1706.droideggs.R;
 
-@TargetApi(19)
 public class PlatLogoActivityKITKAT extends AppCompatActivity {
 
     FrameLayout mContent;

diff --git a/app/src/main/java/com/itachi1706/droideggs/LollipopEgg/LLand.java b/app/src/main/java/com/itachi1706/droideggs/LollipopEgg/LLand.java
@@ -50,7 +50,6 @@
  * Created by Kenneth on 1/6/2015
  * for DroidEggs in package com.itachi1706.droideggs.LollipopEgg
  */
-@TargetApi(21)
 public class LLand extends FrameLayout {
     public static final String TAG = "LLand";
 

diff --git a/app/src/main/java/com/itachi1706/droideggs/LollipopEgg/LLandActivity.java b/app/src/main/java/com/itachi1706/droideggs/LollipopEgg/LLandActivity.java
@@ -16,15 +16,13 @@
 
 package com.itachi1706.droideggs.LollipopEgg;
 
-import android.annotation.TargetApi;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
-import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.itachi1706.droideggs.R;
 
-@TargetApi(21)
 public class LLandActivity extends AppCompatActivity {
 
     @Override

diff --git a/app/src/main/java/com/itachi1706/droideggs/LollipopEgg/PlatLogoActivityLOLLIPOP.java b/app/src/main/java/com/itachi1706/droideggs/LollipopEgg/PlatLogoActivityLOLLIPOP.java
@@ -17,7 +17,6 @@
 package com.itachi1706.droideggs.LollipopEgg;
 
 import android.animation.ObjectAnimator;
-import android.annotation.TargetApi;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -33,7 +32,6 @@
 import android.graphics.drawable.shapes.OvalShape;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
@@ -45,9 +43,10 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.itachi1706.droideggs.R;
 
-@TargetApi(21)
 public class PlatLogoActivityLOLLIPOP extends AppCompatActivity {
     final static int[] FLAVORS = {
             0xFF9C27B0, 0xFFBA68C8, // grape

diff --git a/app/src/main/java/com/itachi1706/droideggs/MNCEgg/PlatLogoActivityMNC.java b/app/src/main/java/com/itachi1706/droideggs/MNCEgg/PlatLogoActivityMNC.java
@@ -16,7 +16,6 @@
 
 package com.itachi1706.droideggs.MNCEgg;
 
-import android.annotation.TargetApi;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
 import android.graphics.Canvas;
@@ -28,8 +27,6 @@
 import android.graphics.drawable.RippleDrawable;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -39,9 +36,11 @@
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.itachi1706.droideggs.R;
 
-@TargetApi(21)
 public class PlatLogoActivityMNC extends AppCompatActivity {
     FrameLayout mLayout;
     int mTapCount;

diff --git a/app/src/main/java/com/itachi1706/droideggs/MarshmallowEgg/MLand.java b/app/src/main/java/com/itachi1706/droideggs/MarshmallowEgg/MLand.java
@@ -18,7 +18,6 @@
 
 import android.animation.LayoutTransition;
 import android.animation.TimeAnimator;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
@@ -58,7 +57,6 @@
  */
 
 // It's like LLand, but "M"ultiplayer.
-@TargetApi(21)
 public class MLand extends FrameLayout {
 
     public static final String TAG = "MLand";

diff --git a/app/src/main/java/com/itachi1706/droideggs/MarshmallowEgg/PlatLogoActivityMARSHMALLOW.java b/app/src/main/java/com/itachi1706/droideggs/MarshmallowEgg/PlatLogoActivityMARSHMALLOW.java
@@ -18,7 +18,6 @@
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
-import android.annotation.TargetApi;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -32,8 +31,6 @@
 import android.graphics.drawable.RippleDrawable;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
@@ -43,13 +40,15 @@
 import android.view.animation.PathInterpolator;
 import android.widget.FrameLayout;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.itachi1706.droideggs.R;
 
 /**
  * Created by Kenneth on 7/10/2015.
  * for DroidEggs in package com.itachi1706.droideggs.MarshmallowEgg
  */
-@TargetApi(21)
 public class PlatLogoActivityMARSHMALLOW extends AppCompatActivity {
     FrameLayout mLayout;
     int mTapCount;

diff --git a/app/src/main/java/com/itachi1706/droideggs/NDPEgg/PlatLogoActivityNDP.java b/app/src/main/java/com/itachi1706/droideggs/NDPEgg/PlatLogoActivityNDP.java
@@ -17,28 +17,27 @@
 package com.itachi1706.droideggs.NDPEgg;
 
 import android.animation.ObjectAnimator;
-import android.annotation.TargetApi;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.RippleDrawable;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.animation.PathInterpolator;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.itachi1706.droideggs.R;
 
 /**
  * Created by Kenneth on 7/10/2015.
  * for DroidEggs in package com.itachi1706.droideggs.MarshmallowEgg
  */
-@TargetApi(21)
 public class PlatLogoActivityNDP extends AppCompatActivity {
     public static final boolean REVEAL_THE_NAME = true;
 

diff --git a/app/src/main/java/com/itachi1706/droideggs/NougatEgg/PlatLogoActivityNougat.java b/app/src/main/java/com/itachi1706/droideggs/NougatEgg/PlatLogoActivityNougat.java
@@ -17,7 +17,6 @@
 package com.itachi1706.droideggs.NougatEgg;
 
 import android.animation.ObjectAnimator;
-import android.annotation.TargetApi;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Intent;
@@ -28,7 +27,6 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
@@ -37,14 +35,15 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.itachi1706.droideggs.NougatEgg.EasterEgg.neko.NekoActivationActivity;
 import com.itachi1706.droideggs.R;
 
 /**
  * Created by Kenneth on 7/10/2015.
  * for DroidEggs in package com.itachi1706.droideggs.MarshmallowEgg
  */
-@TargetApi(21)
 public class PlatLogoActivityNougat extends AppCompatActivity {
     public static final boolean REVEAL_THE_NAME = false;
     public static final boolean FINISH = false;

diff --git a/app/src/main/java/com/itachi1706/droideggs/OreoEgg/EasterEgg/octo/OctopusDrawable.java b/app/src/main/java/com/itachi1706/droideggs/OreoEgg/EasterEgg/octo/OctopusDrawable.java
@@ -15,7 +15,6 @@
 package com.itachi1706.droideggs.OreoEgg.EasterEgg.octo;
 
 import android.animation.TimeAnimator;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
@@ -30,18 +29,18 @@
 import android.graphics.Region;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.dynamicanimation.animation.DynamicAnimation;
 import androidx.dynamicanimation.animation.FloatValueHolder;
 import androidx.dynamicanimation.animation.SpringAnimation;
 import androidx.dynamicanimation.animation.SpringForce;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 
 /**
  * Created by Kenneth on 2/9/2017.
  * for com.itachi1706.droideggs.OreoEgg.EasterEgg.octo in DroidEggs
  */
-@TargetApi(21)
 public class OctopusDrawable extends Drawable {
     private static float BASE_SCALE = 100f;
     public static boolean PATH_DEBUG = false;