Lots of things for the v3

ThibaudM · May 28, 2017 · 7dde7b4 · 7dde7b4
1 parent 3ca4827
commit 7dde7b4
Show file tree

Hide file tree

Showing 173 changed files with 4,170 additions and 3,090 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.3'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         applicationId "com.thibaudperso.sonycamera"
-        minSdkVersion 11
-        targetSdkVersion 23
+        minSdkVersion 9
+        targetSdkVersion 25
     }
     buildTypes {
         release {
@@ -20,6 +20,7 @@ android {
 
 dependencies {
     compile 'com.mcxiaoke.volley:library:1.0.19'
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.google.android.gms:play-services-ads:10.2.4'
 }
diff --git a/app/google-services.json b/app/google-services.json
@@ -0,0 +1,42 @@
+{
+  "project_info": {
+    "project_number": "891460119561",
+    "firebase_url": "https://api-project-891460119561.firebaseio.com",
+    "project_id": "api-project-891460119561",
+    "storage_bucket": "api-project-891460119561.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:891460119561:android:6e80303fb51b1fdb",
+        "android_client_info": {
+          "package_name": "com.thibaudperso.sonycamera"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "891460119561-vjuej37lcjspvhrt54fjpu2m29rddpo8.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA_HY6RYO7Yx58FnWgdTcJcb3GEWedUW74"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/app/lint.xml b/app/lint.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="UnusedResources">
+        <ignore path="src/main/res/drawable-hdpi/ic_battery_life.png" />
+        <ignore path="src/main/res/drawable-hdpi/ic_restart.png" />
+        <ignore path="src/main/res/drawable-hdpi/ic_review_image.png" />
+        <ignore path="src/main/res/drawable-hdpi/ic_switch_device.png" />
+        <ignore path="src/main/res/drawable-hdpi/ic_take_picture.png" />
+        <ignore path="src/main/res/drawable-hdpi/ic_timelapse_start.png" />
+        <ignore path="src/main/res/drawable-hdpi/ic_timelapse_stop.png" />
+        <ignore path="src/main/res/drawable-mdpi/ic_battery_life.png" />
+        <ignore path="src/main/res/drawable-mdpi/ic_restart.png" />
+        <ignore path="src/main/res/drawable-mdpi/ic_review_image.png" />
+        <ignore path="src/main/res/drawable-mdpi/ic_switch_device.png" />
+        <ignore path="src/main/res/drawable-mdpi/ic_take_picture.png" />
+        <ignore path="src/main/res/drawable-mdpi/ic_timelapse_start.png" />
+        <ignore path="src/main/res/drawable-mdpi/ic_timelapse_stop.png" />
+        <ignore path="src/main/res/drawable-xhdpi/ic_battery_life.png" />
+        <ignore path="src/main/res/drawable-xhdpi/ic_restart.png" />
+        <ignore path="src/main/res/drawable-xhdpi/ic_review_image.png" />
+        <ignore path="src/main/res/drawable-xhdpi/ic_switch_device.png" />
+        <ignore path="src/main/res/drawable-xhdpi/ic_take_picture.png" />
+        <ignore path="src/main/res/drawable-xhdpi/ic_timelapse_start.png" />
+        <ignore path="src/main/res/drawable-xhdpi/ic_timelapse_stop.png" />
+        <ignore path="src/main/res/drawable/dialog_bubble.9.png" />
+        <ignore path="src/main/res/drawable/information.png" />
+    </issue>
+</lint>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,21 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
           package="com.thibaudperso.sonycamera"
-          android:versionCode="16"
-          android:versionName="2.1.0">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
+          android:versionCode="17"
+          android:versionName="3.0.0">
+
+    <uses-sdk tools:overrideLibrary="   com.google.android.gms.ads,
+                                        com.google.android.gms.ads.impl,
+                                        com.google.android.gms.clearcut,
+                                        com.google.android.gms.base,
+                                        com.google.android.gms.gass,
+                                        com.google.android.gms.tasks,
+                                        com.google.android.gms"/>
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.NFC"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+
     <application
         android:name=".timelapse.TimelapseApplication"
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
@@ -40,10 +49,15 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".timelapse.ui.settings.TimelapseSettingsActivity"/>
-        <activity android:name=".timelapse.ui.settings.CameraSettingsActivity"/>
-        <activity android:name=".timelapse.ui.processing.ProcessingActivity"/>
-        <activity android:name=".timelapse.ui.finish.FinishActivity"/>
+        <activity android:name=".timelapse.ui.settings.SettingsActivity"/>
+        <activity android:name=".timelapse.ui.adjustments.AdjustmentsActivity"/>
+        <activity
+            android:name=".timelapse.ui.processing.ProcessingActivity"
+            android:launchMode="singleInstance"/>
+
+        <service
+            android:name=".timelapse.service.IntervalometerService"
+            android:exported="false"/>
 
     </application>
 

diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png