yuying
王宇洋 3 years ago
parent 506bc39061
commit 9a343ba6ab

@ -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'

@ -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);

@ -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);
}
});

@ -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);
}

@ -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;
}

@ -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

@ -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"

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -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

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

Loading…
Cancel
Save