Removed unnecessary libs and replaced the jaudiotagger jar with a custom one specially or android.
This commit is contained in:
parent
d56db46794
commit
fdc9be9908
8 changed files with 15 additions and 46 deletions
|
|
@ -50,7 +50,6 @@ android {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
compile files('../libs/jaudiotagger-2.0.4-20111207.115108-15.jar')
|
|
||||||
compile('com.crashlytics.sdk.android:crashlytics:2.2.1@aar') {
|
compile('com.crashlytics.sdk.android:crashlytics:2.2.1@aar') {
|
||||||
transitive = true;
|
transitive = true;
|
||||||
}
|
}
|
||||||
|
|
@ -66,8 +65,6 @@ dependencies {
|
||||||
compile 'com.github.ksoichiro:android-observablescrollview:1.5.1'
|
compile 'com.github.ksoichiro:android-observablescrollview:1.5.1'
|
||||||
compile 'asia.ivity.android:drag-sort-listview:1.0'
|
compile 'asia.ivity.android:drag-sort-listview:1.0'
|
||||||
|
|
||||||
compile 'com.nineoldandroids:library:2.4.0'
|
|
||||||
|
|
||||||
compile 'com.mcxiaoke.volley:library:1.0.16'
|
compile 'com.mcxiaoke.volley:library:1.0.16'
|
||||||
compile 'com.squareup:otto:1.3.7'
|
compile 'com.squareup:otto:1.3.7'
|
||||||
compile 'de.hdodenhof:circleimageview:1.3.0'
|
compile 'de.hdodenhof:circleimageview:1.3.0'
|
||||||
|
|
@ -75,5 +72,4 @@ dependencies {
|
||||||
|
|
||||||
compile 'com.afollestad:material-dialogs:0.7.5.0'
|
compile 'com.afollestad:material-dialogs:0.7.5.0'
|
||||||
compile 'com.afollestad:material-cab:0.1.3'
|
compile 'com.afollestad:material-cab:0.1.3'
|
||||||
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
BIN
app/libs/jaudiotagger-android-2.2.3.jar
Normal file
BIN
app/libs/jaudiotagger-android-2.2.3.jar
Normal file
Binary file not shown.
|
|
@ -12,6 +12,8 @@ import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
|
||||||
import com.squareup.otto.Bus;
|
import com.squareup.otto.Bus;
|
||||||
import com.squareup.otto.ThreadEnforcer;
|
import com.squareup.otto.ThreadEnforcer;
|
||||||
|
|
||||||
|
import org.jaudiotagger.tag.TagOptionSingleton;
|
||||||
|
|
||||||
import io.fabric.sdk.android.Fabric;
|
import io.fabric.sdk.android.Fabric;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -30,6 +32,7 @@ public class App extends Application {
|
||||||
MusicPlayerRemote.init(this);
|
MusicPlayerRemote.init(this);
|
||||||
ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).build();
|
ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).build();
|
||||||
ImageLoader.getInstance().init(config);
|
ImageLoader.getInstance().init(config);
|
||||||
|
TagOptionSingleton.getInstance().isAndroid();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addToVolleyRequestQueue(Request request) {
|
public void addToVolleyRequestQueue(Request request) {
|
||||||
|
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
package com.kabouzeid.gramophone.misc;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author Karim Abou Zeid (kabouzeid)
|
|
||||||
*/
|
|
||||||
public class SmallAnimatorListener implements com.nineoldandroids.animation.Animator.AnimatorListener {
|
|
||||||
@Override
|
|
||||||
public void onAnimationStart(com.nineoldandroids.animation.Animator animation) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onAnimationEnd(com.nineoldandroids.animation.Animator animation) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onAnimationCancel(com.nineoldandroids.animation.Animator animation) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onAnimationRepeat(com.nineoldandroids.animation.Animator animation) {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -46,7 +46,6 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
|
||||||
import com.kabouzeid.gramophone.util.PreferenceUtils;
|
import com.kabouzeid.gramophone.util.PreferenceUtils;
|
||||||
import com.kabouzeid.gramophone.util.Util;
|
import com.kabouzeid.gramophone.util.Util;
|
||||||
import com.kabouzeid.gramophone.util.ViewUtil;
|
import com.kabouzeid.gramophone.util.ViewUtil;
|
||||||
import com.nineoldandroids.view.ViewHelper;
|
|
||||||
import com.nostra13.universalimageloader.core.DisplayImageOptions;
|
import com.nostra13.universalimageloader.core.DisplayImageOptions;
|
||||||
import com.nostra13.universalimageloader.core.ImageLoader;
|
import com.nostra13.universalimageloader.core.ImageLoader;
|
||||||
import com.nostra13.universalimageloader.core.assist.FailReason;
|
import com.nostra13.universalimageloader.core.assist.FailReason;
|
||||||
|
|
@ -90,10 +89,10 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
|
||||||
float flexibleRange = albumArtViewHeight - headerOffset;
|
float flexibleRange = albumArtViewHeight - headerOffset;
|
||||||
|
|
||||||
// Translate album cover
|
// Translate album cover
|
||||||
ViewHelper.setTranslationY(albumArtImageView, Math.max(-albumArtViewHeight, -scrollY / 2));
|
albumArtImageView.setTranslationY(Math.max(-albumArtViewHeight, -scrollY / 2));
|
||||||
|
|
||||||
// Translate list background
|
// Translate list background
|
||||||
ViewHelper.setTranslationY(songsBackgroundView, Math.max(0, -scrollY + albumArtViewHeight));
|
songsBackgroundView.setTranslationY(Math.max(0, -scrollY + albumArtViewHeight));
|
||||||
|
|
||||||
// Change alpha of overlay
|
// Change alpha of overlay
|
||||||
toolbarAlpha = Math.max(0, Math.min(1, (float) scrollY / flexibleRange));
|
toolbarAlpha = Math.max(0, Math.min(1, (float) scrollY / flexibleRange));
|
||||||
|
|
@ -105,7 +104,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
|
||||||
int titleTranslationY = maxTitleTranslationY - scrollY;
|
int titleTranslationY = maxTitleTranslationY - scrollY;
|
||||||
titleTranslationY = Math.max(headerOffset, titleTranslationY);
|
titleTranslationY = Math.max(headerOffset, titleTranslationY);
|
||||||
|
|
||||||
ViewHelper.setTranslationY(albumTitleView, titleTranslationY);
|
albumTitleView.setTranslationY(titleTranslationY);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,6 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
|
||||||
import com.kabouzeid.gramophone.util.PreferenceUtils;
|
import com.kabouzeid.gramophone.util.PreferenceUtils;
|
||||||
import com.kabouzeid.gramophone.util.Util;
|
import com.kabouzeid.gramophone.util.Util;
|
||||||
import com.kabouzeid.gramophone.util.ViewUtil;
|
import com.kabouzeid.gramophone.util.ViewUtil;
|
||||||
import com.nineoldandroids.view.ViewHelper;
|
|
||||||
import com.nostra13.universalimageloader.core.DisplayImageOptions;
|
import com.nostra13.universalimageloader.core.DisplayImageOptions;
|
||||||
import com.nostra13.universalimageloader.core.ImageLoader;
|
import com.nostra13.universalimageloader.core.ImageLoader;
|
||||||
import com.nostra13.universalimageloader.core.assist.FailReason;
|
import com.nostra13.universalimageloader.core.assist.FailReason;
|
||||||
|
|
@ -103,10 +102,10 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor
|
||||||
float flexibleRange = artistImageViewHeight - headerOffset;
|
float flexibleRange = artistImageViewHeight - headerOffset;
|
||||||
|
|
||||||
// Translate album cover
|
// Translate album cover
|
||||||
ViewHelper.setTranslationY(artistImage, Math.max(-artistImageViewHeight, -scrollY / 2));
|
artistImage.setTranslationY(Math.max(-artistImageViewHeight, -scrollY / 2));
|
||||||
|
|
||||||
// Translate list background
|
// Translate list background
|
||||||
ViewHelper.setTranslationY(songsBackgroundView, Math.max(0, -scrollY + artistImageViewHeight));
|
songsBackgroundView.setTranslationY(Math.max(0, -scrollY + artistImageViewHeight));
|
||||||
|
|
||||||
// Change alpha of overlay
|
// Change alpha of overlay
|
||||||
toolbarAlpha = Math.max(0, Math.min(1, (float) scrollY / flexibleRange));
|
toolbarAlpha = Math.max(0, Math.min(1, (float) scrollY / flexibleRange));
|
||||||
|
|
@ -118,12 +117,11 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor
|
||||||
int titleTranslationY = maxTitleTranslationY - scrollY;
|
int titleTranslationY = maxTitleTranslationY - scrollY;
|
||||||
titleTranslationY = Math.max(headerOffset, titleTranslationY);
|
titleTranslationY = Math.max(headerOffset, titleTranslationY);
|
||||||
|
|
||||||
ViewHelper.setTranslationY(artistNameTv, titleTranslationY);
|
artistNameTv.setTranslationY(titleTranslationY);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
setStatusBarTransparent();
|
setStatusBarTransparent();
|
||||||
|
|
@ -144,6 +142,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor
|
||||||
setUpViews();
|
setUpViews();
|
||||||
|
|
||||||
setSupportActionBar(toolbar);
|
setSupportActionBar(toolbar);
|
||||||
|
//noinspection ConstantConditions
|
||||||
getSupportActionBar().setTitle(null);
|
getSupportActionBar().setTitle(null);
|
||||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,8 +32,6 @@ import com.kabouzeid.gramophone.util.MusicUtil;
|
||||||
import com.kabouzeid.gramophone.util.PreferenceUtils;
|
import com.kabouzeid.gramophone.util.PreferenceUtils;
|
||||||
import com.kabouzeid.gramophone.util.Util;
|
import com.kabouzeid.gramophone.util.Util;
|
||||||
import com.kabouzeid.gramophone.util.ViewUtil;
|
import com.kabouzeid.gramophone.util.ViewUtil;
|
||||||
import com.nineoldandroids.view.ViewHelper;
|
|
||||||
import com.nineoldandroids.view.ViewPropertyAnimator;
|
|
||||||
import com.nostra13.universalimageloader.core.ImageLoader;
|
import com.nostra13.universalimageloader.core.ImageLoader;
|
||||||
|
|
||||||
import org.jaudiotagger.audio.AudioFile;
|
import org.jaudiotagger.audio.AudioFile;
|
||||||
|
|
@ -77,12 +75,12 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
|
||||||
if (!isInNoImageMode) {
|
if (!isInNoImageMode) {
|
||||||
alpha = 1 - (float) Math.max(0, headerVariableSpace - scrollY) / headerVariableSpace;
|
alpha = 1 - (float) Math.max(0, headerVariableSpace - scrollY) / headerVariableSpace;
|
||||||
} else {
|
} else {
|
||||||
ViewHelper.setTranslationY(header, scrollY);
|
header.setTranslationY(scrollY);
|
||||||
alpha = 1;
|
alpha = 1;
|
||||||
}
|
}
|
||||||
ViewUtil.setBackgroundAlpha(toolBar, alpha, paletteColorPrimary);
|
ViewUtil.setBackgroundAlpha(toolBar, alpha, paletteColorPrimary);
|
||||||
ViewUtil.setBackgroundAlpha(header, alpha, paletteColorPrimary);
|
ViewUtil.setBackgroundAlpha(header, alpha, paletteColorPrimary);
|
||||||
ViewHelper.setTranslationY(image, scrollY / 2);
|
image.setTranslationY(scrollY / 2);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
private List<String> songPaths;
|
private List<String> songPaths;
|
||||||
|
|
@ -182,8 +180,8 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
|
||||||
protected abstract void deleteImage();
|
protected abstract void deleteImage();
|
||||||
|
|
||||||
private void setUpFab() {
|
private void setUpFab() {
|
||||||
ViewHelper.setScaleX(fab, 0);
|
fab.setScaleX(0);
|
||||||
ViewHelper.setScaleY(fab, 0);
|
fab.setScaleY(0);
|
||||||
fab.setEnabled(false);
|
fab.setEnabled(false);
|
||||||
fab.setOnClickListener(new View.OnClickListener() {
|
fab.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -263,7 +261,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void showFab() {
|
private void showFab() {
|
||||||
ViewPropertyAnimator.animate(fab)
|
fab.animate()
|
||||||
.setDuration(500)
|
.setDuration(500)
|
||||||
.setInterpolator(new OvershootInterpolator())
|
.setInterpolator(new OvershootInterpolator())
|
||||||
.scaleX(1)
|
.scaleX(1)
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue