primary version (#9)

* Ajout d'un plan primaire de l'isima au format obj * Debug dev (#6) * Ajout de l'obj * Ajout de tous les fichiers 3d * Retour avant ajout de la 3D * Ajout de la vue 3d de l'isima après le login google * Navigation sur la carte 3D * Début d'ajout d'un système de UserManager avec pattern Observer Observable avec la vue * Fix du Observer/Observable + TODO lier les updates aux artefacts + TODO faire datasource des users * updates aux artefacts + TODO faire datasource des users * updates aux artefacts + TODO faire datasource des users * Connexion du gps au user manager et du user manager à la carte + TODO recuperer les users != me + TODO login Google * Login Google récupération des informations * Envoi du token à https://wd.exception.ovh/tokensignin * Ajout des fonctionnalités réseaux. Ajout du bouton de débugage. Position GPS utilisateur. Connexion Google. * Mise à jour des API (#7) Use of API 25 * Récupération des utilisateurs sur le web service * Récupération des utilisateurs sur le web service * Ajout du logout fragile Attention à l'ordre lattitude, longitude * Ajout du logout fragile Attention à l'ordre lattitude, longitude * update du build tool
WatchDogZZ · Jan 28, 2017 · a34a574 · a34a574
1 parent 2a7069d
commit a34a574
Show file tree

Hide file tree

Showing 55 changed files with 3,622 additions and 766 deletions.
diff --git a/.idea/android.iml b/.idea/android.iml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/.travis.yml b/.travis.yml
@@ -3,15 +3,16 @@ jdk: oraclejdk8
 sudo: false
 env:
   global:
-  - ANDROID_TARGET=android-11
+  - ANDROID_TARGET=android-12
   - ANDROID_ABI=armeabi-v7a
 android:
   components:
   - platform-tools
   - tools
-  - build-tools-25.0.0
-  - android-23
+  - build-tools-25.0.1
+  - android-25
   - extra-android-m2repository
+  - extra-google-m2repository
   - sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
   licenses:
   - android-sdk-preview-license-52d11cd2

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.1"
     defaultConfig {
         applicationId "ovh.exception.watchdogzz"
-        minSdkVersion 11
-        targetSdkVersion 23
+        minSdkVersion 12
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -21,14 +21,28 @@ android {
     lintOptions {
         abortOnError false
     }
+    dataBinding {
+        enabled = true
+    }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
+    compile 'com.android.support:appcompat-v7:25.0.1'
+    compile 'com.android.support:design:25.0.1'
+
+    // Dependency for Google Sign-In
+    compile 'com.google.android.gms:play-services-auth:10.0.0'
+    compile 'com.google.firebase:firebase-appindexing:10.0.0'
+
+    // Dependency for web services
+    compile 'com.android.volley:volley:1.0.0'
+    compile 'com.google.code.gson:gson:2.8.0'
+
     testCompile 'junit:junit:4.12'
 }
+
+apply plugin: 'com.google.gms.google-services'
diff --git a/app/google-services.json b/app/google-services.json
@@ -0,0 +1,48 @@
+{
+  "project_info": {
+    "project_number": "933756986924",
+    "project_id": "watchdogzz-debug"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:933756986924:android:c7a71a2bd981b9eb",
+        "android_client_info": {
+          "package_name": "ovh.exception.watchdogzz"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "933756986924-v52rhof4skjmj9kprdm13tst684l5756.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "ovh.exception.watchdogzz",
+            "certificate_hash": "9D649B1CBD804239FDAF0E24FB14742B7BDECC6A"
+          }
+        },
+        {
+          "client_id": "933756986924-ont7s5iohrb9rm3nch8momvatsr4qp47.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBKpQ3mgWWvT14QfFqIHKNLyzCu4uRDRfE"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 1
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,22 +6,38 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <!-- Needed only if your app targets Android 5.0 (API level 21) or higher. -->
+    <uses-feature android:name="android.hardware.location.gps" />
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/logo"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".LoginActivity"
-            android:label="@string/app_name">
+            android:name=".activities.LoginActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".activities.MainActivity"
+            android:label="@string/title_activity_main"
+            android:theme="@style/AppTheme.NoActionBar"></activity><!-- ATTENTION: This was auto-generated to add Google Play services to your project for
+     App Indexing.  See https://g.co/AppIndexing/AndroidStudio for more information. -->
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
     </application>
 
 </manifest>