Skip to content
Snippets Groups Projects
Commit 1ccf013d authored by Jawnnypoo's avatar Jawnnypoo
Browse files

Fix nav drawer header issue that crops up due to new support library

parent 3bc260fd
No related branches found
No related tags found
No related merge requests found
Pipeline #
Loading
Loading
@@ -73,12 +73,12 @@ dependencies {
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
 
compile 'com.android.support:appcompat-v7:24.1.1'
compile 'com.android.support:design:24.1.1'
compile 'com.android.support:recyclerview-v7:24.1.1'
compile 'com.android.support:cardview-v7:24.1.1'
compile 'com.android.support:palette-v7:24.1.1'
compile 'com.android.support:customtabs:24.1.1'
compile 'com.android.support:appcompat-v7:24.2.0'
compile 'com.android.support:design:24.2.0'
compile 'com.android.support:recyclerview-v7:24.2.0'
compile 'com.android.support:cardview-v7:24.2.0'
compile 'com.android.support:palette-v7:24.2.0'
compile 'com.android.support:customtabs:24.2.0'
compile 'com.squareup.retrofit2:retrofit:2.1.0'
compile('com.squareup.retrofit2:converter-simplexml:2.1.0') {
exclude group: 'xpp3', module: 'xpp3'
Loading
Loading
@@ -91,12 +91,12 @@ dependencies {
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.0.2'
compile 'com.squareup:otto:1.3.8'
compile 'io.reactivex:rxjava:1.1.8'
compile 'com.artemzin.rxjava:proguard-rules:1.1.8.0'
compile 'io.reactivex:rxjava:1.1.9'
compile 'com.artemzin.rxjava:proguard-rules:1.1.9.0'
compile 'io.reactivex:rxandroid:1.2.1'
compile 'com.jakewharton:butterknife:8.2.1'
apt 'com.jakewharton:butterknife-compiler:8.2.1'
compile 'com.jakewharton.timber:timber:4.1.2'
compile 'com.jakewharton.timber:timber:4.3.0'
apt 'com.bluelinelabs:logansquare-compiler:1.3.7'
compile 'com.bluelinelabs:logansquare:1.3.7'
compile 'net.danlew:android.joda:2.9.4.1'
Loading
Loading
@@ -111,7 +111,7 @@ dependencies {
compile 'com.github.Commit451:Teleprinter:1.0.2'
compile 'com.github.Commit451:BypassPicassoImageGetter:1.0.0'
compile 'com.github.Commit451:Jounce:1.0.1'
compile 'com.github.Commit451:EasyCallback:1.0.0'
compile 'com.github.Commit451:EasyCallback:1.1.0'
compile 'com.github.Commit451:ForegroundViews:2.1.0'
compile 'com.pnikosis:materialish-progress:1.7'
compile 'com.github.Jawnnypoo:PhysicsLayout:2.0.0'
Loading
Loading
@@ -122,11 +122,11 @@ dependencies {
compile 'com.wdullaer:materialdatetimepicker:2.5.0'
compile 'com.wefika:flowlayout:0.4.1'
compile 'com.github.novoda:simple-chrome-custom-tabs:0.1.3-rc1'
compile 'com.afollestad.material-dialogs:core:0.8.6.2'
compile 'com.afollestad.material-dialogs:commons:0.8.6.2'
compile 'com.afollestad.material-dialogs:core:0.9.0.1'
compile 'com.afollestad.material-dialogs:commons:0.9.0.1'
compile 'de.hdodenhof:circleimageview:2.1.0'
 
normalCompile('com.crashlytics.sdk.android:crashlytics:2.6.1@aar') {
normalCompile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') {
transitive = true;
}
}
Loading
Loading
@@ -21,7 +21,7 @@
android:layout_height="@dimen/larger_image_size"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="@dimen/account_header_margin_top"
android:layout_marginTop="16dp"
android:fitsSystemWindows="true"
android:foreground="?attr/selectableItemBackgroundBorderless"
tools:src="@drawable/ic_assign_24dp"/>
Loading
Loading
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="account_header_height">173dp</dimen>
<dimen name="account_header_margin_top">41dp</dimen>
</resources>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="account_header_height">172dp</dimen>
<dimen name="account_header_padding_top">40dp</dimen>
</resources>
\ No newline at end of file
Loading
Loading
@@ -18,8 +18,7 @@
<dimen name="border_size">2dp</dimen>
<dimen name="circle_size">72dp</dimen>
 
<dimen name="account_header_height">148dp</dimen>
<dimen name="account_header_margin_top">16dp</dimen>
<dimen name="account_header_height">172dp</dimen>
 
<dimen name="user_list_image_size">180dp</dimen>
<dimen name="user_header_image_size">300dp</dimen>
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment