diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/RecentSearchAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/RecentSearchAdapter.java deleted file mode 100644 index e4840b2f..00000000 --- a/app/src/main/java/com/cappielloantonio/play/adapter/RecentSearchAdapter.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.cappielloantonio.play.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import androidx.recyclerview.widget.RecyclerView; - -import com.cappielloantonio.play.R; -import com.cappielloantonio.play.model.RecentSearch; - -import java.util.ArrayList; -import java.util.List; - -public class RecentSearchAdapter extends RecyclerView.Adapter { - private static final String TAG = "RecentSearchAdapter"; - - private List searches; - private LayoutInflater mInflater; - private Context context; - private ItemClickListener itemClickListener; - - public RecentSearchAdapter(Context context) { - this.context = context; - this.mInflater = LayoutInflater.from(context); - this.searches = new ArrayList<>(); - } - - @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = mInflater.inflate(R.layout.item_search_recent_searches, parent, false); - return new ViewHolder(view); - } - - @Override - public void onBindViewHolder(ViewHolder holder, int position) { - RecentSearch search = searches.get(position); - - holder.recentSearch.setText(search.getSearch()); - } - - @Override - public int getItemCount() { - return searches.size(); - } - - public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener { - TextView recentSearch; - - ViewHolder(View itemView) { - super(itemView); - - recentSearch = itemView.findViewById(R.id.recent_search_text_view); - - itemView.setOnClickListener(this); - } - - @Override - public void onClick(View view) { - if (itemClickListener != null) - itemClickListener.onItemClick(view, getBindingAdapterPosition()); - } - } - - public void setItems(List searches) { - this.searches = searches; - notifyDataSetChanged(); - } - - public RecentSearch getItem(int id) { - return searches.get(id); - } - - public void setClickListener(ItemClickListener itemClickListener) { - this.itemClickListener = itemClickListener; - } - - public interface ItemClickListener { - void onItemClick(View view, int position); - } -} diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java index 28ce7d1b..c26f58ed 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/SongResultSearchAdapter.java @@ -75,6 +75,7 @@ public class SongResultSearchAdapter extends RecyclerView.Adapter { + openMore(v); + }); + songTitle.setSelected(true); } @@ -104,11 +110,16 @@ public class SongResultSearchAdapter extends RecyclerView.Adapter songs) { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java index 86dd9cd9..468e6fb6 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java @@ -88,7 +88,7 @@ public class AlbumPageFragment extends Fragment { bind.albumNameLabel.setText(albumPageViewModel.getAlbum().getTitle()); bind.albumArtistLabel.setText(albumPageViewModel.getAlbum().getArtistName()); - bind.albumReleaseYearLabel.setText(String.valueOf(albumPageViewModel.getAlbum().getYear())); + bind.albumReleaseYearLabel.setText(albumPageViewModel.getAlbum().getYear() != 0 ? String.valueOf(albumPageViewModel.getAlbum().getYear()) : ""); albumPageViewModel.getAlbumSongList().observe(requireActivity(), songs -> { if(bind != null) { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java index b5f119fd..e944214f 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java @@ -16,15 +16,11 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.cappielloantonio.play.R; import com.cappielloantonio.play.adapter.AlbumAdapter; -import com.cappielloantonio.play.adapter.AlbumCatalogueAdapter; import com.cappielloantonio.play.adapter.ArtistAdapter; -import com.cappielloantonio.play.adapter.ArtistCatalogueAdapter; import com.cappielloantonio.play.adapter.GenreCatalogueAdapter; -import com.cappielloantonio.play.adapter.RecentSearchAdapter; import com.cappielloantonio.play.adapter.SongResultSearchAdapter; import com.cappielloantonio.play.databinding.FragmentSearchBinding; import com.cappielloantonio.play.helper.recyclerview.GridItemDecoration; -import com.cappielloantonio.play.model.RecentSearch; import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.ui.activities.MainActivity; import com.cappielloantonio.play.util.PreferenceUtil; @@ -33,8 +29,6 @@ import com.paulrybitskyi.persistentsearchview.adapters.model.SuggestionItem; import com.paulrybitskyi.persistentsearchview.listeners.OnSuggestionChangeListener; import com.paulrybitskyi.persistentsearchview.utils.SuggestionCreationUtil; -import java.util.ArrayList; - public class SearchFragment extends Fragment { private static final String TAG = "SearchFragment"; diff --git a/app/src/main/res/drawable/gradient_backdrop_background_image.xml b/app/src/main/res/drawable/gradient_backdrop_background_image.xml index 7d92f503..ef1747d5 100644 --- a/app/src/main/res/drawable/gradient_backdrop_background_image.xml +++ b/app/src/main/res/drawable/gradient_backdrop_background_image.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_more_vert.xml b/app/src/main/res/drawable/ic_more_vert.xml new file mode 100644 index 00000000..23f95efa --- /dev/null +++ b/app/src/main/res/drawable/ic_more_vert.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/fragment_album_page.xml b/app/src/main/res/layout/fragment_album_page.xml index 75fe44a7..dc27100e 100644 --- a/app/src/main/res/layout/fragment_album_page.xml +++ b/app/src/main/res/layout/fragment_album_page.xml @@ -1,6 +1,5 @@ - + app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light" + app:titleTextColor="@color/titleTextColor" /> + android:clipChildren="false" + app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@+id/album_cover_image_view" /> + app:layout_constraintTop_toBottomOf="@+id/album_name_label" /> + app:layout_constraintTop_toBottomOf="@+id/album_artist_label" /> + app:elevation="0dp" + app:layout_constraintBottom_toBottomOf="@+id/album_cover_image_view" + app:layout_constraintStart_toEndOf="@+id/album_cover_image_view" /> - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/album_cover_image_view" />