mirror of
https://github.com/gsantner/dandelion
synced 2024-11-21 11:52:07 +01:00
Bump android libs; gradle; Studio 2.1
This commit is contained in:
parent
d0cc3726ea
commit
0a88c1d400
4 changed files with 116 additions and 96 deletions
|
@ -21,10 +21,19 @@ android {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
// Sub-Projects
|
||||
//compile project(':subprojectFromRoot')
|
||||
|
||||
// Jars
|
||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||
testCompile 'junit:junit:4.12'
|
||||
|
||||
// Android standard libs
|
||||
compile 'com.android.support:appcompat-v7:23.3.0'
|
||||
compile 'com.android.support:design:23.3.0'
|
||||
compile 'com.getbase:floatingactionbutton:1.9.1'
|
||||
compile 'com.android.support:support-v4:23.3.0'
|
||||
|
||||
// More libraries
|
||||
compile 'com.jakewharton:butterknife:7.0.1'
|
||||
compile 'com.getbase:floatingactionbutton:1.9.1'
|
||||
}
|
||||
|
|
|
@ -1,8 +1,19 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="colorPrimary">#607d8b</color>
|
||||
<color name="colorPrimaryDark">#607d8b</color>
|
||||
<color name="colorAccent">#ff9800</color>
|
||||
<color name="colorPrimary">@color/primary</color>
|
||||
<color name="colorPrimaryDark">@color/primary_dark</color>
|
||||
<color name="colorAccent">@color/accent</color>
|
||||
|
||||
<!-- Colors from Palette -->
|
||||
<color name="primary">#607d8b</color>
|
||||
<color name="primary_dark">#607d8b</color>
|
||||
<color name="primary_light">#CFD8DC</color>
|
||||
<color name="accent">#ff9800</color>
|
||||
<color name="primary_text">#212121</color>
|
||||
<color name="secondary_text">#727272</color>
|
||||
<color name="icons">#FFFFFF</color>
|
||||
<color name="divider">#B6B6B6</color>
|
||||
<!-- End colors from Palette -->
|
||||
|
||||
<color name="fab_big">#ff9800</color>
|
||||
<color name="fab_big_pressed">#ffb74d</color>
|
||||
|
|
|
@ -5,7 +5,7 @@ buildscript {
|
|||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.0.0'
|
||||
classpath 'com.android.tools.build:gradle:2.1.0'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
|
|
Loading…
Reference in a new issue