Fixes for release (#251)

* Fixed mapping deploy to firebase
* Removed “ask for help translating” dialog
* Fixed screenshot automation
* Disabled location for ui tests
* Added Galaxy S8 compatibility
* Fixed concurrent modification crash
* Removed useless imports

.travis.yml

@@ -58,7 +58,7 @@ after_success:
 - |
   if [[ "$TRAVIS_TAG" ]]; then
     ./gradlew publishRegularRelease
-    ./gradlew -PFirebaseServiceAccountFilePath=$PWD/app/src/main/google-services.json :app:firebaseUploadRegularReleaseProguardMapping
+    ./gradlew -PFirebaseServiceAccountFilePath=$PWD/app/src/release/google-services.json :app:firebaseUploadRegularReleaseProguardMapping
     ./dropbox_uploader.sh upload app/build/outputs/apk/app-regular-release.apk /Release/$TRAVIS_TAG/MyTargets.apk
     ./dropbox_uploader.sh upload app/build/outputs/mapping/regular/release/mapping.txt /Release/$TRAVIS_TAG/mapping.txt
   fi

Screengrabfile

@@ -1,12 +1,12 @@
-app_package_name 'de.dreier.mytargets'
+app_package_name 'de.dreier.mytargets.debug'
 use_tests_in_packages ['de.dreier.mytargets.screengrab']
 
-output_directory 'build'
+output_directory 'build/screengrab'
 
 app_apk_path 'app/build/outputs/apk/app-screengrab-debug.apk'
-tests_apk_path 'app/build/outputs/apk/app-screengrab-debug-androidTest-unaligned.apk'
+tests_apk_path 'app/build/outputs/apk/app-screengrab-debug-androidTest.apk'
 
-locales ['ca-ES', 'cs-CZ', 'de-DE', 'en-US', 'es-ES', 'fr-FR', 'hu-HU', 'it-IT', 'iw-IL', 'ja-JP', 'nl-NL', 'no-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sk-SK', 'sl-SI', 'sv-SE', 'tr-TR', 'zh-CN', 'zh-TW']
+locales ['ca-ES', 'cs-CZ', 'da-DK', 'de-DE', 'en-US', 'es-ES', 'fr-FR', 'hu-HU', 'id-ID', 'it-IT', 'iw-IL', 'ja-JP', 'nl-NL', 'no-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ru-RU', 'sk-SK', 'sl-SI', 'sv-SE', 'tr-TR', 'zh-CN', 'zh-TW']
 
-clear_previous_screenshots true
-skip_open_summary true
+# clear_previous_screenshots true
+skip_open_summary true

app/build.gradle

@@ -88,8 +88,7 @@ if (CROWDIN_API_KEY != null && !CROWDIN_API_KEY.isEmpty()) {
     }
 
     task generateLocalizedScreenshots(type: Exec, group: 'play store', dependsOn: [':crowdinDownload', 'assembleScreengrabDebugAndroidTest', 'assembleScreengrabDebug']) {
-        workingDir '..'
-        commandLine './make_screenshots.sh'
+        commandLine '../make_screenshots.sh'
     }
 
     if (new File('googlePlayAndroidDeveloper.json').exists()) {
@@ -191,4 +190,4 @@ dependencies {
 }
 
 // Must be at the bottom
-apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.gms.google-services'

app/src/androidTest/java/de/dreier/mytargets/features/arrow/ArrowSelectorTest.java

@@ -72,7 +72,7 @@ private void arrowSelectionTest(String type) {
         Intent intent = new Intent();
         intent.setAction(type);
         activityTestRule.launchActivity(intent);
-        allowPermissionsIfNeeded(activityTestRule.getActivity(), ACCESS_FINE_LOCATION);
+        //allowPermissionsIfNeeded(activityTestRule.getActivity(), ACCESS_FINE_LOCATION);
 
         onView(withText(R.string.add_arrow)).perform(nestedScrollTo(), click());
         intended(hasComponent(EditArrowActivity.class.getName()));

app/src/androidTest/java/de/dreier/mytargets/features/bow/BowSelectorTest.java

@@ -72,7 +72,7 @@ private void bowSelectionTest(String type) {
         Intent intent = new Intent();
         intent.setAction(type);
         activityTestRule.launchActivity(intent);
-        allowPermissionsIfNeeded(activityTestRule.getActivity(), ACCESS_FINE_LOCATION);
+        //allowPermissionsIfNeeded(activityTestRule.getActivity(), ACCESS_FINE_LOCATION);
 
         onView(withText(R.string.add_bow)).perform(nestedScrollTo(), click());
         intended(hasComponent(EditBowActivity.class.getName()));

app/src/androidTest/java/de/dreier/mytargets/features/main/IntroActivityTest.java

@@ -68,6 +68,6 @@ public void introActivityTest() {
         onView(withId(R.id.toolbar)).check(matches(hasDescendant(withText(R.string.my_targets))));
 
         onView(matchFabMenu()).perform(click());
-        allowPermissionsIfNeeded(activityTestRule.getActivity(), ACCESS_FINE_LOCATION);
+        //allowPermissionsIfNeeded(activityTestRule.getActivity(), ACCESS_FINE_LOCATION);
     }
 }

app/src/androidTest/java/de/dreier/mytargets/features/settings/SettingsManagerTest.java

@@ -129,12 +129,6 @@ public void setEndCount() {
         assertThat(SettingsManager.getEndCount()).isEqualTo(10);
     }
 
-    @Test
-    public void setTranslationDialogWasShown() {
-        SettingsManager.setTranslationDialogShown(true);
-        assertThat(SettingsManager.isTranslationDialogShown()).isEqualTo(true);
-    }
-
     @Test
     public void setInputMethod() {
         SettingsManager.setInputMethod(KEYBOARD);
@@ -300,4 +294,4 @@ public void setScoreConfiguration() {
         SettingsManager.setScoreConfiguration(config);
         assertThat(SettingsManager.getScoreConfiguration()).isEqualTo(config);
     }
-}
+}

app/src/androidTest/java/de/dreier/mytargets/features/training/EditTrainingActivityTest.java

@@ -88,7 +88,7 @@ public void createFreeTraining() {
         intent.setAction(CREATE_FREE_TRAINING_ACTION);
         activityTestRule.launchActivity(intent);
 
-        allowPermissionsIfNeeded(activityTestRule.getActivity(), ACCESS_FINE_LOCATION);
+        //allowPermissionsIfNeeded(activityTestRule.getActivity(), ACCESS_FINE_LOCATION);
 
         // Select distance 20m
         onView(withId(R.id.distance)).perform(nestedScrollTo(), click());
@@ -150,7 +150,7 @@ public void createTrainingWithStandardRound() {
         intent.setAction(CREATE_TRAINING_WITH_STANDARD_ROUND_ACTION);
         activityTestRule.launchActivity(intent);
 
-        allowPermissionsIfNeeded(activityTestRule.getActivity(), ACCESS_FINE_LOCATION);
+        //allowPermissionsIfNeeded(activityTestRule.getActivity(), ACCESS_FINE_LOCATION);
 
         // Has last used standard round been restored
         onView(withId(R.id.standardRound))

app/src/androidTest/java/de/dreier/mytargets/features/training/standardround/EditStandardRoundActivityTest.java

@@ -79,7 +79,7 @@ public void editStandardRoundActivity() {
         intent.setAction(CREATE_TRAINING_WITH_STANDARD_ROUND_ACTION);
         activityTestRule.launchActivity(intent);
 
-        allowPermissionsIfNeeded(activityTestRule.getActivity(), ACCESS_FINE_LOCATION);
+        //allowPermissionsIfNeeded(activityTestRule.getActivity(), ACCESS_FINE_LOCATION);
 
         onView(withId(R.id.standardRound)).perform(scrollTo(), click());
 

app/src/androidTest/java/de/dreier/mytargets/test/utils/actions/TargetViewActions.java

@@ -21,18 +21,18 @@
 import android.support.test.espresso.action.Tap;
 
 public class TargetViewActions {
-    protected static ViewAction clickTarget(final float x, final float y) {
+    public static ViewAction clickTarget(final float x, final float y) {
         return new GeneralClickAction(
                 Tap.SINGLE,
                 view -> LowLevelActions.getTargetCoordinates(view, new float[]{x, y}),
                 Press.FINGER);
     }
 
-    protected static ViewAction holdTapTarget(final float x, final float y) {
+    public static ViewAction holdTapTarget(final float x, final float y) {
         return LowLevelActions.pressAndHold(new float[]{x, y});
     }
 
-    protected static ViewAction releaseTapTarget(final float x, final float y) {
+    public static ViewAction releaseTapTarget(final float x, final float y) {
         return LowLevelActions.release(new float[]{x, y});
     }
 }

app/src/androidTestScreengrab/java/de/dreier/mytargets/screengrab/ScreenshotTest.java

@@ -7,7 +7,6 @@
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 
-import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -18,28 +17,29 @@
 import org.junit.runner.RunWith;
 
 import de.dreier.mytargets.R;
-import de.dreier.mytargets.UITestBase;
-import de.dreier.mytargets.base.activities.MainActivity;
-import de.dreier.mytargets.managers.SettingsManager;
+import de.dreier.mytargets.features.main.MainActivity;
+import de.dreier.mytargets.features.settings.SettingsManager;
 import de.dreier.mytargets.shared.models.Dimension;
 import de.dreier.mytargets.shared.models.Target;
-import de.dreier.mytargets.shared.targets.models.WAField;
-import de.dreier.mytargets.utils.rules.SimpleDbTestRule;
+import de.dreier.mytargets.shared.targets.models.WAFull;
+import de.dreier.mytargets.test.base.UITestBase;
+import de.dreier.mytargets.test.utils.rules.SimpleDbTestRule;
 import tools.fastlane.screengrab.Screengrab;
 import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy;
 import tools.fastlane.screengrab.locale.LocaleTestRule;
 
-import static android.Manifest.permission.ACCESS_FINE_LOCATION;
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.Espresso.pressBack;
 import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.isRoot;
-import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withParent;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static de.dreier.mytargets.PermissionGranter.allowPermissionsIfNeeded;
+import static de.dreier.mytargets.test.utils.actions.TargetViewActions.clickTarget;
+import static de.dreier.mytargets.test.utils.actions.TargetViewActions.holdTapTarget;
+import static de.dreier.mytargets.test.utils.actions.TargetViewActions.releaseTapTarget;
+import static de.dreier.mytargets.test.utils.matchers.ViewMatcher.matchFabMenu;
 import static org.hamcrest.core.AllOf.allOf;
 
 @SdkSuppress(minSdkVersion = 18)
@@ -60,7 +60,7 @@ public void setUp() {
         Screengrab.setDefaultScreenshotStrategy(new UiAutomatorScreenshotStrategy());
         SettingsManager.setArrowNumbersEnabled(false);
         SettingsManager.setShotsPerEnd(6);
-        SettingsManager.setTarget(new Target(WAField.ID, 1,
+        SettingsManager.setTarget(new Target(WAFull.ID, 2,
                 new Dimension(60, Dimension.Unit.CENTIMETER)));
         SettingsManager.setTimerEnabled(true);
     }
@@ -86,22 +86,20 @@ public void takeScreenshots() {
         Screengrab.screenshot("6_statistics");
         navigateUp();
         navigateUp();
-        onView(matchFab()).perform(click());
-        onView(CoreMatchers.allOf(withId(R.id.fab1), withParent(withId(R.id.fab))))
-                .perform(click());
-        allowPermissionsIfNeeded(activityTestRule.getActivity(), ACCESS_FINE_LOCATION);
+        onView(matchFabMenu()).perform(click());
+        onView(withId(R.id.fab1)).perform(click());
         Screengrab.screenshot("2_enter_training");
-        onView(withContentDescription(R.string.save)).perform(click());
+        save();
         onView(isRoot()).perform(click());
         onView(isRoot()).perform(click());
         Screengrab.screenshot("8_timer");
         pressBack();
         onView(withId(R.id.targetViewContainer)).perform(
                 clickTarget(0.1f, 0.05f),
-                clickTarget(-0.45f, 0.5f),
-                clickTarget(-0.5f, -0.6f),
-                holdTapTarget(0.5f, 0.4f));
+                clickTarget(-0.15f, 0.3f),
+                clickTarget(-0.24f, -0.06f),
+                holdTapTarget(0.0f, 0.0f));
         Screengrab.screenshot("1_enter_end");
-        onView(withId(R.id.targetViewContainer)).perform(releaseTapTarget(0.5f, 0.4f));
+        onView(withId(R.id.targetViewContainer)).perform(releaseTapTarget(0.0f, 0.0f));
     }
-}
+}

app/src/main/AndroidManifest.xml

@@ -37,6 +37,9 @@
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera.any"
+        android:required="false" />
     <uses-feature
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
@@ -46,6 +49,12 @@
     <uses-feature
         android:name="android.hardware.location"
         android:required="false" />
+    <uses-feature
+        android:name="android.hardware.location.network"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.location.gps"
+        android:required="false"/>
 
     <application
         android:name=".app.ApplicationInstance"
@@ -58,6 +67,9 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:replace="android:name">
+        <meta-data
+            android:name="android.max_aspect"
+            android:value="2.1" />
         <meta-data
             android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAIy_jZMyyGuh5M-ICvUll4H1WyF1R9M8cUcN5wVw" />

app/src/main/java/de/dreier/mytargets/features/main/MainActivity.java

@@ -22,7 +22,6 @@
 import de.dreier.mytargets.R;
 import de.dreier.mytargets.base.activities.SimpleFragmentActivityBase;
 import de.dreier.mytargets.features.settings.SettingsManager;
-import de.dreier.mytargets.utils.TranslationUtils;
 
 /**
  * Shows an overview over all training days
@@ -37,8 +36,6 @@ public void onCreate(Bundle savedInstanceState) {
             SettingsManager.setShouldShowIntroActivity(false);
             Intent intent = new Intent(this, IntroActivity.class);
             startActivity(intent);
-        } else {
-            TranslationUtils.askForHelpTranslating(this);
         }
     }
 
@@ -47,4 +44,4 @@ public Fragment instantiateFragment() {
         return new MainFragment();
     }
 
-}
+}

app/src/main/java/de/dreier/mytargets/features/settings/SettingsManager.java

@@ -77,7 +77,6 @@ public class SettingsManager {
     private static final String KEY_NUMBERING_ENABLED = "numbering";
     private static final String KEY_INDOOR = "indoor";
     private static final String KEY_END_COUNT = "rounds";
-    private static final String KEY_TRANSLATION_DIALOG_SHOWN = "translation_dialog_shown";
     private static final String KEY_INPUT_MODE = "target_mode";
     private static final String KEY_SHOW_MODE = "show_mode";
     private static final SharedPreferences lastUsed = ApplicationInstance
@@ -210,17 +209,6 @@ public static void setEndCount(int endCount) {
                 .apply();
     }
 
-    public static boolean isTranslationDialogShown() {
-        return preferences.getBoolean(KEY_TRANSLATION_DIALOG_SHOWN, false);
-    }
-
-    public static void setTranslationDialogShown(boolean shown) {
-        preferences
-                .edit()
-                .putBoolean(KEY_TRANSLATION_DIALOG_SHOWN, shown)
-                .apply();
-    }
-
     public static TargetViewBase.EInputMethod getInputMethod() {
         return preferences
                 .getBoolean(KEY_INPUT_MODE, false)

app/src/main/java/de/dreier/mytargets/features/training/input/InputActivity.java

@@ -401,7 +401,7 @@ private void updateEnd() {
         updateWearNotification();
     }
 
-    private void startWearNotification() {
+    private void updateWearNotification() {
         NotificationInfo info = buildInfo();
         if (manager == null) {
             manager = new WearMessageManager(this, info);
@@ -442,11 +442,6 @@ private void updateNavigationButtons() {
         updateNextButton();
     }
 
-    private void updateWearNotification() {
-        // Send message to wearable app, that we are starting an end
-        new Thread(InputActivity.this::startWearNotification).start();
-    }
-
     private void updatePreviousButton() {
         final boolean isFirstEnd = data.endIndex == 0;
         final boolean isFirstRound = data.roundIndex == 0;