yuying

app/build.gradle

@@ -9,7 +9,7 @@ android {
     compileSdk 30
 
     defaultConfig {
-        applicationId 'com.echo.colorize'
+        applicationId 'com.yuying.colorize'
         minSdk 21
         targetSdk 30
         versionCode 1
@@ -58,8 +58,6 @@ dependencies {
     implementation 'org.tensorflow:tensorflow-lite-support:0.1.0'
     implementation 'org.tensorflow:tensorflow-lite-metadata:0.1.0'
     implementation 'org.tensorflow:tensorflow-lite-gpu:2.3.0'
-    implementation project(path: ':stinger_game')
-    implementation project(path: ':photo_editor')
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

app/src/main/java/com/echo/colorizeit/APP.java

@@ -17,9 +17,9 @@ public class APP extends Application {
         // 提供 this、App ID、App Key、Server Host 作为参数
         // 注意这里千万不要调用 cn.leancloud.core.LeanCloud 的 initialize 方法，否则会出现 NetworkOnMainThread 等错误。
         LeanCloud.initialize(this,
-                "IIuObRE1fWDsL8sOMXuqLgux-gzGzoHsz",
-                "IwTKYR5dPLT901k7hlbGxtuX",
-                "https://iiuobre1.lc-cn-n1-shared.com");
+                "OdD4tNlK5eChmderJ9ryf5m2-gzGzoHsz",
+                "17l22uySxDwuba465xU85VXD",
+                "https://odd4tnlk.lc-cn-n1-shared.com");
         LeanCloud.setLogLevel(LCLogger.Level.DEBUG);
 
 

app/src/main/java/com/echo/colorizeit/BaiduAPI/BaiduImageAPI.java

@@ -18,9 +18,9 @@ import java.util.HashMap;
  */
 public class BaiduImageAPI {
     //设置APPID/AK/SK
-    public static final String APP_ID = "24778510";
-    public static final String API_KEY = "z2Uw0ij41KQLxlfNmbs9X4YZ";
-    public static final String SECRET_KEY = "wIiKlRQjQA9XG40ivhPwcl89E40FP8TU";
+    public static final String APP_ID = "25146767";
+    public static final String API_KEY = "bF9HZSY82nDUzxnnD4lQZh40";
+    public static final String SECRET_KEY = "s4AaZEUjgyv3yFuYd3Zo4VGPYZpvmNtP";
 
     public BaiduImageAPI() {
     }

app/src/main/java/com/echo/colorizeit/ui/a_image_upload_activity/ImageUploadViewActivity.java

@@ -29,8 +29,6 @@ import com.echo.colorizeit.ML.CategoryProcessListener;
 import com.echo.colorizeit.ML.LabelerModel;
 import com.echo.colorizeit.Util;
 import com.echo.colorizeit.ui.BaseActivity;
-import com.echo.photo_editor.photo_editor_view.PhotoEditorView;
-import com.echo.stinger_game.myganme.GameActivity;
 import com.example.myapplication.R;
 import com.example.myapplication.databinding.ImageColorizeUploadActivityBinding;
 
@@ -79,13 +77,6 @@ public class ImageUploadViewActivity extends BaseActivity {
 //        });
         binding.lableView.setAdapter(labelAdapter);
         model.setImageViewDataByPath(intent.getStringExtra("sourceFilePath"));
-        binding.imageProcessingAnimation.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(_this, GameActivity.class);
-                startActivity(intent);
-            }
-        });
         colorize_image();
         binding.CompareButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -212,18 +203,6 @@ public class ImageUploadViewActivity extends BaseActivity {
             }
         });
 
-        binding.ContinueEditingButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                System.out.println("ContinueEditingButton");
-                String data = PhotoLib.saveImageToGallery(getApplicationContext(), model.getColorizedImageBitmap());
-                Intent intent = new Intent(_this, PhotoEditorView.class);
-                intent.putExtra("sourceFilePath", data);
-                startActivity(intent);
-
-            }
-        });
-
 
         setContentView(binding.getRoot());
     }
@@ -283,7 +262,6 @@ public class ImageUploadViewActivity extends BaseActivity {
                         binding.ShareButton.setEnabled(true);
                         binding.SaveImageButton.setEnabled(true);
                         binding.CompareButton.setEnabled(true);
-                        binding.ContinueEditingButton.setEnabled(true);
                         binding.uploadFinishAnimationView.playAnimation();
                         Animation animation_fade_out = AnimationUtils.loadAnimation(_this, R.anim.fade_out);
                         Animation animation_fade_out1 = AnimationUtils.loadAnimation(_this, R.anim.fade_out);

app/src/main/java/com/echo/colorizeit/ui/a_open_screen_activity/OpenScreenActivity.java

@@ -21,7 +21,6 @@ import androidx.lifecycle.ViewModelProvider;
 import com.daimajia.androidanimations.library.Techniques;
 import com.daimajia.androidanimations.library.YoYo;
 import com.echo.colorizeit.MainActivity;
-import com.echo.stinger_game.myganme.GameActivity;
 import com.echo.colorizeit.ui.BaseActivity;
 import com.example.myapplication.R;
 import com.example.myapplication.databinding.OpenScreenBinding;
@@ -175,8 +174,6 @@ public class OpenScreenActivity extends BaseActivity {
         alterDiaglog.setPositiveButton("Play a Game", new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                Intent intent = new Intent(_this, GameActivity.class);
-                startActivity(intent);
             }
         });
 

app/src/main/java/com/echo/colorizeit/ui/f_gallery_view/ImageAdapter.java

@@ -20,7 +20,6 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.echo.colorizeit.ImageUtil.rcImage;
 import com.echo.colorizeit.ui.a_image_upload_activity.ImageUploadViewActivity;
-import com.echo.photo_editor.photo_editor_view.PhotoEditorView;
 import com.example.myapplication.R;
 import com.google.android.material.snackbar.Snackbar;
 
@@ -68,22 +67,6 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
             }
         });
         holder.Image.startAnimation(animation_fade_in);
-        holder.Image.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(holder.Image.getContext(), PhotoEditorView.class);
-                intent.putExtra("sourceFilePath", image.getImgPath());
-                holder.Image.getContext().startActivity(intent);
-            }
-        });
-        holder.Edit_button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(holder.Image.getContext(), PhotoEditorView.class);
-                intent.putExtra("sourceFilePath", image.getImgPath());
-                holder.Image.getContext().startActivity(intent);
-            }
-        });
         holder.Share_button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -160,7 +143,7 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
             super(view);
             Image = (ImageView) view.findViewById(R.id.rc_image_view);
             Share_button = view.findViewById(R.id.gallery_share_button);
-            Edit_button = view.findViewById(R.id.gallery_edit_button);
+//            Edit_button = view.findViewById(R.id.gallery_edit_button);
             Save_button = view.findViewById(R.id.gallery_save_button);
         }
 

app/src/main/java/com/echo/colorizeit/ui/f_main_index_page_view/MainIndexPageFragment.java

@@ -35,7 +35,6 @@ import com.echo.colorizeit.ui.BaseFragment;
 import com.echo.colorizeit.ui.a_image_upload_activity.ImageUploadViewActivity;
 import com.echo.colorizeit.ui.a_login_activity.LoginViewActivity;
 import com.echo.colorizeit.ui.v_others.ResizableImageView;
-import com.echo.stinger_game.myganme.GameActivity;
 import com.example.myapplication.R;
 import com.example.myapplication.databinding.FragmentSlideshowBinding;
 import com.luck.picture.lib.PictureSelector;
@@ -217,14 +216,6 @@ public class MainIndexPageFragment extends BaseFragment {
             }
         });
 
-        binding.wellComeView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getActivity(), GameActivity.class);
-                startActivity(intent);
-            }
-        });
-
 
         return root;
     }

app/src/main/res/drawable/openscreenshare.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient android:startColor="#FFB74D"
-        android:endColor="#BA68C8"
+    <gradient android:startColor="#00ACC1"
+        android:endColor="#5E35B1"
         android:angle="270" />
 </shape>

app/src/main/res/layout/image_colorize_upload_activity.xml

@@ -110,8 +110,9 @@
 
     <com.karacce.buttom.Buttom
         android:id="@+id/SaveImageButton"
-        android:layout_width="170dp"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="32dp"
         android:enabled="false"
@@ -124,24 +125,7 @@
         app:buttom_gradient_type="linear"
         app:buttom_type="gradient"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-    <com.karacce.buttom.Buttom
-        android:id="@+id/ContinueEditingButton"
-        android:layout_width="170dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginBottom="32dp"
-        android:enabled="false"
-        android:text="Continue Editing"
-        android:textColor="@color/white"
-        app:buttom_corner_radius="30dp"
-        app:buttom_gradient_end_color="#3F51B5"
-        app:buttom_gradient_orientation="left_right"
-        app:buttom_gradient_start_color="#00BCD4"
-        app:buttom_gradient_type="linear"
-        app:buttom_type="gradient"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
     <ImageView

app/src/main/res/layout/open_screen.xml

@@ -68,7 +68,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="@font/architects_daughter"
-        android:text="yuyang.wang@ucdconnect.ie"
+        android:text="北京育英学校"
         android:textColor="@color/white"
         android:textSize="24sp"
         android:visibility="invisible"

app/src/main/res/layout/rcimage_item.xml

@@ -32,24 +32,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:padding="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/gallery_edit_button"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/rc_image_view"
         app:srcCompat="@drawable/ic_baseline_share_24" />
 
-    <ImageView
-        android:id="@+id/gallery_edit_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:padding="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/gallery_share_button"
-        app:srcCompat="@drawable/ic_baseline_edit_24" />
-
     <ImageView
         android:id="@+id/gallery_save_button"
         android:layout_width="wrap_content"

app/src/test/java/com/echo/colorizeit/ExampleUnitTest.java

@@ -1,8 +1,8 @@
 package com.echo.colorizeit;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 /**
  * @author Wang Yuyang

settings.gradle

@@ -9,6 +9,3 @@ dependencyResolutionManagement {
 }
 rootProject.name = "My Application"
 include ':app'
-include ':photo_editor'
-include ':stinger_game'
-include ':photoEditor_test'