From 6ef711522ec4d38e0bb0b2773c15875511d0cecb Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Thu, 25 Feb 2016 12:00:54 +0100 Subject: [PATCH] Updated support libraries. Removed an obsolete library. --- app/build.gradle | 28 +++++++++---------- .../ui/fragments/player/PlayerFragment.java | 4 +-- app/src/main/res/values/styles_parents.xml | 6 ++-- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index afe9520b..e6be6592 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -61,6 +61,7 @@ android { targetSdkVersion 23 renderscriptTargetApi 23 + vectorDrawables.useSupportLibrary = true applicationId "com.kabouzeid.gramophone" versionCode 101 @@ -104,10 +105,10 @@ dependencies { transitive = true } - compile('com.github.afollestad.material-dialogs:core:0.8.5.4@aar') { + compile('com.github.afollestad.material-dialogs:core:0.8.5.5@aar') { transitive = true } - compile('com.github.afollestad.material-dialogs:commons:0.8.5.4@aar') { + compile('com.github.afollestad.material-dialogs:commons:0.8.5.5@aar') { transitive = true } @@ -119,24 +120,23 @@ dependencies { transitive = true } - compile 'com.android.support:support-v4:23.1.1' - compile 'com.android.support:support-v13:23.1.1' - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.android.support:recyclerview-v7:23.1.1' - compile 'com.android.support:gridlayout-v7:23.1.1' - compile 'com.android.support:cardview-v7:23.1.1' - compile 'com.android.support:palette-v7:23.1.1' - compile 'com.android.support:design:23.1.1' - compile 'com.android.support:support-annotations:23.1.1' - compile 'com.android.support:percent:23.1.1' - compile 'com.android.support:preference-v7:23.1.1' + compile 'com.android.support:support-v4:23.2.0' + compile 'com.android.support:support-v13:23.2.0' + compile 'com.android.support:appcompat-v7:23.2.0' + compile 'com.android.support:recyclerview-v7:23.2.0' + compile 'com.android.support:gridlayout-v7:23.2.0' + compile 'com.android.support:cardview-v7:23.2.0' + compile 'com.android.support:palette-v7:23.2.0' + compile 'com.android.support:design:23.2.0' + compile 'com.android.support:support-annotations:23.2.0' + compile 'com.android.support:percent:23.2.0' + compile 'com.android.support:preference-v7:23.2.0' compile 'com.github.ksoichiro:android-observablescrollview:1.6.0' compile 'com.github.kabouzeid:SeekArc:80bdd8330e' compile 'com.github.kabouzeid:AndroidSlidingUpPanel:3.2.1' compile 'com.squareup.retrofit2:retrofit:2.0.0-beta4' compile 'com.squareup.retrofit2:converter-gson:2.0.0-beta4' compile 'com.jakewharton:butterknife:7.0.1' - compile 'org.solovyev.android.views:linear-layout-manager:0.5@aar' //noinspection GradleDynamicVersion compile 'com.anjlab.android.iab.v3:library:1.0.+' compile 'de.psdev.licensesdialog:licensesdialog:1.8.0' diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java index 032d77be..d01f40d7 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java @@ -10,6 +10,7 @@ import android.support.annotation.ColorInt; import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.CardView; +import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; @@ -44,8 +45,6 @@ import com.kabouzeid.gramophone.util.ViewUtil; import com.kabouzeid.gramophone.views.WidthFitSquareLayout; import com.sothree.slidinguppanel.SlidingUpPanelLayout; -import org.solovyev.android.views.llm.LinearLayoutManager; - import butterknife.Bind; import butterknife.ButterKnife; @@ -218,7 +217,6 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove wrappedAdapter = recyclerViewDragDropManager.createWrappedAdapter(playingQueueAdapter); layoutManager = new LinearLayoutManager(getActivity()); - layoutManager.setChildSize((int) (getResources().getDisplayMetrics().density * 72)); recyclerView.setLayoutManager(layoutManager); recyclerView.setAdapter(wrappedAdapter); diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml index 45f85b6b..8b9ac349 100644 --- a/app/src/main/res/values/styles_parents.xml +++ b/app/src/main/res/values/styles_parents.xml @@ -18,7 +18,7 @@ @color/grey_900 @color/md_divider_white - @color/secondary_text_default_material_dark + @color/ate_secondary_text_dark @style/ThemeOverlay.AppCompat @@ -48,7 +48,7 @@ @color/grey_300 @color/md_divider_black - @color/secondary_text_default_material_light + @color/ate_secondary_text_light @style/ThemeOverlay.AppCompat.Light @@ -91,7 +91,7 @@