From 8dc9579462332f60b0da16dabff852354feed920 Mon Sep 17 00:00:00 2001 From: tom79 Date: Thu, 30 May 2019 15:55:09 +0200 Subject: [PATCH] Fix color & remove some elements --- .../android/activities/BaseActivity.java | 4 - .../activities/PhotoEditorActivity.java | 27 +--- .../imageeditor/PropertiesBSFragment.java | 8 +- .../tools/EditingToolsAdapter.java | 7 +- .../res/drawable/ic_insert_emoticon_media.xml | 9 ++ .../fragment_bottom_properties_dialog.xml | 143 +++++++++--------- app/src/main/res/layout/row_filter_view.xml | 2 +- app/src/main/res/values/strings.xml | 6 + 8 files changed, 106 insertions(+), 100 deletions(-) create mode 100644 app/src/main/res/drawable/ic_insert_emoticon_media.xml diff --git a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java index 27acba6f3..a17e27650 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java @@ -66,10 +66,6 @@ public class BaseActivity extends AppCompatActivity { } - public void makeFullScreen() { - requestWindowFeature(Window.FEATURE_NO_TITLE); - getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); - } @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { diff --git a/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java b/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java index 1d4bda5e9..ecfc81571 100644 --- a/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java @@ -20,7 +20,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.Environment; import android.support.annotation.NonNull; -import android.support.v4.content.res.ResourcesCompat; import android.view.Window; @@ -52,15 +51,12 @@ import android.support.transition.TransitionManager; import android.support.v7.app.AlertDialog; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.util.Log; import android.view.View; import android.view.animation.AnticipateOvershootInterpolator; import android.widget.ImageView; import android.widget.TextView; - - import java.io.File; import java.io.IOException; @@ -128,8 +124,6 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorL - - // makeFullScreen(); setContentView(R.layout.activity_photoeditor); initViews(); @@ -214,27 +208,22 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorL @Override public void onAddViewListener(ViewType viewType, int numberOfAddedViews) { - Log.d(Helper.TAG, "onAddViewListener() called with: viewType = [" + viewType + "], numberOfAddedViews = [" + numberOfAddedViews + "]"); } @Override public void onRemoveViewListener(int numberOfAddedViews) { - Log.d(Helper.TAG, "onRemoveViewListener() called with: numberOfAddedViews = [" + numberOfAddedViews + "]"); } @Override public void onRemoveViewListener(ViewType viewType, int numberOfAddedViews) { - Log.d(Helper.TAG, "onRemoveViewListener() called with: viewType = [" + viewType + "], numberOfAddedViews = [" + numberOfAddedViews + "]"); } @Override public void onStartViewChangeListener(ViewType viewType) { - Log.d(Helper.TAG, "onStartViewChangeListener() called with: viewType = [" + viewType + "]"); } @Override public void onStopViewChangeListener(ViewType viewType) { - Log.d(Helper.TAG, "onStopViewChangeListener() called with: viewType = [" + viewType + "]"); } @Override @@ -266,7 +255,7 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorL Intent intent = new Intent(); intent.setType("image/*"); intent.setAction(Intent.ACTION_GET_CONTENT); - startActivityForResult(Intent.createChooser(intent, "Select Picture"), PICK_REQUEST); + startActivityForResult(Intent.createChooser(intent, getString(R.string.toot_select_image)), PICK_REQUEST); break; } } @@ -274,7 +263,7 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorL @SuppressLint("MissingPermission") private void saveImage() { if (requestPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { - showLoading("Saving..."); + showLoading(getString(R.string.saving)); File file = new File(Environment.getExternalStorageDirectory() + File.separator + "" + System.currentTimeMillis() + ".png"); @@ -290,14 +279,14 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorL @Override public void onSuccess(@NonNull String imagePath) { hideLoading(); - showSnackbar("Image Saved Successfully"); + showSnackbar(getString(R.string.image_saved)); mPhotoEditorView.getSource().setImageURI(Uri.fromFile(new File(imagePath))); } @Override public void onFailure(@NonNull Exception exception) { hideLoading(); - showSnackbar("Failed to save Image"); + showSnackbar(getString(R.string.save_image_failed)); } }); } catch (IOException e) { @@ -371,21 +360,21 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorL private void showSaveDialog() { AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage("Are you want to exit without saving image ?"); - builder.setPositiveButton("Save", new DialogInterface.OnClickListener() { + builder.setMessage( getString(R.string.confirm_exit_editing)); + builder.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { saveImage(); } }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); } }); - builder.setNeutralButton("Discard", new DialogInterface.OnClickListener() { + builder.setNeutralButton(R.string.discard, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { finish(); diff --git a/app/src/main/java/app/fedilab/android/imageeditor/PropertiesBSFragment.java b/app/src/main/java/app/fedilab/android/imageeditor/PropertiesBSFragment.java index 41940eec1..1fa2c459b 100644 --- a/app/src/main/java/app/fedilab/android/imageeditor/PropertiesBSFragment.java +++ b/app/src/main/java/app/fedilab/android/imageeditor/PropertiesBSFragment.java @@ -11,6 +11,10 @@ import android.view.View; import android.view.ViewGroup; import android.widget.SeekBar; +import org.jetbrains.annotations.NotNull; + +import java.util.Objects; + import app.fedilab.android.R; public class PropertiesBSFragment extends BottomSheetDialogFragment implements SeekBar.OnSeekBarChangeListener { @@ -35,7 +39,7 @@ public class PropertiesBSFragment extends BottomSheetDialogFragment implements S } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NotNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { return inflater.inflate(R.layout.fragment_bottom_properties_dialog, container, false); } @@ -52,7 +56,7 @@ public class PropertiesBSFragment extends BottomSheetDialogFragment implements S LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false); rvColor.setLayoutManager(layoutManager); rvColor.setHasFixedSize(true); - ColorPickerAdapter colorPickerAdapter = new ColorPickerAdapter(getActivity()); + ColorPickerAdapter colorPickerAdapter = new ColorPickerAdapter(Objects.requireNonNull(getActivity())); colorPickerAdapter.setOnColorPickerClickListener(new ColorPickerAdapter.OnColorPickerClickListener() { @Override public void onColorPickerClickListener(int colorCode) { diff --git a/app/src/main/java/app/fedilab/android/imageeditor/tools/EditingToolsAdapter.java b/app/src/main/java/app/fedilab/android/imageeditor/tools/EditingToolsAdapter.java index 500a36230..05a90d68b 100644 --- a/app/src/main/java/app/fedilab/android/imageeditor/tools/EditingToolsAdapter.java +++ b/app/src/main/java/app/fedilab/android/imageeditor/tools/EditingToolsAdapter.java @@ -1,7 +1,6 @@ package app.fedilab.android.imageeditor.tools; import android.support.annotation.NonNull; -import android.support.v4.util.Pair; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; @@ -29,10 +28,10 @@ public class EditingToolsAdapter extends RecyclerView.Adapter + + diff --git a/app/src/main/res/layout/fragment_bottom_properties_dialog.xml b/app/src/main/res/layout/fragment_bottom_properties_dialog.xml index a5e12c124..ed25897da 100644 --- a/app/src/main/res/layout/fragment_bottom_properties_dialog.xml +++ b/app/src/main/res/layout/fragment_bottom_properties_dialog.xml @@ -1,79 +1,82 @@ - + android:layout_height="wrap_content" + android:background="@android:color/black" + android:orientation="vertical"> + + + - + - + - + - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/row_filter_view.xml b/app/src/main/res/layout/row_filter_view.xml index 0f36224aa..50e3dbaa3 100644 --- a/app/src/main/res/layout/row_filter_view.xml +++ b/app/src/main/res/layout/row_filter_view.xml @@ -22,7 +22,7 @@ android:id="@+id/txtFilterName" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="#90000000" + android:background="#606984" android:gravity="center" android:padding="4dp" android:textColor="@android:color/white" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e24bff2b4..3a9083364 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -970,6 +970,12 @@ Filter Adjust Brush + Are you want to exit without saving image? + Discard + Saving... + Image Saved Successfully! + Failed to save Image + Opacity %d vote %d votes