diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 98ffe9d..c51b63a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,25 +6,26 @@ plugins { // id("org.jetbrains.kotlin.android") // id ("kotlin-kapt") id("io.objectbox") - id("com.google.gms.google-services") - id("com.google.firebase.crashlytics") } val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) android { - namespace = "com.offline.music.player" + namespace = "com.offline.music.playermp3" compileSdk = 34 defaultConfig { //com.hi.music.player - applicationId = "com.offline.music.player" + applicationId = "com.offline.music.playermp3" minSdk = 23 targetSdk = 34 versionCode = 1 versionName = "1.0.0" - setProperty("archivesBaseName", "Offline Music Player" + versionName + "(${versionCode})_$timestamp") + setProperty( + "archivesBaseName", + "Offline Music Player" + versionName + "(${versionCode})_$timestamp" + ) testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -75,7 +76,7 @@ dependencies { implementation("com.github.bumptech.glide:glide:4.16.0") // kapt("com.github.bumptech.glide:compiler:4.16.0") // Glide 的图片变换库，包括高斯模糊 - implementation ("jp.wasabeef:glide-transformations:4.3.0") + implementation("jp.wasabeef:glide-transformations:4.3.0") //提取图片主色 @@ -93,14 +94,7 @@ dependencies { //----------media3 - // implementation ("com.geyifeng.immersionbar:immersionbar:3.2.2") // implementation ("com.geyifeng.immersionbar:immersionbar-components:3.2.2") - - //------------------firebase - implementation(platform("com.google.firebase:firebase-bom:33.1.1")) - implementation("com.google.firebase:firebase-crashlytics") - implementation("com.google.firebase:firebase-analytics") - implementation("com.google.firebase:firebase-config") } \ No newline at end of file diff --git a/app/google-services.json b/app/google-services.json deleted file mode 100644 index 214f730..0000000 --- a/app/google-services.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "project_info": { - "project_number": "550960818622", - "project_id": "himelody-and", - "storage_bucket": "himelody-and.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:550960818622:android:96fd4141e43410fb24f1ef", - "android_client_info": { - "package_name": "com.offline.music.player" - } - }, - "oauth_client": [], - "api_key": [ - { - "current_key": "AIzaSyCp3XR60onMqiGj9pD8ADmrDEOOn__sQDk" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [] - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 0f5210c..22fa2d7 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -29,7 +29,7 @@ -dontwarn retrofit2.** -dontwarn javax.annotation.Nullable --keep class com.offline.music.player.javabean.A_data.AudioItem { *; } +-keep class com.offline.music.playermp3.javabean.A_data.AudioItem { *; } # 保持 Context、Intent 和权限相关的公共方法 -keep class android.content.Context { *; } diff --git a/app/src/androidTest/java/com/offline/music/player/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/offline/music/playermp3/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/com/offline/music/player/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/offline/music/playermp3/ExampleInstrumentedTest.java index e27f1b6..fa5d710 100644 --- a/app/src/androidTest/java/com/offline/music/player/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/offline/music/playermp3/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.offline.music.player; +package com.offline.music.playermp3; import android.content.Context; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a2f7226..6822e6f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,9 +17,9 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@mipmap/logo" + android:icon="@drawable/music_player_launch" android:label="@string/app_name" - android:roundIcon="@mipmap/logo" + android:roundIcon="@drawable/music_player_launch" android:supportsRtl="true" android:theme="@style/Theme.MusicApp" tools:targetApi="31"> diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..a0e5da2 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/com/offline/music/player/MusicApplication.java b/app/src/main/java/com/offline/music/playermp3/MusicApplication.java similarity index 96% rename from app/src/main/java/com/offline/music/player/MusicApplication.java rename to app/src/main/java/com/offline/music/playermp3/MusicApplication.java index 13d7c65..ade0dda 100644 --- a/app/src/main/java/com/offline/music/player/MusicApplication.java +++ b/app/src/main/java/com/offline/music/playermp3/MusicApplication.java @@ -1,4 +1,4 @@ -package com.offline.music.player; +package com.offline.music.playermp3; import android.app.Application; import android.content.Context; diff --git a/app/src/main/java/com/offline/music/player/adapter/A_HomeViewPagerAdapter.java b/app/src/main/java/com/offline/music/playermp3/adapter/A_HomeViewPagerAdapter.java similarity index 82% rename from app/src/main/java/com/offline/music/player/adapter/A_HomeViewPagerAdapter.java rename to app/src/main/java/com/offline/music/playermp3/adapter/A_HomeViewPagerAdapter.java index 3d4497a..d3fa31d 100644 --- a/app/src/main/java/com/offline/music/player/adapter/A_HomeViewPagerAdapter.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/A_HomeViewPagerAdapter.java @@ -1,12 +1,12 @@ -package com.offline.music.player.adapter; +package com.offline.music.playermp3.adapter; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; -import com.offline.music.player.ui.fragmnt.A_HomeFragment; -import com.offline.music.player.ui.fragmnt.A_ImportFragment; +import com.offline.music.playermp3.ui.fragmnt.A_HomeFragment; +import com.offline.music.playermp3.ui.fragmnt.A_ImportFragment; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/offline/music/player/adapter/A_ImportFragmentAdapter.java b/app/src/main/java/com/offline/music/playermp3/adapter/A_ImportFragmentAdapter.java similarity index 70% rename from app/src/main/java/com/offline/music/player/adapter/A_ImportFragmentAdapter.java rename to app/src/main/java/com/offline/music/playermp3/adapter/A_ImportFragmentAdapter.java index 0cce4d2..ed9b5c9 100644 --- a/app/src/main/java/com/offline/music/player/adapter/A_ImportFragmentAdapter.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/A_ImportFragmentAdapter.java @@ -1,4 +1,4 @@ -package com.offline.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.content.Context; import android.content.Intent; @@ -12,23 +12,22 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.offline.music.player.R; -import com.offline.music.player.javabean.A_data.AudioItem; -import com.offline.music.player.ui.activity.A_PlayActivity; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.ui.activity.A_PlayActivity; import java.util.ArrayList; import java.util.List; - public class A_ImportFragmentAdapter extends RecyclerView.Adapter { private Context context; private List audioFiles = new ArrayList<>(); private AudioItem audioItem; - private OnOptionClickListener onOptionClickListener;; + private OnOptionClickListener onOptionClickListener; private String newName; - public A_ImportFragmentAdapter(Context context,String newName) { + public A_ImportFragmentAdapter(Context context, String newName) { this.context = context; this.newName = newName; } @@ -41,22 +40,31 @@ public class A_ImportFragmentAdapter extends RecyclerView.Adapter= 0 && position < audioFiles.size()) { audioFiles.get(position).setName(newTitle); // 假设 AudioItem 有一个 setName 方法 @@ -95,12 +102,12 @@ public class A_ImportFragmentAdapter extends RecyclerView.Adapter { int position = getAdapterPosition(); - if (position != RecyclerView.NO_POSITION && onOptionClickListener != null) { + if (position != RecyclerView.NO_POSITION && onOptionClickListener != null && audioItem != null) { onOptionClickListener.onOptionClick(position, audioItem.getFile(), option); } }); } + + // 添加 bind 方法，将 audioItem 传递给 ViewHolder + public void bind(AudioItem audioItem) { + this.audioItem = audioItem; + } } - } - - diff --git a/app/src/main/java/com/offline/music/player/adapter/A_InstrumentAdapter.java b/app/src/main/java/com/offline/music/playermp3/adapter/A_InstrumentAdapter.java similarity index 90% rename from app/src/main/java/com/offline/music/player/adapter/A_InstrumentAdapter.java rename to app/src/main/java/com/offline/music/playermp3/adapter/A_InstrumentAdapter.java index 8a637a0..33aa325 100644 --- a/app/src/main/java/com/offline/music/player/adapter/A_InstrumentAdapter.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/A_InstrumentAdapter.java @@ -1,4 +1,4 @@ -package com.offline.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.content.Context; import android.content.Intent; @@ -14,10 +14,10 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.offline.music.player.R; -import com.offline.music.player.helper.AudioItemDiffCallback; -import com.offline.music.player.javabean.A_data.AudioItem; -import com.offline.music.player.ui.activity.A_PlayActivity; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.helper.AudioItemDiffCallback; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.ui.activity.A_PlayActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/offline/music/player/adapter/A_NatureAdapter.java b/app/src/main/java/com/offline/music/playermp3/adapter/A_NatureAdapter.java similarity index 90% rename from app/src/main/java/com/offline/music/player/adapter/A_NatureAdapter.java rename to app/src/main/java/com/offline/music/playermp3/adapter/A_NatureAdapter.java index 5d7d9f5..f574150 100644 --- a/app/src/main/java/com/offline/music/player/adapter/A_NatureAdapter.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/A_NatureAdapter.java @@ -1,4 +1,4 @@ -package com.offline.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.content.Context; import android.content.Intent; @@ -13,10 +13,10 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.offline.music.player.R; -import com.offline.music.player.helper.AudioItemDiffCallback; -import com.offline.music.player.javabean.A_data.AudioItem; -import com.offline.music.player.ui.activity.A_PlayActivity; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.helper.AudioItemDiffCallback; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.ui.activity.A_PlayActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/offline/music/player/adapter/A_WhiteAdapter.java b/app/src/main/java/com/offline/music/playermp3/adapter/A_WhiteAdapter.java similarity index 90% rename from app/src/main/java/com/offline/music/player/adapter/A_WhiteAdapter.java rename to app/src/main/java/com/offline/music/playermp3/adapter/A_WhiteAdapter.java index 7f038c5..8608d6e 100644 --- a/app/src/main/java/com/offline/music/player/adapter/A_WhiteAdapter.java +++ b/app/src/main/java/com/offline/music/playermp3/adapter/A_WhiteAdapter.java @@ -1,4 +1,4 @@ -package com.offline.music.player.adapter; +package com.offline.music.playermp3.adapter; import android.content.Context; import android.content.Intent; @@ -14,10 +14,10 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.offline.music.player.R; -import com.offline.music.player.helper.AudioItemDiffCallback; -import com.offline.music.player.javabean.A_data.AudioItem; -import com.offline.music.player.ui.activity.A_PlayActivity; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.helper.AudioItemDiffCallback; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.ui.activity.A_PlayActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/offline/music/player/helper/AudioItemDiffCallback.java b/app/src/main/java/com/offline/music/playermp3/helper/AudioItemDiffCallback.java similarity index 90% rename from app/src/main/java/com/offline/music/player/helper/AudioItemDiffCallback.java rename to app/src/main/java/com/offline/music/playermp3/helper/AudioItemDiffCallback.java index 40b930a..d9f9287 100644 --- a/app/src/main/java/com/offline/music/player/helper/AudioItemDiffCallback.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/AudioItemDiffCallback.java @@ -1,8 +1,8 @@ -package com.offline.music.player.helper; +package com.offline.music.playermp3.helper; import androidx.recyclerview.widget.DiffUtil; -import com.offline.music.player.javabean.A_data.AudioItem; +import com.offline.music.playermp3.javabean.A_data.AudioItem; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/com/offline/music/player/helper/CircularProgressBar.java b/app/src/main/java/com/offline/music/playermp3/helper/CircularProgressBar.java similarity index 98% rename from app/src/main/java/com/offline/music/player/helper/CircularProgressBar.java rename to app/src/main/java/com/offline/music/playermp3/helper/CircularProgressBar.java index e55c2a9..42c113c 100644 --- a/app/src/main/java/com/offline/music/player/helper/CircularProgressBar.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/CircularProgressBar.java @@ -1,4 +1,4 @@ -package com.offline.music.player.helper; +package com.offline.music.playermp3.helper; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/offline/music/player/helper/ItemDecoration.java b/app/src/main/java/com/offline/music/playermp3/helper/ItemDecoration.java similarity index 96% rename from app/src/main/java/com/offline/music/player/helper/ItemDecoration.java rename to app/src/main/java/com/offline/music/playermp3/helper/ItemDecoration.java index bfe3ce5..9577526 100644 --- a/app/src/main/java/com/offline/music/player/helper/ItemDecoration.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/ItemDecoration.java @@ -1,4 +1,4 @@ -package com.offline.music.player.helper; +package com.offline.music.playermp3.helper; import android.graphics.Rect; import android.view.View; @@ -9,7 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; -import com.offline.music.player.MusicApplication; +import com.offline.music.playermp3.MusicApplication; public class ItemDecoration extends RecyclerView.ItemDecoration { diff --git a/app/src/main/java/com/offline/music/player/helper/JsonUtils.java b/app/src/main/java/com/offline/music/playermp3/helper/JsonUtils.java similarity index 93% rename from app/src/main/java/com/offline/music/player/helper/JsonUtils.java rename to app/src/main/java/com/offline/music/playermp3/helper/JsonUtils.java index 67b55cc..66a2051 100644 --- a/app/src/main/java/com/offline/music/player/helper/JsonUtils.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/JsonUtils.java @@ -1,9 +1,9 @@ -package com.offline.music.player.helper; +package com.offline.music.playermp3.helper; import android.content.Context; -import com.offline.music.player.javabean.A_data.AudioItem; -import com.offline.music.player.javabean.A_data.Category; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.javabean.A_data.Category; import org.json.JSONArray; import org.json.JSONObject; diff --git a/app/src/main/java/com/offline/music/player/helper/SettingUtil.java b/app/src/main/java/com/offline/music/playermp3/helper/SettingUtil.java similarity index 98% rename from app/src/main/java/com/offline/music/player/helper/SettingUtil.java rename to app/src/main/java/com/offline/music/playermp3/helper/SettingUtil.java index 03e4e86..3537b3d 100644 --- a/app/src/main/java/com/offline/music/player/helper/SettingUtil.java +++ b/app/src/main/java/com/offline/music/playermp3/helper/SettingUtil.java @@ -1,4 +1,4 @@ -package com.offline.music.player.helper; +package com.offline.music.playermp3.helper; import android.content.ActivityNotFoundException; import android.content.Context; diff --git a/app/src/main/java/com/offline/music/player/javabean/A_data/AudioItem.java b/app/src/main/java/com/offline/music/playermp3/javabean/A_data/AudioItem.java similarity index 94% rename from app/src/main/java/com/offline/music/player/javabean/A_data/AudioItem.java rename to app/src/main/java/com/offline/music/playermp3/javabean/A_data/AudioItem.java index edaefdd..30ffdbe 100644 --- a/app/src/main/java/com/offline/music/player/javabean/A_data/AudioItem.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/A_data/AudioItem.java @@ -1,4 +1,4 @@ -package com.offline.music.player.javabean.A_data; +package com.offline.music.playermp3.javabean.A_data; import java.io.Serializable; diff --git a/app/src/main/java/com/offline/music/player/javabean/A_data/Category.java b/app/src/main/java/com/offline/music/playermp3/javabean/A_data/Category.java similarity index 90% rename from app/src/main/java/com/offline/music/player/javabean/A_data/Category.java rename to app/src/main/java/com/offline/music/playermp3/javabean/A_data/Category.java index 3800c72..eb44db6 100644 --- a/app/src/main/java/com/offline/music/player/javabean/A_data/Category.java +++ b/app/src/main/java/com/offline/music/playermp3/javabean/A_data/Category.java @@ -1,4 +1,4 @@ -package com.offline.music.player.javabean.A_data; +package com.offline.music.playermp3.javabean.A_data; import java.util.List; diff --git a/app/src/main/java/com/offline/music/player/service/MusicPlayerForegroundService.java b/app/src/main/java/com/offline/music/playermp3/service/MusicPlayerForegroundService.java similarity index 95% rename from app/src/main/java/com/offline/music/player/service/MusicPlayerForegroundService.java rename to app/src/main/java/com/offline/music/playermp3/service/MusicPlayerForegroundService.java index 1756887..69e5788 100644 --- a/app/src/main/java/com/offline/music/player/service/MusicPlayerForegroundService.java +++ b/app/src/main/java/com/offline/music/playermp3/service/MusicPlayerForegroundService.java @@ -1,4 +1,4 @@ -package com.offline.music.player.service; +package com.offline.music.playermp3.service; import android.app.Notification; import android.app.NotificationChannel; @@ -24,9 +24,9 @@ import androidx.core.app.NotificationCompat; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.offline.music.player.R; -import com.offline.music.player.javabean.A_data.AudioItem; -import com.offline.music.player.ui.activity.A_PlayActivity; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.ui.activity.A_PlayActivity; import java.io.File; import java.io.IOException; @@ -101,8 +101,8 @@ public class MusicPlayerForegroundService extends Service { Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? PendingIntent.FLAG_IMMUTABLE : 0); // 适配Android 12 return new NotificationCompat.Builder(this, CHANNEL_ID) - .setContentTitle("正在播放音频") // 通知标题 - .setContentText("您的音频正在播放") // 通知内容 + .setContentTitle("Playing audio") // 通知标题 + .setContentText("Your audio is playing") // 通知内容 .setSmallIcon(R.drawable.home_select) // 小图标 .setContentIntent(pendingIntent) // 点击通知的Intent .setPriority(NotificationCompat.PRIORITY_LOW) // 低优先级 @@ -113,7 +113,7 @@ public class MusicPlayerForegroundService extends Service { private void createNotificationChannel() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { NotificationChannel serviceChannel = new NotificationChannel( - CHANNEL_ID, "音乐播放器频道", NotificationManager.IMPORTANCE_LOW); + CHANNEL_ID, "Music player channel", NotificationManager.IMPORTANCE_LOW); NotificationManager manager = getSystemService(NotificationManager.class); if (manager != null) { manager.createNotificationChannel(serviceChannel); // 创建渠道 @@ -190,7 +190,7 @@ public class MusicPlayerForegroundService extends Service { if (afd != null) { mediaPlayer.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength()); // 设置数据源 } else { - throw new IOException("无法打开内容URI: " + path); + throw new IOException("Unable to open the content URI: " + path); } } catch (SecurityException e) { Log.e("MusicPlayerService", "权限被拒绝，无法访问内容URI: " + path, e); @@ -208,7 +208,7 @@ public class MusicPlayerForegroundService extends Service { if (file.exists()) { mediaPlayer.setDataSource(file.getAbsolutePath()); // 从文件加载 } else { - throw new IOException("文件未找到: " + path); + throw new IOException("File not found: " + path); } } } @@ -225,7 +225,7 @@ public class MusicPlayerForegroundService extends Service { return (dotIndex > 0) ? fileName.substring(0, dotIndex) : fileName; } catch (Exception e) { Log.e("MusicPlayerService", "获取文件名失败", e); - return "未知文件"; // 默认文件名 + return "Unknown file"; // 默认文件名 } } @@ -249,7 +249,7 @@ public class MusicPlayerForegroundService extends Service { } else { pauseAudio(); // 时间到，暂停音乐 isPlaying.postValue(false); // 更新播放状态 - Toast.makeText(getApplicationContext(), "定时器结束", Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), "Timer end", Toast.LENGTH_SHORT).show(); stopTimer(); // 时间到，结束计时器 } } diff --git a/app/src/main/java/com/offline/music/player/ui/activity/A_HomeActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_HomeActivity.java similarity index 95% rename from app/src/main/java/com/offline/music/player/ui/activity/A_HomeActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/A_HomeActivity.java index 37e4b43..b36c8af 100644 --- a/app/src/main/java/com/offline/music/player/ui/activity/A_HomeActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_HomeActivity.java @@ -1,4 +1,4 @@ -package com.offline.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import android.content.ComponentName; import android.content.Context; @@ -11,12 +11,12 @@ import android.view.View; import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; -import com.offline.music.player.R; -import com.offline.music.player.adapter.A_HomeViewPagerAdapter; -import com.offline.music.player.databinding.ActivityAhomeBinding; -import com.offline.music.player.databinding.HomeTabCustomBinding; -import com.offline.music.player.javabean.A_data.AudioItem; -import com.offline.music.player.service.MusicPlayerForegroundService; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.adapter.A_HomeViewPagerAdapter; +import com.offline.music.playermp3.databinding.ActivityAhomeBinding; +import com.offline.music.playermp3.databinding.HomeTabCustomBinding; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.service.MusicPlayerForegroundService; import java.util.Locale; diff --git a/app/src/main/java/com/offline/music/player/ui/activity/A_PlayActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_PlayActivity.java similarity index 97% rename from app/src/main/java/com/offline/music/player/ui/activity/A_PlayActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/A_PlayActivity.java index caf3ddc..4f191d4 100644 --- a/app/src/main/java/com/offline/music/player/ui/activity/A_PlayActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_PlayActivity.java @@ -1,4 +1,4 @@ -package com.offline.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import android.content.ComponentName; import android.content.Context; @@ -30,10 +30,10 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.offline.music.player.R; -import com.offline.music.player.databinding.ActivityAplayBinding; -import com.offline.music.player.javabean.A_data.AudioItem; -import com.offline.music.player.service.MusicPlayerForegroundService; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.databinding.ActivityAplayBinding; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.service.MusicPlayerForegroundService; import java.util.ArrayList; import java.util.List; @@ -111,6 +111,8 @@ public class A_PlayActivity extends BaseActivity { return; } + Log.d("paly","-----" +audioItem.getName()); + Glide.with(this) .load("file:///android_asset/" + audioItem.getImage()) .placeholder(R.mipmap.playing_background) // 默认图片 diff --git a/app/src/main/java/com/offline/music/player/ui/activity/A_SettingActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_SettingActivity.java similarity index 87% rename from app/src/main/java/com/offline/music/player/ui/activity/A_SettingActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/A_SettingActivity.java index 00d3fd0..8d8c0c2 100644 --- a/app/src/main/java/com/offline/music/player/ui/activity/A_SettingActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_SettingActivity.java @@ -1,9 +1,9 @@ -package com.offline.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import android.view.View; -import com.offline.music.player.databinding.ActivityAsettingBinding; -import com.offline.music.player.helper.SettingUtil; +import com.offline.music.playermp3.databinding.ActivityAsettingBinding; +import com.offline.music.playermp3.helper.SettingUtil; public class A_SettingActivity extends BaseActivity { diff --git a/app/src/main/java/com/offline/music/player/ui/activity/A_SplashActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_SplashActivity.java similarity index 92% rename from app/src/main/java/com/offline/music/player/ui/activity/A_SplashActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/A_SplashActivity.java index a09644b..f596bbe 100644 --- a/app/src/main/java/com/offline/music/player/ui/activity/A_SplashActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/A_SplashActivity.java @@ -1,10 +1,10 @@ -package com.offline.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import android.content.Intent; import android.os.CountDownTimer; import android.view.View; -import com.offline.music.player.databinding.ActivityAsplashBinding; +import com.offline.music.playermp3.databinding.ActivityAsplashBinding; public class A_SplashActivity extends BaseActivity { diff --git a/app/src/main/java/com/offline/music/player/ui/activity/BaseActivity.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/BaseActivity.java similarity index 96% rename from app/src/main/java/com/offline/music/player/ui/activity/BaseActivity.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/BaseActivity.java index b7f61f4..51f0f9b 100644 --- a/app/src/main/java/com/offline/music/player/ui/activity/BaseActivity.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/BaseActivity.java @@ -1,4 +1,4 @@ -package com.offline.music.player.ui.activity; +package com.offline.music.playermp3.ui.activity; import android.os.Bundle; import android.os.Handler; @@ -11,7 +11,7 @@ import androidx.core.view.WindowCompat; import androidx.core.view.WindowInsetsControllerCompat; import androidx.viewbinding.ViewBinding; -import com.offline.music.player.databinding.ActivityBaseBinding; +import com.offline.music.playermp3.databinding.ActivityBaseBinding; public abstract class BaseActivity extends AppCompatActivity implements View.OnClickListener { diff --git a/app/src/main/java/com/offline/music/player/ui/activity/viewmodel/A_VMHome.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/A_VMHome.java similarity index 81% rename from app/src/main/java/com/offline/music/player/ui/activity/viewmodel/A_VMHome.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/A_VMHome.java index 16ee189..611b0e6 100644 --- a/app/src/main/java/com/offline/music/player/ui/activity/viewmodel/A_VMHome.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/A_VMHome.java @@ -1,4 +1,4 @@ -package com.offline.music.player.ui.activity.viewmodel; +package com.offline.music.playermp3.ui.activity.viewmodel; import android.app.Application; diff --git a/app/src/main/java/com/offline/music/player/ui/activity/viewmodel/A_VMPlay.java b/app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/A_VMPlay.java similarity index 81% rename from app/src/main/java/com/offline/music/player/ui/activity/viewmodel/A_VMPlay.java rename to app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/A_VMPlay.java index 493dfd9..0263ab8 100644 --- a/app/src/main/java/com/offline/music/player/ui/activity/viewmodel/A_VMPlay.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/activity/viewmodel/A_VMPlay.java @@ -1,4 +1,4 @@ -package com.offline.music.player.ui.activity.viewmodel; +package com.offline.music.playermp3.ui.activity.viewmodel; import android.app.Application; diff --git a/app/src/main/java/com/offline/music/player/ui/fragmnt/A_HomeFragment.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/A_HomeFragment.java similarity index 83% rename from app/src/main/java/com/offline/music/player/ui/fragmnt/A_HomeFragment.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/A_HomeFragment.java index 3e278a3..0eff884 100644 --- a/app/src/main/java/com/offline/music/player/ui/fragmnt/A_HomeFragment.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/A_HomeFragment.java @@ -1,14 +1,14 @@ -package com.offline.music.player.ui.fragmnt; +package com.offline.music.playermp3.ui.fragmnt; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; -import com.offline.music.player.adapter.A_InstrumentAdapter; -import com.offline.music.player.adapter.A_NatureAdapter; -import com.offline.music.player.adapter.A_WhiteAdapter; -import com.offline.music.player.databinding.FragmentAHomeBinding; -import com.offline.music.player.helper.ItemDecoration; -import com.offline.music.player.ui.fragmnt.viewmodel.A_VMHome; +import com.offline.music.playermp3.adapter.A_InstrumentAdapter; +import com.offline.music.playermp3.adapter.A_NatureAdapter; +import com.offline.music.playermp3.adapter.A_WhiteAdapter; +import com.offline.music.playermp3.databinding.FragmentAHomeBinding; +import com.offline.music.playermp3.helper.ItemDecoration; +import com.offline.music.playermp3.ui.fragmnt.viewmodel.A_VMHome; public class A_HomeFragment extends BaseFragment { diff --git a/app/src/main/java/com/offline/music/player/ui/fragmnt/A_ImportFragment.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/A_ImportFragment.java similarity index 85% rename from app/src/main/java/com/offline/music/player/ui/fragmnt/A_ImportFragment.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/A_ImportFragment.java index ce52ac8..9c012dc 100644 --- a/app/src/main/java/com/offline/music/player/ui/fragmnt/A_ImportFragment.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/A_ImportFragment.java @@ -1,4 +1,4 @@ -package com.offline.music.player.ui.fragmnt; +package com.offline.music.playermp3.ui.fragmnt; import static android.app.Activity.RESULT_OK; @@ -9,6 +9,7 @@ import android.content.UriPermission; import android.content.pm.PackageManager; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; +import android.media.MediaMetadataRetriever; import android.net.Uri; import android.os.Build; import android.os.Environment; @@ -28,12 +29,12 @@ import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; -import com.offline.music.player.R; -import com.offline.music.player.adapter.A_ImportFragmentAdapter; -import com.offline.music.player.databinding.FragmentAImportBinding; -import com.offline.music.player.javabean.A_data.AudioItem; -import com.offline.music.player.ui.activity.A_SettingActivity; -import com.offline.music.player.ui.fragmnt.viewmodel.A_VMImport; +import com.offline.music.playermp3.R; +import com.offline.music.playermp3.adapter.A_ImportFragmentAdapter; +import com.offline.music.playermp3.databinding.FragmentAImportBinding; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.ui.activity.A_SettingActivity; +import com.offline.music.playermp3.ui.fragmnt.viewmodel.A_VMImport; import java.io.IOException; import java.util.List; @@ -212,7 +213,6 @@ public class A_ImportFragment extends BaseFragment { } } - private void openAudioPicker() { if (!Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) { Toast.makeText(getContext(), "The external storage is unavailable", Toast.LENGTH_LONG).show(); @@ -237,15 +237,39 @@ public class A_ImportFragment extends BaseFragment { requireActivity().getContentResolver().takePersistableUriPermission( selectedAudioUri, Intent.FLAG_GRANT_READ_URI_PERMISSION); + // 检查音频时长 + long duration = 0; try { - viewModel.addAudioFile(selectedAudioUri); + duration = getAudioDuration(selectedAudioUri); } catch (IOException e) { throw new RuntimeException(e); } + + if (duration < 4000) { + Toast.makeText(requireContext(), "The audio duration cannot be less than 4 seconds", Toast.LENGTH_SHORT).show(); + } else { + try { + viewModel.addAudioFile(selectedAudioUri); // 如果时长符合条件，添加音频文件 + } catch (IOException e) { + Log.e("A_ImportFragment", "IOException while adding audio file", e); + Toast.makeText(requireContext(), "An error occurred while adding the audio file", Toast.LENGTH_SHORT).show(); + } + } } } } + private long getAudioDuration(Uri uri) throws IOException { + MediaMetadataRetriever retriever = new MediaMetadataRetriever(); + try { + retriever.setDataSource(requireContext(), uri); + String durationStr = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION); + return Long.parseLong(durationStr); // 返回音频时长（毫秒） + } finally { + retriever.release(); // 释放资源 + } + } + @Override public void onResume() { super.onResume(); diff --git a/app/src/main/java/com/offline/music/player/ui/fragmnt/BaseFragment.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/BaseFragment.java similarity index 97% rename from app/src/main/java/com/offline/music/player/ui/fragmnt/BaseFragment.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/BaseFragment.java index db381ca..39864a6 100644 --- a/app/src/main/java/com/offline/music/player/ui/fragmnt/BaseFragment.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/BaseFragment.java @@ -1,4 +1,4 @@ -package com.offline.music.player.ui.fragmnt; +package com.offline.music.playermp3.ui.fragmnt; import android.content.Context; import android.os.Bundle; diff --git a/app/src/main/java/com/offline/music/player/ui/fragmnt/viewmodel/A_VMHome.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/A_VMHome.java similarity index 92% rename from app/src/main/java/com/offline/music/player/ui/fragmnt/viewmodel/A_VMHome.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/A_VMHome.java index 327066c..2695ae6 100644 --- a/app/src/main/java/com/offline/music/player/ui/fragmnt/viewmodel/A_VMHome.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/A_VMHome.java @@ -1,13 +1,13 @@ -package com.offline.music.player.ui.fragmnt.viewmodel; +package com.offline.music.playermp3.ui.fragmnt.viewmodel; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.offline.music.player.MusicApplication; -import com.offline.music.player.helper.JsonUtils; -import com.offline.music.player.javabean.A_data.AudioItem; -import com.offline.music.player.javabean.A_data.Category; +import com.offline.music.playermp3.MusicApplication; +import com.offline.music.playermp3.helper.JsonUtils; +import com.offline.music.playermp3.javabean.A_data.AudioItem; +import com.offline.music.playermp3.javabean.A_data.Category; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/offline/music/player/ui/fragmnt/viewmodel/A_VMImport.java b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/A_VMImport.java similarity index 97% rename from app/src/main/java/com/offline/music/player/ui/fragmnt/viewmodel/A_VMImport.java rename to app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/A_VMImport.java index b3c369d..754e183 100644 --- a/app/src/main/java/com/offline/music/player/ui/fragmnt/viewmodel/A_VMImport.java +++ b/app/src/main/java/com/offline/music/playermp3/ui/fragmnt/viewmodel/A_VMImport.java @@ -1,4 +1,4 @@ -package com.offline.music.player.ui.fragmnt.viewmodel; +package com.offline.music.playermp3.ui.fragmnt.viewmodel; import android.app.Application; import android.content.Context; @@ -13,7 +13,7 @@ import androidx.lifecycle.MutableLiveData; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.offline.music.player.javabean.A_data.AudioItem; +import com.offline.music.playermp3.javabean.A_data.AudioItem; import java.io.IOException; import java.lang.reflect.Type; diff --git a/app/src/main/res/drawable-v24/music_player_launch.png b/app/src/main/res/drawable-v24/music_player_launch.png new file mode 100644 index 0000000..38d1bea Binary files /dev/null and b/app/src/main/res/drawable-v24/music_player_launch.png differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 07d5da9..ca3826a 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:android="http://schemas.android.com/apk/res/android"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_ahome.xml b/app/src/main/res/layout/activity_ahome.xml index 5622b0a..a7840b4 100644 --- a/app/src/main/res/layout/activity_ahome.xml +++ b/app/src/main/res/layout/activity_ahome.xml @@ -49,7 +49,7 @@ app:layout_constraintTop_toTopOf="parent"> - diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..c4a603d 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..c4a603d --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp index c209e78..3c3fa10 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..42ee5af Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..ea56aa8 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp index 4f0f1d6..c0dc313 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..a170949 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..a4bf276 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp index 948a307..df3155c 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..39d5e1b Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..fbd3073 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 28d4b77..19643ba 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..ee08dc5 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..063f15e Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/launch_icon.png b/app/src/main/res/mipmap-xxxhdpi/bygone.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/launch_icon.png rename to app/src/main/res/mipmap-xxxhdpi/bygone.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index aa7d642..81d7ae9 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..1fda563 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..fdac814 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/logo.jpg b/app/src/main/res/mipmap-xxxhdpi/logo.jpg deleted file mode 100644 index 8b1f4a8..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/logo.jpg and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/music_logo.png b/app/src/main/res/mipmap-xxxhdpi/music_logo.png new file mode 100644 index 0000000..38d1bea Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/music_logo.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/placeholder.jpg b/app/src/main/res/mipmap-xxxhdpi/placeholder.jpg deleted file mode 100644 index 92a5d44..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/placeholder.jpg and /dev/null differ diff --git a/app/src/test/java/com/offline/music/player/ExampleUnitTest.java b/app/src/test/java/com/offline/music/playermp3/ExampleUnitTest.java similarity index 90% rename from app/src/test/java/com/offline/music/player/ExampleUnitTest.java rename to app/src/test/java/com/offline/music/playermp3/ExampleUnitTest.java index 7b7959f..f513ae3 100644 --- a/app/src/test/java/com/offline/music/player/ExampleUnitTest.java +++ b/app/src/test/java/com/offline/music/playermp3/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.offline.music.player; +package com.offline.music.playermp3; import org.junit.Test; diff --git a/build.gradle.kts b/build.gradle.kts index f0ca203..dc3324a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,10 +3,6 @@ plugins { id("com.android.application") version "8.1.3" apply false // id("org.jetbrains.kotlin.android") version "1.9.22" apply false - - id("com.google.gms.google-services") version "4.3.15" apply false - id ("com.google.firebase.crashlytics") version "2.9.2" apply false - } buildscript {