Skip to content

FEAT: Music Player UI Enhanced #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cpg merged 18 commits into from
Jul 6, 2020
Merged

FEAT: Music Player UI Enhanced #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
891031f
Crash Solved Happing Due to lack Of Permissions
samarth30 Jan 3, 2020
1ff078b
Crash Solved Happing Due to lack Of Permissions and added dilogue box
samarth30 Jan 3, 2020
b93983d
Crash Solved Happening Due to lack Of Permissions and added dilogue box
samarth30 Jan 3, 2020
b431ed5
Connection Error solved
samarth30 Jan 5, 2020
4900512
fixed the connection error in apps navigation
samarth30 Jan 5, 2020
e2327ee
Connection Error solved Final
samarth30 Jan 5, 2020
49b088e
UI Enhanced
samarth30 Jan 6, 2020
efe5b8a
Merge branch 'beta' into enhancementmusicplayer
chirag-jn Jul 6, 2020
a37fbca
reset new issue template
chirag-jn Jul 6, 2020
5318fd7
clean code
chirag-jn Jul 6, 2020
06660fe
clean code
chirag-jn Jul 6, 2020
16d72dc
clean code
chirag-jn Jul 6, 2020
6c78b23
clean code
chirag-jn Jul 6, 2020
b35e114
remove animatoo
chirag-jn Jul 6, 2020
e553429
clean code
chirag-jn Jul 6, 2020
1889375
clean code
chirag-jn Jul 6, 2020
6c432ba
clean code
chirag-jn Jul 6, 2020
f667d4a
clean code
chirag-jn Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/amahi/anywhere/activity/ExpandedControlsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ public boolean onCreateOptionsMenu(Menu menu) {
CastButtonFactory.setUpMediaRouteButton(this, menu, R.id.media_route_menu_item);
return true;
}
}
}
18 changes: 10 additions & 8 deletions src/main/java/org/amahi/anywhere/activity/ServerFileAudioActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@
import android.os.Bundle;
import android.os.IBinder;
import android.os.Parcelable;

import androidx.appcompat.widget.Toolbar;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.ImageButton;
import android.widget.MediaController;
import android.widget.TextView;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.viewpager.widget.ViewPager;

import com.google.android.exoplayer2.ui.PlayerControlView;
import com.google.android.gms.cast.MediaInfo;
import com.google.android.gms.cast.MediaLoadOptions;
Expand Down Expand Up @@ -151,8 +151,10 @@ private void setUpInjections() {
private void setUpHomeNavigation() {
Toolbar toolbar = findViewById(R.id.toolbar_audio);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowHomeEnabled(true);
if(getSupportActionBar()!=null) {
getSupportActionBar().setDisplayShowHomeEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
}

private void setUpCast() {
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/org/amahi/anywhere/fragment/AudioControllerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import android.graphics.Bitmap;
import android.os.Bundle;
import android.os.Handler;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -14,6 +12,9 @@
import android.widget.RelativeLayout;
import android.widget.TextView;

import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;

import com.squareup.otto.Subscribe;

import org.amahi.anywhere.R;
Expand Down Expand Up @@ -69,7 +70,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
if (audioService.getAudioPlayer().getPlayWhenReady()) {
playPauseButton.setImageResource(R.drawable.lb_ic_play);
playPauseButton.setContentDescription(getResources().getString(R.string.play_the_audio));
} else {
} else {
playPauseButton.setImageResource(R.drawable.lb_ic_pause);
playPauseButton.setContentDescription(getResources().getString(R.string.pause_the_audio));
}
Expand All @@ -90,9 +91,9 @@ public void connect(AudioService audioService) {

if (audioService.getAudioPlayer().getPlayWhenReady()) {
playPauseButton.setImageResource(R.drawable.lb_ic_pause);
} else {
} else {
playPauseButton.setImageResource(R.drawable.lb_ic_play);
}
}

AudioMetadataFormatter formatter = audioService.getAudioMetadataFormatter();
if (formatter != null) {
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/amahi/anywhere/tv/fragment/TvPlaybackAudioFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ private void setUpRows() {
playbackControlsRowPresenter.setProgressColor(Color.WHITE);
playbackControlsRowPresenter.setOnActionClickedListener(action -> {
if (action.getId() == mPlayPauseAction.getId()) {
togglePlayPause(mPlayPauseAction.getIndex() == PlaybackControlsRow.PlayPauseAction.PAUSE);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
togglePlayPause(mPlayPauseAction.getIndex() == PlaybackControlsRow.PlayPauseAction.PAUSE);
}
} else if (action.getId() == mRewindAction.getId()) {
rewind();
} else if (action.getId() == mFastForwardAction.getId()) {
Expand Down
27 changes: 15 additions & 12 deletions src/main/res/layout/activity_server_file_audio.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
-->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/layout_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -29,10 +30,12 @@
android:layout_height="match_parent" />

<com.google.android.exoplayer2.ui.PlayerControlView
android:id="@+id/control_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/control_view"
android:layout_gravity="bottom"/>
android:layout_gravity="bottom"
android:focusable="true"
app:shutter_background_color="@android:color/transparent" />

<FrameLayout
android:id="@+id/audio_list_container"
Expand All @@ -41,39 +44,39 @@
android:layout_marginTop="?attr/actionBarSize" />

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_audio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/toolbar_audio"
android:background="@color/background_secondary"
android:background="@android:color/transparent"
android:elevation="4dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingEnd="8dp"
android:paddingStart="8dp">
android:paddingStart="8dp"
android:paddingEnd="8dp">

<TextView
android:id="@+id/text_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:maxLines="1"
android:textSize="@dimen/text_medium"
android:text="Audio Title"
android:layout_gravity="center_horizontal"
android:textColor="@color/primary_text"/>
android:textColor="@color/primary_text"
android:textSize="@dimen/text_medium" />

<TextView
android:id="@+id/text_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:maxLines="1"
android:textSize="@dimen/text_micro"
android:text="Audio Subtitle"
android:layout_gravity="center_horizontal"
android:textColor="@color/secondary_text"/>
android:textColor="@color/secondary_text"
android:textSize="@dimen/text_micro" />

</LinearLayout>
</androidx.appcompat.widget.Toolbar>
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/exo_player_control_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_gravity="bottom"
android:layoutDirection="ltr"
android:background="@color/background_secondary"
android:background="@android:color/transparent"
android:orientation="vertical"
tools:targetApi="28">

Expand Down
19 changes: 9 additions & 10 deletions src/main/res/layout/fragment_audio_controller.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
-->

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/audio_controller"
android:layout_width="match_parent"
android:layout_height="64dp"
Expand All @@ -37,7 +37,6 @@

<ImageButton

app:contentDescription="@string/stop_the_audio"
android:id="@+id/stop_audio_btn"
android:layout_width="64dp"
android:layout_height="64dp"
Expand All @@ -46,7 +45,7 @@
android:padding="16dp"
android:scaleType="centerCrop"
android:src="@drawable/ic_close_24dp"
/>
app:contentDescription="@string/stop_the_audio" />

<ImageButton
android:id="@+id/play_pause_btn"
Expand All @@ -63,30 +62,30 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="64dp"
android:layout_toEndOf="@id/art_image_view"
android:layout_toStartOf="@id/play_pause_btn"
android:layout_toEndOf="@id/art_image_view"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingEnd="8dp"
android:paddingStart="8dp">
android:paddingStart="8dp"
android:paddingEnd="8dp">

<TextView
android:id="@+id/audio_title_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@color/primary_text"
android:textSize="@dimen/text_micro"
tools:text="Audio Title"
android:textColor="@color/primary_text"/>
tools:text="Audio Title" />

<TextView
android:id="@+id/audio_subtitle_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@color/secondary_text"
android:textSize="@dimen/text_micro"
tools:text="Audio Subtitle"
android:textColor="@color/secondary_text"/>
tools:text="Audio Subtitle" />

</LinearLayout>

Expand Down