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

fix some blank image issues

Browse source
This commit is contained in:
dkanada 2020-09-21 04:09:13 +09:00
commit c00765c59e
3 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java
View file

@ -107,6 +107,7 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
itemView.setElevation(activity.getResources().getDimensionPixelSize(R.dimen.card_elevation)); itemView.setElevation(activity.getResources().getDimensionPixelSize(R.dimen.card_elevation));
} }
if (shortSeparator != null) { if (shortSeparator != null) {
shortSeparator.setVisibility(View.GONE); shortSeparator.setVisibility(View.GONE);
} }
@ -132,12 +133,12 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
break; break;
case ARTIST: case ARTIST:
setImageTransitionName(activity.getString(R.string.transition_artist_image)); setImageTransitionName(activity.getString(R.string.transition_artist_image));
View description = itemView.findViewById(R.id.text);
if (description != null) description.setVisibility(View.GONE);
break; break;
default: default:
View container = itemView.findViewById(R.id.image_container); View container = itemView.findViewById(R.id.image_container);
if (container != null) { if (container != null) container.setVisibility(View.GONE);
container.setVisibility(View.GONE);
}
break; break;
} }
} }

3
app/src/main/java/com/dkanada/gramophone/glide/CustomGlideRequest.java
View file

@ -55,8 +55,7 @@ public class CustomGlideRequest {
Object uri = item != null ? createUrl(item) : R.drawable.default_album_art; Object uri = item != null ? createUrl(item) : R.drawable.default_album_art;
return requestManager.load(uri) return requestManager.load(uri)
.apply(createRequestOptions(item)) .apply(createRequestOptions(item));
.transition(new DrawableTransitionOptions().crossFade(DEFAULT_ANIMATION));
} }
} }

27
app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java
View file

@ -9,6 +9,7 @@ import androidx.annotation.Nullable;
import com.dkanada.gramophone.databinding.ActivityMainContentBinding; import com.dkanada.gramophone.databinding.ActivityMainContentBinding;
import com.dkanada.gramophone.databinding.ActivityMainDrawerLayoutBinding; import com.dkanada.gramophone.databinding.ActivityMainDrawerLayoutBinding;
import com.dkanada.gramophone.databinding.NavigationDrawerHeaderBinding;
import com.dkanada.gramophone.dialogs.ConfirmLogoutDialog; import com.dkanada.gramophone.dialogs.ConfirmLogoutDialog;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.drawerlayout.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout;
@ -44,13 +45,11 @@ import java.util.List;
public class MainActivity extends AbsSlidingMusicPanelActivity { public class MainActivity extends AbsSlidingMusicPanelActivity {
private ActivityMainDrawerLayoutBinding binding; private ActivityMainDrawerLayoutBinding binding;
private ActivityMainContentBinding contentBinding; private ActivityMainContentBinding contentBinding;
private NavigationDrawerHeaderBinding navigationBinding;
@Nullable @Nullable
MainActivityFragmentCallbacks currentFragment; MainActivityFragmentCallbacks currentFragment;
@Nullable
private View navigationDrawerHeader;
@Nullable @Nullable
private List<BaseItemDto> libraries; private List<BaseItemDto> libraries;
@ -174,9 +173,11 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
private void updateNavigationDrawerHeader() { private void updateNavigationDrawerHeader() {
if (!MusicPlayerRemote.getPlayingQueue().isEmpty()) { if (!MusicPlayerRemote.getPlayingQueue().isEmpty()) {
Song song = MusicPlayerRemote.getCurrentSong(); Song song = MusicPlayerRemote.getCurrentSong();
if (navigationDrawerHeader == null) { if (navigationBinding == null) {
navigationDrawerHeader = binding.navigationView.inflateHeaderView(R.layout.navigation_drawer_header); navigationBinding = NavigationDrawerHeaderBinding.inflate(getLayoutInflater());
navigationDrawerHeader.setOnClickListener(v -> {
binding.navigationView.addHeaderView(navigationBinding.getRoot());
navigationBinding.getRoot().setOnClickListener(v -> {
binding.drawerLayout.closeDrawers(); binding.drawerLayout.closeDrawers();
if (getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) { if (getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
expandPanel(); expandPanel();
@ -184,17 +185,15 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
}); });
} }
((TextView) navigationDrawerHeader.findViewById(R.id.title)).setText(song.title); navigationBinding.title.setText(song.title);
((TextView) navigationDrawerHeader.findViewById(R.id.text)).setText(MusicUtil.getSongInfoString(song)); navigationBinding.text.setText(MusicUtil.getSongInfoString(song));
CustomGlideRequest.Builder CustomGlideRequest.Builder
.from(Glide.with(this), song.primary) .from(Glide.with(this), song.primary)
.build().into(((ImageView) navigationDrawerHeader.findViewById(R.id.image))); .build().into(navigationBinding.image);
} else { } else if (binding.navigationView.getHeaderCount() != 0) {
if (navigationDrawerHeader != null) { binding.navigationView.removeHeaderView(navigationBinding.getRoot());
binding.navigationView.removeHeaderView(navigationDrawerHeader); navigationBinding = null;
navigationDrawerHeader = null;
}
} }
} }