diff --git a/app/FunPrankSounds b/app/FunPrankSounds new file mode 100644 index 0000000..c4ee33d Binary files /dev/null and b/app/FunPrankSounds differ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 30f581c..b3bb336 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -8,7 +8,6 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") id("io.objectbox") - id("plugin.resTools") } val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) val keystorePropertiesFile = file("keystore.properties") @@ -70,14 +69,7 @@ android { } } } -resConfig { - new_prefix = "better_" // 资源前缀 - old_prefix = "" // 老前缀，可为''空字符串 - // === below use default - // resFolderPath 资源目录 - // srcFolderPath 源代码目录 - // manifestFilePath 清单文件目录 -} + dependencies { implementation("androidx.appcompat:appcompat:1.7.1") implementation("com.google.android.material:material:1.13.0") diff --git a/app/keystore.properties b/app/keystore.properties index de0b7b6..3a64f85 100644 --- a/app/keystore.properties +++ b/app/keystore.properties @@ -1,6 +1,6 @@ -app_name=Prank Sound App -package_name=com.light.prank.sound.app -keystoreFile=PrankSoundApp -key_alias=PrankSoundAppkey0 -key_store_password=PrankSoundApp -key_password=PrankSoundApp \ No newline at end of file +app_name=Fun Prank Sounds +package_name=com.fun.wave.pranksounds +keystoreFile=FunPrankSounds +key_alias=FunPrankSounds_key0 +key_store_password=FunPrankSounds +key_password=FunPrankSounds \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index adf64b0..4da16e5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,12 +8,13 @@ android:maxSdkVersion="32" /> + android:maxSdkVersion="32" + tools:ignore="ScopedStorage" /> diff --git a/app/src/main/java/com/fun/wave/pranksounds/activity/AcCategoryList.java b/app/src/main/java/com/fun/wave/pranksounds/activity/AcCategoryList.java deleted file mode 100644 index dd742f0..0000000 --- a/app/src/main/java/com/fun/wave/pranksounds/activity/AcCategoryList.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.fun.wave.pranksounds.activity; - -import android.content.Intent; -import android.view.View; - -import androidx.recyclerview.widget.GridLayoutManager; - -import com.fun.wave.pranksounds.base.BaseActivity; -import com.fun.wave.pranksounds.dataListener.SoundsWrapper; -import com.fun.wave.pranksounds.utils.MyItemSpace; -import com.fun.wave.pranksounds.utils.MyUtils; -import com.fun.wave.pranksounds.dataListener.OnClickItemListener; -import com.fun.wave.pranksounds.dataListener.PrankBean; -import com.fun.pranksounds.databinding.AcCategoryListBinding; - -public class AcCategoryList extends BaseActivity implements View.OnClickListener, OnClickItemListener { - - - private SoundsWrapper data; - private int colorIndex; - - - - @Override - protected void init() { - data = (SoundsWrapper) getIntent().getSerializableExtra(MyUtils.KEY_LIST_DATA); - colorIndex = getIntent().getIntExtra(MyUtils.KEY_LIST_COLOR_POS,0); - viewBind.categoryName.setText(data.getName()); - onList(); - viewBind.back.setOnClickListener(this); - } - - @Override - protected AcCategoryListBinding initViewBinding() { - return AcCategoryListBinding.inflate(getLayoutInflater()); - } - - private void onList() { - MyItemSpace itemHelper = new MyItemSpace(5, 5, 0); - viewBind.listRecycler.addItemDecoration(itemHelper); - viewBind.listRecycler.setLayoutManager(new GridLayoutManager(this, 2)); - AdapterCategoryList adapterCategoryList = new AdapterCategoryList(this, data.getPrankBeanList(),0,this); - viewBind.listRecycler.setAdapter(adapterCategoryList); - adapterCategoryList.setColorIndex(colorIndex); - } - - @Override - public void onClick(View v) { - if(v.equals(viewBind.back)){ - finish(); - } - - } - - @Override - public void onClickSoundsListener(PrankBean data) { - Intent intent = new Intent(this, AcPlayPranks.class); - intent.putExtra(MyUtils.KEY_PLAY_DATA, data); - intent.putExtra(MyUtils.KEY_LIST_COLOR_POS, colorIndex); - startActivity(intent); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/fun/wave/pranksounds/activity/ListActivity.java b/app/src/main/java/com/fun/wave/pranksounds/activity/ListActivity.java new file mode 100644 index 0000000..cb8585a --- /dev/null +++ b/app/src/main/java/com/fun/wave/pranksounds/activity/ListActivity.java @@ -0,0 +1,63 @@ +package com.fun.wave.pranksounds.activity; + +import android.content.Intent; +import android.view.View; + +import androidx.recyclerview.widget.GridLayoutManager; + +import com.fun.wave.pranksounds.base.BaseActivity; +import com.fun.wave.pranksounds.databinding.ListActivityBinding; +import com.fun.wave.pranksounds.listener.ClickSoundsListener; +import com.fun.wave.pranksounds.listener.PrankBean; +import com.fun.wave.pranksounds.listener.SoundsWrapper; +import com.fun.wave.pranksounds.main.ListAdapter; +import com.fun.wave.pranksounds.utils.Common; +import com.fun.wave.pranksounds.utils.ItemDec; + +public class ListActivity extends BaseActivity implements View.OnClickListener, ClickSoundsListener { + + + private SoundsWrapper data; + private int colorIndex; + + + + @Override + protected void init() { + data = (SoundsWrapper) getIntent().getSerializableExtra(Common.KEY_LIST_DATA); + colorIndex = getIntent().getIntExtra(Common.KEY_LIST_COLOR_POS,0); + viewBind.categoryName.setText(data.getName()); + onList(); + viewBind.back.setOnClickListener(this); + } + + @Override + protected ListActivityBinding initViewBinding() { + return ListActivityBinding.inflate(getLayoutInflater()); + } + + private void onList() { + ItemDec itemHelper = new ItemDec(5, 5, 0); + viewBind.listRecycler.addItemDecoration(itemHelper); + viewBind.listRecycler.setLayoutManager(new GridLayoutManager(this, 2)); + ListAdapter listAdapter = new ListAdapter(this, data.getPrankBeanList(),0,this); + viewBind.listRecycler.setAdapter(listAdapter); + listAdapter.setColorIndex(colorIndex); + } + + @Override + public void onClick(View v) { + if(v.equals(viewBind.back)){ + finish(); + } + + } + + @Override + public void onClickSoundsListener(PrankBean data) { + Intent intent = new Intent(this, PlayActivity.class); + intent.putExtra(Common.KEY_PLAY_DATA, data); + intent.putExtra(Common.KEY_LIST_COLOR_POS, colorIndex); + startActivity(intent); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/fun/wave/pranksounds/activity/AcMain.java b/app/src/main/java/com/fun/wave/pranksounds/activity/OneActivity.java similarity index 77% rename from app/src/main/java/com/fun/wave/pranksounds/activity/AcMain.java rename to app/src/main/java/com/fun/wave/pranksounds/activity/OneActivity.java index ae6a095..63035d6 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/activity/AcMain.java +++ b/app/src/main/java/com/fun/wave/pranksounds/activity/OneActivity.java @@ -18,16 +18,16 @@ import androidx.fragment.app.Fragment; import androidx.viewpager2.adapter.FragmentStateAdapter; import androidx.viewpager2.widget.ViewPager2; -import com.fun.pranksounds.R; +import com.fun.wave.pranksounds.R; import com.fun.wave.pranksounds.base.BaseActivity; -import com.fun.wave.pranksounds.custom.AcRecording; -import com.fun.wave.pranksounds.custom.AcSave; -import com.fun.wave.pranksounds.custom.FragmentCustom; -import com.fun.pranksounds.databinding.AcMainBinding; -import com.fun.pranksounds.databinding.TabItemLayoutBinding; -import com.fun.wave.pranksounds.like.FragmentLike; -import com.fun.wave.pranksounds.main.FragmentMain; -import com.fun.wave.pranksounds.utils.MyUtils; +import com.fun.wave.pranksounds.collection.CollectionFragment; +import com.fun.wave.pranksounds.databinding.OneActivityBinding; +import com.fun.wave.pranksounds.databinding.TabItemLayoutBinding; +import com.fun.wave.pranksounds.main.MainFragment; +import com.fun.wave.pranksounds.mine.MineFragment; +import com.fun.wave.pranksounds.mine.RecordingActivity; +import com.fun.wave.pranksounds.mine.SaveActivity; +import com.fun.wave.pranksounds.utils.Common; import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; @@ -35,7 +35,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -public class AcMain extends BaseActivity { +public class OneActivity extends BaseActivity { private ActivityResultLauncher audioPickerLauncher; @@ -70,7 +70,7 @@ public class AcMain extends BaseActivity { if (isGranted) { intentRecordAudio(); } else { - Toast.makeText(AcMain.this, "Recording permission denied", Toast.LENGTH_SHORT).show(); + Toast.makeText(OneActivity.this, "Recording permission denied", Toast.LENGTH_SHORT).show(); } } ); @@ -92,7 +92,7 @@ public class AcMain extends BaseActivity { if (isGranted) { importAudio(); } else { - Toast.makeText(AcMain.this, getString(R.string.permission_denied), Toast.LENGTH_SHORT).show(); + Toast.makeText(OneActivity.this, getString(R.string.permission_denied), Toast.LENGTH_SHORT).show(); } } } @@ -103,9 +103,9 @@ public class AcMain extends BaseActivity { public void onActivityResult(Uri uri) { // Handle the returned Uri if (uri != null) { - long duration = MyUtils.getAudioDuration(AcMain.this, uri); - Intent intent = new Intent(AcMain.this, AcSave.class); - intent.putExtra(AcSave.KEY_Path, uri.toString()); + long duration = Common.getAudioDuration(OneActivity.this, uri); + Intent intent = new Intent(OneActivity.this, SaveActivity.class); + intent.putExtra(SaveActivity.KEY_Path, uri.toString()); // intent.putExtra(AcSave.KEY_Time, duration); startActivity(intent); } @@ -114,20 +114,20 @@ public class AcMain extends BaseActivity { } @Override - protected AcMainBinding initViewBinding() { - return AcMainBinding.inflate(getLayoutInflater()); + protected OneActivityBinding initViewBinding() { + return OneActivityBinding.inflate(getLayoutInflater()); } private void intentRecordAudio() { - Intent intent = new Intent(AcMain.this, AcRecording.class); + Intent intent = new Intent(OneActivity.this, RecordingActivity.class); startActivity(intent); } private void initVp2() { List fragmentList = new ArrayList<>(); - fragmentList.add(FragmentMain.newInstance()); - fragmentList.add(FragmentLike.newInstance()); - fragmentList.add(FragmentCustom.newInstance()); + fragmentList.add(MainFragment.newInstance()); + fragmentList.add(CollectionFragment.newInstance()); + fragmentList.add(MineFragment.newInstance()); viewBind.vp2.setAdapter(new FragmentStateAdapter(this) { @NonNull @Override @@ -202,7 +202,7 @@ public class AcMain extends BaseActivity { @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { super.onRequestPermissionsResult(requestCode, permissions, grantResults); - if (requestCode == MyUtils.REQUEST_READ_STORAGE_PERMISSION) { + if (requestCode == Common.REQUEST_READ_STORAGE_PERMISSION) { if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { importAudio(); } else { @@ -221,18 +221,18 @@ public class AcMain extends BaseActivity { switch (type) { case 0: if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - if (ContextCompat.checkSelfPermission(AcMain.this, MyUtils.permission_read_audio[0]) + if (ContextCompat.checkSelfPermission(OneActivity.this, Common.permission_read_audio[0]) != PackageManager.PERMISSION_GRANTED) { - requestStorePermissionsLauncher.launch(MyUtils.permission_read_audio); + requestStorePermissionsLauncher.launch(Common.permission_read_audio); } else { importAudio(); } } else { - if (ContextCompat.checkSelfPermission(AcMain.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) + if (ContextCompat.checkSelfPermission(OneActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || - ContextCompat.checkSelfPermission(AcMain.this, Manifest.permission.READ_EXTERNAL_STORAGE) + ContextCompat.checkSelfPermission(OneActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { - requestStorePermissionsLauncher.launch(MyUtils.permission_store); + requestStorePermissionsLauncher.launch(Common.permission_store); } else { importAudio(); } @@ -245,9 +245,9 @@ public class AcMain extends BaseActivity { } private void checkAndRequestAudioPermission() { - if (ContextCompat.checkSelfPermission(AcMain.this, MyUtils.permission_record_audio) + if (ContextCompat.checkSelfPermission(OneActivity.this, Common.permission_record_audio) != PackageManager.PERMISSION_GRANTED) { - requestRecordAudioLauncher.launch(MyUtils.permission_record_audio); + requestRecordAudioLauncher.launch(Common.permission_record_audio); } else { intentRecordAudio(); } diff --git a/app/src/main/java/com/fun/wave/pranksounds/activity/AcPlayPranks.java b/app/src/main/java/com/fun/wave/pranksounds/activity/PlayActivity.java similarity index 84% rename from app/src/main/java/com/fun/wave/pranksounds/activity/AcPlayPranks.java rename to app/src/main/java/com/fun/wave/pranksounds/activity/PlayActivity.java index d5a6e48..8b60b76 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/activity/AcPlayPranks.java +++ b/app/src/main/java/com/fun/wave/pranksounds/activity/PlayActivity.java @@ -12,21 +12,22 @@ import android.view.View; import androidx.recyclerview.widget.LinearLayoutManager; import com.bumptech.glide.Glide; -import com.fun.wave.pranksounds.utils.PopupClock; +import com.fun.wave.pranksounds.R; import com.fun.wave.pranksounds.base.BaseActivity; -import com.fun.wave.pranksounds.utils.MyItemSpace; -import com.fun.wave.pranksounds.utils.MyUtils; -import com.fun.wave.pranksounds.dataListener.ObjectBoxMan; -import com.fun.wave.pranksounds.dataListener.OnClickItemListener; -import com.fun.wave.pranksounds.dataListener.OnClickTimerListener; -import com.fun.wave.pranksounds.dataListener.PrankBean; -import com.fun.pranksounds.R; -import com.fun.pranksounds.databinding.AcPlayPranksBinding; +import com.fun.wave.pranksounds.databinding.PlayActivityBinding; +import com.fun.wave.pranksounds.listener.ClickSoundsListener; +import com.fun.wave.pranksounds.listener.ClickTimerListener; +import com.fun.wave.pranksounds.listener.ObjectBoxMan; +import com.fun.wave.pranksounds.listener.PrankBean; +import com.fun.wave.pranksounds.main.ListAdapter; +import com.fun.wave.pranksounds.utils.Common; +import com.fun.wave.pranksounds.utils.ItemDec; +import com.fun.wave.pranksounds.utils.PopupClock; import java.io.IOException; import java.util.List; -public class AcPlayPranks extends BaseActivity implements View.OnClickListener, OnClickTimerListener, OnClickItemListener { +public class PlayActivity extends BaseActivity implements View.OnClickListener, ClickTimerListener, ClickSoundsListener { @@ -43,8 +44,8 @@ public class AcPlayPranks extends BaseActivity implements V @Override protected void init() { - PrankBean = (PrankBean) getIntent().getSerializableExtra(MyUtils.KEY_PLAY_DATA); - color = getIntent().getIntExtra(MyUtils.KEY_LIST_COLOR_POS,0); + PrankBean = (PrankBean) getIntent().getSerializableExtra(Common.KEY_PLAY_DATA); + color = getIntent().getIntExtra(Common.KEY_LIST_COLOR_POS,0); initAudio(); String covert = PrankBean.getCovert(); if (covert != null && !covert.isEmpty()) { @@ -61,7 +62,7 @@ public class AcPlayPranks extends BaseActivity implements V viewBind.imLike.setOnClickListener(this); viewBind.imLoop.setOnClickListener(this); viewBind.imTimer.setOnClickListener(this); - MyUtils.setVolume(this, viewBind.seekbar); + Common.setVolume(this, viewBind.seekbar); initLike(); loadMore(); @@ -69,8 +70,8 @@ public class AcPlayPranks extends BaseActivity implements V } @Override - protected AcPlayPranksBinding initViewBinding() { - return AcPlayPranksBinding.inflate(getLayoutInflater()); + protected PlayActivityBinding initViewBinding() { + return PlayActivityBinding.inflate(getLayoutInflater()); } private void stopCountDown() { @@ -120,12 +121,12 @@ public class AcPlayPranks extends BaseActivity implements V } private void loadMore() { List more = ObjectBoxMan.getMore(); - MyItemSpace itemHelper = new MyItemSpace(0, 0, (int) MyUtils.dpToPx(3)); - AdapterCategoryList adapterCategoryList = new AdapterCategoryList(this, more, 1, this); + ItemDec itemHelper = new ItemDec(0, 0, (int) Common.dpToPx(3)); + ListAdapter listAdapter = new ListAdapter(this, more, 1, this); viewBind.moreRecycler.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)); - viewBind.moreRecycler.setAdapter(adapterCategoryList); + viewBind.moreRecycler.setAdapter(listAdapter); viewBind.moreRecycler.addItemDecoration(itemHelper); - adapterCategoryList.setColorIndex(color); + listAdapter.setColorIndex(color); } private void initAudio() { @@ -205,7 +206,7 @@ public class AcPlayPranks extends BaseActivity implements V mediaPlayer.setLooping(viewBind.imLoop.isSelected()); } else if (v.equals(viewBind.imTimer)) { if (popupClock == null) { - popupClock = new PopupClock(AcPlayPranks.this, this); + popupClock = new PopupClock(PlayActivity.this, this); } popupClock.showTop(viewBind.imTimer); } @@ -237,8 +238,8 @@ public class AcPlayPranks extends BaseActivity implements V @Override public void onClickSoundsListener(PrankBean data) { - Intent intent = new Intent(this, AcPlayPranks.class); - intent.putExtra(MyUtils.KEY_PLAY_DATA, data); + Intent intent = new Intent(this, PlayActivity.class); + intent.putExtra(Common.KEY_PLAY_DATA, data); startActivity(intent); finish(); } diff --git a/app/src/main/java/com/fun/wave/pranksounds/activity/AcSplashUi.java b/app/src/main/java/com/fun/wave/pranksounds/activity/WelActivity.java similarity index 77% rename from app/src/main/java/com/fun/wave/pranksounds/activity/AcSplashUi.java rename to app/src/main/java/com/fun/wave/pranksounds/activity/WelActivity.java index dc7ad75..0b9d4d6 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/activity/AcSplashUi.java +++ b/app/src/main/java/com/fun/wave/pranksounds/activity/WelActivity.java @@ -3,11 +3,10 @@ package com.fun.wave.pranksounds.activity; import android.content.Intent; import android.os.CountDownTimer; - import com.fun.wave.pranksounds.base.BaseActivity; -import com.fun.pranksounds.databinding.AcSplashUiBinding; +import com.fun.wave.pranksounds.databinding.WelActivityBinding; -public class AcSplashUi extends BaseActivity { +public class WelActivity extends BaseActivity { private CountDownTimer countDownTimer; @Override @@ -29,13 +28,13 @@ public class AcSplashUi extends BaseActivity { } @Override - protected AcSplashUiBinding initViewBinding() { - return AcSplashUiBinding.inflate(getLayoutInflater()); + protected WelActivityBinding initViewBinding() { + return WelActivityBinding.inflate(getLayoutInflater()); } private void welcomeMain() { viewBind.loadingPb.setProgress(100); - Intent intent = new Intent(this, AcMain.class); + Intent intent = new Intent(this, OneActivity.class); startActivity(intent); finish(); } diff --git a/app/src/main/java/com/fun/wave/pranksounds/like/AdapterLike.java b/app/src/main/java/com/fun/wave/pranksounds/collection/CollectionAdapter.java similarity index 74% rename from app/src/main/java/com/fun/wave/pranksounds/like/AdapterLike.java rename to app/src/main/java/com/fun/wave/pranksounds/collection/CollectionAdapter.java index ee06d54..f715688 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/like/AdapterLike.java +++ b/app/src/main/java/com/fun/wave/pranksounds/collection/CollectionAdapter.java @@ -1,4 +1,4 @@ -package com.fun.wave.pranksounds.like; +package com.fun.wave.pranksounds.collection; import android.content.Context; import android.content.Intent; @@ -10,18 +10,18 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.fun.wave.pranksounds.activity.AcPlayPranks; -import com.fun.wave.pranksounds.dataListener.PrankBean; -import com.fun.wave.pranksounds.dataListener.ObjectBoxMan; -import com.fun.wave.pranksounds.utils.MyUtils; -import com.fun.pranksounds.R; -import com.fun.pranksounds.databinding.LikeAdapterBinding; +import com.fun.wave.pranksounds.R; +import com.fun.wave.pranksounds.activity.PlayActivity; +import com.fun.wave.pranksounds.databinding.CollectionAdapterBinding; +import com.fun.wave.pranksounds.listener.ObjectBoxMan; +import com.fun.wave.pranksounds.listener.PrankBean; +import com.fun.wave.pranksounds.utils.Common; import java.io.File; import java.util.List; -public class AdapterLike extends RecyclerView.Adapter { +public class CollectionAdapter extends RecyclerView.Adapter { private List mValues; private Context mCOn; @@ -29,7 +29,7 @@ public class AdapterLike extends RecyclerView.Adapter { - public AdapterLike(Context context, List items, boolean showDelete) { + public CollectionAdapter(Context context, List items, boolean showDelete) { mValues = items; mCOn = context; this.showDelete = showDelete; @@ -45,7 +45,7 @@ public class AdapterLike extends RecyclerView.Adapter { @Override public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - return new ViewHolder(LikeAdapterBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); + return new ViewHolder(CollectionAdapterBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); @@ -56,7 +56,7 @@ public class AdapterLike extends RecyclerView.Adapter { PrankBean PrankBean = mValues.get(position); holder.vb.ttvName.setText(PrankBean.getName()); int colorIndex = PrankBean.getColorIndex(); - holder.vb.layout.setBackground(ContextCompat.getDrawable(mCOn, MyUtils.childBgs[colorIndex])); + holder.vb.layout.setBackground(ContextCompat.getDrawable(mCOn, Common.childBgs[colorIndex])); if (PrankBean.isCustomization()) { Glide.with(mCOn).load(R.drawable.image_sounds).into(holder.vb.image); } else { @@ -98,9 +98,9 @@ public class AdapterLike extends RecyclerView.Adapter { holder.vb.layout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(mCOn, AcPlayPranks.class); - intent.putExtra(MyUtils.KEY_PLAY_DATA, PrankBean); - intent.putExtra(MyUtils.KEY_LIST_COLOR_POS, colorIndex); + Intent intent = new Intent(mCOn, PlayActivity.class); + intent.putExtra(Common.KEY_PLAY_DATA, PrankBean); + intent.putExtra(Common.KEY_LIST_COLOR_POS, colorIndex); mCOn.startActivity(intent); } }); @@ -113,9 +113,9 @@ public class AdapterLike extends RecyclerView.Adapter { public class ViewHolder extends RecyclerView.ViewHolder { - public LikeAdapterBinding vb; + public CollectionAdapterBinding vb; - public ViewHolder(LikeAdapterBinding binding) { + public ViewHolder(CollectionAdapterBinding binding) { super(binding.getRoot()); vb = binding; } diff --git a/app/src/main/java/com/fun/wave/pranksounds/like/FragmentLike.java b/app/src/main/java/com/fun/wave/pranksounds/collection/CollectionFragment.java similarity index 72% rename from app/src/main/java/com/fun/wave/pranksounds/like/FragmentLike.java rename to app/src/main/java/com/fun/wave/pranksounds/collection/CollectionFragment.java index 99ea6cd..a1a2139 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/like/FragmentLike.java +++ b/app/src/main/java/com/fun/wave/pranksounds/collection/CollectionFragment.java @@ -1,4 +1,4 @@ -package com.fun.wave.pranksounds.like; +package com.fun.wave.pranksounds.collection; import android.os.Bundle; import android.util.Log; @@ -10,24 +10,24 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.fun.wave.pranksounds.utils.MyItemSpace; -import com.fun.wave.pranksounds.dataListener.ObjectBoxMan; -import com.fun.wave.pranksounds.dataListener.PrankBean; -import com.fun.pranksounds.databinding.FragmentLikeBinding; +import com.fun.wave.pranksounds.databinding.CollectionFragmentBinding; +import com.fun.wave.pranksounds.listener.ObjectBoxMan; +import com.fun.wave.pranksounds.listener.PrankBean; +import com.fun.wave.pranksounds.utils.ItemDec; import java.util.List; -public class FragmentLike extends Fragment { +public class CollectionFragment extends Fragment { - private AdapterLike adapter; + private CollectionAdapter adapter; - public FragmentLike() { + public CollectionFragment() { } @SuppressWarnings("unused") - public static FragmentLike newInstance() { - FragmentLike fragment = new FragmentLike(); + public static CollectionFragment newInstance() { + CollectionFragment fragment = new CollectionFragment(); Bundle args = new Bundle(); fragment.setArguments(args); return fragment; @@ -38,12 +38,12 @@ public class FragmentLike extends Fragment { super.onCreate(savedInstanceState); } - private FragmentLikeBinding collectBinding; + private CollectionFragmentBinding collectBinding; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - collectBinding = FragmentLikeBinding.inflate(getLayoutInflater()); + collectBinding = CollectionFragmentBinding.inflate(getLayoutInflater()); RecyclerView recyclerView = collectBinding.list; recyclerView.setLayoutManager(new GridLayoutManager(requireContext(), 2)); List all = ObjectBoxMan.getAllLike(); @@ -54,8 +54,8 @@ public class FragmentLike extends Fragment { collectBinding.layoutEmpty.setVisibility(View.GONE); collectBinding.list.setVisibility(View.VISIBLE); } - adapter = new AdapterLike(requireContext(), all,false); - MyItemSpace itemHelper = new MyItemSpace(7, 7, 7); + adapter = new CollectionAdapter(requireContext(), all,false); + ItemDec itemHelper = new ItemDec(7, 7, 7); recyclerView.addItemDecoration(itemHelper); recyclerView.setAdapter(adapter); diff --git a/app/src/main/java/com/fun/wave/pranksounds/dataListener/OnClickItemListener.java b/app/src/main/java/com/fun/wave/pranksounds/dataListener/OnClickItemListener.java deleted file mode 100644 index d821e30..0000000 --- a/app/src/main/java/com/fun/wave/pranksounds/dataListener/OnClickItemListener.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.fun.wave.pranksounds.dataListener; - -public interface OnClickItemListener { - - void onClickSoundsListener(PrankBean data); -} diff --git a/app/src/main/java/com/fun/wave/pranksounds/dataListener/OnClickTimerListener.java b/app/src/main/java/com/fun/wave/pranksounds/dataListener/OnClickTimerListener.java deleted file mode 100644 index 5834018..0000000 --- a/app/src/main/java/com/fun/wave/pranksounds/dataListener/OnClickTimerListener.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.fun.wave.pranksounds.dataListener; - -public interface OnClickTimerListener { - - void onClickTimerListener(long time); -} diff --git a/app/src/main/java/com/fun/wave/pranksounds/listener/ClickSoundsListener.java b/app/src/main/java/com/fun/wave/pranksounds/listener/ClickSoundsListener.java new file mode 100644 index 0000000..cc0febc --- /dev/null +++ b/app/src/main/java/com/fun/wave/pranksounds/listener/ClickSoundsListener.java @@ -0,0 +1,6 @@ +package com.fun.wave.pranksounds.listener; + +public interface ClickSoundsListener { + + void onClickSoundsListener(PrankBean data); +} diff --git a/app/src/main/java/com/fun/wave/pranksounds/listener/ClickTimerListener.java b/app/src/main/java/com/fun/wave/pranksounds/listener/ClickTimerListener.java new file mode 100644 index 0000000..6ab56dd --- /dev/null +++ b/app/src/main/java/com/fun/wave/pranksounds/listener/ClickTimerListener.java @@ -0,0 +1,6 @@ +package com.fun.wave.pranksounds.listener; + +public interface ClickTimerListener { + + void onClickTimerListener(long time); +} diff --git a/app/src/main/java/com/fun/wave/pranksounds/dataListener/ObjectBoxMan.java b/app/src/main/java/com/fun/wave/pranksounds/listener/ObjectBoxMan.java similarity index 98% rename from app/src/main/java/com/fun/wave/pranksounds/dataListener/ObjectBoxMan.java rename to app/src/main/java/com/fun/wave/pranksounds/listener/ObjectBoxMan.java index c58bf34..c716805 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/dataListener/ObjectBoxMan.java +++ b/app/src/main/java/com/fun/wave/pranksounds/listener/ObjectBoxMan.java @@ -1,4 +1,4 @@ -package com.fun.wave.pranksounds.dataListener; +package com.fun.wave.pranksounds.listener; import android.content.Context; diff --git a/app/src/main/java/com/fun/wave/pranksounds/utils/OnUpdateRecordingTime.java b/app/src/main/java/com/fun/wave/pranksounds/listener/OnUpdateRecordingTime.java similarity index 64% rename from app/src/main/java/com/fun/wave/pranksounds/utils/OnUpdateRecordingTime.java rename to app/src/main/java/com/fun/wave/pranksounds/listener/OnUpdateRecordingTime.java index 02b0996..5aebfd7 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/utils/OnUpdateRecordingTime.java +++ b/app/src/main/java/com/fun/wave/pranksounds/listener/OnUpdateRecordingTime.java @@ -1,4 +1,4 @@ -package com.fun.wave.pranksounds.utils; +package com.fun.wave.pranksounds.listener; public interface OnUpdateRecordingTime { diff --git a/app/src/main/java/com/fun/wave/pranksounds/dataListener/PrankBean.java b/app/src/main/java/com/fun/wave/pranksounds/listener/PrankBean.java similarity index 96% rename from app/src/main/java/com/fun/wave/pranksounds/dataListener/PrankBean.java rename to app/src/main/java/com/fun/wave/pranksounds/listener/PrankBean.java index 106da78..ab59c33 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/dataListener/PrankBean.java +++ b/app/src/main/java/com/fun/wave/pranksounds/listener/PrankBean.java @@ -1,4 +1,4 @@ -package com.fun.wave.pranksounds.dataListener; +package com.fun.wave.pranksounds.listener; import java.io.Serializable; diff --git a/app/src/main/java/com/fun/wave/pranksounds/dataListener/SoundsWrapper.java b/app/src/main/java/com/fun/wave/pranksounds/listener/SoundsWrapper.java similarity index 95% rename from app/src/main/java/com/fun/wave/pranksounds/dataListener/SoundsWrapper.java rename to app/src/main/java/com/fun/wave/pranksounds/listener/SoundsWrapper.java index 9a90776..a7f8202 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/dataListener/SoundsWrapper.java +++ b/app/src/main/java/com/fun/wave/pranksounds/listener/SoundsWrapper.java @@ -1,4 +1,4 @@ -package com.fun.wave.pranksounds.dataListener; +package com.fun.wave.pranksounds.listener; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/fun/wave/pranksounds/activity/AdapterCategoryList.java b/app/src/main/java/com/fun/wave/pranksounds/main/ListAdapter.java similarity index 68% rename from app/src/main/java/com/fun/wave/pranksounds/activity/AdapterCategoryList.java rename to app/src/main/java/com/fun/wave/pranksounds/main/ListAdapter.java index 3d56b71..a43ddf0 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/activity/AdapterCategoryList.java +++ b/app/src/main/java/com/fun/wave/pranksounds/main/ListAdapter.java @@ -1,4 +1,4 @@ -package com.fun.wave.pranksounds.activity; +package com.fun.wave.pranksounds.main; import android.content.Context; import android.view.LayoutInflater; @@ -10,25 +10,25 @@ import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.fun.wave.pranksounds.dataListener.OnClickItemListener; -import com.fun.wave.pranksounds.dataListener.PrankBean; -import com.fun.wave.pranksounds.utils.MyUtils; -import com.fun.pranksounds.databinding.CategoryListAdapterBinding; +import com.fun.wave.pranksounds.databinding.ListAdapterBinding; +import com.fun.wave.pranksounds.listener.ClickSoundsListener; +import com.fun.wave.pranksounds.listener.PrankBean; +import com.fun.wave.pranksounds.utils.Common; import java.util.List; -public class AdapterCategoryList extends RecyclerView.Adapter { +public class ListAdapter extends RecyclerView.Adapter { private final List mValues; private Context mCon; private int type; - private OnClickItemListener mListener; + private ClickSoundsListener mListener; private int colorIndex; public void setColorIndex(int colorIndex) { this.colorIndex = colorIndex; } - public AdapterCategoryList(Context context, List items, int mType, OnClickItemListener listener) { + public ListAdapter(Context context, List items, int mType, ClickSoundsListener listener) { mValues = items; this.mCon = context; type = mType; @@ -37,14 +37,14 @@ public class AdapterCategoryList extends RecyclerView.Adapter { +public class MainAdapter extends RecyclerView.Adapter { private final List mValues; private Context mCon; - public AdapterMain(Context context, List items) { + public MainAdapter(Context context, List items) { mValues = items; this.mCon = context; } @@ -41,7 +41,7 @@ public class AdapterMain extends RecyclerView.Adapter { public void onBindViewHolder(final ViewHolder holder, int position) { int absoluteAdapterPosition = holder.getAbsoluteAdapterPosition(); int i = absoluteAdapterPosition % 6; - holder.vb.relative.setBackground(ContextCompat.getDrawable(mCon, MyUtils.bgs[i])); + holder.vb.relative.setBackground(ContextCompat.getDrawable(mCon, Common.bgs[i])); SoundsWrapper soundsWrapper = mValues.get(absoluteAdapterPosition); String covert = soundsWrapper.getCovert(); Glide.with(mCon).load(covert).into(holder.vb.image); @@ -49,9 +49,9 @@ public class AdapterMain extends RecyclerView.Adapter { holder.vb.relative.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(mCon, AcCategoryList.class); - intent.putExtra(MyUtils.KEY_LIST_DATA, soundsWrapper); - intent.putExtra(MyUtils.KEY_LIST_COLOR_POS, i); + Intent intent = new Intent(mCon, ListActivity.class); + intent.putExtra(Common.KEY_LIST_DATA, soundsWrapper); + intent.putExtra(Common.KEY_LIST_COLOR_POS, i); mCon.startActivity(intent); } }); diff --git a/app/src/main/java/com/fun/wave/pranksounds/main/FragmentMain.java b/app/src/main/java/com/fun/wave/pranksounds/main/MainFragment.java similarity index 66% rename from app/src/main/java/com/fun/wave/pranksounds/main/FragmentMain.java rename to app/src/main/java/com/fun/wave/pranksounds/main/MainFragment.java index c1ae132..6377419 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/main/FragmentMain.java +++ b/app/src/main/java/com/fun/wave/pranksounds/main/MainFragment.java @@ -8,27 +8,27 @@ import android.view.ViewGroup; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.GridLayoutManager; +import com.fun.wave.pranksounds.databinding.MainFragmentBinding; import com.fun.wave.pranksounds.utils.App; -import com.fun.wave.pranksounds.utils.MyItemSpace; -import com.fun.pranksounds.databinding.FragmentMainBinding; +import com.fun.wave.pranksounds.utils.ItemDec; import java.util.Collections; -public class FragmentMain extends Fragment { +public class MainFragment extends Fragment { - private FragmentMainBinding binding; + private MainFragmentBinding binding; - public FragmentMain() { + public MainFragment() { } @SuppressWarnings("unused") - public static FragmentMain newInstance() { - FragmentMain fragment = new FragmentMain(); + public static MainFragment newInstance() { + MainFragment fragment = new MainFragment(); Bundle args = new Bundle(); fragment.setArguments(args); return fragment; @@ -42,13 +42,13 @@ public class FragmentMain extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - binding = FragmentMainBinding.inflate(inflater); + binding = MainFragmentBinding.inflate(inflater); - MyItemSpace itemHelper = new MyItemSpace(15, 15, 7); + ItemDec itemHelper = new ItemDec(15, 15, 7); binding.recyclerView.addItemDecoration(itemHelper); binding.recyclerView.setLayoutManager(new GridLayoutManager(requireContext(), 2)); Collections.shuffle(App.bean); - binding.recyclerView.setAdapter(new AdapterMain(requireContext(), App.bean )); + binding.recyclerView.setAdapter(new MainAdapter(requireContext(), App.bean )); diff --git a/app/src/main/java/com/fun/wave/pranksounds/custom/FragmentCustom.java b/app/src/main/java/com/fun/wave/pranksounds/mine/MineFragment.java similarity index 64% rename from app/src/main/java/com/fun/wave/pranksounds/custom/FragmentCustom.java rename to app/src/main/java/com/fun/wave/pranksounds/mine/MineFragment.java index e1f3c11..4fd5419 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/custom/FragmentCustom.java +++ b/app/src/main/java/com/fun/wave/pranksounds/mine/MineFragment.java @@ -1,4 +1,4 @@ -package com.fun.wave.pranksounds.custom; +package com.fun.wave.pranksounds.mine; import android.os.Bundle; import android.view.LayoutInflater; @@ -8,25 +8,25 @@ import android.view.ViewGroup; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.GridLayoutManager; -import com.fun.wave.pranksounds.dataListener.ObjectBoxMan; -import com.fun.wave.pranksounds.dataListener.PrankBean; -import com.fun.pranksounds.databinding.FragmentCustomBinding; -import com.fun.wave.pranksounds.like.AdapterLike; -import com.fun.wave.pranksounds.utils.MyItemSpace; +import com.fun.wave.pranksounds.collection.CollectionAdapter; +import com.fun.wave.pranksounds.databinding.MineFragmentBinding; +import com.fun.wave.pranksounds.listener.ObjectBoxMan; +import com.fun.wave.pranksounds.listener.PrankBean; +import com.fun.wave.pranksounds.utils.ItemDec; import java.util.List; -public class FragmentCustom extends Fragment { +public class MineFragment extends Fragment { - private FragmentCustomBinding binding; - private AdapterLike adapter; - public FragmentCustom() { + private MineFragmentBinding binding; + private CollectionAdapter adapter; + public MineFragment() { } - public static FragmentCustom newInstance() { - FragmentCustom fragment = new FragmentCustom(); + public static MineFragment newInstance() { + MineFragment fragment = new MineFragment(); Bundle args = new Bundle(); fragment.setArguments(args); return fragment; @@ -36,12 +36,12 @@ public class FragmentCustom extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - binding = FragmentCustomBinding.inflate(getLayoutInflater()); - MyItemSpace itemHelper = new MyItemSpace(7, 7, 7); + binding = MineFragmentBinding.inflate(getLayoutInflater()); + ItemDec itemHelper = new ItemDec(7, 7, 7); binding.recyclerImport.addItemDecoration(itemHelper); binding.recyclerImport.setLayoutManager(new GridLayoutManager(requireContext(), 2)); List all = ObjectBoxMan.getAllCustomization(); - adapter = new AdapterLike(requireContext(), all, true); + adapter = new CollectionAdapter(requireContext(), all, true); updateEmpty(all); binding.recyclerImport.setAdapter(adapter); return binding.getRoot(); diff --git a/app/src/main/java/com/fun/wave/pranksounds/custom/AcRecording.java b/app/src/main/java/com/fun/wave/pranksounds/mine/RecordingActivity.java similarity index 65% rename from app/src/main/java/com/fun/wave/pranksounds/custom/AcRecording.java rename to app/src/main/java/com/fun/wave/pranksounds/mine/RecordingActivity.java index eb43d6f..a395810 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/custom/AcRecording.java +++ b/app/src/main/java/com/fun/wave/pranksounds/mine/RecordingActivity.java @@ -1,4 +1,4 @@ -package com.fun.wave.pranksounds.custom; +package com.fun.wave.pranksounds.mine; import android.content.Intent; import android.os.Handler; @@ -6,22 +6,22 @@ import android.os.Looper; import android.util.Log; import android.view.View; -import com.fun.pranksounds.R; +import com.fun.wave.pranksounds.R; import com.fun.wave.pranksounds.base.BaseActivity; -import com.fun.pranksounds.databinding.AcRecordingBinding; -import com.fun.wave.pranksounds.utils.MyRecorderUtils; -import com.fun.wave.pranksounds.utils.OnUpdateRecordingTime; +import com.fun.wave.pranksounds.databinding.RecordingActivityBinding; +import com.fun.wave.pranksounds.listener.OnUpdateRecordingTime; +import com.fun.wave.pranksounds.utils.RecordUtils; -public class AcRecording extends BaseActivity { +public class RecordingActivity extends BaseActivity { private Handler handler = new Handler(Looper.getMainLooper()); private boolean isCreate = false; - private MyRecorderUtils myRecorderUtils; + private RecordUtils recordUtils; @Override protected void init() { - myRecorderUtils = new MyRecorderUtils(this, handler, new OnUpdateRecordingTime() { + recordUtils = new RecordUtils(this, handler, new OnUpdateRecordingTime() { @Override public void onUpdateTime(long time) { @@ -36,8 +36,8 @@ public class AcRecording extends BaseActivity { } @Override - protected AcRecordingBinding initViewBinding() { - return AcRecordingBinding.inflate(getLayoutInflater()); + protected RecordingActivityBinding initViewBinding() { + return RecordingActivityBinding.inflate(getLayoutInflater()); } private void initEvent() { @@ -59,7 +59,7 @@ public class AcRecording extends BaseActivity { private void createSound(Boolean isStop) { if (!isCreate) { - myRecorderUtils.startRecording(); + recordUtils.startRecording(); viewBind.lottieView.playAnimation(); viewBind.viewPause.setSelected(true); isCreate = true; @@ -67,22 +67,22 @@ public class AcRecording extends BaseActivity { if (isStop) { viewBind.lottieView.cancelAnimation(); viewBind.viewPause.setSelected(false); - myRecorderUtils.stopRecording(); - Intent intent = new Intent(AcRecording.this, AcSave.class); + recordUtils.stopRecording(); + Intent intent = new Intent(RecordingActivity.this, SaveActivity.class); // intent.putExtra(AcSave.KEY_Time, elapsedTime); - intent.putExtra(AcSave.KEY_Path, myRecorderUtils.getTempFileName()); - intent.putExtra(AcSave.KEY_import, 1); + intent.putExtra(SaveActivity.KEY_Path, recordUtils.getTempFileName()); + intent.putExtra(SaveActivity.KEY_import, 1); startActivity(intent); finish(); } else { - Log.d("================","--"+myRecorderUtils.isRecording()); - if (myRecorderUtils.isRecording()) { + Log.d("================","--"+ recordUtils.isRecording()); + if (recordUtils.isRecording()) { viewBind.viewPause.setSelected(false); - myRecorderUtils.pauseRecording(); + recordUtils.pauseRecording(); viewBind.lottieView.pauseAnimation(); } else { viewBind.viewPause.setSelected(true); - myRecorderUtils.resumeRecording(); + recordUtils.resumeRecording(); viewBind.lottieView.resumeAnimation(); } } @@ -93,6 +93,6 @@ public class AcRecording extends BaseActivity { @Override protected void onDestroy() { super.onDestroy(); - myRecorderUtils.stopRecording(); + recordUtils.stopRecording(); } } \ No newline at end of file diff --git a/app/src/main/java/com/fun/wave/pranksounds/custom/AcSave.java b/app/src/main/java/com/fun/wave/pranksounds/mine/SaveActivity.java similarity index 89% rename from app/src/main/java/com/fun/wave/pranksounds/custom/AcSave.java rename to app/src/main/java/com/fun/wave/pranksounds/mine/SaveActivity.java index 1b16a21..5da7bbb 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/custom/AcSave.java +++ b/app/src/main/java/com/fun/wave/pranksounds/mine/SaveActivity.java @@ -1,4 +1,4 @@ -package com.fun.wave.pranksounds.custom; +package com.fun.wave.pranksounds.mine; import android.annotation.SuppressLint; import android.content.ContentResolver; @@ -13,18 +13,18 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import com.fun.wave.pranksounds.R; import com.fun.wave.pranksounds.base.BaseActivity; -import com.fun.wave.pranksounds.dataListener.ObjectBoxMan; -import com.fun.wave.pranksounds.dataListener.PrankBean; -import com.fun.pranksounds.R; -import com.fun.pranksounds.databinding.AcSaveBinding; +import com.fun.wave.pranksounds.databinding.SaveActivityBinding; +import com.fun.wave.pranksounds.listener.ObjectBoxMan; +import com.fun.wave.pranksounds.listener.PrankBean; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -public class AcSave extends BaseActivity { +public class SaveActivity extends BaseActivity { private String path; @@ -50,8 +50,8 @@ public class AcSave extends BaseActivity { } @Override - protected AcSaveBinding initViewBinding() { - return AcSaveBinding.inflate(getLayoutInflater()); + protected SaveActivityBinding initViewBinding() { + return SaveActivityBinding.inflate(getLayoutInflater()); } private void togglePrank() throws IOException { @@ -139,14 +139,14 @@ public class AcSave extends BaseActivity { if (!TextUtils.isEmpty(name)) { if(!b){ viewBind.saveEdit.setText(""); - Toast.makeText(AcSave.this, getString(R.string.name_hint), Toast.LENGTH_SHORT).show(); + Toast.makeText(SaveActivity.this, getString(R.string.name_hint), Toast.LENGTH_SHORT).show(); return; } saveData(name); - Toast.makeText(AcSave.this, getString(R.string.save_tips), Toast.LENGTH_SHORT).show(); + Toast.makeText(SaveActivity.this, getString(R.string.save_tips), Toast.LENGTH_SHORT).show(); finish(); } else { - Toast.makeText(AcSave.this, getString(R.string.save_tip), Toast.LENGTH_SHORT).show(); + Toast.makeText(SaveActivity.this, getString(R.string.save_tip), Toast.LENGTH_SHORT).show(); } }); } diff --git a/app/src/main/java/com/fun/wave/pranksounds/utils/App.java b/app/src/main/java/com/fun/wave/pranksounds/utils/App.java index fb3f570..48d2cf2 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/utils/App.java +++ b/app/src/main/java/com/fun/wave/pranksounds/utils/App.java @@ -4,10 +4,10 @@ import android.app.Application; import android.content.res.AssetManager; import android.graphics.Typeface; -import com.fun.wave.pranksounds.dataListener.SoundsWrapper; -import com.fun.wave.pranksounds.dataListener.PrankBean; +import com.fun.wave.pranksounds.listener.SoundsWrapper; +import com.fun.wave.pranksounds.listener.PrankBean; -import com.fun.wave.pranksounds.dataListener.ObjectBoxMan; +import com.fun.wave.pranksounds.listener.ObjectBoxMan; import java.io.IOException; import java.io.InputStream; @@ -34,9 +34,9 @@ public class App extends Application { try { prankBeanList = new ArrayList<>(); InputStream open = getAssets().open("prank.json"); - String string = MyUtils.getString(open); + String string = Common.getString(open); if (!string.isEmpty()) { - bean = MyUtils.getBean(string); + bean = Common.getBean(string); for (SoundsWrapper category:bean){ for (PrankBean prankBean1 : category.getPrankBeanList()) { prankBean1.setLike(false); diff --git a/app/src/main/java/com/fun/wave/pranksounds/utils/MyUtils.java b/app/src/main/java/com/fun/wave/pranksounds/utils/Common.java similarity index 97% rename from app/src/main/java/com/fun/wave/pranksounds/utils/MyUtils.java rename to app/src/main/java/com/fun/wave/pranksounds/utils/Common.java index 5674e0f..c5cf6eb 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/utils/MyUtils.java +++ b/app/src/main/java/com/fun/wave/pranksounds/utils/Common.java @@ -15,9 +15,9 @@ import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; -import com.fun.wave.pranksounds.dataListener.PrankBean; -import com.fun.wave.pranksounds.dataListener.SoundsWrapper; -import com.fun.pranksounds.R; +import com.fun.wave.pranksounds.listener.PrankBean; +import com.fun.wave.pranksounds.listener.SoundsWrapper; +import com.fun.wave.pranksounds.R; import org.json.JSONArray; import org.json.JSONException; @@ -31,7 +31,7 @@ import java.io.StringWriter; import java.util.ArrayList; import java.util.List; -public class MyUtils { +public class Common { public static int[] bgs = new int[]{R.drawable.main_item_bg,R.drawable.main_item_bg,R.drawable.main_item_bg,R.drawable.main_item_bg, R.drawable.main_item_bg,R.drawable.main_item_bg}; diff --git a/app/src/main/java/com/fun/wave/pranksounds/utils/MyItemSpace.java b/app/src/main/java/com/fun/wave/pranksounds/utils/ItemDec.java similarity index 96% rename from app/src/main/java/com/fun/wave/pranksounds/utils/MyItemSpace.java rename to app/src/main/java/com/fun/wave/pranksounds/utils/ItemDec.java index 871e755..16adc9b 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/utils/MyItemSpace.java +++ b/app/src/main/java/com/fun/wave/pranksounds/utils/ItemDec.java @@ -10,11 +10,11 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; -public class MyItemSpace extends RecyclerView.ItemDecoration { +public class ItemDec extends RecyclerView.ItemDecoration { private int v, h, ex; - public MyItemSpace(int v, int h, int ex) { + public ItemDec(int v, int h, int ex) { this.v = Math.round(dpToPx(v)); this.h = Math.round(dpToPx(h)); this.ex = Math.round(dpToPx(ex)); diff --git a/app/src/main/java/com/fun/wave/pranksounds/utils/MyTv.java b/app/src/main/java/com/fun/wave/pranksounds/utils/MineTextView.java similarity index 72% rename from app/src/main/java/com/fun/wave/pranksounds/utils/MyTv.java rename to app/src/main/java/com/fun/wave/pranksounds/utils/MineTextView.java index 95957a4..efda3f4 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/utils/MyTv.java +++ b/app/src/main/java/com/fun/wave/pranksounds/utils/MineTextView.java @@ -8,13 +8,13 @@ import android.util.AttributeSet; import androidx.annotation.Nullable; -import com.fun.pranksounds.R; +import com.fun.wave.pranksounds.R; -public class MyTv extends androidx.appcompat.widget.AppCompatTextView { +public class MineTextView extends androidx.appcompat.widget.AppCompatTextView { - public MyTv(Context context, @Nullable AttributeSet attrs) { + public MineTextView(Context context, @Nullable AttributeSet attrs) { super(context, attrs); initAttrs(context,attrs); } @@ -24,7 +24,7 @@ public class MyTv extends androidx.appcompat.widget.AppCompatTextView { TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.MyTV); boolean aBoolean = typedArray.getBoolean(R.styleable.MyTV_apply_font,false); if(aBoolean){ - MyUtils.initFont(this); + Common.initFont(this); } typedArray.recycle(); diff --git a/app/src/main/java/com/fun/wave/pranksounds/utils/PopupClock.java b/app/src/main/java/com/fun/wave/pranksounds/utils/PopupClock.java index 3df5c3d..18867d4 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/utils/PopupClock.java +++ b/app/src/main/java/com/fun/wave/pranksounds/utils/PopupClock.java @@ -8,15 +8,15 @@ import android.view.View; import android.view.ViewGroup; import android.widget.PopupWindow; -import com.fun.wave.pranksounds.dataListener.OnClickTimerListener; -import com.fun.pranksounds.databinding.PopupClockBinding; +import com.fun.wave.pranksounds.listener.ClickTimerListener; +import com.fun.wave.pranksounds.databinding.PopupClockBinding; public class PopupClock implements View.OnClickListener { private PopupClockBinding binding; private PopupWindow popupWindow; - private OnClickTimerListener mListener; + private ClickTimerListener mListener; - public PopupClock(Activity context, OnClickTimerListener listener) { + public PopupClock(Activity context, ClickTimerListener listener) { mListener = listener; binding = PopupClockBinding.inflate(context.getLayoutInflater()); popupWindow = new PopupWindow(binding.getRoot(), ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); @@ -50,12 +50,12 @@ public class PopupClock implements View.OnClickListener { Gravity.NO_GRAVITY); } - private void setSelected(MyTv tv) { + private void setSelected(MineTextView tv) { int childCount = binding.layoutTime.getChildCount(); for (int i = 0; i < childCount; i++) { View child = binding.layoutTime.getChildAt(i); - if (child instanceof MyTv) { - MyTv tvTimer = (MyTv) child; + if (child instanceof MineTextView) { + MineTextView tvTimer = (MineTextView) child; if (tvTimer.equals(tv)) { tvTimer.setSelected(true); } else { @@ -77,8 +77,8 @@ public class PopupClock implements View.OnClickListener { @Override public void onClick(View v) { - if (v instanceof MyTv) { - MyTv v1 = (MyTv) v; + if (v instanceof MineTextView) { + MineTextView v1 = (MineTextView) v; String string = v1.getText().toString(); switch (string){ case "off": diff --git a/app/src/main/java/com/fun/wave/pranksounds/utils/MyRecorderUtils.java b/app/src/main/java/com/fun/wave/pranksounds/utils/RecordUtils.java similarity index 94% rename from app/src/main/java/com/fun/wave/pranksounds/utils/MyRecorderUtils.java rename to app/src/main/java/com/fun/wave/pranksounds/utils/RecordUtils.java index 2ccfecb..93b430a 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/utils/MyRecorderUtils.java +++ b/app/src/main/java/com/fun/wave/pranksounds/utils/RecordUtils.java @@ -5,11 +5,13 @@ import android.media.MediaRecorder; import android.os.Handler; import android.util.Log; +import com.fun.wave.pranksounds.listener.OnUpdateRecordingTime; + import java.io.File; import java.io.IOException; -public class MyRecorderUtils { +public class RecordUtils { private MediaRecorder mediaRecorder; private String tempFileName; private boolean isRecording = false; @@ -22,7 +24,7 @@ public class MyRecorderUtils { private Runnable updateRunnable; private Handler mHandler; - public MyRecorderUtils(Context context, Handler handler,OnUpdateRecordingTime listener) { + public RecordUtils(Context context, Handler handler, OnUpdateRecordingTime listener) { mHandler = handler; File dir = context.getCacheDir(); File file = new File(dir, "temp_audio.mp3"); diff --git a/app/src/main/java/com/fun/wave/pranksounds/utils/CustomRippleView.kt b/app/src/main/java/com/fun/wave/pranksounds/utils/RippleView.kt similarity index 98% rename from app/src/main/java/com/fun/wave/pranksounds/utils/CustomRippleView.kt rename to app/src/main/java/com/fun/wave/pranksounds/utils/RippleView.kt index 9c021e3..bf2a9f1 100644 --- a/app/src/main/java/com/fun/wave/pranksounds/utils/CustomRippleView.kt +++ b/app/src/main/java/com/fun/wave/pranksounds/utils/RippleView.kt @@ -9,7 +9,7 @@ import android.util.AttributeSet import android.view.View import androidx.core.animation.doOnEnd -class CustomRippleView @JvmOverloads constructor( +class RippleView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null ) : View(context, attrs) { diff --git a/app/src/main/res/drawable/drawable_bg_btn.xml b/app/src/main/res/drawable/bg_button_save.xml similarity index 100% rename from app/src/main/res/drawable/drawable_bg_btn.xml rename to app/src/main/res/drawable/bg_button_save.xml diff --git a/app/src/main/res/drawable/drawable_bg_edittext.xml b/app/src/main/res/drawable/bg_stoke_name.xml similarity index 100% rename from app/src/main/res/drawable/drawable_bg_edittext.xml rename to app/src/main/res/drawable/bg_stoke_name.xml diff --git a/app/src/main/res/drawable/drawable_red_like.xml b/app/src/main/res/drawable/collection_selected.xml similarity index 100% rename from app/src/main/res/drawable/drawable_red_like.xml rename to app/src/main/res/drawable/collection_selected.xml diff --git a/app/src/main/res/drawable/drawable_play_like_0.xml b/app/src/main/res/drawable/collection_unselected.xml similarity index 100% rename from app/src/main/res/drawable/drawable_play_like_0.xml rename to app/src/main/res/drawable/collection_unselected.xml diff --git a/app/src/main/res/drawable/drawable_looper.xml b/app/src/main/res/drawable/drawable_looper.xml deleted file mode 100644 index 86e4f88..0000000 --- a/app/src/main/res/drawable/drawable_looper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/drawable_back_00.xml b/app/src/main/res/drawable/ic_back.xml similarity index 100% rename from app/src/main/res/drawable/drawable_back_00.xml rename to app/src/main/res/drawable/ic_back.xml diff --git a/app/src/main/res/drawable/drawable_delete.xml b/app/src/main/res/drawable/ic_remove_collection.xml similarity index 100% rename from app/src/main/res/drawable/drawable_delete.xml rename to app/src/main/res/drawable/ic_remove_collection.xml diff --git a/app/src/main/res/drawable/drawable_timer_1.xml b/app/src/main/res/drawable/icon_timer.xml similarity index 100% rename from app/src/main/res/drawable/drawable_timer_1.xml rename to app/src/main/res/drawable/icon_timer.xml diff --git a/app/src/main/res/drawable/drawable_volume_white.xml b/app/src/main/res/drawable/icon_volume.xml similarity index 100% rename from app/src/main/res/drawable/drawable_volume_white.xml rename to app/src/main/res/drawable/icon_volume.xml diff --git a/app/src/main/res/drawable/drawable_image_empty.xml b/app/src/main/res/drawable/image_empty_data.xml similarity index 100% rename from app/src/main/res/drawable/drawable_image_empty.xml rename to app/src/main/res/drawable/image_empty_data.xml diff --git a/app/src/main/res/drawable/drawable_loop_0.xml b/app/src/main/res/drawable/loop_selected.xml similarity index 100% rename from app/src/main/res/drawable/drawable_loop_0.xml rename to app/src/main/res/drawable/loop_selected.xml diff --git a/app/src/main/res/drawable/drawable_loop_1.xml b/app/src/main/res/drawable/loop_unselected.xml similarity index 100% rename from app/src/main/res/drawable/drawable_loop_1.xml rename to app/src/main/res/drawable/loop_unselected.xml diff --git a/app/src/main/res/drawable/drawable_welcome_pb.xml b/app/src/main/res/drawable/pb_welcome.xml similarity index 100% rename from app/src/main/res/drawable/drawable_welcome_pb.xml rename to app/src/main/res/drawable/pb_welcome.xml diff --git a/app/src/main/res/drawable/drawable_layer_sounds.xml b/app/src/main/res/drawable/rect_sounds.xml similarity index 100% rename from app/src/main/res/drawable/drawable_layer_sounds.xml rename to app/src/main/res/drawable/rect_sounds.xml diff --git a/app/src/main/res/drawable/drawable_bg_timer.xml b/app/src/main/res/drawable/rect_timer_dialog.xml similarity index 100% rename from app/src/main/res/drawable/drawable_bg_timer.xml rename to app/src/main/res/drawable/rect_timer_dialog.xml diff --git a/app/src/main/res/drawable/selector_like.xml b/app/src/main/res/drawable/selector_like.xml deleted file mode 100644 index a00c4fb..0000000 --- a/app/src/main/res/drawable/selector_like.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/status_collection.xml b/app/src/main/res/drawable/status_collection.xml new file mode 100644 index 0000000..561b50c --- /dev/null +++ b/app/src/main/res/drawable/status_collection.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/status_looper.xml b/app/src/main/res/drawable/status_looper.xml new file mode 100644 index 0000000..0a44463 --- /dev/null +++ b/app/src/main/res/drawable/status_looper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/like_adapter.xml b/app/src/main/res/layout/collection_adapter.xml similarity index 94% rename from app/src/main/res/layout/like_adapter.xml rename to app/src/main/res/layout/collection_adapter.xml index 4c39e00..1e4569d 100644 --- a/app/src/main/res/layout/like_adapter.xml +++ b/app/src/main/res/layout/collection_adapter.xml @@ -21,7 +21,7 @@ android:orientation="vertical" android:padding="5dp"> - + android:src="@drawable/ic_remove_collection" /> - + android:src="@drawable/image_empty_data" /> + tools:context=".activity.ListActivity"> - + android:src="@drawable/ic_back" /> diff --git a/app/src/main/res/layout/category_list_adapter.xml b/app/src/main/res/layout/list_adapter.xml similarity index 96% rename from app/src/main/res/layout/category_list_adapter.xml rename to app/src/main/res/layout/list_adapter.xml index d0e5156..aa9bafc 100644 --- a/app/src/main/res/layout/category_list_adapter.xml +++ b/app/src/main/res/layout/list_adapter.xml @@ -15,7 +15,7 @@ android:paddingEnd="5dp" android:paddingBottom="10dp"> - - - + tools:context=".activity.OneActivity"> - + android:src="@drawable/image_empty_data" /> + tools:context=".activity.OneActivity"> + tools:context=".activity.PlayActivity"> - + android:src="@drawable/ic_back" /> @@ -86,7 +86,7 @@ android:layout_height="wrap_content" android:layout_gravity="center"> - @@ -119,7 +119,7 @@ android:layout_marginStart="66dp" android:layout_marginEnd="15dp" android:padding="4dp" - android:src="@drawable/drawable_timer_1" + android:src="@drawable/icon_timer" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -130,7 +130,7 @@ android:layout_height="40dp" android:layout_marginStart="15dp" android:padding="2dp" - android:src="@drawable/drawable_looper" + android:src="@drawable/status_looper" app:layout_constraintLeft_toRightOf="@id/im_timer" app:layout_constraintTop_toTopOf="@id/im_timer" /> @@ -141,7 +141,7 @@ android:layout_height="40dp" android:layout_marginStart="15dp" android:padding="5dp" - android:src="@drawable/selector_like" + android:src="@drawable/status_collection" app:layout_constraintLeft_toRightOf="@id/im_loop" app:layout_constraintTop_toTopOf="@id/im_timer" /> @@ -160,7 +160,7 @@ android:layout_width="22dp" android:layout_height="22dp" android:layout_centerVertical="true" - android:src="@drawable/drawable_volume_white" /> + android:src="@drawable/icon_volume" /> @@ -180,7 +180,7 @@ - - - - - - - - + android:src="@drawable/ic_back" /> - - + android:src="@drawable/ic_back" /> @@ -55,7 +55,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/audio_im" - android:background="@drawable/drawable_bg_btn" + android:background="@drawable/bg_button_save" android:gravity="center" android:orientation="horizontal" android:paddingStart="10dp" @@ -67,7 +67,7 @@ android:layout_height="22dp" android:src="@drawable/selector_play" /> - - + tools:context=".activity.WelActivity"> - + android:progressDrawable="@drawable/pb_welcome" /> diff --git a/build.gradle.kts b/build.gradle.kts index 7cb4045..152cfdc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,6 +16,5 @@ buildscript { // Android Gradle Plugin 4.1.0 or later supported. // classpath("com.android.tools.build:gradle:8.1.0") classpath("io.objectbox:objectbox-gradle-plugin:5.0.1") - classpath ("io.github.jiayuliang1314:ResTools:1.0.5") } } \ No newline at end of file