Set wallpaper only on window focus; remove unit tests

tecdrop · Aug 26, 2021 · 2088a61 · 2088a61
1 parent b6a2318
commit 2088a61
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 60 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,6 @@ android {
         targetSdk 31
         versionCode 6
         versionName "2.1"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -28,10 +26,4 @@ android {
 }
 
 dependencies {
-
-//    implementation 'androidx.appcompat:appcompat:1.3.1'
-//    implementation 'com.google.android.material:material:1.4.0'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
diff --git a/app/src/androidTest/java/com/appgramming/lonecolor/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/appgramming/lonecolor/ExampleInstrumentedTest.java
diff --git a/app/src/main/java/com/appgramming/lonecolor/LoneColorActivity.java b/app/src/main/java/com/appgramming/lonecolor/LoneColorActivity.java
@@ -41,18 +41,19 @@ protected void onCreate(Bundle savedInstanceState) {
     public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
 
-        // Set the color wallpaper
-        setColorWallpaper();
+        if (hasFocus) {
+            // Set the color wallpaper
+            setColorWallpaper();
 
-        // Finish the activity
-        finish();
+            // Finish the activity
+            finish();
+        }
     }
 
     /**
      * Sets the color wallpaper to the color value in the Clipboard, or to a random color.
      */
     private void setColorWallpaper() {
-
         // Try to get the color parameter from the clipboard
         Integer colorParam = null;
         try {

diff --git a/app/src/main/java/com/appgramming/lonecolor/utils/ColorWallpaper.java b/app/src/main/java/com/appgramming/lonecolor/utils/ColorWallpaper.java
@@ -46,16 +46,16 @@ public static void setColorWallpaper(Context context, int color) throws IOExcept
         // Get the Wallpaper Manager
         final WallpaperManager wpManager = WallpaperManager.getInstance(context);
 
-        // Create the pitch black bitmap
-        final Bitmap pitchBlackBitmap = createColorBitmap(color, MIN_SAFE_SIZE, MIN_SAFE_SIZE);
+        // Create the color bitmap
+        final Bitmap colorBitmap = createColorBitmap(color, MIN_SAFE_SIZE, MIN_SAFE_SIZE);
 
         // Set the wallpaper
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             // On Android N and above use the new API to set both the general system wallpaper and
             // the lock-screen-specific wallpaper
-            wpManager.setBitmap(pitchBlackBitmap, null, true, WallpaperManager.FLAG_SYSTEM | WallpaperManager.FLAG_LOCK);
+            wpManager.setBitmap(colorBitmap, null, true, WallpaperManager.FLAG_SYSTEM | WallpaperManager.FLAG_LOCK);
         } else {
-            wpManager.setBitmap(pitchBlackBitmap);
+            wpManager.setBitmap(colorBitmap);
         }
     }
 

diff --git a/app/src/test/java/com/appgramming/lonecolor/ExampleUnitTest.java b/app/src/test/java/com/appgramming/lonecolor/ExampleUnitTest.java