add two strings back and ignore artist activity result
This commit is contained in:
parent
c9300d0395
commit
a011c43fec
10 changed files with 13 additions and 25 deletions
|
|
@ -43,7 +43,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
|
||||||
|
|
||||||
protected int itemLayoutRes;
|
protected int itemLayoutRes;
|
||||||
|
|
||||||
protected boolean usePalette = false;
|
protected boolean usePalette;
|
||||||
|
|
||||||
public AlbumAdapter(@NonNull AppCompatActivity activity, List<Album> dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) {
|
public AlbumAdapter(@NonNull AppCompatActivity activity, List<Album> dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) {
|
||||||
super(activity, cabHolder, R.menu.menu_media_selection);
|
super(activity, cabHolder, R.menu.menu_media_selection);
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
|
||||||
|
|
||||||
protected int itemLayoutRes;
|
protected int itemLayoutRes;
|
||||||
|
|
||||||
protected boolean usePalette = false;
|
protected boolean usePalette;
|
||||||
|
|
||||||
public ArtistAdapter(@NonNull AppCompatActivity activity, List<Artist> dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) {
|
public ArtistAdapter(@NonNull AppCompatActivity activity, List<Artist> dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) {
|
||||||
super(activity, cabHolder, R.menu.menu_media_selection);
|
super(activity, cabHolder, R.menu.menu_media_selection);
|
||||||
|
|
@ -168,7 +168,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
|
||||||
private List<Song> getSongList(@NonNull List<Artist> artists) {
|
private List<Song> getSongList(@NonNull List<Artist> artists) {
|
||||||
final List<Song> songs = new ArrayList<>();
|
final List<Song> songs = new ArrayList<>();
|
||||||
for (Artist artist : artists) {
|
for (Artist artist : artists) {
|
||||||
songs.addAll(artist.getSongs()); // maybe async in future?
|
songs.addAll(artist.getSongs());
|
||||||
}
|
}
|
||||||
return songs;
|
return songs;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,8 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
|
||||||
|
|
||||||
protected int itemLayoutRes;
|
protected int itemLayoutRes;
|
||||||
|
|
||||||
protected boolean usePalette = false;
|
protected boolean usePalette;
|
||||||
protected boolean showSectionName = true;
|
protected boolean showSectionName;
|
||||||
|
|
||||||
public SongAdapter(AppCompatActivity activity, List<Song> dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) {
|
public SongAdapter(AppCompatActivity activity, List<Song> dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) {
|
||||||
this(activity, dataSet, itemLayoutRes, usePalette, cabHolder, true);
|
this(activity, dataSet, itemLayoutRes, usePalette, cabHolder, true);
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,6 @@ public class Artist implements Parcelable {
|
||||||
Artist artist = (Artist) o;
|
Artist artist = (Artist) o;
|
||||||
|
|
||||||
return albums != null ? albums.equals(artist.albums) : artist.albums == null;
|
return albums != null ? albums.equals(artist.albums) : artist.albums == null;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -85,7 +84,6 @@ public class Artist implements Parcelable {
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int describeContents() {
|
public int describeContents() {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
||||||
|
|
@ -41,10 +41,7 @@ public class Playlist implements Parcelable {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "Playlist{" +
|
return "Playlist{" + "id=" + id + ", name='" + name + '\'' + '}';
|
||||||
"id=" + id +
|
|
||||||
", name='" + name + '\'' +
|
|
||||||
'}';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@ public class FrequentPlaylist extends AbsSmartPlaylist {
|
||||||
SongPlayCountStore.getInstance(context).clear();
|
SongPlayCountStore.getInstance(context).clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int describeContents() {
|
public int describeContents() {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
||||||
|
|
@ -14,11 +14,9 @@ import android.widget.LinearLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import com.kabouzeid.appthemehelper.ThemeStore;
|
import com.kabouzeid.appthemehelper.ThemeStore;
|
||||||
import com.kabouzeid.gramophone.App;
|
|
||||||
import com.kabouzeid.gramophone.R;
|
import com.kabouzeid.gramophone.R;
|
||||||
import com.kabouzeid.gramophone.dialogs.DonationsDialog;
|
import com.kabouzeid.gramophone.dialogs.DonationsDialog;
|
||||||
import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
|
import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
|
||||||
import com.kabouzeid.gramophone.ui.activities.bugreport.BugReportActivity;
|
|
||||||
|
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
|
|
@ -172,7 +170,7 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
|
||||||
} else if (v == visitWebsite) {
|
} else if (v == visitWebsite) {
|
||||||
openUrl(WEBSITE);
|
openUrl(WEBSITE);
|
||||||
} else if (v == reportBugs) {
|
} else if (v == reportBugs) {
|
||||||
startActivity(new Intent(this, BugReportActivity.class));
|
openUrl(GITHUB);
|
||||||
} else if (v == writeAnEmail) {
|
} else if (v == writeAnEmail) {
|
||||||
Intent intent = new Intent(Intent.ACTION_SENDTO);
|
Intent intent = new Intent(Intent.ACTION_SENDTO);
|
||||||
intent.setData(Uri.parse("mailto:contact@kabouzeid.com"));
|
intent.setData(Uri.parse("mailto:contact@kabouzeid.com"));
|
||||||
|
|
|
||||||
|
|
@ -158,7 +158,8 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
|
||||||
setTaskDescriptionColor(color);
|
setTaskDescriptionColor(color);
|
||||||
|
|
||||||
toolbar.setBackgroundColor(color);
|
toolbar.setBackgroundColor(color);
|
||||||
setSupportActionBar(toolbar); // needed to auto readjust the toolbar content color
|
// needed to auto readjust the toolbar content color
|
||||||
|
setSupportActionBar(toolbar);
|
||||||
setStatusbarColor(color);
|
setStatusbarColor(color);
|
||||||
|
|
||||||
int secondaryTextColor = MaterialValueHelper.getSecondaryTextColor(this, ColorUtil.isColorLight(color));
|
int secondaryTextColor = MaterialValueHelper.getSecondaryTextColor(this, ColorUtil.isColorLight(color));
|
||||||
|
|
|
||||||
|
|
@ -195,14 +195,6 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
|
||||||
if (resultCode == RESULT_OK) {
|
|
||||||
reload();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getPaletteColor() {
|
public int getPaletteColor() {
|
||||||
return toolbarColor;
|
return toolbarColor;
|
||||||
|
|
@ -216,7 +208,8 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
|
||||||
setTaskDescriptionColor(color);
|
setTaskDescriptionColor(color);
|
||||||
|
|
||||||
toolbar.setBackgroundColor(color);
|
toolbar.setBackgroundColor(color);
|
||||||
setSupportActionBar(toolbar); // needed to auto readjust the toolbar content color
|
// needed to auto readjust the toolbar content color
|
||||||
|
setSupportActionBar(toolbar);
|
||||||
setStatusbarColor(color);
|
setStatusbarColor(color);
|
||||||
|
|
||||||
int secondaryTextColor = MaterialValueHelper.getSecondaryTextColor(this, ColorUtil.isColorLight(color));
|
int secondaryTextColor = MaterialValueHelper.getSecondaryTextColor(this, ColorUtil.isColorLight(color));
|
||||||
|
|
|
||||||
|
|
@ -170,6 +170,8 @@
|
||||||
<string name="write_an_email">Write an email</string>
|
<string name="write_an_email">Write an email</string>
|
||||||
<string name="follow_on_twitter">Follow on Twitter</string>
|
<string name="follow_on_twitter">Follow on Twitter</string>
|
||||||
<string name="visit_website">Visit website</string>
|
<string name="visit_website">Visit website</string>
|
||||||
|
<string name="report_bugs">Report bugs</string>
|
||||||
|
<string name="report_bugs_summary">Report bugs or request new features.</string>
|
||||||
<string name="translate">Translate</string>
|
<string name="translate">Translate</string>
|
||||||
<string name="translate_summary">Help translating Phonograph to your native language.</string>
|
<string name="translate_summary">Help translating Phonograph to your native language.</string>
|
||||||
<string name="rate_on_google_play">Rate</string>
|
<string name="rate_on_google_play">Rate</string>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue