Skip to content

Commit

Permalink
v2.0.5
Browse files Browse the repository at this point in the history
bug fixes
UX and UI enhancements
  • Loading branch information
ElysiumGit committed Feb 20, 2021
1 parent 79d2ac4 commit 3ae49dd
Show file tree
Hide file tree
Showing 15 changed files with 35 additions and 44 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ android {
vectorDrawables.useSupportLibrary = true

applicationId 'cyberwolf.musicplayer'
versionCode 70
versionName '2.0.3'
versionCode 72
versionName '2.0.5'
}
signingConfigs {
release {
Expand Down
Binary file modified app/release/app-release.aab
Binary file not shown.
2 changes: 1 addition & 1 deletion app/src/main/java/com/kabouzeid/trebl/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void onCreate() {
if (!ThemeStore.isConfigured(this, 1)) {
ThemeStore.editTheme(this)
.primaryColorRes(R.color.md_indigo_500)
.accentColorRes(R.color.md_pink_A400)
.accentColorRes(R.color.md_red_900)
.commit();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public CategoryInfo[] newArray(int size) {
};

public enum Category {
//boin empty tabs icon
//noteworthy: empty tabs icon
SONGS(R.string.emptystring),
ALBUMS(R.string.emptystring),
ARTISTS(R.string.emptystring),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,7 @@ private void updateNavigationDrawerHeader() {
}
((TextView) navigationDrawerHeader.findViewById(R.id.title)).setText(song.title);
((TextView) navigationDrawerHeader.findViewById(R.id.text)).setText(MusicUtil.getSongInfoString(song));
//boin removed drawerview
/*SongGlideRequest.Builder.from(Glide.with(this), song)
.checkIgnoreMediaStore(this).build()
.into(((ImageView) navigationDrawerHeader.findViewById(R.id.image)));*/

} else {
if (navigationDrawerHeader != null) {
navigationView.removeHeaderView(navigationDrawerHeader);
Expand All @@ -302,8 +299,8 @@ public void onPlayingMetaChanged() {
blurryBg.setAlpha(0.0f);
blurryBg.setScaleX(1);
blurryBg.setScaleY(1);
//boin testing error circumvention caused by outdated context
Glide.with(/*MainActivity.this*/getApplicationContext()).load(Util.getAlbumArtUri(MusicPlayerRemote.getCurrentSong().albumId))
//noteworthy: error circumvention caused by outdated context
Glide.with(getApplicationContext()).load(Util.getAlbumArtUri(MusicPlayerRemote.getCurrentSong().albumId))
.transform( new BlurTransformation.Builder(MainActivity.this).build())
.placeholder(R.drawable.default_blur)
.error(R.drawable.default_blur)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,9 @@ public void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int s
}
}
ThemeStore.editTheme(this)
//.primaryColor(Color.TRANSPARENT) //boin transparent color
.primaryColor(selectedColor)
.commit();

// mPreferences.edit().putInt("materialColor",selectedColor).apply();

break;
case R.string.accent_color:
if (!App.isProVersion()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void setStatusbarColor(int color) {

public void setStatusbarColorAuto() {
// we don't want to use statusbar color because we are doing the color darkening on our own to support KitKat
//boin status bar color is assigned here in accordance with the active theme. This is done independently as the status bar is treated as a separate layer
//noteworthy: status bar color is assigned here in accordance with the active theme. This is done independently as the status bar is treated as a separate layer
setStatusbarColor(ThemeStore.primaryColor(this));
mPreferences = PreferenceManager.getDefaultSharedPreferences(this);
if(PreferenceUtil.getInstance(this).getGeneralTheme()==PreferenceUtil.getThemeResFromPrefValue("dark")){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.fragment.app.Fragment;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
Expand Down Expand Up @@ -55,6 +56,7 @@
import com.kabouzeid.trebl.util.ViewUtil;
import com.kabouzeid.trebl.views.BreadCrumbLayout;
import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
import com.sothree.slidinguppanel.SlidingUpPanelLayout;

import java.io.File;
import java.io.FileFilter;
Expand All @@ -79,7 +81,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi
private Unbinder unbinder;

@BindView(R.id.coordinator_layout)
ConstraintLayout coordinatorLayout;
CoordinatorLayout coordinatorLayout;
@BindView(R.id.container)
View container;
@BindView(android.R.id.empty)
Expand Down Expand Up @@ -223,6 +225,7 @@ public void onChanged() {
checkIsEmpty();
}


@Override
public void onPause() {
super.onPause();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public void onSharedPreferenceChanged(SharedPreferences preferences, String key)
private void setUpToolbar() {
int primaryColor = ThemeStore.primaryColor(getActivity());

//boin here we assign the color of the appbar and toolbar, in accordance with the active themes
//noteworthy: here we assign the color of the appbar and toolbar, in accordance with the active themes
//automatically uses primary color when material themes are active and defaults to transparent when pro themes are activated. (transparent looks cleaner)
mPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
if(PreferenceUtil.getInstance(getActivity()).getGeneralTheme()==PreferenceUtil.getThemeResFromPrefValue("dark")){
Expand All @@ -160,10 +160,6 @@ private void setUpToolbar() {
appbar.setBackgroundColor(Color.TRANSPARENT);
toolbar.setBackgroundColor(Color.TRANSPARENT);
}

//appbar.setBackgroundColor(primaryColor); //boin set appbar color
//toolbar.setBackgroundColor(primaryColor);
//toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp); boin remove the navigation icon
getActivity().setTitle(R.string.emptystring);
getMainActivity().setSupportActionBar(toolbar);
}
Expand Down
16 changes: 7 additions & 9 deletions app/src/main/res/layout/fragment_folder.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.kabouzeid.trebl.com.trebl.gramophone.ui.fragments.mainactivity.folders.FoldersFragment">
tools:context="com.kabouzeid.trebl.ui.fragments.mainactivity.folders.FoldersFragment">

<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:ignore="UnusedAttribute">

<androidx.constraintlayout.widget.ConstraintLayout
Expand Down Expand Up @@ -86,9 +83,6 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintTop_toBottomOf="@id/appbar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
Expand All @@ -106,8 +100,12 @@
android:fontFamily="sans-serif-light"
android:text="@string/empty"
android:textColor="?android:textColorSecondary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:textSize="@dimen/empty_text_size" />

</FrameLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
7 changes: 3 additions & 4 deletions app/src/main/res/layout/fragment_library.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
Expand Down Expand Up @@ -150,8 +150,7 @@
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@id/appbar"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
16 changes: 8 additions & 8 deletions app/src/main/res/menu/menu_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
android:id="@+id/action_pro"
android:icon="@drawable/ic_new"
android:title="@string/action_pro"
app:showAsAction="ifRoom" />

<item
android:id="@+id/action_equalizer"
android:icon="@drawable/ic_eq"
android:title="@string/action_equalizer"
app:showAsAction="ifRoom" />
app:showAsAction="always" />

<item
android:id="@+id/action_search"
android:icon="@drawable/ic_search_white_24dp"
android:title="@string/action_search"
app:showAsAction="ifRoom" />
app:showAsAction="always" />

<item
android:id="@+id/action_equalizer"
android:icon="@drawable/ic_eq"
android:title="@string/action_equalizer"
app:showAsAction="always" />

<item
android:id="@+id/action_shuffle_all"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/xml/pref_library.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<com.kabouzeid.trebl.preferences.LibraryPreference
app:iconSpaceReserved="false"
android:key="library_categories"
app:isPreferenceVisible="false"
android:summary="@string/pref_summary_library_categories"
android:title="@string/library_categories" />

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
classpath 'com.android.tools.build:gradle:4.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jun 30 12:21:34 CEST 2020
#Fri Feb 12 03:33:07 IST 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

0 comments on commit 3ae49dd

Please sign in to comment.