diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3002216..cc86b9d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,13 +6,13 @@ plugins { } android { - namespace = "com.example.myapplication" + namespace = "com.dazuoye.filemanager" compileSdk = 34 defaultConfig { - applicationId = "com.example.myapplication" + applicationId = "com.dazuoye.filemanager" minSdk = 29 - targetSdk = 34 + targetSdk = 35 versionCode = 1 versionName = "1.0" diff --git a/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java deleted file mode 100644 index 982ba51..0000000 --- a/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.example.myapplication; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.example.myapplication", appContext.getPackageName()); - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5bc63f3..f2ace33 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,9 +6,6 @@ - - - = VERSION_CODES.TIRAMISU) { - val perm33 = arrayOf( - permission.READ_MEDIA_AUDIO, - permission.READ_MEDIA_VIDEO, - permission.READ_MEDIA_IMAGES - ) - ActivityCompat.requestPermissions( - activity, perm33, 101 - ) - } } else { // for legacy system val permissions = arrayOf(permission.READ_EXTERNAL_STORAGE, permission.WRITE_EXTERNAL_STORAGE) diff --git a/app/src/main/java/com/example/myapplication/compose/SearchActivity.kt b/app/src/main/java/com/dazuoye/filemanager/compose/SearchActivity.kt similarity index 74% rename from app/src/main/java/com/example/myapplication/compose/SearchActivity.kt rename to app/src/main/java/com/dazuoye/filemanager/compose/SearchActivity.kt index 938ab9f..779eabb 100644 --- a/app/src/main/java/com/example/myapplication/compose/SearchActivity.kt +++ b/app/src/main/java/com/dazuoye/filemanager/compose/SearchActivity.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.compose +package com.dazuoye.filemanager.compose import android.os.Bundle import androidx.activity.ComponentActivity @@ -9,12 +9,12 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.Surface import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import com.example.myapplication.R -import com.example.myapplication.compose.ui.SearchFileColumn -import com.example.myapplication.fileSystem.byTypeFileLister.DocumentLister -import com.example.myapplication.fileSystem.byTypeFileLister.ImageLister -import com.example.myapplication.fileSystem.byTypeFileLister.MusicLister -import com.example.myapplication.fileSystem.byTypeFileLister.VideoLister +import com.dazuoye.filemanager.R +import com.dazuoye.filemanager.compose.ui.SearchFileColumn +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.ImageLister +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.MusicLister +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.VideoLister class SearchActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/example/myapplication/compose/SettingActivity.kt b/app/src/main/java/com/dazuoye/filemanager/compose/SettingActivity.kt similarity index 94% rename from app/src/main/java/com/example/myapplication/compose/SettingActivity.kt rename to app/src/main/java/com/dazuoye/filemanager/compose/SettingActivity.kt index ac31067..fe7a073 100644 --- a/app/src/main/java/com/example/myapplication/compose/SettingActivity.kt +++ b/app/src/main/java/com/dazuoye/filemanager/compose/SettingActivity.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.compose +package com.dazuoye.filemanager.compose import android.content.Intent import android.os.Build @@ -32,11 +32,11 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.content.ContextCompat -import com.example.myapplication.R -import com.example.myapplication.SettingStorage -import com.example.myapplication.compose.ui.Setting -import com.example.myapplication.main_page -import com.example.myapplication.utils.Sysinfo +import com.dazuoye.filemanager.R +import com.dazuoye.filemanager.SettingStorage +import com.dazuoye.filemanager.compose.ui.Setting +import com.dazuoye.filemanager.main_page +import com.dazuoye.filemanager.utils.Sysinfo class SettingActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/example/myapplication/compose/ViewFileActivity.kt b/app/src/main/java/com/dazuoye/filemanager/compose/ViewFileActivity.kt similarity index 89% rename from app/src/main/java/com/example/myapplication/compose/ViewFileActivity.kt rename to app/src/main/java/com/dazuoye/filemanager/compose/ViewFileActivity.kt index 59649ad..26da422 100644 --- a/app/src/main/java/com/example/myapplication/compose/ViewFileActivity.kt +++ b/app/src/main/java/com/dazuoye/filemanager/compose/ViewFileActivity.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.compose +package com.dazuoye.filemanager.compose import android.os.Bundle import android.os.Environment @@ -10,8 +10,8 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.Surface import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import com.example.myapplication.R -import com.example.myapplication.compose.ui.FileColumn +import com.dazuoye.filemanager.R +import com.dazuoye.filemanager.compose.ui.FileColumn import java.io.File class ViewFileActivity : ComponentActivity() { diff --git a/app/src/main/java/com/example/myapplication/compose/ui/FileColumn.kt b/app/src/main/java/com/dazuoye/filemanager/compose/ui/FileColumn.kt similarity index 97% rename from app/src/main/java/com/example/myapplication/compose/ui/FileColumn.kt rename to app/src/main/java/com/dazuoye/filemanager/compose/ui/FileColumn.kt index adac3c9..aba2ec0 100644 --- a/app/src/main/java/com/example/myapplication/compose/ui/FileColumn.kt +++ b/app/src/main/java/com/dazuoye/filemanager/compose/ui/FileColumn.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.compose.ui +package com.dazuoye.filemanager.compose.ui import android.annotation.SuppressLint import android.content.ClipData @@ -55,15 +55,15 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.content.FileProvider -import com.example.myapplication.R -import com.example.myapplication.SettingStorage -import com.example.myapplication.compose.PasteHelper -import com.example.myapplication.fileSystem.CutHelper -import com.example.myapplication.fileSystem.WrappedFile -import com.example.myapplication.fileSystem.WrappedFile.Type -import com.example.myapplication.main_page -import com.example.myapplication.utils.AlertHelper -import com.example.myapplication.utils.ClipHelper +import com.dazuoye.filemanager.R +import com.dazuoye.filemanager.SettingStorage +import com.dazuoye.filemanager.compose.PasteHelper +import com.dazuoye.filemanager.fileSystem.CutHelper +import com.dazuoye.filemanager.fileSystem.WrappedFile +import com.dazuoye.filemanager.fileSystem.WrappedFile.Type +import com.dazuoye.filemanager.main_page +import com.dazuoye.filemanager.utils.AlertHelper +import com.dazuoye.filemanager.utils.ClipHelper import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/myapplication/compose/ui/SearchFileColumn.kt b/app/src/main/java/com/dazuoye/filemanager/compose/ui/SearchFileColumn.kt similarity index 94% rename from app/src/main/java/com/example/myapplication/compose/ui/SearchFileColumn.kt rename to app/src/main/java/com/dazuoye/filemanager/compose/ui/SearchFileColumn.kt index a1a3e25..c09ae4c 100644 --- a/app/src/main/java/com/example/myapplication/compose/ui/SearchFileColumn.kt +++ b/app/src/main/java/com/dazuoye/filemanager/compose/ui/SearchFileColumn.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.compose.ui +package com.dazuoye.filemanager.compose.ui import android.content.Context import android.content.Intent @@ -31,12 +31,9 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.focus.FocusRequester -import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextOverflow @@ -44,14 +41,12 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.content.FileProvider -import com.example.myapplication.R -import com.example.myapplication.fileSystem.CutHelper -import com.example.myapplication.fileSystem.WrappedFile -import com.example.myapplication.fileSystem.WrappedFile.Type -import com.example.myapplication.fileSystem.searchFile -import com.example.myapplication.main_page -import com.example.myapplication.utils.AlertHelper -import com.example.myapplication.utils.ClipHelper +import com.dazuoye.filemanager.R +import com.dazuoye.filemanager.fileSystem.WrappedFile +import com.dazuoye.filemanager.fileSystem.WrappedFile.Type +import com.dazuoye.filemanager.fileSystem.searchFile +import com.dazuoye.filemanager.main_page +import com.dazuoye.filemanager.utils.AlertHelper import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -274,7 +269,6 @@ class SearchFileColumn( items(fileList) { file -> FileSingleView( file, - update = update, onItemClick = onItemClick ) } @@ -284,7 +278,6 @@ class SearchFileColumn( @Composable private fun FileSingleView( file: WrappedFile, - update: (() -> Unit)? = null, onItemClick: ((String) -> Unit)? = null ) { diff --git a/app/src/main/java/com/example/myapplication/compose/ui/Setting.kt b/app/src/main/java/com/dazuoye/filemanager/compose/ui/Setting.kt similarity index 97% rename from app/src/main/java/com/example/myapplication/compose/ui/Setting.kt rename to app/src/main/java/com/dazuoye/filemanager/compose/ui/Setting.kt index 581dfa2..4f9f3c2 100644 --- a/app/src/main/java/com/example/myapplication/compose/ui/Setting.kt +++ b/app/src/main/java/com/dazuoye/filemanager/compose/ui/Setting.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.compose.ui +package com.dazuoye.filemanager.compose.ui import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row diff --git a/app/src/main/java/com/example/myapplication/document_page.kt b/app/src/main/java/com/dazuoye/filemanager/document_page.kt similarity index 94% rename from app/src/main/java/com/example/myapplication/document_page.kt rename to app/src/main/java/com/dazuoye/filemanager/document_page.kt index ba15b0f..3c8d140 100644 --- a/app/src/main/java/com/example/myapplication/document_page.kt +++ b/app/src/main/java/com/dazuoye/filemanager/document_page.kt @@ -1,4 +1,4 @@ -package com.example.myapplication +package com.dazuoye.filemanager import android.annotation.SuppressLint import android.content.ActivityNotFoundException @@ -19,14 +19,14 @@ import androidx.core.content.FileProvider import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type -import com.example.myapplication.fileSystem.adapters.DocumentAdapter -import com.example.myapplication.fileSystem.adapters.DocumentModel -import com.example.myapplication.compose.SearchActivity -import com.example.myapplication.fileSystem.CutHelper -import com.example.myapplication.fileSystem.byTypeFileLister.DocumentLister.Companion.instance -import com.example.myapplication.fileSystem.byTypeFileLister.DocumentLister.Companion.regex -import com.example.myapplication.utils.AlertHelper -import com.example.myapplication.utils.ClipHelper +import com.dazuoye.filemanager.fileSystem.adapters.DocumentAdapter +import com.dazuoye.filemanager.fileSystem.adapters.DocumentModel +import com.dazuoye.filemanager.compose.SearchActivity +import com.dazuoye.filemanager.fileSystem.CutHelper +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister.Companion.instance +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister.Companion.regex +import com.dazuoye.filemanager.utils.AlertHelper +import com.dazuoye.filemanager.utils.ClipHelper import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/myapplication/fileSystem/DeleteHelper.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/DeleteHelper.kt similarity index 90% rename from app/src/main/java/com/example/myapplication/fileSystem/DeleteHelper.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/DeleteHelper.kt index b79faad..236e1bb 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/DeleteHelper.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/DeleteHelper.kt @@ -1,9 +1,9 @@ -package com.example.myapplication.fileSystem +package com.dazuoye.filemanager.fileSystem import android.content.Context import android.os.Environment -import com.example.myapplication.compose.PasteHelper -import com.example.myapplication.utils.ClipHelper +import com.dazuoye.filemanager.compose.PasteHelper +import com.dazuoye.filemanager.utils.ClipHelper import java.io.File class DeleteHelper { diff --git a/app/src/main/java/com/example/myapplication/fileSystem/FileSearcher.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/FileSearcher.kt similarity index 93% rename from app/src/main/java/com/example/myapplication/fileSystem/FileSearcher.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/FileSearcher.kt index b3dba3c..ef1ebc3 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/FileSearcher.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/FileSearcher.kt @@ -1,6 +1,5 @@ -package com.example.myapplication.fileSystem +package com.dazuoye.filemanager.fileSystem -import android.content.Context import android.os.Environment import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/com/example/myapplication/fileSystem/SystemStorageInfo.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/SystemStorageInfo.kt similarity index 96% rename from app/src/main/java/com/example/myapplication/fileSystem/SystemStorageInfo.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/SystemStorageInfo.kt index 1fda380..486bf36 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/SystemStorageInfo.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/SystemStorageInfo.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.fileSystem +package com.dazuoye.filemanager.fileSystem import android.app.usage.StorageStatsManager import android.content.Context diff --git a/app/src/main/java/com/example/myapplication/fileSystem/WrappedFile.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/WrappedFile.kt similarity index 92% rename from app/src/main/java/com/example/myapplication/fileSystem/WrappedFile.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/WrappedFile.kt index cccfddd..b25ab4d 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/WrappedFile.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/WrappedFile.kt @@ -1,12 +1,12 @@ -package com.example.myapplication.fileSystem +package com.dazuoye.filemanager.fileSystem import android.content.Context import android.icu.text.DecimalFormat import android.text.format.DateFormat -import com.example.myapplication.fileSystem.byTypeFileLister.DocumentLister -import com.example.myapplication.fileSystem.byTypeFileLister.ImageLister -import com.example.myapplication.fileSystem.byTypeFileLister.MusicLister -import com.example.myapplication.fileSystem.byTypeFileLister.VideoLister +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.ImageLister +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.MusicLister +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.VideoLister import java.io.File import java.net.URLConnection import java.nio.file.Files diff --git a/app/src/main/java/com/example/myapplication/fileSystem/adapters/Document.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/adapters/Document.kt similarity index 89% rename from app/src/main/java/com/example/myapplication/fileSystem/adapters/Document.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/adapters/Document.kt index 0fd231d..0929253 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/adapters/Document.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/adapters/Document.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.fileSystem.adapters +package com.dazuoye.filemanager.fileSystem.adapters import android.content.Context import android.view.LayoutInflater @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter import android.widget.TextView -import com.example.myapplication.R -import com.example.myapplication.SettingStorage +import com.dazuoye.filemanager.R +import com.dazuoye.filemanager.SettingStorage import java.io.File class DocumentModel(document: File) { diff --git a/app/src/main/java/com/example/myapplication/fileSystem/adapters/Image.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/adapters/Image.kt similarity index 92% rename from app/src/main/java/com/example/myapplication/fileSystem/adapters/Image.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/adapters/Image.kt index e9f8de7..6fe2392 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/adapters/Image.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/adapters/Image.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.fileSystem.adapters +package com.dazuoye.filemanager.fileSystem.adapters import android.content.Context import android.graphics.Bitmap @@ -12,8 +12,8 @@ import android.widget.ArrayAdapter import android.widget.GridView import android.widget.ImageView import android.widget.TextView -import com.example.myapplication.R -import com.example.myapplication.SettingStorage +import com.dazuoye.filemanager.R +import com.dazuoye.filemanager.SettingStorage import java.io.File class ImageModel(image: File) { diff --git a/app/src/main/java/com/example/myapplication/fileSystem/adapters/Music.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/adapters/Music.kt similarity index 89% rename from app/src/main/java/com/example/myapplication/fileSystem/adapters/Music.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/adapters/Music.kt index 7ca0b59..984c9c5 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/adapters/Music.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/adapters/Music.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.fileSystem.adapters +package com.dazuoye.filemanager.fileSystem.adapters import android.content.Context import android.view.LayoutInflater @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter import android.widget.TextView -import com.example.myapplication.R -import com.example.myapplication.SettingStorage +import com.dazuoye.filemanager.R +import com.dazuoye.filemanager.SettingStorage import java.io.File class MusicModel(music: File) { diff --git a/app/src/main/java/com/example/myapplication/fileSystem/adapters/Video.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/adapters/Video.kt similarity index 92% rename from app/src/main/java/com/example/myapplication/fileSystem/adapters/Video.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/adapters/Video.kt index 83ca763..bf73d3e 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/adapters/Video.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/adapters/Video.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.fileSystem.adapters +package com.dazuoye.filemanager.fileSystem.adapters import android.content.Context import android.graphics.Bitmap @@ -12,8 +12,8 @@ import android.widget.ArrayAdapter import android.widget.GridView import android.widget.ImageView import android.widget.TextView -import com.example.myapplication.R -import com.example.myapplication.SettingStorage +import com.dazuoye.filemanager.R +import com.dazuoye.filemanager.SettingStorage import java.io.File class VideoModel(video: File) { diff --git a/app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/DocumentLister.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/DocumentLister.kt similarity index 93% rename from app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/DocumentLister.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/DocumentLister.kt index 02189ec..3233f29 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/DocumentLister.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/DocumentLister.kt @@ -1,7 +1,7 @@ -package com.example.myapplication.fileSystem.byTypeFileLister +package com.dazuoye.filemanager.fileSystem.byTypeFileLister import android.os.Environment -import com.example.myapplication.fileSystem.WrappedFile +import com.dazuoye.filemanager.fileSystem.WrappedFile import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/ImageLister.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/ImageLister.kt similarity index 93% rename from app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/ImageLister.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/ImageLister.kt index 01cdfeb..41686b3 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/ImageLister.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/ImageLister.kt @@ -1,7 +1,7 @@ -package com.example.myapplication.fileSystem.byTypeFileLister +package com.dazuoye.filemanager.fileSystem.byTypeFileLister import android.os.Environment -import com.example.myapplication.fileSystem.WrappedFile +import com.dazuoye.filemanager.fileSystem.WrappedFile import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/Lister.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/Lister.kt similarity index 91% rename from app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/Lister.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/Lister.kt index 0dd9775..c83aa26 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/Lister.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/Lister.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.fileSystem.byTypeFileLister +package com.dazuoye.filemanager.fileSystem.byTypeFileLister import java.io.File diff --git a/app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/MusicLister.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/MusicLister.kt similarity index 93% rename from app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/MusicLister.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/MusicLister.kt index cb4642b..dea7cf9 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/MusicLister.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/MusicLister.kt @@ -1,7 +1,7 @@ -package com.example.myapplication.fileSystem.byTypeFileLister +package com.dazuoye.filemanager.fileSystem.byTypeFileLister import android.os.Environment -import com.example.myapplication.fileSystem.WrappedFile +import com.dazuoye.filemanager.fileSystem.WrappedFile import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/VideoLister.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/VideoLister.kt similarity index 93% rename from app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/VideoLister.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/VideoLister.kt index 24b0293..f0a34fc 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/byTypeFileLister/VideoLister.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/byTypeFileLister/VideoLister.kt @@ -1,7 +1,7 @@ -package com.example.myapplication.fileSystem.byTypeFileLister +package com.dazuoye.filemanager.fileSystem.byTypeFileLister import android.os.Environment -import com.example.myapplication.fileSystem.WrappedFile +import com.dazuoye.filemanager.fileSystem.WrappedFile import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/myapplication/fileSystem/getFolderSize.kt b/app/src/main/java/com/dazuoye/filemanager/fileSystem/getFolderSize.kt similarity index 88% rename from app/src/main/java/com/example/myapplication/fileSystem/getFolderSize.kt rename to app/src/main/java/com/dazuoye/filemanager/fileSystem/getFolderSize.kt index b007767..e08da51 100644 --- a/app/src/main/java/com/example/myapplication/fileSystem/getFolderSize.kt +++ b/app/src/main/java/com/dazuoye/filemanager/fileSystem/getFolderSize.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.fileSystem +package com.dazuoye.filemanager.fileSystem import java.io.File @@ -13,7 +13,7 @@ fun getFolderSize(folder: File, level: Int = 0): Long { var size = 0L - val file = folder.listFiles() + folder.listFiles() folder.listFiles()?.forEach { content -> size += if (content.isFile) { content.length() diff --git a/app/src/main/java/com/example/myapplication/main_page.java b/app/src/main/java/com/dazuoye/filemanager/main_page.java similarity index 95% rename from app/src/main/java/com/example/myapplication/main_page.java rename to app/src/main/java/com/dazuoye/filemanager/main_page.java index 5055ff6..5fce9d9 100644 --- a/app/src/main/java/com/example/myapplication/main_page.java +++ b/app/src/main/java/com/dazuoye/filemanager/main_page.java @@ -1,4 +1,4 @@ -package com.example.myapplication; +package com.dazuoye.filemanager; import android.content.Context; import android.content.Intent; @@ -11,10 +11,10 @@ import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; -import com.example.myapplication.compose.SearchActivity; -import com.example.myapplication.compose.SettingActivity; -import com.example.myapplication.compose.ViewFileActivity; -import com.example.myapplication.fileSystem.DeleteHelper; +import com.dazuoye.filemanager.compose.SearchActivity; +import com.dazuoye.filemanager.compose.SettingActivity; +import com.dazuoye.filemanager.compose.ViewFileActivity; +import com.dazuoye.filemanager.fileSystem.DeleteHelper; import java.io.File; public class main_page extends AppCompatActivity { diff --git a/app/src/main/java/com/example/myapplication/music_page.kt b/app/src/main/java/com/dazuoye/filemanager/music_page.kt similarity index 93% rename from app/src/main/java/com/example/myapplication/music_page.kt rename to app/src/main/java/com/dazuoye/filemanager/music_page.kt index 0d7ecb0..4338be1 100644 --- a/app/src/main/java/com/example/myapplication/music_page.kt +++ b/app/src/main/java/com/dazuoye/filemanager/music_page.kt @@ -1,4 +1,4 @@ -package com.example.myapplication +package com.dazuoye.filemanager import android.annotation.SuppressLint import android.content.DialogInterface @@ -18,14 +18,14 @@ import androidx.core.content.FileProvider import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type -import com.example.myapplication.fileSystem.adapters.MusicAdapter -import com.example.myapplication.fileSystem.adapters.MusicModel -import com.example.myapplication.compose.SearchActivity -import com.example.myapplication.fileSystem.CutHelper -import com.example.myapplication.fileSystem.byTypeFileLister.DocumentLister -import com.example.myapplication.fileSystem.byTypeFileLister.MusicLister.Companion.instance -import com.example.myapplication.utils.AlertHelper -import com.example.myapplication.utils.ClipHelper +import com.dazuoye.filemanager.fileSystem.adapters.MusicAdapter +import com.dazuoye.filemanager.fileSystem.adapters.MusicModel +import com.dazuoye.filemanager.compose.SearchActivity +import com.dazuoye.filemanager.fileSystem.CutHelper +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.MusicLister.Companion.instance +import com.dazuoye.filemanager.utils.AlertHelper +import com.dazuoye.filemanager.utils.ClipHelper import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/myapplication/picture_page.kt b/app/src/main/java/com/dazuoye/filemanager/picture_page.kt similarity index 94% rename from app/src/main/java/com/example/myapplication/picture_page.kt rename to app/src/main/java/com/dazuoye/filemanager/picture_page.kt index 0b31fa8..f945b45 100644 --- a/app/src/main/java/com/example/myapplication/picture_page.kt +++ b/app/src/main/java/com/dazuoye/filemanager/picture_page.kt @@ -1,4 +1,4 @@ -package com.example.myapplication +package com.dazuoye.filemanager import android.annotation.SuppressLint import android.content.DialogInterface @@ -18,14 +18,14 @@ import androidx.core.content.FileProvider import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type -import com.example.myapplication.fileSystem.adapters.ImageAdapter -import com.example.myapplication.fileSystem.adapters.ImageModel -import com.example.myapplication.compose.SearchActivity -import com.example.myapplication.fileSystem.CutHelper -import com.example.myapplication.fileSystem.byTypeFileLister.DocumentLister -import com.example.myapplication.fileSystem.byTypeFileLister.ImageLister.Companion.instance -import com.example.myapplication.utils.AlertHelper -import com.example.myapplication.utils.ClipHelper +import com.dazuoye.filemanager.fileSystem.adapters.ImageAdapter +import com.dazuoye.filemanager.fileSystem.adapters.ImageModel +import com.dazuoye.filemanager.compose.SearchActivity +import com.dazuoye.filemanager.fileSystem.CutHelper +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.ImageLister.Companion.instance +import com.dazuoye.filemanager.utils.AlertHelper +import com.dazuoye.filemanager.utils.ClipHelper import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/myapplication/store_page.kt b/app/src/main/java/com/dazuoye/filemanager/store_page.kt similarity index 86% rename from app/src/main/java/com/example/myapplication/store_page.kt rename to app/src/main/java/com/dazuoye/filemanager/store_page.kt index 1ed4be2..68ba5f3 100644 --- a/app/src/main/java/com/example/myapplication/store_page.kt +++ b/app/src/main/java/com/dazuoye/filemanager/store_page.kt @@ -1,4 +1,4 @@ -package com.example.myapplication +package com.dazuoye.filemanager import android.content.Intent import android.os.Bundle @@ -8,12 +8,12 @@ import android.widget.ProgressBar import android.widget.TextView import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity -import com.example.myapplication.fileSystem.SystemStorageInfo -import com.example.myapplication.fileSystem.WrappedFile -import com.example.myapplication.fileSystem.byTypeFileLister.DocumentLister -import com.example.myapplication.fileSystem.byTypeFileLister.ImageLister -import com.example.myapplication.fileSystem.byTypeFileLister.MusicLister -import com.example.myapplication.fileSystem.byTypeFileLister.VideoLister +import com.dazuoye.filemanager.fileSystem.SystemStorageInfo +import com.dazuoye.filemanager.fileSystem.WrappedFile +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.ImageLister +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.MusicLister +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.VideoLister import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/myapplication/utils/AlertHelper.kt b/app/src/main/java/com/dazuoye/filemanager/utils/AlertHelper.kt similarity index 96% rename from app/src/main/java/com/example/myapplication/utils/AlertHelper.kt rename to app/src/main/java/com/dazuoye/filemanager/utils/AlertHelper.kt index ab343a8..90869b3 100644 --- a/app/src/main/java/com/example/myapplication/utils/AlertHelper.kt +++ b/app/src/main/java/com/dazuoye/filemanager/utils/AlertHelper.kt @@ -1,11 +1,11 @@ -package com.example.myapplication.utils +package com.dazuoye.filemanager.utils import android.content.Context import android.content.DialogInterface import androidx.appcompat.app.AlertDialog.Builder -import com.example.myapplication.R -import com.example.myapplication.fileSystem.DeleteHelper -import com.example.myapplication.fileSystem.WrappedFile +import com.dazuoye.filemanager.R +import com.dazuoye.filemanager.fileSystem.DeleteHelper +import com.dazuoye.filemanager.fileSystem.WrappedFile import java.io.File class AlertHelper { diff --git a/app/src/main/java/com/example/myapplication/utils/ClipHelper.kt b/app/src/main/java/com/dazuoye/filemanager/utils/ClipHelper.kt similarity index 95% rename from app/src/main/java/com/example/myapplication/utils/ClipHelper.kt rename to app/src/main/java/com/dazuoye/filemanager/utils/ClipHelper.kt index d084d4b..c3e0a50 100644 --- a/app/src/main/java/com/example/myapplication/utils/ClipHelper.kt +++ b/app/src/main/java/com/dazuoye/filemanager/utils/ClipHelper.kt @@ -1,4 +1,4 @@ -package com.example.myapplication.utils +package com.dazuoye.filemanager.utils import android.content.ClipData import android.content.ClipboardManager @@ -6,7 +6,7 @@ import android.content.ContentResolver import android.content.Context import android.net.Uri import androidx.core.content.FileProvider -import com.example.myapplication.BuildConfig +import com.dazuoye.filemanager.BuildConfig import kotlinx.coroutines.InternalCoroutinesApi import kotlinx.coroutines.internal.synchronized import java.io.File diff --git a/app/src/main/java/com/example/myapplication/utils/Sysinfo.java b/app/src/main/java/com/dazuoye/filemanager/utils/Sysinfo.java similarity index 87% rename from app/src/main/java/com/example/myapplication/utils/Sysinfo.java rename to app/src/main/java/com/dazuoye/filemanager/utils/Sysinfo.java index 927eb29..5721bf4 100644 --- a/app/src/main/java/com/example/myapplication/utils/Sysinfo.java +++ b/app/src/main/java/com/dazuoye/filemanager/utils/Sysinfo.java @@ -1,4 +1,4 @@ -package com.example.myapplication.utils; +package com.dazuoye.filemanager.utils; public class Sysinfo { static { diff --git a/app/src/main/java/com/example/myapplication/video_page.kt b/app/src/main/java/com/dazuoye/filemanager/video_page.kt similarity index 94% rename from app/src/main/java/com/example/myapplication/video_page.kt rename to app/src/main/java/com/dazuoye/filemanager/video_page.kt index 7c3ca73..5ab4486 100644 --- a/app/src/main/java/com/example/myapplication/video_page.kt +++ b/app/src/main/java/com/dazuoye/filemanager/video_page.kt @@ -1,4 +1,4 @@ -package com.example.myapplication +package com.dazuoye.filemanager import android.annotation.SuppressLint import android.content.DialogInterface @@ -18,14 +18,14 @@ import androidx.core.content.FileProvider import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type -import com.example.myapplication.fileSystem.adapters.VideoAdapter -import com.example.myapplication.fileSystem.adapters.VideoModel -import com.example.myapplication.compose.SearchActivity -import com.example.myapplication.fileSystem.CutHelper -import com.example.myapplication.fileSystem.byTypeFileLister.DocumentLister -import com.example.myapplication.fileSystem.byTypeFileLister.VideoLister.Companion.instance -import com.example.myapplication.utils.AlertHelper -import com.example.myapplication.utils.ClipHelper +import com.dazuoye.filemanager.fileSystem.adapters.VideoAdapter +import com.dazuoye.filemanager.fileSystem.adapters.VideoModel +import com.dazuoye.filemanager.compose.SearchActivity +import com.dazuoye.filemanager.fileSystem.CutHelper +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.DocumentLister +import com.dazuoye.filemanager.fileSystem.byTypeFileLister.VideoLister.Companion.instance +import com.dazuoye.filemanager.utils.AlertHelper +import com.dazuoye.filemanager.utils.ClipHelper import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/jniLibs/arm64-v8a/libsysinfo.so b/app/src/main/jniLibs/arm64-v8a/libsysinfo.so index 0b2fed9..4547b9a 100755 Binary files a/app/src/main/jniLibs/arm64-v8a/libsysinfo.so and b/app/src/main/jniLibs/arm64-v8a/libsysinfo.so differ diff --git a/app/src/main/jniLibs/x86_64/libsysinfo.so b/app/src/main/jniLibs/x86_64/libsysinfo.so index 4b39217..a9281a0 100755 Binary files a/app/src/main/jniLibs/x86_64/libsysinfo.so and b/app/src/main/jniLibs/x86_64/libsysinfo.so differ diff --git a/app/src/main/rust/libsysinfo/src/lib.rs b/app/src/main/rust/libsysinfo/src/lib.rs index 8d34310..b45f494 100644 --- a/app/src/main/rust/libsysinfo/src/lib.rs +++ b/app/src/main/rust/libsysinfo/src/lib.rs @@ -28,7 +28,7 @@ fn get_sys() -> String { } #[no_mangle] -pub extern "system" fn Java_com_example_myapplication_utils_Sysinfo_getSystemNative<'local>( +pub extern "system" fn Java_com_dazuoye_filemanager_utils_Sysinfo_getSystemNative<'local>( env: JNIEnv<'local>, _: JClass<'local>, ) -> jstring { diff --git a/app/src/test/java/com/example/myapplication/ExampleUnitTest.java b/app/src/test/java/com/example/myapplication/ExampleUnitTest.java deleted file mode 100644 index bf43ee5..0000000 --- a/app/src/test/java/com/example/myapplication/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.myapplication; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file