diff --git a/app/build.gradle b/app/build.gradle index 2dce7f6a2..342b47427 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,6 +26,19 @@ android { multiDexEnabled true resourceConfigurations += ["ar", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "fi", "fr", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt", "ro-rRO", "ru", "sk", "sl", "sv", "tr", "uk", "zh-rTW", "zh-rCN"] + + //testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + flavorDimensions "version" + productFlavors { + fdroid { + dimension "version" + } + screengrab { + dimension "version" + applicationIdSuffix = ".screengrab" + } } buildTypes { @@ -113,6 +126,12 @@ dependencies { testImplementation 'androidx.test:core:1.5.0' testImplementation 'junit:junit:4.13.2' testImplementation 'org.robolectric:robolectric:4.10.3' + + // Screenshots + testImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + testImplementation 'com.android.support.test:rules:1.0.2' + testImplementation 'com.android.support.test:runner:1.0.2' + testImplementation 'tools.fastlane:screengrab:2.1.1' } tasks.withType(SpotBugsTask) { diff --git a/app/src/screengrab/AndroidManifest.xml b/app/src/screengrab/AndroidManifest.xml new file mode 100644 index 000000000..6a130a389 --- /dev/null +++ b/app/src/screengrab/AndroidManifest.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + diff --git a/app/src/test/java/protect/card_locker/screenshot/ScreenshotCreation.java b/app/src/test/java/protect/card_locker/screenshot/ScreenshotCreation.java new file mode 100644 index 000000000..5f2195d2c --- /dev/null +++ b/app/src/test/java/protect/card_locker/screenshot/ScreenshotCreation.java @@ -0,0 +1,31 @@ +package protect.card_locker.screenshot; + +import android.support.test.rule.ActivityTestRule; + +import androidx.test.core.app.ActivityScenario; +import androidx.test.runner.AndroidJUnit4; + +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestRule; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +import protect.card_locker.MainActivity; +import tools.fastlane.screengrab.Screengrab; +import tools.fastlane.screengrab.locale.LocaleTestRule; + +@RunWith(AndroidJUnit4.class) +public class ScreenshotCreation { + @ClassRule + public static final TestRule classRule = new LocaleTestRule(); + + @Rule + public final ActivityTestRule activityTestRule = new ActivityTestRule<>(MainActivity.class); + + @Test + public void takeScreenshot() throws Exception { + Screengrab.screenshot("mainactivity"); + } +} diff --git a/fastlane/README.md b/fastlane/README.md new file mode 100644 index 000000000..7ec1207f1 --- /dev/null +++ b/fastlane/README.md @@ -0,0 +1,48 @@ +fastlane documentation +---- + +# Installation + +Make sure you have the latest version of the Xcode command line tools installed: + +```sh +xcode-select --install +``` + +For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) + +# Available Actions + +## Android + +### android test + +```sh +[bundle exec] fastlane android test +``` + +Runs all the tests + +### android beta + +```sh +[bundle exec] fastlane android beta +``` + +Submit a new Beta Build to Crashlytics Beta + +### android deploy + +```sh +[bundle exec] fastlane android deploy +``` + +Deploy a new version to the Google Play + +---- + +This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. + +More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). + +The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools). diff --git a/fastlane/Screengrabfile b/fastlane/Screengrabfile new file mode 100644 index 000000000..936435190 --- /dev/null +++ b/fastlane/Screengrabfile @@ -0,0 +1,18 @@ +# remove the leading '#' to uncomment lines + +app_package_name('me.hackerchick.catima.screengrab.debug') +use_tests_in_packages(['protect.card_locker.screenshot']) + +app_apk_path('app/build/outputs/apk/screengrab/debug/app-screengrab-debug.apk') +tests_apk_path('app/build/outputs/apk/androidTest/screengrab/debug/app-screengrab-debug-androidTest.apk') + +locales(['en-US', 'fr-FR', 'it-IT']) + +# clear all previously generated screenshots in your local output directory before creating new ones +clear_previous_screenshots(true) + +# For more information about all available options run +# fastlane screengrab --help + +#test_instrumentation_runner('android.test.InstrumentationTestRunner') +#org.robolectric.RobolectricTestRunner') diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png deleted file mode 100644 index f0e367f4a..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png deleted file mode 100644 index 1be6f7f74..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png deleted file mode 100644 index 83b97f75c..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png deleted file mode 100644 index c88e38bc8..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png deleted file mode 100644 index 419414f19..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png deleted file mode 100644 index 9c6b0f4c7..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png deleted file mode 100644 index 0edda4571..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png and /dev/null differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png deleted file mode 100644 index dfa1110bd..000000000 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png and /dev/null differ diff --git a/fastlane/report.xml b/fastlane/report.xml new file mode 100644 index 000000000..ccec46803 --- /dev/null +++ b/fastlane/report.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + +