Explorar el Código

updated gradle versions; fixed drawer color; removed volley repo

develop
Robin Thoni hace 6 años
padre
commit
544ead9bfc

+ 5
- 5
app/build.gradle Ver fichero

@@ -16,13 +16,13 @@ repositories {
16 16
 
17 17
 
18 18
 android {
19
-    compileSdkVersion 22
20
-    buildToolsVersion "22.0.1"
19
+    compileSdkVersion 25
20
+    buildToolsVersion '25.0.3'
21 21
 
22 22
     defaultConfig {
23 23
         applicationId "com.rthoni.camotion"
24 24
         minSdkVersion 14
25
-        targetSdkVersion 22
25
+        targetSdkVersion 25
26 26
         versionCode 3
27 27
         versionName "0.0.7"
28 28
     }
@@ -37,8 +37,8 @@ android {
37 37
 dependencies {
38 38
     compile fileTree(dir: 'libs', include: ['*.jar'])
39 39
     testCompile 'junit:junit:4.12'
40
-    compile 'com.android.support:appcompat-v7:22.2.1'
41
-    compile 'com.android.support:design:22.2.1'
40
+    compile 'com.android.support:appcompat-v7:25.0.1'
41
+    compile 'com.android.support:design:25.0.1'
42 42
     compile project(':luticateauth')
43 43
     compile project(':luticateutils')
44 44
     compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {

+ 4
- 3
app/src/main/java/com/rthoni/camotion/ui/MainActivity.java Ver fichero

@@ -13,6 +13,7 @@ import android.support.v7.app.AppCompatActivity;
13 13
 import android.support.v7.widget.Toolbar;
14 14
 import android.view.MenuItem;
15 15
 import android.view.SubMenu;
16
+import android.view.View;
16 17
 import android.widget.TextView;
17 18
 import android.widget.Toast;
18 19
 
@@ -54,17 +55,17 @@ public class MainActivity extends AppCompatActivity
54 55
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
55 56
         setSupportActionBar(toolbar);
56 57
 
57
-        _locationNameView = (TextView) findViewById(R.id.location_name_textview);
58
-
59 58
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
60 59
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar,
61 60
                 R.string.navigation_drawer_open, R.string.navigation_drawer_close);
62
-        drawer.setDrawerListener(toggle);
61
+        drawer.addDrawerListener(toggle);
63 62
         toggle.syncState();
64 63
 
65 64
         _navigationView = (NavigationView) findViewById(R.id.nav_view);
66 65
         _navigationView.setNavigationItemSelectedListener(this);
67 66
         _locationsMenu = _navigationView.getMenu().findItem(R.id.location_menu).getSubMenu();
67
+        View parentView = _navigationView.getHeaderView(0);
68
+        _locationNameView = (TextView) parentView.findViewById(R.id.location_name_textview);
68 69
 
69 70
         init();
70 71
     }

+ 1
- 1
build.gradle Ver fichero

@@ -5,7 +5,7 @@ buildscript {
5 5
         jcenter()
6 6
     }
7 7
     dependencies {
8
-        classpath 'com.android.tools.build:gradle:1.5.0'
8
+        classpath 'com.android.tools.build:gradle:2.3.1'
9 9
 
10 10
         // NOTE: Do not place your application dependencies here; they belong
11 11
         // in the individual module build.gradle files

+ 2
- 2
gradle/wrapper/gradle-wrapper.properties Ver fichero

@@ -1,6 +1,6 @@
1
-#Sat Apr 16 15:29:43 CEST 2016
1
+#Sun Dec 10 17:40:56 CET 2017
2 2
 distributionBase=GRADLE_USER_HOME
3 3
 distributionPath=wrapper/dists
4 4
 zipStoreBase=GRADLE_USER_HOME
5 5
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

+ 4
- 4
luticateauth/build.gradle Ver fichero

@@ -1,12 +1,12 @@
1 1
 apply plugin: 'com.android.library'
2 2
 
3 3
 android {
4
-    compileSdkVersion 22
5
-    buildToolsVersion "22.0.1"
4
+    compileSdkVersion 25
5
+    buildToolsVersion '25.0.3'
6 6
 
7 7
     defaultConfig {
8 8
         minSdkVersion 14
9
-        targetSdkVersion 22
9
+        targetSdkVersion 25
10 10
         versionCode 1
11 11
         versionName "1.0"
12 12
     }
@@ -21,6 +21,6 @@ android {
21 21
 dependencies {
22 22
     compile fileTree(dir: 'libs', include: ['*.jar'])
23 23
     testCompile 'junit:junit:4.12'
24
-    compile 'com.android.support:appcompat-v7:22.2.1'
24
+    compile 'com.android.support:appcompat-v7:25.0.1'
25 25
     compile project(':luticateutils')
26 26
 }

+ 5
- 5
luticateutils/build.gradle Ver fichero

@@ -1,12 +1,12 @@
1 1
 apply plugin: 'com.android.library'
2 2
 
3 3
 android {
4
-    compileSdkVersion 22
5
-    buildToolsVersion "22.0.1"
4
+    compileSdkVersion 25
5
+    buildToolsVersion '25.0.3'
6 6
 
7 7
     defaultConfig {
8 8
         minSdkVersion 14
9
-        targetSdkVersion 22
9
+        targetSdkVersion 25
10 10
         versionCode 1
11 11
         versionName "1.0"
12 12
     }
@@ -21,6 +21,6 @@ android {
21 21
 dependencies {
22 22
     compile fileTree(dir: 'libs', include: ['*.jar'])
23 23
     testCompile 'junit:junit:4.12'
24
-    compile 'com.android.support:appcompat-v7:22.2.1'
25
-    compile project(':volley')
24
+    compile 'com.android.support:appcompat-v7:25.0.1'
25
+    compile 'com.android.volley:volley:1.1.0'
26 26
 }

+ 1
- 1
settings.gradle Ver fichero

@@ -1 +1 @@
1
-include ':app', ':luticateutils', ':luticateauth', ':volley'
1
+include ':app', ':luticateutils', ':luticateauth'

+ 0
- 1
volley

@@ -1 +0,0 @@
1
-Subproject commit 96c4d0b9f58229b9dbba51f1776addedc66f4749

Loading…
Cancelar
Guardar