diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..ed66926 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 87e63bf..9798c62 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,11 @@ * 悬浮歌词功能 * 基本播放器功能（控制暂停 上下曲 播放歌单操作） -![Screenshot_20240204_165814.png](image%2FScreenshot_20240204_165814.png) -![Screenshot_20240204_170426.png](image%2FScreenshot_20240204_170426.png) -![Screenshot_20240204_165932.png](image%2FScreenshot_20240204_165932.png) -* +![Screenshot_20240217_180254.png](image%2FScreenshot_20240217_180254.png) +![Screenshot_20240217_180447.png](image%2FScreenshot_20240217_180447.png) +![Screenshot_20240217_180310.png](image%2FScreenshot_20240217_180310.png) + + * 在使用中有任何问题，欢迎反馈给我，可以用以下联系方式跟我交流 * [邮件]() * QQ:1966944300 @@ -38,16 +39,18 @@ 导入的包 ```javascript -dependencies { +dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.9.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'com.google.code.gson:gson:2.9.1' implementation 'com.squareup.okhttp3:okhttp:4.11.0' + //图片处理 implementation 'com.github.bumptech.glide:glide:4.16.0' + implementation "androidx.palette:palette:1.0.0" // 废弃的歌词组件 // implementation 'com.github.wangchenyan:lrcview:2.2.1' implementation 'com.google.android.flexbox:flexbox:3.0.0' @@ -56,11 +59,17 @@ dependencies { //修改音乐标签库 implementation 'com.mpatric:mp3agic:0.9.1' + +// 沉浸式状态栏 + api project(path: ':StatusBarUtil') + api project(path: ':lrcview') } ``` 修改JAR的包 ```javascript +[//]: # (主要修改内容MD3化) com.github.QuadFlask:colorpicker:0.0.15 -//主要修改内容MD3化 +[//]: # (歌词做全局变量给悬浮窗歌词) +'com.github.wangchenyan:lrcview:2.2.1' ... \ No newline at end of file diff --git a/app/src/main/java/com/muqingbfq/activity_search.java b/app/src/main/java/com/muqingbfq/activity_search.java index 2c20903..587b05e 100644 --- a/app/src/main/java/com/muqingbfq/activity_search.java +++ b/app/src/main/java/com/muqingbfq/activity_search.java @@ -33,6 +33,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.muqingbfq.databinding.ActivitySearchBinding; +import com.muqingbfq.fragment.search; import com.muqingbfq.mq.FragmentActivity; import com.muqingbfq.mq.gj; import com.muqingbfq.mq.wj; @@ -183,7 +184,6 @@ public class activity_search extends FragmentActivity { binding.listRecycler.getAdapter().notifyItemInserted(0); } wj.xrwb(wj.filesdri + wj.lishi_json, new Gson().toJson(json_list)); -// binding.listRecycler.getAdapter().notifyDataSetChanged(); } catch (Exception e) { gj.sc(e); } @@ -216,9 +216,9 @@ public class activity_search extends FragmentActivity { public void start(String name) { dismiss(); if (!TextUtils.isEmpty(name)) { -/* search sea = (search) getSupportFragmentManager().findFragmentById(R.id.search_fragment); + search sea = (search) getSupportFragmentManager().findFragmentById(R.id.search_fragment); binding.searchFragment.setVisibility(View.VISIBLE); - sea.sx(name);*/ + sea.sx(name); addSearchRecord(name); } } diff --git a/app/src/main/java/com/muqingbfq/bfq.java b/app/src/main/java/com/muqingbfq/bfq.java index 4515376..42c3c9d 100644 --- a/app/src/main/java/com/muqingbfq/bfq.java +++ b/app/src/main/java/com/muqingbfq/bfq.java @@ -59,14 +59,13 @@ public class bfq extends AppCompatActivity @SuppressLint("ClickableViewAccessibility") private void setLrc() { + DisplayMetrics dm = getResources().getDisplayMetrics(); + main.k = dm.widthPixels; + main.g = dm.heightPixels; + ViewGroup.LayoutParams layoutParams = binding.cardview.getLayoutParams(); if (!gj.isTablet(this)) { - ViewGroup.LayoutParams layoutParams = binding.cardview.getLayoutParams(); - DisplayMetrics dm = getResources().getDisplayMetrics(); - main.k = dm.widthPixels; - main.g = dm.heightPixels; layoutParams.height = (int) (main.k / 1.3f); layoutParams.width = (int) (main.k / 1.3f); - binding.cardview.setLayoutParams(layoutParams); binding.fragmentBfq.setOnTouchListener((v, event) -> bfq.super.onTouchEvent(event)); binding.lrcView.setOnTapListener((view, x, y) -> { @@ -85,7 +84,11 @@ public class bfq extends AppCompatActivity } }); }); + } else { + layoutParams.height = (int) (main.g / 2.0f); + layoutParams.width = (int) (main.g / 2.0f); } + binding.cardview.setLayoutParams(layoutParams); binding.lrcView. setDraggable(true, (a, time) -> { bfqkz.mt.seekTo((int) time); @@ -468,7 +471,7 @@ public class bfq extends AppCompatActivity @Override public boolean onScroll(@NonNull MotionEvent e1, @NonNull MotionEvent e2, float distanceX, float distanceY) { - if (binding.cardview.getVisibility() == View.GONE) { + if (binding.lrcView.getVisibility() == View.VISIBLE) { return false; } float y = binding.getRoot().getRootView().getTranslationY() - distanceY; diff --git a/app/src/main/java/com/muqingbfq/home.java b/app/src/main/java/com/muqingbfq/home.java index a75a430..5016d80 100644 --- a/app/src/main/java/com/muqingbfq/home.java +++ b/app/src/main/java/com/muqingbfq/home.java @@ -2,6 +2,7 @@ package com.muqingbfq; import android.content.ComponentName; import android.content.Context; +import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.support.v4.media.MediaBrowserCompat; @@ -205,7 +206,7 @@ public class home extends com.muqingbfq.mq.AppCompatActivity - - + android:paddingHorizontal="10dp"> + - - - + + + + app:layout_constraintEnd_toStartOf="@id/lrcView" + app:layout_constraintHorizontal_weight="1" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_weight="1" + app:layout_constraintStart_toEndOf="@id/cardview" + app:layout_constraintTop_toTopOf="parent" + app:lrcCurrentTextColor="#EEEEEE" + app:lrcNormalTextColor="#CCCCCC" + app:lrcTimelineTextColor="#EEEEEE" + app:lrcNormalTextSize="16sp" + app:lrcTextSize="20sp" /> @@ -189,8 +205,8 @@ android:layout_height="wrap_content" android:layout_weight="1" app:labelBehavior="gone" - app:thumbColor="@color/thumbColor" - app:trackColorActive="@color/thumbColor" + app:thumbColor="#E6E6E6" + app:trackColorActive="#CCCCCC" tools:ignore="SpeakableTextPresentCheck" /> + android:layout_marginTop="3dp" + android:src="@drawable/end" + app:tint="#F1F1F1" /> + + android:layout_weight="1" + android:gravity="center_horizontal"> + - + android:textSize="26sp" + android:visibility="visible" /> + android:layout_marginTop="3dp" + android:src="@drawable/abc_ic_menu_share_mtrl_alpha" + app:tint="#F1F1F1" /> + app:lrcTextSize="20sp" /> + app:layout_constraintEnd_toEndOf="parent" + app:tint="#CCCCCC"> diff --git a/app/src/main/res/layout/activity_gd.xml b/app/src/main/res/layout/activity_gd.xml index eadad64..3d0bfd8 100644 --- a/app/src/main/res/layout/activity_gd.xml +++ b/app/src/main/res/layout/activity_gd.xml @@ -14,6 +14,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:textSize="26sp" + android:transitionName="view" android:textColor="@color/text"/> @@ -44,6 +45,7 @@ android:layout_height="match_parent" /> + + android:layout_width="wrap_content" + android:layout_height="wrap_content">