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

add two strings back and ignore artist activity result

Browse source
This commit is contained in:
dkanada 2019-11-25 02:27:46 +09:00
commit a011c43fec
10 changed files with 13 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java
View file

@ -43,7 +43,7 @@ public class AlbumAdapter extends AbsMultiSelectAdapter<AlbumAdapter.ViewHolder,
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) {
super(activity, cabHolder, R.menu.menu_media_selection);

4
app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java
View file

@ -42,7 +42,7 @@ public class ArtistAdapter extends AbsMultiSelectAdapter<ArtistAdapter.ViewHolde
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) {
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) {
final List<Song> songs = new ArrayList<>();
for (Artist artist : artists) {
songs.addAll(artist.getSongs()); // maybe async in future?
songs.addAll(artist.getSongs());
}
return songs;
}

4
app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java
View file

@ -43,8 +43,8 @@ public class SongAdapter extends AbsMultiSelectAdapter<SongAdapter.ViewHolder, S
protected int itemLayoutRes;
protected boolean usePalette = false;
protected boolean showSectionName = true;
protected boolean usePalette;
protected boolean showSectionName;
public SongAdapter(AppCompatActivity activity, List<Song> dataSet, @LayoutRes int itemLayoutRes, boolean usePalette, @Nullable CabHolder cabHolder) {
this(activity, dataSet, itemLayoutRes, usePalette, cabHolder, true);

2
app/src/main/java/com/kabouzeid/gramophone/model/Artist.java
View file

@ -70,7 +70,6 @@ public class Artist implements Parcelable {
Artist artist = (Artist) o;
return albums != null ? albums.equals(artist.albums) : artist.albums == null;
}
@Override
@ -85,7 +84,6 @@ public class Artist implements Parcelable {
'}';
}
@Override
public int describeContents() {
return 0;

5
app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java
View file

@ -41,10 +41,7 @@ public class Playlist implements Parcelable {
@Override
public String toString() {
return "Playlist{" +
"id=" + id +
", name='" + name + '\'' +
'}';
return "Playlist{" + "id=" + id + ", name='" + name + '\'' + '}';
}
@Override

1
app/src/main/java/com/kabouzeid/gramophone/model/playlist/FrequentPlaylist.java
View file

@ -31,7 +31,6 @@ public class FrequentPlaylist extends AbsSmartPlaylist {
SongPlayCountStore.getInstance(context).clear();
}
@Override
public int describeContents() {
return 0;

4
app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java
View file

@ -14,11 +14,9 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.kabouzeid.appthemehelper.ThemeStore;
import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.dialogs.DonationsDialog;
import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
import com.kabouzeid.gramophone.ui.activities.bugreport.BugReportActivity;
import butterknife.BindView;
import butterknife.ButterKnife;
@ -172,7 +170,7 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
} else if (v == visitWebsite) {
openUrl(WEBSITE);
} else if (v == reportBugs) {
startActivity(new Intent(this, BugReportActivity.class));
openUrl(GITHUB);
} else if (v == writeAnEmail) {
Intent intent = new Intent(Intent.ACTION_SENDTO);
intent.setData(Uri.parse("mailto:contact@kabouzeid.com"));

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

@ -158,7 +158,8 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
setTaskDescriptionColor(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);
int secondaryTextColor = MaterialValueHelper.getSecondaryTextColor(this, ColorUtil.isColorLight(color));

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

@ -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
public int getPaletteColor() {
return toolbarColor;
@ -216,7 +208,8 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
setTaskDescriptionColor(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);
int secondaryTextColor = MaterialValueHelper.getSecondaryTextColor(this, ColorUtil.isColorLight(color));

2
app/src/main/res/values/strings.xml
View file

@ -170,6 +170,8 @@
<string name="write_an_email">Write an email</string>
<string name="follow_on_twitter">Follow on Twitter</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_summary">Help translating Phonograph to your native language.</string>
<string name="rate_on_google_play">Rate</string>