tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed unnecessary libs and replaced the jaudiotagger jar with a custom one specially or android.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-05-31 18:02:55 +02:00
commit fdc9be9908
8 changed files with 15 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
View file

@ -46,7 +46,6 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.nineoldandroids.view.ViewHelper;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.FailReason;
@ -90,10 +89,10 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
float flexibleRange = albumArtViewHeight - headerOffset;
// Translate album cover
ViewHelper.setTranslationY(albumArtImageView, Math.max(-albumArtViewHeight, -scrollY / 2));
albumArtImageView.setTranslationY(Math.max(-albumArtViewHeight, -scrollY / 2));
// Translate list background
ViewHelper.setTranslationY(songsBackgroundView, Math.max(0, -scrollY + albumArtViewHeight));
songsBackgroundView.setTranslationY(Math.max(0, -scrollY + albumArtViewHeight));
// Change alpha of overlay
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;
titleTranslationY = Math.max(headerOffset, titleTranslationY);
ViewHelper.setTranslationY(albumTitleView, titleTranslationY);
albumTitleView.setTranslationY(titleTranslationY);
}
};

9
app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
View file

@ -54,7 +54,6 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.nineoldandroids.view.ViewHelper;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.FailReason;
@ -103,10 +102,10 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor
float flexibleRange = artistImageViewHeight - headerOffset;
// Translate album cover
ViewHelper.setTranslationY(artistImage, Math.max(-artistImageViewHeight, -scrollY / 2));
artistImage.setTranslationY(Math.max(-artistImageViewHeight, -scrollY / 2));
// Translate list background
ViewHelper.setTranslationY(songsBackgroundView, Math.max(0, -scrollY + artistImageViewHeight));
songsBackgroundView.setTranslationY(Math.max(0, -scrollY + artistImageViewHeight));
// Change alpha of overlay
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;
titleTranslationY = Math.max(headerOffset, titleTranslationY);
ViewHelper.setTranslationY(artistNameTv, titleTranslationY);
artistNameTv.setTranslationY(titleTranslationY);
}
};
@Override
protected void onCreate(Bundle savedInstanceState) {
setStatusBarTransparent();
@ -144,6 +142,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor
setUpViews();
setSupportActionBar(toolbar);
//noinspection ConstantConditions
getSupportActionBar().setTitle(null);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

12
app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
View file

@ -32,8 +32,6 @@ import com.kabouzeid.gramophone.util.MusicUtil;
import com.kabouzeid.gramophone.util.PreferenceUtils;
import com.kabouzeid.gramophone.util.Util;
import com.kabouzeid.gramophone.util.ViewUtil;
import com.nineoldandroids.view.ViewHelper;
import com.nineoldandroids.view.ViewPropertyAnimator;
import com.nostra13.universalimageloader.core.ImageLoader;
import org.jaudiotagger.audio.AudioFile;
@ -77,12 +75,12 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
if (!isInNoImageMode) {
alpha = 1 - (float) Math.max(0, headerVariableSpace - scrollY) / headerVariableSpace;
} else {
ViewHelper.setTranslationY(header, scrollY);
header.setTranslationY(scrollY);
alpha = 1;
}
ViewUtil.setBackgroundAlpha(toolBar, alpha, paletteColorPrimary);
ViewUtil.setBackgroundAlpha(header, alpha, paletteColorPrimary);
ViewHelper.setTranslationY(image, scrollY / 2);
image.setTranslationY(scrollY / 2);
}
};
private List<String> songPaths;
@ -182,8 +180,8 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
protected abstract void deleteImage();
private void setUpFab() {
ViewHelper.setScaleX(fab, 0);
ViewHelper.setScaleY(fab, 0);
fab.setScaleX(0);
fab.setScaleY(0);
fab.setEnabled(false);
fab.setOnClickListener(new View.OnClickListener() {
@Override
@ -263,7 +261,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
}
private void showFab() {
ViewPropertyAnimator.animate(fab)
fab.animate()
.setDuration(500)
.setInterpolator(new OvershootInterpolator())
.scaleX(1)