-
wanglei authored
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/zxhy/solarmasterace/adapter/ViewHolder.kt # app/src/main/java/com/zxhy/solarmasterace/data/FileBean.kt # app/src/main/java/com/zxhy/solarmasterace/filebrowser/CardFileAdapter.kt # app/src/main/java/com/zxhy/solarmasterace/filebrowser/DupImageAdapter.kt # app/src/main/java/com/zxhy/solarmasterace/filebrowser/FileBrowserActivity.kt # app/src/main/java/com/zxhy/solarmasterace/filebrowser/FileGridAdapter.kt # app/src/main/java/com/zxhy/solarmasterace/filedetails/FileDetailActivity.kt # app/src/main/java/com/zxhy/solarmasterace/internalstorage/InternalStorageActivity.kt # app/src/main/java/com/zxhy/solarmasterace/quicktools/FileEx.kt # app/src/main/java/com/zxhy/solarmasterace/quicktools/FileHelper.kt # app/src/main/java/com/zxhy/solarmasterace/tools/RecentImageAdapter.kt # app/src/main/java/com/zxhy/solarmasterace/tools/ToolsFragment.kt # app/src/main/res/layout/activity_file_browser.xml # app/src/main/res/layout/activity_file_detail.xml # app/src/main/res/layout/activity_internal_storage.xml
bd6767e7
