Lint fixes (#19)

- Code inspection
 - Redundant resources removed
 - Resources moved the corresponding flavours
 - Deprecated dependencies upgraded
 - lint changes
 - circleci updated to capture screenshot

.circleci/config.yml

@@ -14,17 +14,11 @@ commands:
     description: checkout repo and android dependencies
     steps:
       - checkout
-      - android/restore-gradle-cache
-  build_gradle:
-    description: Build the gradle
-    steps:
-      - android/restore-gradle-cache
       - run:
-          name: Download Dependencies
+          name: Give gradle permissions
           command: |
             sudo chmod +x ./gradlew
-            ./gradlew androidDependencies
-      - android/save-gradle-cache
+      - android/restore-gradle-cache
   run_tests:
     description: run tests for flavour specified
     parameters:
@@ -33,11 +27,11 @@ commands:
         default: "AtlasWeather"
     steps:
       # The next step will run the unit tests
-      - build_gradle
       - run:
           name: Run non-instrumentation unit tests
           command: |
-            ./gradlew test<< parameters.flavour >>DebugUnitTest --continue
+            ./gradlew test<< parameters.flavour >>DebugUnitTest
+      - android/save-gradle-cache
       - store_artifacts:
           path: app/build/reports
           destination: reports
@@ -49,24 +43,27 @@ commands:
       flavour:
         type: string
         default: "AtlasWeather"
+      package_suffix:
+        type: string
+        default: "atlas_weather"
     steps:
-      - build_gradle
       - android/start-emulator-and-run-tests:
           post-emulator-launch-assemble-command: ./gradlew assemble<< parameters.flavour >>DebugAndroidTest
-          test-command: ./gradlew connected<< parameters.flavour >>DebugAndroidTest
+          test-command: ./gradlew connected<< parameters.flavour >>DebugAndroidTest --continue
           system-image: system-images;android-26;google_apis;x86
           pull-data: true
-          pull-data-path: /storage/emulated/0/Android/data/
           pull-data-target: ~/app-data
-          restore-gradle-cache-prefix: v1a
+      # store screenshots for failed ui tests
+      - when:
+          condition: on_fail
+          steps:
+            - store_artifacts:
+                path: ~/app-data
+                destination: screenshots
       # store test reports
       - store_artifacts:
           path: app/build/reports/androidTests/connected
           destination: reports
-      # store screenshots for failed ui tests
-      - store_artifacts:
-          path: ~/app-data
-          destination: screenshots
       - store_test_results:
           path: app/build/outputs/androidTest-results/connected
   deploy_to_play_store:
@@ -83,7 +80,6 @@ commands:
           name: Setup playstore key
           command: |
             echo "$GOOGLE_PLAY_KEY" > "google-play-key.json"
-      - build_gradle
       - run:
           name: Run fastlane command to deploy to playstore
           command: |
@@ -101,6 +97,9 @@ jobs:
       flavour:
         type: string
         default: "AtlasWeather"
+      package_suffix:
+        type: string
+        default: "atlas_weather"
     # These next lines define the Android machine image executor.
     # See: https://circleci.com/docs/2.0/executor-types/
     executor:
@@ -138,6 +137,7 @@ workflows:
       - build-and-test:
           context: appttude
           flavour: "MonoWeather"
+          package_suffix: "monoWeather"
           filters:
             branches:
               ignore:
@@ -156,6 +156,7 @@ workflows:
       - build-and-test:
           context: appttude
           flavour: "AtlasWeather"
+          package_suffix: "atlas_weather"
           filters:
             branches:
               ignore: