Slightly updated the album tag editor appearance to partially fix issue #23

This commit is contained in:
Karim Abou Zeid 2015-05-31 19:35:55 +02:00
commit b4e15b1e02
3 changed files with 11 additions and 18 deletions

View file

@ -173,7 +173,6 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
recyclerView = (ObservableRecyclerView) findViewById(R.id.list); recyclerView = (ObservableRecyclerView) findViewById(R.id.list);
albumTitleView = (TextView) findViewById(R.id.album_title); albumTitleView = (TextView) findViewById(R.id.album_title);
songsBackgroundView = findViewById(R.id.list_background); songsBackgroundView = findViewById(R.id.list_background);
// statusBar = findViewById(R.id.status_bar);
} }
private void setUpObservableListViewParams() { private void setUpObservableListViewParams() {
@ -301,6 +300,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
private void setUpToolBar() { private void setUpToolBar() {
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
//noinspection ConstantConditions
getSupportActionBar().setTitle(null); getSupportActionBar().setTitle(null);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
} }

View file

@ -79,7 +79,6 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
alpha = 1; alpha = 1;
} }
ViewUtil.setBackgroundAlpha(toolBar, alpha, paletteColorPrimary); ViewUtil.setBackgroundAlpha(toolBar, alpha, paletteColorPrimary);
ViewUtil.setBackgroundAlpha(header, alpha, paletteColorPrimary);
image.setTranslationY(scrollY / 2); image.setTranslationY(scrollY / 2);
} }
}; };
@ -126,12 +125,6 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
private void setUpScrollView() { private void setUpScrollView() {
scrollView.setScrollViewCallbacks(observableScrollViewCallbacks); scrollView.setScrollViewCallbacks(observableScrollViewCallbacks);
scrollView.post(new Runnable() {
@Override
public void run() {
scrollView.scrollVerticallyTo(headerVariableSpace / 2);
}
});
} }
private void setUpImageView() { private void setUpImageView() {
@ -199,10 +192,11 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
final int primaryColor = PreferenceUtils.getInstance(this).getThemeColorPrimary(); final int primaryColor = PreferenceUtils.getInstance(this).getThemeColorPrimary();
paletteColorPrimary = primaryColor; paletteColorPrimary = primaryColor;
observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false); observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false);
setStatusBarColor(primaryColor); setStatusBarColor(paletteColorPrimary);
if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(this).coloredNavigationBarTagEditorEnabled()) if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(this).coloredNavigationBarTagEditorEnabled())
setNavigationBarColor(primaryColor); setNavigationBarColor(paletteColorPrimary);
notifyTaskColorChange(primaryColor); header.setBackgroundColor(paletteColorPrimary);
notifyTaskColorChange(paletteColorPrimary);
} }
private void getIntentExtras() { private void getIntentExtras() {
@ -287,7 +281,6 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
private void applyPalette(final Bitmap bitmap) { private void applyPalette(final Bitmap bitmap) {
Palette.from(bitmap) Palette.from(bitmap)
.generate(new Palette.PaletteAsyncListener() { .generate(new Palette.PaletteAsyncListener() {
@Override @Override
public void onGenerated(Palette palette) { public void onGenerated(Palette palette) {
final Palette.Swatch vibrantSwatch = palette.getVibrantSwatch(); final Palette.Swatch vibrantSwatch = palette.getVibrantSwatch();
@ -295,10 +288,11 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
final int vibrantColor = palette.getVibrantColor(DialogUtils.resolveColor(AbsTagEditorActivity.this, R.attr.default_bar_color)); final int vibrantColor = palette.getVibrantColor(DialogUtils.resolveColor(AbsTagEditorActivity.this, R.attr.default_bar_color));
paletteColorPrimary = vibrantColor; paletteColorPrimary = vibrantColor;
observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false); observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false);
setStatusBarColor(vibrantColor); setStatusBarColor(paletteColorPrimary);
if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(AbsTagEditorActivity.this).coloredNavigationBarTagEditorEnabled()) if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(AbsTagEditorActivity.this).coloredNavigationBarTagEditorEnabled())
setNavigationBarColor(vibrantColor); setNavigationBarColor(paletteColorPrimary);
notifyTaskColorChange(vibrantColor); header.setBackgroundColor(paletteColorPrimary);
notifyTaskColorChange(paletteColorPrimary);
} else { } else {
resetColors(); resetColors();
} }
@ -318,7 +312,6 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
protected void writeValuesToFiles(final Map<FieldKey, String> fieldKeyValueMap, final Artwork artwork, final boolean deleteArtwork) { protected void writeValuesToFiles(final Map<FieldKey, String> fieldKeyValueMap, final Artwork artwork, final boolean deleteArtwork) {
Util.hideSoftKeyboard(this); Util.hideSoftKeyboard(this);
final String writingFileStr = getResources().getString(R.string.writing_file_number); final String writingFileStr = getResources().getString(R.string.writing_file_number);
//TODO dialog currently disappears on orientation change and using DialogFragment causes an exception for some reason
final MaterialDialog progressDialog = new MaterialDialog.Builder(AbsTagEditorActivity.this) final MaterialDialog progressDialog = new MaterialDialog.Builder(AbsTagEditorActivity.this)
.title(R.string.saving_changes) .title(R.string.saving_changes)
.cancelable(false) .cancelable(false)

View file

@ -26,7 +26,6 @@
android:id="@+id/header" android:id="@+id/header"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignBottom="@+id/image"
android:elevation="@dimen/toolbar_elevation" android:elevation="@dimen/toolbar_elevation"
android:minHeight="@dimen/title_view_height" android:minHeight="@dimen/title_view_height"
android:orientation="vertical" android:orientation="vertical"
@ -34,7 +33,8 @@
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp"
android:paddingTop="8dp" android:paddingTop="8dp"
tools:ignore="UnusedAttribute"> tools:ignore="UnusedAttribute"
android:layout_below="@+id/image">
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:layout_width="match_parent" android:layout_width="match_parent"