diff --git a/app/build.gradle b/app/build.gradle index 4b61df5..b7d8797 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 { diff --git a/app/release/app-release.aab b/app/release/app-release.aab index c44339e..0bab48c 100644 Binary files a/app/release/app-release.aab and b/app/release/app-release.aab differ diff --git a/app/src/main/java/com/kabouzeid/trebl/App.java b/app/src/main/java/com/kabouzeid/trebl/App.java index 4739910..9bfd01d 100644 --- a/app/src/main/java/com/kabouzeid/trebl/App.java +++ b/app/src/main/java/com/kabouzeid/trebl/App.java @@ -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(); } diff --git a/app/src/main/java/com/kabouzeid/trebl/model/CategoryInfo.java b/app/src/main/java/com/kabouzeid/trebl/model/CategoryInfo.java index 0815f4a..99a388d 100644 --- a/app/src/main/java/com/kabouzeid/trebl/model/CategoryInfo.java +++ b/app/src/main/java/com/kabouzeid/trebl/model/CategoryInfo.java @@ -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), diff --git a/app/src/main/java/com/kabouzeid/trebl/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/trebl/ui/activities/MainActivity.java index 8014d8f..bbe62b1 100644 --- a/app/src/main/java/com/kabouzeid/trebl/ui/activities/MainActivity.java +++ b/app/src/main/java/com/kabouzeid/trebl/ui/activities/MainActivity.java @@ -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); @@ -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) diff --git a/app/src/main/java/com/kabouzeid/trebl/ui/activities/SettingsActivity.java b/app/src/main/java/com/kabouzeid/trebl/ui/activities/SettingsActivity.java index 24fc576..9d60655 100644 --- a/app/src/main/java/com/kabouzeid/trebl/ui/activities/SettingsActivity.java +++ b/app/src/main/java/com/kabouzeid/trebl/ui/activities/SettingsActivity.java @@ -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()) { diff --git a/app/src/main/java/com/kabouzeid/trebl/ui/activities/base/AbsThemeActivity.java b/app/src/main/java/com/kabouzeid/trebl/ui/activities/base/AbsThemeActivity.java index 961e20e..1239a0a 100644 --- a/app/src/main/java/com/kabouzeid/trebl/ui/activities/base/AbsThemeActivity.java +++ b/app/src/main/java/com/kabouzeid/trebl/ui/activities/base/AbsThemeActivity.java @@ -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")){ diff --git a/app/src/main/java/com/kabouzeid/trebl/ui/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/com/kabouzeid/trebl/ui/fragments/mainactivity/folders/FoldersFragment.java index 6c98393..45b1f07 100644 --- a/app/src/main/java/com/kabouzeid/trebl/ui/fragments/mainactivity/folders/FoldersFragment.java +++ b/app/src/main/java/com/kabouzeid/trebl/ui/fragments/mainactivity/folders/FoldersFragment.java @@ -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; @@ -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; @@ -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) @@ -223,6 +225,7 @@ public void onChanged() { checkIsEmpty(); } + @Override public void onPause() { super.onPause(); diff --git a/app/src/main/java/com/kabouzeid/trebl/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/kabouzeid/trebl/ui/fragments/mainactivity/library/LibraryFragment.java index af2a7af..3748359 100644 --- a/app/src/main/java/com/kabouzeid/trebl/ui/fragments/mainactivity/library/LibraryFragment.java +++ b/app/src/main/java/com/kabouzeid/trebl/ui/fragments/mainactivity/library/LibraryFragment.java @@ -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")){ @@ -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); } diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml index 1ef9641..803325d 100644 --- a/app/src/main/res/layout/fragment_folder.xml +++ b/app/src/main/res/layout/fragment_folder.xml @@ -1,19 +1,16 @@ - + tools:context="com.kabouzeid.trebl.ui.fragments.mainactivity.folders.FoldersFragment"> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index a5e41ea..503be8d 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 8ee8ae4..eb9438a 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -7,19 +7,19 @@ android:id="@+id/action_pro" android:icon="@drawable/ic_new" android:title="@string/action_pro" - app:showAsAction="ifRoom" /> - - + app:showAsAction="always" /> + app:showAsAction="always" /> + + diff --git a/build.gradle b/build.gradle index f4ca595..acc0baa 100644 --- a/build.gradle +++ b/build.gradle @@ -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" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a19a735..c3e7a3a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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