From 0d181f5aee58b94f4b11550c2696d5507ee40a90 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Fri, 31 Mar 2023 08:03:29 +0200
Subject: [PATCH] Modernize screenshots

---
 .github/workflows/Android-CI-release.yml      |  2 +-
 .github/workflows/Android-CI.yml              | 10 ++--
 .idea/codeStyles/Project.xml                  |  3 --
 .../lib/util/pc/IOIOPcApplicationHelper.java  |  1 -
 .../java/ioio/lib/util/pc/IOIOSwingApp.java   |  2 +-
 applications/HelloIOIO/build.gradle           | 52 ++----------------
 .../ioio/examples/hello/HelloIOIOSmokeTest.kt | 20 +++----
 .../HelloIOIO/src/debug/AndroidManifest.xml   |  9 ----
 applications/HolidayIOIO/build.gradle         | 53 +++----------------
 .../examples/holiday/HolidayIOIOSmokeTest.kt  | 20 ++++---
 .../HolidayIOIO/src/debug/AndroidManifest.xml |  9 ----
 applications/IOIOManager/build.gradle         | 52 ++----------------
 .../ioio/manager/AppImageLibrarySmokeTest.kt  | 20 +++----
 .../IOIOManager/src/debug/AndroidManifest.xml |  9 ----
 applications/IOIOSimpleApp/build.gradle       | 51 ++----------------
 .../examples/simple/IOIOSimpleAppSmokeTest.kt | 19 ++++---
 .../src/debug/AndroidManifest.xml             |  9 ----
 17 files changed, 69 insertions(+), 272 deletions(-)
 delete mode 100644 applications/HelloIOIO/src/debug/AndroidManifest.xml
 delete mode 100644 applications/HolidayIOIO/src/debug/AndroidManifest.xml
 delete mode 100644 applications/IOIOManager/src/debug/AndroidManifest.xml
 delete mode 100644 applications/IOIOSimpleApp/src/debug/AndroidManifest.xml

diff --git a/.github/workflows/Android-CI-release.yml b/.github/workflows/Android-CI-release.yml
index 97af3b659..733df3c7f 100644
--- a/.github/workflows/Android-CI-release.yml
+++ b/.github/workflows/Android-CI-release.yml
@@ -20,7 +20,7 @@ jobs:
           distribution: 'adopt'
           java-version: 11
       - name: Install Android SDK
-        uses: malinskiy/action-android/install-sdk@release/0.1.2
+        uses: malinskiy/action-android/install-sdk@release/0.1.4
       - name: Build project
         run: ./gradlew clean build
         env:
diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml
index 38d2940ac..26ce880f9 100644
--- a/.github/workflows/Android-CI.yml
+++ b/.github/workflows/Android-CI.yml
@@ -20,13 +20,13 @@ jobs:
           distribution: 'adopt'
           java-version: ${{ matrix.java_version }}
       - name: Install Android SDK
-        uses: malinskiy/action-android/install-sdk@release/0.1.2
+        uses: malinskiy/action-android/install-sdk@release/0.1.4
       - name: Run tests
         run: ./gradlew test
         env:
           VERSION: ${{ github.ref }}
       - name: Run instrumentation tests
-        uses: malinskiy/action-android/emulator-run-cmd@release/0.1.2
+        uses: malinskiy/action-android/emulator-run-cmd@release/0.1.4
         env:
           VERSION: ${{ github.ref }}
         with:
@@ -51,7 +51,9 @@ jobs:
         if: ${{ always() }}
         with:
           name: IOIO-Screenshots
-          path: applications/screenshots/adb/
+          path:  |
+            applications/**/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected
+            applications/**/build/outputs/androidTest-results/connected
   Check:
     name: Check
     runs-on: ubuntu-latest
@@ -66,7 +68,7 @@ jobs:
           distribution: 'adopt'
           java-version: 11
       - name: Install Android SDK
-        uses: malinskiy/action-android/install-sdk@release/0.1.2
+        uses: malinskiy/action-android/install-sdk@release/0.1.4
       - name: Code checks
         run: ./gradlew check
       - name: Archive Lint report
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 7722c0c00..76552928a 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -55,9 +55,6 @@
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/IOIOLibPC/src/main/java/ioio/lib/util/pc/IOIOPcApplicationHelper.java b/IOIOLibPC/src/main/java/ioio/lib/util/pc/IOIOPcApplicationHelper.java
index 47ac2ae6b..01f642afa 100644
--- a/IOIOLibPC/src/main/java/ioio/lib/util/pc/IOIOPcApplicationHelper.java
+++ b/IOIOLibPC/src/main/java/ioio/lib/util/pc/IOIOPcApplicationHelper.java
@@ -44,7 +44,6 @@
  * <p>
  * This class implements a common life-cycle for applications interacting with
  * IOIO devices. Usage is as follows:
- * <ul>
  * <li>Create an instance of {@link IOIOPcApplicationHelper}, passing a
  * {@link IOIOLooperProvider} to the constructor.</li>
  * <li>When the application starts, call {@link #start()}, which will in turn
diff --git a/IOIOLibPC/src/main/java/ioio/lib/util/pc/IOIOSwingApp.java b/IOIOLibPC/src/main/java/ioio/lib/util/pc/IOIOSwingApp.java
index 58c025c63..6fa941738 100644
--- a/IOIOLibPC/src/main/java/ioio/lib/util/pc/IOIOSwingApp.java
+++ b/IOIOLibPC/src/main/java/ioio/lib/util/pc/IOIOSwingApp.java
@@ -18,7 +18,7 @@
  * creating an instance of this class, and calling its
  * {@code void go(String[] args)} method.</li>
  * <li>Implement {@code Window createMainWindow(String args[])} with code to create your main window.
- * For proper cleanup on exit, make sure to set {@link JFrame.DISPOSE_ON_CLOSE} as the default close operation of your window.</li>
+ * For proper cleanup on exit, make sure to set JFrame.DISPOSE_ON_CLOSE as the default close operation of your window.</li>
  * <li>Implement
  * {@code IOIOLooper createIOIOLooper(String connectionType, Object extra)} with
  * code that should run on IOIO-dedicated threads.</li>
diff --git a/applications/HelloIOIO/build.gradle b/applications/HelloIOIO/build.gradle
index 2264b10f6..8d03a14af 100644
--- a/applications/HelloIOIO/build.gradle
+++ b/applications/HelloIOIO/build.gradle
@@ -12,6 +12,7 @@ android {
         versionName getTag()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments useTestStorageService: 'true'
     }
 
 }
@@ -21,51 +22,8 @@ dependencies {
     implementation project(':IOIOLibAndroidAccessory')
     implementation project(':IOIOLibAndroidDevice')
 
-    androidTestImplementation 'com.github.AppDevNext:Moka:1.1'
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
+    androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
+    androidTestUtil "androidx.test.services:test-services:1.4.2"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
+//    androidTestImplementation "androidx.test:rules:1.5.0" //    GrantPermissionRule
 }
-
-def adbDirectory = '/storage/emulated/0/Download' // api 28
-//def adbDirectory = '/storage/self/primary/Download' // api 21
-def reportsDirectory = "$projectDir/../screenshots/adb"
-
-def clearScreenshotsTask = task('clearScreenshots', type: Exec) {
-    println "clearScreenshotsTask"
-    executable "${android.getAdbExe().toString()}"
-    args 'shell', 'rm', '-r', adbDirectory
-}
-
-def createScreenshotDirectoryTask = task('createScreenshotDirectory', type: Exec, group: 'reporting') {
-    println "createScreenshotDirectoryTask"
-    executable "${android.getAdbExe().toString()}"
-    args 'shell', 'mkdir', '-p', adbDirectory
-}
-
-def fetchScreenshotsTask = task('fetchScreenshots', type: Exec, group: 'reporting') {
-    println "fetchScreenshotsTask"
-    executable "${android.getAdbExe().toString()}"
-    args 'pull', adbDirectory + '/.', reportsDirectory
-
-    dependsOn {
-        createScreenshotDirectoryTask
-    }
-
-    doFirst {
-        new File(reportsDirectory).mkdirs()
-    }
-}
-
-tasks.whenTaskAdded { task ->
-    if (task.name == 'connectedDebugAndroidTest' || task.name == 'connectedCodeDebugAndroidTest') {
-        task.mustRunAfter {
-            clearScreenshotsTask
-            createScreenshotDirectoryTask
-        }
-        task.finalizedBy {
-            fetchScreenshotsTask
-        }
-    }
-}
\ No newline at end of file
diff --git a/applications/HelloIOIO/src/androidTest/java/ioio/examples/hello/HelloIOIOSmokeTest.kt b/applications/HelloIOIO/src/androidTest/java/ioio/examples/hello/HelloIOIOSmokeTest.kt
index ac0905d76..6c6350646 100644
--- a/applications/HelloIOIO/src/androidTest/java/ioio/examples/hello/HelloIOIOSmokeTest.kt
+++ b/applications/HelloIOIO/src/androidTest/java/ioio/examples/hello/HelloIOIOSmokeTest.kt
@@ -1,32 +1,32 @@
 package ioio.examples.hello
 
-import android.Manifest
+import androidx.test.core.graphics.writeToTestStorage
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.espresso.screenshot.captureToBitmap
+import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.rule.GrantPermissionRule
-import com.moka.utils.Screenshot
 import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.TestName
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class HelloIOIOSmokeTest {
 
     @get:Rule
-    var activityScenarioRule = ActivityScenarioRule(MainActivity::class.java)
+    val activityScenarioRule = activityScenarioRule<MainActivity>()
 
-    @get:Rule
-    val grantPermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
-            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            Manifest.permission.READ_EXTERNAL_STORAGE)
+    var nameRule = TestName()
 
     @Test
     fun smokeTestSimplyStart() {
         onView(withId(R.id.button)).check(matches(isDisplayed()))
-        Screenshot.takeScreenshot("smoke")
+        onView(ViewMatchers.isRoot())
+            .captureToBitmap()
+            .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}")
     }
 }
diff --git a/applications/HelloIOIO/src/debug/AndroidManifest.xml b/applications/HelloIOIO/src/debug/AndroidManifest.xml
deleted file mode 100644
index 1ac081bde..000000000
--- a/applications/HelloIOIO/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:installLocation="internalOnly">
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <application tools:ignore="AllowBackup" />
-</manifest>
\ No newline at end of file
diff --git a/applications/HolidayIOIO/build.gradle b/applications/HolidayIOIO/build.gradle
index 9fe39b1cb..67b5b018b 100644
--- a/applications/HolidayIOIO/build.gradle
+++ b/applications/HolidayIOIO/build.gradle
@@ -12,6 +12,7 @@ android {
         versionName getTag()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments useTestStorageService: 'true'
     }
 }
 
@@ -19,52 +20,10 @@ dependencies {
     implementation project(':IOIOLibAndroidBluetooth')
     implementation project(':IOIOLibAndroidAccessory')
     implementation project(':IOIOLibAndroidDevice')
+    implementation 'androidx.test:rules:1.5.0'
 
-    androidTestImplementation 'com.github.AppDevNext:Moka:1.1'
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
-}
-
-def adbDirectory = '/storage/emulated/0/Download' // api 28
-//def adbDirectory = '/storage/self/primary/Download' // api 21
-def reportsDirectory = "$projectDir/../screenshots/adb"
-
-def clearScreenshotsTask = task('clearScreenshots', type: Exec) {
-    println "clearScreenshotsTask"
-    executable "${android.getAdbExe().toString()}"
-    args 'shell', 'rm', '-r', adbDirectory
-}
-
-def createScreenshotDirectoryTask = task('createScreenshotDirectory', type: Exec, group: 'reporting') {
-    println "createScreenshotDirectoryTask"
-    executable "${android.getAdbExe().toString()}"
-    args 'shell', 'mkdir', '-p', adbDirectory
-}
-
-def fetchScreenshotsTask = task('fetchScreenshots', type: Exec, group: 'reporting') {
-    println "fetchScreenshotsTask"
-    executable "${android.getAdbExe().toString()}"
-    args 'pull', adbDirectory + '/.', reportsDirectory
-
-    dependsOn {
-        createScreenshotDirectoryTask
-    }
-
-    doFirst {
-        new File(reportsDirectory).mkdirs()
-    }
-}
-
-tasks.whenTaskAdded { task ->
-    if (task.name == 'connectedDebugAndroidTest' || task.name == 'connectedCodeDebugAndroidTest') {
-        task.mustRunAfter {
-            clearScreenshotsTask
-            createScreenshotDirectoryTask
-        }
-        task.finalizedBy {
-            fetchScreenshotsTask
-        }
-    }
+    androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
+    androidTestUtil "androidx.test.services:test-services:1.4.2"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
+    androidTestImplementation "androidx.test:rules:1.5.0" //    GrantPermissionRule
 }
diff --git a/applications/HolidayIOIO/src/androidTest/java/ioio/examples/holiday/HolidayIOIOSmokeTest.kt b/applications/HolidayIOIO/src/androidTest/java/ioio/examples/holiday/HolidayIOIOSmokeTest.kt
index 3b4a46633..73746a6a1 100644
--- a/applications/HolidayIOIO/src/androidTest/java/ioio/examples/holiday/HolidayIOIOSmokeTest.kt
+++ b/applications/HolidayIOIO/src/androidTest/java/ioio/examples/holiday/HolidayIOIOSmokeTest.kt
@@ -1,32 +1,38 @@
 package ioio.examples.holiday
 
 import android.Manifest
+import androidx.test.core.graphics.writeToTestStorage
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.espresso.screenshot.captureToBitmap
+import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.GrantPermissionRule
-import com.moka.utils.Screenshot
 import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.TestName
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class HolidayIOIOSmokeTest {
 
     @get:Rule
-    var activityScenarioRule = ActivityScenarioRule(HolidayIOIOActivity::class.java)
+    val activityScenarioRule = activityScenarioRule<HolidayIOIOActivity>()
+
+    var nameRule = TestName()
+
 
     @get:Rule
     val grantPermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
-            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            Manifest.permission.CAMERA,
-            Manifest.permission.READ_EXTERNAL_STORAGE)
+            Manifest.permission.CAMERA
+    )
 
     @Test
     fun smokeTestSimplyStart() {
         Espresso.onView(ViewMatchers.withId(R.id.frequencySeekBar)).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
-        Screenshot.takeScreenshot("smoke")
+        Espresso.onView(ViewMatchers.isRoot())
+            .captureToBitmap()
+            .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}")
     }
 }
diff --git a/applications/HolidayIOIO/src/debug/AndroidManifest.xml b/applications/HolidayIOIO/src/debug/AndroidManifest.xml
deleted file mode 100644
index 1ac081bde..000000000
--- a/applications/HolidayIOIO/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:installLocation="internalOnly">
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <application tools:ignore="AllowBackup" />
-</manifest>
\ No newline at end of file
diff --git a/applications/IOIOManager/build.gradle b/applications/IOIOManager/build.gradle
index ce53f9c24..79d491598 100644
--- a/applications/IOIOManager/build.gradle
+++ b/applications/IOIOManager/build.gradle
@@ -12,6 +12,7 @@ android {
         versionName getTag()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments useTestStorageService: 'true'
     }
 
     buildTypes {
@@ -28,52 +29,7 @@ dependencies {
     implementation project(':IOIOLibAndroidAccessory')
     implementation project(':IOIOLibAndroidDevice')
 
-    androidTestImplementation 'com.github.AppDevNext:Moka:1.1'
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
+    androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
+    androidTestUtil "androidx.test.services:test-services:1.4.2"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
 }
-
-def adbDirectory = '/storage/emulated/0/Download' // api 28
-//def adbDirectory = '/storage/self/primary/Download' // api 21
-def reportsDirectory = "$projectDir/../screenshots/adb"
-
-def clearScreenshotsTask = task('clearScreenshots', type: Exec) {
-    println "clearScreenshotsTask"
-    executable "${android.getAdbExe().toString()}"
-    args 'shell', 'rm', '-r', adbDirectory
-}
-
-def createScreenshotDirectoryTask = task('createScreenshotDirectory', type: Exec, group: 'reporting') {
-    println "createScreenshotDirectoryTask"
-    executable "${android.getAdbExe().toString()}"
-    args 'shell', 'mkdir', '-p', adbDirectory
-}
-
-def fetchScreenshotsTask = task('fetchScreenshots', type: Exec, group: 'reporting') {
-    println "fetchScreenshotsTask"
-    executable "${android.getAdbExe().toString()}"
-    args 'pull', adbDirectory + '/.', reportsDirectory
-
-    dependsOn {
-        createScreenshotDirectoryTask
-    }
-
-    doFirst {
-        new File(reportsDirectory).mkdirs()
-    }
-}
-
-tasks.whenTaskAdded { task ->
-    if (task.name == 'connectedDebugAndroidTest' || task.name == 'connectedCodeDebugAndroidTest') {
-        task.mustRunAfter {
-            clearScreenshotsTask
-            createScreenshotDirectoryTask
-        }
-        task.finalizedBy {
-            fetchScreenshotsTask
-        }
-    }
-}
-
diff --git a/applications/IOIOManager/src/androidTest/java/ioio/manager/AppImageLibrarySmokeTest.kt b/applications/IOIOManager/src/androidTest/java/ioio/manager/AppImageLibrarySmokeTest.kt
index 80ebe9a97..38dbcad78 100644
--- a/applications/IOIOManager/src/androidTest/java/ioio/manager/AppImageLibrarySmokeTest.kt
+++ b/applications/IOIOManager/src/androidTest/java/ioio/manager/AppImageLibrarySmokeTest.kt
@@ -1,31 +1,31 @@
 package ioio.manager
 
-import android.Manifest
+import androidx.test.core.graphics.writeToTestStorage
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.screenshot.captureToBitmap
+import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.rule.GrantPermissionRule
-import com.moka.utils.Screenshot
 import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.TestName
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class AppImageLibrarySmokeTest {
 
     @get:Rule
-    var activityScenarioRule = ActivityScenarioRule(AppImageLibraryActivity::class.java)
+    val activityScenarioRule = activityScenarioRule<AppImageLibraryActivity>()
 
-    @get:Rule
-    val grantPermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
-            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            Manifest.permission.READ_EXTERNAL_STORAGE)
+    var nameRule = TestName()
 
     @Test
     fun smokeTestSimplyStart() {
         Espresso.onView(ViewMatchers.withId(android.R.id.empty)).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
-        Screenshot.takeScreenshot("smoke")
+        Espresso.onView(isRoot())
+            .captureToBitmap()
+            .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}")
     }
 }
diff --git a/applications/IOIOManager/src/debug/AndroidManifest.xml b/applications/IOIOManager/src/debug/AndroidManifest.xml
deleted file mode 100644
index 1ac081bde..000000000
--- a/applications/IOIOManager/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:installLocation="internalOnly">
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <application tools:ignore="AllowBackup" />
-</manifest>
\ No newline at end of file
diff --git a/applications/IOIOSimpleApp/build.gradle b/applications/IOIOSimpleApp/build.gradle
index 9fe39b1cb..18b38c881 100644
--- a/applications/IOIOSimpleApp/build.gradle
+++ b/applications/IOIOSimpleApp/build.gradle
@@ -12,6 +12,7 @@ android {
         versionName getTag()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments useTestStorageService: 'true'
     }
 }
 
@@ -20,51 +21,7 @@ dependencies {
     implementation project(':IOIOLibAndroidAccessory')
     implementation project(':IOIOLibAndroidDevice')
 
-    androidTestImplementation 'com.github.AppDevNext:Moka:1.1'
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
-}
-
-def adbDirectory = '/storage/emulated/0/Download' // api 28
-//def adbDirectory = '/storage/self/primary/Download' // api 21
-def reportsDirectory = "$projectDir/../screenshots/adb"
-
-def clearScreenshotsTask = task('clearScreenshots', type: Exec) {
-    println "clearScreenshotsTask"
-    executable "${android.getAdbExe().toString()}"
-    args 'shell', 'rm', '-r', adbDirectory
-}
-
-def createScreenshotDirectoryTask = task('createScreenshotDirectory', type: Exec, group: 'reporting') {
-    println "createScreenshotDirectoryTask"
-    executable "${android.getAdbExe().toString()}"
-    args 'shell', 'mkdir', '-p', adbDirectory
-}
-
-def fetchScreenshotsTask = task('fetchScreenshots', type: Exec, group: 'reporting') {
-    println "fetchScreenshotsTask"
-    executable "${android.getAdbExe().toString()}"
-    args 'pull', adbDirectory + '/.', reportsDirectory
-
-    dependsOn {
-        createScreenshotDirectoryTask
-    }
-
-    doFirst {
-        new File(reportsDirectory).mkdirs()
-    }
-}
-
-tasks.whenTaskAdded { task ->
-    if (task.name == 'connectedDebugAndroidTest' || task.name == 'connectedCodeDebugAndroidTest') {
-        task.mustRunAfter {
-            clearScreenshotsTask
-            createScreenshotDirectoryTask
-        }
-        task.finalizedBy {
-            fetchScreenshotsTask
-        }
-    }
+    androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
+    androidTestUtil "androidx.test.services:test-services:1.4.2"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
 }
diff --git a/applications/IOIOSimpleApp/src/androidTest/java/ioio/examples/simple/IOIOSimpleAppSmokeTest.kt b/applications/IOIOSimpleApp/src/androidTest/java/ioio/examples/simple/IOIOSimpleAppSmokeTest.kt
index 1de71107e..f4fc2986e 100644
--- a/applications/IOIOSimpleApp/src/androidTest/java/ioio/examples/simple/IOIOSimpleAppSmokeTest.kt
+++ b/applications/IOIOSimpleApp/src/androidTest/java/ioio/examples/simple/IOIOSimpleAppSmokeTest.kt
@@ -1,31 +1,30 @@
 package ioio.examples.simple
 
-import android.Manifest
+import androidx.test.core.graphics.writeToTestStorage
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.espresso.screenshot.captureToBitmap
+import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.rule.GrantPermissionRule
-import com.moka.utils.Screenshot
 import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.TestName
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class IOIOSimpleAppSmokeTest {
 
     @get:Rule
-    var activityScenarioRule = ActivityScenarioRule(IOIOSimpleApp::class.java)
+    val activityScenarioRule = activityScenarioRule<IOIOSimpleApp>()
 
-    @get:Rule
-    val grantPermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
-            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            Manifest.permission.READ_EXTERNAL_STORAGE)
+    var nameRule = TestName()
 
     @Test
     fun smokeTestSimplyStart() {
         Espresso.onView(ViewMatchers.withId(R.id.SeekBar)).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
-        Screenshot.takeScreenshot("smoke")
+        Espresso.onView(ViewMatchers.isRoot())
+            .captureToBitmap()
+            .writeToTestStorage("${javaClass.simpleName}_${nameRule.methodName}")
     }
 }
diff --git a/applications/IOIOSimpleApp/src/debug/AndroidManifest.xml b/applications/IOIOSimpleApp/src/debug/AndroidManifest.xml
deleted file mode 100644
index 1ac081bde..000000000
--- a/applications/IOIOSimpleApp/src/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:installLocation="internalOnly">
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <application tools:ignore="AllowBackup" />
-</manifest>
\ No newline at end of file