From a37cee528630c286beeffaafc84d094bbed6a9e7 Mon Sep 17 00:00:00 2001 From: Wang Yuyang Date: Wed, 22 Sep 2021 13:53:55 +0800 Subject: [PATCH] change_package_name --- .../myapplication/ExampleInstrumentedTest.java | 2 +- app/src/main/AndroidManifest.xml | 10 +++++----- .../com/{example => echo}/myapplication/APP.java | 2 +- .../myapplication/BaiduAPI/BaiduImageAPI.java | 4 ++-- .../myapplication/BaiduAPI/styleTransTypes.java | 2 +- .../myapplication/ImageUtil/GlideEngine.java | 2 +- .../myapplication/ImageUtil/ImageLoaderUtils.java | 2 +- .../myapplication/ImageUtil/PhotoLib.java | 2 +- .../myapplication/ImageUtil/rcImage.java | 2 +- .../myapplication/Interfaces/RequestsListener.java | 2 +- .../{example => echo}/myapplication/ML/MLModel.java | 2 +- .../myapplication/ML/ProcessListener.java | 2 +- .../myapplication/ML/StyleTransModel.java | 5 +---- .../myapplication/MainActivity.java | 7 ++++--- .../com/{example => echo}/myapplication/Util.java | 2 +- .../myapplication/ui/BaseActivity.java | 2 +- .../myapplication/ui/BaseFragment.java | 2 +- .../ui/a_camera_activity/CameraKitActivity.java | 2 +- .../ImageUploadActivityViewModel.java | 8 ++++---- .../ImageUploadViewActivity.java | 10 +++++----- .../a_open_screen_activity/OpenScreenActivity.java | 6 +++--- .../a_open_screen_activity/OpenScreenViewModel.java | 4 ++-- .../ImageProcessTESTFragment.java | 10 +++++----- .../ImageProcessTESTViewModel.java | 2 +- .../ui/f_gallery_view/GalleryFragment.java | 8 ++++---- .../ui/f_gallery_view/GalleryViewModel.java | 2 +- .../ui/f_gallery_view/ImageAdapter.java | 4 ++-- .../MainIndexPageFragment.java | 12 ++++++------ .../MainIndexPageViewModel.java | 2 +- .../myapplication/ui/f_user_view/UserFragment.java | 2 +- .../ui/f_user_view/UserFragmentViewModel.java | 2 +- .../ui/v_others/ResizableImageView.java | 2 +- app/src/main/res/layout/app_bar_main.xml | 2 +- .../main/res/layout/fragment_clarity_enhancement.xml | 2 +- app/src/main/res/layout/fragment_image_colorize.xml | 2 +- app/src/main/res/layout/fragment_slideshow.xml | 6 +++--- app/src/main/res/layout/fragment_user.xml | 2 +- app/src/main/res/layout/open_screen.xml | 2 +- app/src/main/res/navigation/mobile_navigation.xml | 8 ++++---- .../myapplication/ExampleUnitTest.java | 2 +- 40 files changed, 76 insertions(+), 78 deletions(-) rename app/src/androidTest/java/com/{example => echo}/myapplication/ExampleInstrumentedTest.java (95%) rename app/src/main/java/com/{example => echo}/myapplication/APP.java (96%) rename app/src/main/java/com/{example => echo}/myapplication/BaiduAPI/BaiduImageAPI.java (97%) rename app/src/main/java/com/{example => echo}/myapplication/BaiduAPI/styleTransTypes.java (76%) rename app/src/main/java/com/{example => echo}/myapplication/ImageUtil/GlideEngine.java (99%) rename app/src/main/java/com/{example => echo}/myapplication/ImageUtil/ImageLoaderUtils.java (95%) rename app/src/main/java/com/{example => echo}/myapplication/ImageUtil/PhotoLib.java (98%) rename app/src/main/java/com/{example => echo}/myapplication/ImageUtil/rcImage.java (94%) rename app/src/main/java/com/{example => echo}/myapplication/Interfaces/RequestsListener.java (68%) rename app/src/main/java/com/{example => echo}/myapplication/ML/MLModel.java (69%) rename app/src/main/java/com/{example => echo}/myapplication/ML/ProcessListener.java (82%) rename app/src/main/java/com/{example => echo}/myapplication/ML/StyleTransModel.java (95%) rename app/src/main/java/com/{example => echo}/myapplication/MainActivity.java (96%) rename app/src/main/java/com/{example => echo}/myapplication/Util.java (98%) rename app/src/main/java/com/{example => echo}/myapplication/ui/BaseActivity.java (96%) rename app/src/main/java/com/{example => echo}/myapplication/ui/BaseFragment.java (97%) rename app/src/main/java/com/{example => echo}/myapplication/ui/a_camera_activity/CameraKitActivity.java (95%) rename app/src/main/java/com/{example => echo}/myapplication/ui/a_image_upload_activity/ImageUploadActivityViewModel.java (89%) rename app/src/main/java/com/{example => echo}/myapplication/ui/a_image_upload_activity/ImageUploadViewActivity.java (97%) rename app/src/main/java/com/{example => echo}/myapplication/ui/a_open_screen_activity/OpenScreenActivity.java (97%) rename app/src/main/java/com/{example => echo}/myapplication/ui/a_open_screen_activity/OpenScreenViewModel.java (97%) rename app/src/main/java/com/{example => echo}/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTFragment.java (96%) rename app/src/main/java/com/{example => echo}/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTViewModel.java (96%) rename app/src/main/java/com/{example => echo}/myapplication/ui/f_gallery_view/GalleryFragment.java (94%) rename app/src/main/java/com/{example => echo}/myapplication/ui/f_gallery_view/GalleryViewModel.java (88%) rename app/src/main/java/com/{example => echo}/myapplication/ui/f_gallery_view/ImageAdapter.java (96%) rename app/src/main/java/com/{example => echo}/myapplication/ui/f_main_index_page_view/MainIndexPageFragment.java (96%) rename app/src/main/java/com/{example => echo}/myapplication/ui/f_main_index_page_view/MainIndexPageViewModel.java (98%) rename app/src/main/java/com/{example => echo}/myapplication/ui/f_user_view/UserFragment.java (99%) rename app/src/main/java/com/{example => echo}/myapplication/ui/f_user_view/UserFragmentViewModel.java (97%) rename app/src/main/java/com/{example => echo}/myapplication/ui/v_others/ResizableImageView.java (94%) rename app/src/test/java/com/{example => echo}/myapplication/ExampleUnitTest.java (90%) diff --git a/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/echo/myapplication/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/echo/myapplication/ExampleInstrumentedTest.java index 982ba51..4052635 100644 --- a/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/echo/myapplication/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.example.myapplication; +package com.echo.myapplication; import android.content.Context; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 09c6996..19b47cb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ @@ -35,7 +35,7 @@ @@ -46,13 +46,13 @@ diff --git a/app/src/main/java/com/example/myapplication/APP.java b/app/src/main/java/com/echo/myapplication/APP.java similarity index 96% rename from app/src/main/java/com/example/myapplication/APP.java rename to app/src/main/java/com/echo/myapplication/APP.java index 7c77f0b..09b18ef 100644 --- a/app/src/main/java/com/example/myapplication/APP.java +++ b/app/src/main/java/com/echo/myapplication/APP.java @@ -1,4 +1,4 @@ -package com.example.myapplication; +package com.echo.myapplication; import android.app.Application; import android.content.Context; diff --git a/app/src/main/java/com/example/myapplication/BaiduAPI/BaiduImageAPI.java b/app/src/main/java/com/echo/myapplication/BaiduAPI/BaiduImageAPI.java similarity index 97% rename from app/src/main/java/com/example/myapplication/BaiduAPI/BaiduImageAPI.java rename to app/src/main/java/com/echo/myapplication/BaiduAPI/BaiduImageAPI.java index 03c03e4..6893e4b 100644 --- a/app/src/main/java/com/example/myapplication/BaiduAPI/BaiduImageAPI.java +++ b/app/src/main/java/com/echo/myapplication/BaiduAPI/BaiduImageAPI.java @@ -1,9 +1,9 @@ -package com.example.myapplication.BaiduAPI; +package com.echo.myapplication.BaiduAPI; import android.util.Log; import com.baidu.aip.imageprocess.AipImageProcess; -import com.example.myapplication.Interfaces.RequestsListener; +import com.echo.myapplication.Interfaces.RequestsListener; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/example/myapplication/BaiduAPI/styleTransTypes.java b/app/src/main/java/com/echo/myapplication/BaiduAPI/styleTransTypes.java similarity index 76% rename from app/src/main/java/com/example/myapplication/BaiduAPI/styleTransTypes.java rename to app/src/main/java/com/echo/myapplication/BaiduAPI/styleTransTypes.java index 4de95ff..e8677c6 100644 --- a/app/src/main/java/com/example/myapplication/BaiduAPI/styleTransTypes.java +++ b/app/src/main/java/com/echo/myapplication/BaiduAPI/styleTransTypes.java @@ -1,4 +1,4 @@ -package com.example.myapplication.BaiduAPI; +package com.echo.myapplication.BaiduAPI; public enum styleTransTypes { cartoon, diff --git a/app/src/main/java/com/example/myapplication/ImageUtil/GlideEngine.java b/app/src/main/java/com/echo/myapplication/ImageUtil/GlideEngine.java similarity index 99% rename from app/src/main/java/com/example/myapplication/ImageUtil/GlideEngine.java rename to app/src/main/java/com/echo/myapplication/ImageUtil/GlideEngine.java index 888e7f8..4132943 100644 --- a/app/src/main/java/com/example/myapplication/ImageUtil/GlideEngine.java +++ b/app/src/main/java/com/echo/myapplication/ImageUtil/GlideEngine.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ImageUtil; +package com.echo.myapplication.ImageUtil; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/example/myapplication/ImageUtil/ImageLoaderUtils.java b/app/src/main/java/com/echo/myapplication/ImageUtil/ImageLoaderUtils.java similarity index 95% rename from app/src/main/java/com/example/myapplication/ImageUtil/ImageLoaderUtils.java rename to app/src/main/java/com/echo/myapplication/ImageUtil/ImageLoaderUtils.java index 685a2f0..4aeebca 100644 --- a/app/src/main/java/com/example/myapplication/ImageUtil/ImageLoaderUtils.java +++ b/app/src/main/java/com/echo/myapplication/ImageUtil/ImageLoaderUtils.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ImageUtil; +package com.echo.myapplication.ImageUtil; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/example/myapplication/ImageUtil/PhotoLib.java b/app/src/main/java/com/echo/myapplication/ImageUtil/PhotoLib.java similarity index 98% rename from app/src/main/java/com/example/myapplication/ImageUtil/PhotoLib.java rename to app/src/main/java/com/echo/myapplication/ImageUtil/PhotoLib.java index ea61b3c..89b52eb 100644 --- a/app/src/main/java/com/example/myapplication/ImageUtil/PhotoLib.java +++ b/app/src/main/java/com/echo/myapplication/ImageUtil/PhotoLib.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ImageUtil; +package com.echo.myapplication.ImageUtil; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/com/example/myapplication/ImageUtil/rcImage.java b/app/src/main/java/com/echo/myapplication/ImageUtil/rcImage.java similarity index 94% rename from app/src/main/java/com/example/myapplication/ImageUtil/rcImage.java rename to app/src/main/java/com/echo/myapplication/ImageUtil/rcImage.java index d44c4ea..a1f6560 100644 --- a/app/src/main/java/com/example/myapplication/ImageUtil/rcImage.java +++ b/app/src/main/java/com/echo/myapplication/ImageUtil/rcImage.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ImageUtil; +package com.echo.myapplication.ImageUtil; public class rcImage { private String imgName; diff --git a/app/src/main/java/com/example/myapplication/Interfaces/RequestsListener.java b/app/src/main/java/com/echo/myapplication/Interfaces/RequestsListener.java similarity index 68% rename from app/src/main/java/com/example/myapplication/Interfaces/RequestsListener.java rename to app/src/main/java/com/echo/myapplication/Interfaces/RequestsListener.java index efb890a..bf0ead9 100644 --- a/app/src/main/java/com/example/myapplication/Interfaces/RequestsListener.java +++ b/app/src/main/java/com/echo/myapplication/Interfaces/RequestsListener.java @@ -1,4 +1,4 @@ -package com.example.myapplication.Interfaces; +package com.echo.myapplication.Interfaces; public interface RequestsListener { void success(String data); diff --git a/app/src/main/java/com/example/myapplication/ML/MLModel.java b/app/src/main/java/com/echo/myapplication/ML/MLModel.java similarity index 69% rename from app/src/main/java/com/example/myapplication/ML/MLModel.java rename to app/src/main/java/com/echo/myapplication/ML/MLModel.java index f4b32de..4644f26 100644 --- a/app/src/main/java/com/example/myapplication/ML/MLModel.java +++ b/app/src/main/java/com/echo/myapplication/ML/MLModel.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ML; +package com.echo.myapplication.ML; public interface MLModel { void process(String path, ProcessListener listener); diff --git a/app/src/main/java/com/example/myapplication/ML/ProcessListener.java b/app/src/main/java/com/echo/myapplication/ML/ProcessListener.java similarity index 82% rename from app/src/main/java/com/example/myapplication/ML/ProcessListener.java rename to app/src/main/java/com/echo/myapplication/ML/ProcessListener.java index aee6ea0..52c83d2 100644 --- a/app/src/main/java/com/example/myapplication/ML/ProcessListener.java +++ b/app/src/main/java/com/echo/myapplication/ML/ProcessListener.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ML; +package com.echo.myapplication.ML; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/example/myapplication/ML/StyleTransModel.java b/app/src/main/java/com/echo/myapplication/ML/StyleTransModel.java similarity index 95% rename from app/src/main/java/com/example/myapplication/ML/StyleTransModel.java rename to app/src/main/java/com/echo/myapplication/ML/StyleTransModel.java index 4037471..8b66ed1 100644 --- a/app/src/main/java/com/example/myapplication/ML/StyleTransModel.java +++ b/app/src/main/java/com/echo/myapplication/ML/StyleTransModel.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ML; +package com.echo.myapplication.ML; import android.content.Context; import android.graphics.Bitmap; @@ -7,14 +7,11 @@ import android.graphics.BitmapFactory; import com.example.myapplication.ml.MagentaArbitraryImageStylizationV1256Fp16Prediction1; import com.example.myapplication.ml.MagentaArbitraryImageStylizationV1256Fp16Transfer1; -import org.tensorflow.lite.DataType; import org.tensorflow.lite.support.image.TensorImage; import org.tensorflow.lite.support.tensorbuffer.TensorBuffer; import java.io.IOException; -import cn.hutool.core.util.SerializeUtil; - public class StyleTransModel implements MLModel{ private Context context; diff --git a/app/src/main/java/com/example/myapplication/MainActivity.java b/app/src/main/java/com/echo/myapplication/MainActivity.java similarity index 96% rename from app/src/main/java/com/example/myapplication/MainActivity.java rename to app/src/main/java/com/echo/myapplication/MainActivity.java index ba3f379..e5e321a 100644 --- a/app/src/main/java/com/example/myapplication/MainActivity.java +++ b/app/src/main/java/com/echo/myapplication/MainActivity.java @@ -1,4 +1,4 @@ -package com.example.myapplication; +package com.echo.myapplication; import android.content.Intent; import android.graphics.Bitmap; @@ -11,8 +11,9 @@ import android.view.Window; import android.view.WindowManager; import com.etebarian.meowbottomnavigation.MeowBottomNavigation; -import com.example.myapplication.ImageUtil.PhotoLib; -import com.example.myapplication.ui.a_image_upload_activity.ImageUploadViewActivity; +import com.echo.myapplication.ImageUtil.PhotoLib; +import com.example.myapplication.R; +import com.echo.myapplication.ui.a_image_upload_activity.ImageUploadViewActivity; import com.google.android.material.snackbar.Snackbar; import androidx.annotation.Nullable; diff --git a/app/src/main/java/com/example/myapplication/Util.java b/app/src/main/java/com/echo/myapplication/Util.java similarity index 98% rename from app/src/main/java/com/example/myapplication/Util.java rename to app/src/main/java/com/echo/myapplication/Util.java index 0b04672..4847057 100644 --- a/app/src/main/java/com/example/myapplication/Util.java +++ b/app/src/main/java/com/echo/myapplication/Util.java @@ -1,4 +1,4 @@ -package com.example.myapplication; +package com.echo.myapplication; import android.content.Context; import android.provider.Settings; diff --git a/app/src/main/java/com/example/myapplication/ui/BaseActivity.java b/app/src/main/java/com/echo/myapplication/ui/BaseActivity.java similarity index 96% rename from app/src/main/java/com/example/myapplication/ui/BaseActivity.java rename to app/src/main/java/com/echo/myapplication/ui/BaseActivity.java index 9d97b16..4f57dd1 100644 --- a/app/src/main/java/com/example/myapplication/ui/BaseActivity.java +++ b/app/src/main/java/com/echo/myapplication/ui/BaseActivity.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui; +package com.echo.myapplication.ui; import android.app.ProgressDialog; import android.view.View; diff --git a/app/src/main/java/com/example/myapplication/ui/BaseFragment.java b/app/src/main/java/com/echo/myapplication/ui/BaseFragment.java similarity index 97% rename from app/src/main/java/com/example/myapplication/ui/BaseFragment.java rename to app/src/main/java/com/echo/myapplication/ui/BaseFragment.java index 7bc2251..1bb5bd8 100644 --- a/app/src/main/java/com/example/myapplication/ui/BaseFragment.java +++ b/app/src/main/java/com/echo/myapplication/ui/BaseFragment.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui; +package com.echo.myapplication.ui; import android.app.ProgressDialog; import android.os.Bundle; diff --git a/app/src/main/java/com/example/myapplication/ui/a_camera_activity/CameraKitActivity.java b/app/src/main/java/com/echo/myapplication/ui/a_camera_activity/CameraKitActivity.java similarity index 95% rename from app/src/main/java/com/example/myapplication/ui/a_camera_activity/CameraKitActivity.java rename to app/src/main/java/com/echo/myapplication/ui/a_camera_activity/CameraKitActivity.java index eb3649b..e668024 100644 --- a/app/src/main/java/com/example/myapplication/ui/a_camera_activity/CameraKitActivity.java +++ b/app/src/main/java/com/echo/myapplication/ui/a_camera_activity/CameraKitActivity.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.a_camera_activity; +package com.echo.myapplication.ui.a_camera_activity; import android.os.Bundle; diff --git a/app/src/main/java/com/example/myapplication/ui/a_image_upload_activity/ImageUploadActivityViewModel.java b/app/src/main/java/com/echo/myapplication/ui/a_image_upload_activity/ImageUploadActivityViewModel.java similarity index 89% rename from app/src/main/java/com/example/myapplication/ui/a_image_upload_activity/ImageUploadActivityViewModel.java rename to app/src/main/java/com/echo/myapplication/ui/a_image_upload_activity/ImageUploadActivityViewModel.java index 38e52fa..0c5220d 100644 --- a/app/src/main/java/com/example/myapplication/ui/a_image_upload_activity/ImageUploadActivityViewModel.java +++ b/app/src/main/java/com/echo/myapplication/ui/a_image_upload_activity/ImageUploadActivityViewModel.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.a_image_upload_activity; +package com.echo.myapplication.ui.a_image_upload_activity; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -6,9 +6,9 @@ import android.graphics.BitmapFactory; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.example.myapplication.BaiduAPI.BaiduImageAPI; -import com.example.myapplication.ImageUtil.PhotoLib; -import com.example.myapplication.Interfaces.RequestsListener; +import com.echo.myapplication.BaiduAPI.BaiduImageAPI; +import com.echo.myapplication.ImageUtil.PhotoLib; +import com.echo.myapplication.Interfaces.RequestsListener; public class ImageUploadActivityViewModel extends ViewModel { private BaiduImageAPI baiduImageAPI; diff --git a/app/src/main/java/com/example/myapplication/ui/a_image_upload_activity/ImageUploadViewActivity.java b/app/src/main/java/com/echo/myapplication/ui/a_image_upload_activity/ImageUploadViewActivity.java similarity index 97% rename from app/src/main/java/com/example/myapplication/ui/a_image_upload_activity/ImageUploadViewActivity.java rename to app/src/main/java/com/echo/myapplication/ui/a_image_upload_activity/ImageUploadViewActivity.java index 706be85..f0662a1 100644 --- a/app/src/main/java/com/example/myapplication/ui/a_image_upload_activity/ImageUploadViewActivity.java +++ b/app/src/main/java/com/echo/myapplication/ui/a_image_upload_activity/ImageUploadViewActivity.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.a_image_upload_activity; +package com.echo.myapplication.ui.a_image_upload_activity; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -21,12 +21,12 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import androidx.navigation.ui.AppBarConfiguration; -import com.example.myapplication.ImageUtil.PhotoLib; -import com.example.myapplication.Interfaces.RequestsListener; +import com.echo.myapplication.Util; +import com.echo.myapplication.ui.BaseActivity; +import com.echo.myapplication.ImageUtil.PhotoLib; +import com.echo.myapplication.Interfaces.RequestsListener; import com.example.myapplication.R; -import com.example.myapplication.Util; import com.example.myapplication.databinding.ImageColorizeUploadActivityBinding; -import com.example.myapplication.ui.BaseActivity; import ch.halcyon.squareprogressbar.utils.PercentStyle; diff --git a/app/src/main/java/com/example/myapplication/ui/a_open_screen_activity/OpenScreenActivity.java b/app/src/main/java/com/echo/myapplication/ui/a_open_screen_activity/OpenScreenActivity.java similarity index 97% rename from app/src/main/java/com/example/myapplication/ui/a_open_screen_activity/OpenScreenActivity.java rename to app/src/main/java/com/echo/myapplication/ui/a_open_screen_activity/OpenScreenActivity.java index d87f431..0a04472 100644 --- a/app/src/main/java/com/example/myapplication/ui/a_open_screen_activity/OpenScreenActivity.java +++ b/app/src/main/java/com/echo/myapplication/ui/a_open_screen_activity/OpenScreenActivity.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.a_open_screen_activity; +package com.echo.myapplication.ui.a_open_screen_activity; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -19,10 +19,10 @@ import androidx.lifecycle.ViewModelProvider; import com.daimajia.androidanimations.library.Techniques; import com.daimajia.androidanimations.library.YoYo; -import com.example.myapplication.MainActivity; +import com.echo.myapplication.MainActivity; +import com.echo.myapplication.ui.BaseActivity; import com.example.myapplication.R; import com.example.myapplication.databinding.OpenScreenBinding; -import com.example.myapplication.ui.BaseActivity; public class OpenScreenActivity extends BaseActivity { private OpenScreenBinding binding; diff --git a/app/src/main/java/com/example/myapplication/ui/a_open_screen_activity/OpenScreenViewModel.java b/app/src/main/java/com/echo/myapplication/ui/a_open_screen_activity/OpenScreenViewModel.java similarity index 97% rename from app/src/main/java/com/example/myapplication/ui/a_open_screen_activity/OpenScreenViewModel.java rename to app/src/main/java/com/echo/myapplication/ui/a_open_screen_activity/OpenScreenViewModel.java index 1805686..7f13cfa 100644 --- a/app/src/main/java/com/example/myapplication/ui/a_open_screen_activity/OpenScreenViewModel.java +++ b/app/src/main/java/com/echo/myapplication/ui/a_open_screen_activity/OpenScreenViewModel.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.a_open_screen_activity; +package com.echo.myapplication.ui.a_open_screen_activity; import android.content.Context; import android.content.SharedPreferences; @@ -6,7 +6,7 @@ import android.content.SharedPreferences; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.example.myapplication.Util; +import com.echo.myapplication.Util; import cn.leancloud.LCUser; import io.reactivex.Observer; diff --git a/app/src/main/java/com/example/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTFragment.java b/app/src/main/java/com/echo/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTFragment.java similarity index 96% rename from app/src/main/java/com/example/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTFragment.java rename to app/src/main/java/com/echo/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTFragment.java index 866bc6a..36f7467 100644 --- a/app/src/main/java/com/example/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTFragment.java +++ b/app/src/main/java/com/echo/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTFragment.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.f_ImageProcessTEST_view; +package com.echo.myapplication.ui.f_ImageProcessTEST_view; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -17,13 +17,13 @@ import androidx.annotation.Nullable; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.example.myapplication.ImageUtil.GlideEngine; +import com.echo.myapplication.ML.ProcessListener; +import com.echo.myapplication.ML.StyleTransModel; +import com.echo.myapplication.ui.BaseFragment; +import com.echo.myapplication.ImageUtil.GlideEngine; -import com.example.myapplication.ML.ProcessListener; -import com.example.myapplication.ML.StyleTransModel; import com.example.myapplication.R; import com.example.myapplication.databinding.FragmentImageColorizeBinding; -import com.example.myapplication.ui.BaseFragment; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; diff --git a/app/src/main/java/com/example/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTViewModel.java b/app/src/main/java/com/echo/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTViewModel.java similarity index 96% rename from app/src/main/java/com/example/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTViewModel.java rename to app/src/main/java/com/echo/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTViewModel.java index 6260ad6..6d20ed4 100644 --- a/app/src/main/java/com/example/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTViewModel.java +++ b/app/src/main/java/com/echo/myapplication/ui/f_ImageProcessTEST_view/ImageProcessTESTViewModel.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.f_ImageProcessTEST_view; +package com.echo.myapplication.ui.f_ImageProcessTEST_view; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/example/myapplication/ui/f_gallery_view/GalleryFragment.java b/app/src/main/java/com/echo/myapplication/ui/f_gallery_view/GalleryFragment.java similarity index 94% rename from app/src/main/java/com/example/myapplication/ui/f_gallery_view/GalleryFragment.java rename to app/src/main/java/com/echo/myapplication/ui/f_gallery_view/GalleryFragment.java index 10aad84..4cac98a 100644 --- a/app/src/main/java/com/example/myapplication/ui/f_gallery_view/GalleryFragment.java +++ b/app/src/main/java/com/echo/myapplication/ui/f_gallery_view/GalleryFragment.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.f_gallery_view; +package com.echo.myapplication.ui.f_gallery_view; import android.os.Bundle; import android.os.Environment; @@ -15,11 +15,11 @@ import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; -import com.example.myapplication.ImageUtil.rcImage; +import com.echo.myapplication.ImageUtil.rcImage; +import com.echo.myapplication.Util; +import com.echo.myapplication.ui.BaseFragment; import com.example.myapplication.R; -import com.example.myapplication.Util; import com.example.myapplication.databinding.FragmentClarityEnhancementBinding; -import com.example.myapplication.ui.BaseFragment; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/example/myapplication/ui/f_gallery_view/GalleryViewModel.java b/app/src/main/java/com/echo/myapplication/ui/f_gallery_view/GalleryViewModel.java similarity index 88% rename from app/src/main/java/com/example/myapplication/ui/f_gallery_view/GalleryViewModel.java rename to app/src/main/java/com/echo/myapplication/ui/f_gallery_view/GalleryViewModel.java index 866ac9f..9a03c38 100644 --- a/app/src/main/java/com/example/myapplication/ui/f_gallery_view/GalleryViewModel.java +++ b/app/src/main/java/com/echo/myapplication/ui/f_gallery_view/GalleryViewModel.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.f_gallery_view; +package com.echo.myapplication.ui.f_gallery_view; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; diff --git a/app/src/main/java/com/example/myapplication/ui/f_gallery_view/ImageAdapter.java b/app/src/main/java/com/echo/myapplication/ui/f_gallery_view/ImageAdapter.java similarity index 96% rename from app/src/main/java/com/example/myapplication/ui/f_gallery_view/ImageAdapter.java rename to app/src/main/java/com/echo/myapplication/ui/f_gallery_view/ImageAdapter.java index 518a6d8..0473aba 100644 --- a/app/src/main/java/com/example/myapplication/ui/f_gallery_view/ImageAdapter.java +++ b/app/src/main/java/com/echo/myapplication/ui/f_gallery_view/ImageAdapter.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.f_gallery_view; +package com.echo.myapplication.ui.f_gallery_view; import android.graphics.BitmapFactory; import android.view.LayoutInflater; @@ -12,7 +12,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.example.myapplication.ImageUtil.rcImage; +import com.echo.myapplication.ImageUtil.rcImage; import com.example.myapplication.R; import java.util.List; diff --git a/app/src/main/java/com/example/myapplication/ui/f_main_index_page_view/MainIndexPageFragment.java b/app/src/main/java/com/echo/myapplication/ui/f_main_index_page_view/MainIndexPageFragment.java similarity index 96% rename from app/src/main/java/com/example/myapplication/ui/f_main_index_page_view/MainIndexPageFragment.java rename to app/src/main/java/com/echo/myapplication/ui/f_main_index_page_view/MainIndexPageFragment.java index 249953a..68dfcd3 100644 --- a/app/src/main/java/com/example/myapplication/ui/f_main_index_page_view/MainIndexPageFragment.java +++ b/app/src/main/java/com/echo/myapplication/ui/f_main_index_page_view/MainIndexPageFragment.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.f_main_index_page_view; +package com.echo.myapplication.ui.f_main_index_page_view; import static androidx.core.content.ContextCompat.checkSelfPermission; @@ -26,13 +26,13 @@ import androidx.annotation.Nullable; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import com.example.myapplication.Util; -import com.example.myapplication.ui.BaseFragment; -import com.example.myapplication.ui.a_image_upload_activity.ImageUploadViewActivity; -import com.example.myapplication.ImageUtil.GlideEngine; +import com.echo.myapplication.ImageUtil.GlideEngine; +import com.echo.myapplication.Util; +import com.echo.myapplication.ui.BaseFragment; +import com.echo.myapplication.ui.a_image_upload_activity.ImageUploadViewActivity; +import com.echo.myapplication.ui.v_others.ResizableImageView; import com.example.myapplication.R; import com.example.myapplication.databinding.FragmentSlideshowBinding; -import com.example.myapplication.ui.v_others.ResizableImageView; import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureMimeType; diff --git a/app/src/main/java/com/example/myapplication/ui/f_main_index_page_view/MainIndexPageViewModel.java b/app/src/main/java/com/echo/myapplication/ui/f_main_index_page_view/MainIndexPageViewModel.java similarity index 98% rename from app/src/main/java/com/example/myapplication/ui/f_main_index_page_view/MainIndexPageViewModel.java rename to app/src/main/java/com/echo/myapplication/ui/f_main_index_page_view/MainIndexPageViewModel.java index 26f2953..2e6b854 100644 --- a/app/src/main/java/com/example/myapplication/ui/f_main_index_page_view/MainIndexPageViewModel.java +++ b/app/src/main/java/com/echo/myapplication/ui/f_main_index_page_view/MainIndexPageViewModel.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.f_main_index_page_view; +package com.echo.myapplication.ui.f_main_index_page_view; import android.graphics.Bitmap; import android.graphics.Canvas; diff --git a/app/src/main/java/com/example/myapplication/ui/f_user_view/UserFragment.java b/app/src/main/java/com/echo/myapplication/ui/f_user_view/UserFragment.java similarity index 99% rename from app/src/main/java/com/example/myapplication/ui/f_user_view/UserFragment.java rename to app/src/main/java/com/echo/myapplication/ui/f_user_view/UserFragment.java index 67cccfa..56471de 100644 --- a/app/src/main/java/com/example/myapplication/ui/f_user_view/UserFragment.java +++ b/app/src/main/java/com/echo/myapplication/ui/f_user_view/UserFragment.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.f_user_view; +package com.echo.myapplication.ui.f_user_view; import android.os.Bundle; import android.transition.Fade; diff --git a/app/src/main/java/com/example/myapplication/ui/f_user_view/UserFragmentViewModel.java b/app/src/main/java/com/echo/myapplication/ui/f_user_view/UserFragmentViewModel.java similarity index 97% rename from app/src/main/java/com/example/myapplication/ui/f_user_view/UserFragmentViewModel.java rename to app/src/main/java/com/echo/myapplication/ui/f_user_view/UserFragmentViewModel.java index f2d1cc0..65033e0 100644 --- a/app/src/main/java/com/example/myapplication/ui/f_user_view/UserFragmentViewModel.java +++ b/app/src/main/java/com/echo/myapplication/ui/f_user_view/UserFragmentViewModel.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.f_user_view; +package com.echo.myapplication.ui.f_user_view; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; diff --git a/app/src/main/java/com/example/myapplication/ui/v_others/ResizableImageView.java b/app/src/main/java/com/echo/myapplication/ui/v_others/ResizableImageView.java similarity index 94% rename from app/src/main/java/com/example/myapplication/ui/v_others/ResizableImageView.java rename to app/src/main/java/com/echo/myapplication/ui/v_others/ResizableImageView.java index 5112482..03d6d2d 100644 --- a/app/src/main/java/com/example/myapplication/ui/v_others/ResizableImageView.java +++ b/app/src/main/java/com/echo/myapplication/ui/v_others/ResizableImageView.java @@ -1,4 +1,4 @@ -package com.example.myapplication.ui.v_others; +package com.echo.myapplication.ui.v_others; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 4b82c25..17d6942 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainActivity"> + tools:context="com.echo.myapplication.MainActivity"> + tools:context="com.echo.myapplication.ui.f_gallery_view.GalleryFragment"> + tools:context="com.echo.myapplication.ui.f_ImageProcessTEST_view.ImageProcessTESTFragment"> + tools:context="com.echo.myapplication.ui.f_main_index_page_view.MainIndexPageFragment"> - - diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 8db0250..2a7f256 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -7,23 +7,23 @@ \ No newline at end of file diff --git a/app/src/test/java/com/example/myapplication/ExampleUnitTest.java b/app/src/test/java/com/echo/myapplication/ExampleUnitTest.java similarity index 90% rename from app/src/test/java/com/example/myapplication/ExampleUnitTest.java rename to app/src/test/java/com/echo/myapplication/ExampleUnitTest.java index bf43ee5..a28c867 100644 --- a/app/src/test/java/com/example/myapplication/ExampleUnitTest.java +++ b/app/src/test/java/com/echo/myapplication/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.example.myapplication; +package com.echo.myapplication; import org.junit.Test;