diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index b482e4041f5f..60046919bb6c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -71,7 +71,6 @@ import org.wordpress.android.editor.EditorMediaUtils; import org.wordpress.android.editor.EditorThemeUpdateListener; import org.wordpress.android.editor.ExceptionLogger; -import org.wordpress.android.editor.ImageSettingsDialogFragment; import org.wordpress.android.editor.gutenberg.DialogVisibility; import org.wordpress.android.editor.gutenberg.GutenbergEditorFragment; import org.wordpress.android.editor.gutenberg.GutenbergPropsBuilder; @@ -1487,17 +1486,6 @@ public void onRequestPermissionsResult(int requestCode, } private boolean handleBackPressed() { - Fragment fragment = getSupportFragmentManager().findFragmentByTag( - ImageSettingsDialogFragment.IMAGE_SETTINGS_DIALOG_TAG); - if (fragment != null && fragment.isVisible()) { - if (fragment instanceof ImageSettingsDialogFragment) { - ImageSettingsDialogFragment imFragment = (ImageSettingsDialogFragment) fragment; - imFragment.dismissFragment(); - } - - return false; - } - if (mViewPager.getCurrentItem() == PAGE_PUBLISH_SETTINGS) { mViewPager.setCurrentItem(PAGE_SETTINGS); invalidateOptionsMenu(); diff --git a/libs/editor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java b/libs/editor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java deleted file mode 100644 index e9e74ffc447d..000000000000 --- a/libs/editor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java +++ /dev/null @@ -1,597 +0,0 @@ -package org.wordpress.android.editor; - -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.res.Configuration; -import android.graphics.drawable.ColorDrawable; -import android.net.Uri; -import android.os.Bundle; -import android.view.KeyEvent; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; -import android.view.View; -import android.view.ViewGroup; -import android.view.inputmethod.InputMethodManager; -import android.widget.CheckBox; -import android.widget.EditText; -import android.widget.ImageView; -import android.widget.ProgressBar; -import android.widget.SeekBar; -import android.widget.Spinner; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; -import androidx.core.content.ContextCompat; -import androidx.fragment.app.DialogFragment; - -import com.android.volley.VolleyError; -import com.android.volley.toolbox.ImageLoader; -import com.android.volley.toolbox.NetworkImageView; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; - -import org.json.JSONException; -import org.json.JSONObject; -import org.wordpress.android.util.AppLog; -import org.wordpress.android.util.DisplayUtils; -import org.wordpress.android.util.MediaUtils; -import org.wordpress.android.util.ToastUtils; - -import java.util.Arrays; -import java.util.Locale; - -import static org.wordpress.android.editor.EditorFragmentAbstract.ATTR_ALIGN; -import static org.wordpress.android.editor.EditorFragmentAbstract.ATTR_ALT; -import static org.wordpress.android.editor.EditorFragmentAbstract.ATTR_CAPTION; -import static org.wordpress.android.editor.EditorFragmentAbstract.ATTR_DIMEN_HEIGHT; -import static org.wordpress.android.editor.EditorFragmentAbstract.ATTR_DIMEN_WIDTH; -import static org.wordpress.android.editor.EditorFragmentAbstract.ATTR_ID_ATTACHMENT; -import static org.wordpress.android.editor.EditorFragmentAbstract.ATTR_ID_IMAGE_REMOTE; -import static org.wordpress.android.editor.EditorFragmentAbstract.ATTR_SRC; -import static org.wordpress.android.editor.EditorFragmentAbstract.ATTR_TITLE; -import static org.wordpress.android.editor.EditorFragmentAbstract.ATTR_URL_LINK; -import static org.wordpress.android.editor.EditorFragmentAbstract.EXTRA_ENABLED_AZTEC; -import static org.wordpress.android.editor.EditorFragmentAbstract.EXTRA_FEATURED; -import static org.wordpress.android.editor.EditorFragmentAbstract.EXTRA_IMAGE_FEATURED; -import static org.wordpress.android.editor.EditorFragmentAbstract.EXTRA_IMAGE_META; -import static org.wordpress.android.editor.EditorFragmentAbstract.EXTRA_MAX_WIDTH; - -/** - * A full-screen DialogFragment with image settings. - *

- * Modifies the action bar - host activity must call {@link ImageSettingsDialogFragment#dismissFragment()} - * when the fragment is dismissed to restore it. - *

- * Use {@link ImageSettingsDialogFragment#ARG_REQUEST_CODE_KEY} to pass request code in arguments with inorder - * to receive activity results from this fragment. - */ -public class ImageSettingsDialogFragment extends DialogFragment { - public static final String IMAGE_SETTINGS_DIALOG_TAG = "image-settings"; - public static final String ARG_REQUEST_CODE_KEY = "image-settings-request-code-key"; - - private JSONObject mImageMeta; - private int mMaxImageWidth; - private ImageLoader mImageLoader; - - private ImageView mImageView; - private ProgressBar mProgress; - private EditText mTitleText; - private EditText mCaptionText; - private EditText mAltText; - private Spinner mAlignmentSpinner; - private String[] mAlignmentKeyArray; - private EditText mLinkTo; - private EditText mWidthText; - private CheckBox mFeaturedCheckBox; - - private boolean mIsFeatured; - - private CharSequence mPreviousActionBarTitle; - private boolean mPreviousHomeAsUpEnabled; - private View mPreviousCustomView; - - public static ImageSettingsDialogFragment newInstance(int requestCode, String src, String title, - String caption, String alt, String align, - String urlLink, int naturalWidth, int dimenWidth, - @NonNull String maxWidth, Boolean isImageFeatured, - Boolean isFeatured, Boolean isAztecEnabled - ) throws JSONException { - JSONObject imageMeta = new JSONObject(); - imageMeta.put(ATTR_SRC, src); - imageMeta.put(ATTR_TITLE, title); - imageMeta.put(ATTR_CAPTION, caption); - imageMeta.put(ATTR_ALT, alt); - imageMeta.put(ATTR_ALIGN, align); - imageMeta.put(ATTR_URL_LINK, urlLink); - imageMeta.put("naturalWidth", naturalWidth); - imageMeta.put(ATTR_DIMEN_WIDTH, dimenWidth); - - return newInstance(requestCode, imageMeta, maxWidth, isImageFeatured, isFeatured, isAztecEnabled); - } - - public static ImageSettingsDialogFragment newInstance(int requestCode, @NonNull JSONObject imageMeta, - @NonNull String maxWidth, Boolean isImageFeatured, - Boolean isFeatured, Boolean isAztecEnabled - ) { - return newInstance(requestCode, imageMeta.toString(), maxWidth, isImageFeatured, isFeatured, isAztecEnabled); - } - - public static ImageSettingsDialogFragment newInstance(int requestCode, @NonNull String imageMeta, - @NonNull String maxWidth, Boolean isImageFeatured, - Boolean isFeatured, Boolean isAztecEnabled - ) { - ImageSettingsDialogFragment imageSettingsDialogFragment = new ImageSettingsDialogFragment(); - Bundle bundle = new Bundle(); - bundle.putInt(ARG_REQUEST_CODE_KEY, requestCode); - bundle.putString(EXTRA_IMAGE_META, imageMeta); - bundle.putString(EXTRA_MAX_WIDTH, maxWidth); - bundle.putBoolean(EXTRA_IMAGE_FEATURED, isImageFeatured); - bundle.putBoolean(EXTRA_FEATURED, isFeatured); - bundle.putBoolean(EXTRA_ENABLED_AZTEC, isAztecEnabled); - imageSettingsDialogFragment.setArguments(bundle); - return imageSettingsDialogFragment; - } - - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setHasOptionsMenu(true); - - ActionBar actionBar = getActionBar(); - if (actionBar == null) { - return; - } - - actionBar.show(); - - mPreviousActionBarTitle = actionBar.getTitle(); - mPreviousCustomView = actionBar.getCustomView(); - - final int displayOptions = actionBar.getDisplayOptions(); - mPreviousHomeAsUpEnabled = (displayOptions & ActionBar.DISPLAY_HOME_AS_UP) != 0; - - actionBar.setTitle(R.string.image_settings); - actionBar.setDisplayHomeAsUpEnabled(true); - if (getResources().getBoolean(R.bool.show_extra_side_padding)) { - actionBar.setHomeAsUpIndicator(R.drawable.ic_close_padded); - } else { - actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp); - } - - // Show custom view with padded Save button - actionBar.setDisplayShowCustomEnabled(true); - actionBar.setCustomView(R.layout.image_settings_formatbar); - - actionBar.getCustomView().findViewById(R.id.menu_save).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - mImageMeta = extractMetaDataFromFields(mImageMeta); - - String imageRemoteId = ""; - try { - imageRemoteId = mImageMeta.getString(ATTR_ID_ATTACHMENT); - } catch (JSONException e) { - AppLog.e(AppLog.T.EDITOR, "Unable to retrieve featured image id from meta data"); - } - - Intent intent = new Intent(); - intent.putExtra(EXTRA_IMAGE_META, mImageMeta.toString()); - - mIsFeatured = mFeaturedCheckBox.isChecked(); - intent.putExtra(EXTRA_FEATURED, mIsFeatured); - - if (!imageRemoteId.isEmpty()) { - intent.putExtra(ATTR_ID_IMAGE_REMOTE, Integer.parseInt(imageRemoteId)); - } - - if (getArguments() != null) { - requireParentFragment().onActivityResult( - getArguments().getInt(ARG_REQUEST_CODE_KEY), - getArguments().getInt(ARG_REQUEST_CODE_KEY), - intent - ); - } - - restorePreviousActionBar(); - getParentFragmentManager().popBackStack(); - ToastUtils.showToast(requireActivity(), R.string.image_settings_save_toast); - } - }); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.dialog_image_options, container, false); - - TextView filenameLabel = (TextView) view.findViewById(R.id.image_filename); - mImageView = (ImageView) view.findViewById(R.id.image_thumbnail); - mProgress = (ProgressBar) view.findViewById(R.id.progress); - mTitleText = (EditText) view.findViewById(R.id.image_title); - mCaptionText = (EditText) view.findViewById(R.id.image_caption); - mAltText = (EditText) view.findViewById(R.id.image_alt_text); - mAlignmentSpinner = (Spinner) view.findViewById(R.id.alignment_spinner); - mLinkTo = (EditText) view.findViewById(R.id.image_link_to); - SeekBar widthSeekBar = (SeekBar) view.findViewById(R.id.image_size_seekbar); - mWidthText = (EditText) view.findViewById(R.id.image_width_text); - mFeaturedCheckBox = (CheckBox) view.findViewById(R.id.featuredImage); - - // Populate the dialog with existing values - Bundle bundle = getArguments(); - if (bundle != null) { - try { - mImageMeta = new JSONObject(bundle.getString(EXTRA_IMAGE_META)); - - final String imageSrc = mImageMeta.getString(ATTR_SRC); - final String imageFilename = imageSrc.substring(imageSrc.lastIndexOf("/") + 1); - - loadThumbnail(imageSrc); - filenameLabel.setText(imageFilename); - - mTitleText.setText(mImageMeta.getString(ATTR_TITLE)); - mCaptionText.setText(mImageMeta.getString(ATTR_CAPTION)); - mAltText.setText(mImageMeta.getString(ATTR_ALT)); - - String alignment = mImageMeta.getString(ATTR_ALIGN); - mAlignmentKeyArray = getResources().getStringArray(R.array.alignment_key_array); - int alignmentIndex = Arrays.asList(mAlignmentKeyArray).indexOf(alignment); - mAlignmentSpinner.setSelection(alignmentIndex == -1 ? 0 : alignmentIndex); - - mLinkTo.setText(mImageMeta.getString(ATTR_URL_LINK)); - - mMaxImageWidth = MediaUtils.getMaximumImageSize(mImageMeta.getInt("naturalWidth"), - bundle.getString(EXTRA_MAX_WIDTH)); - - setupWidthSeekBar(widthSeekBar, mWidthText, mImageMeta.getInt(ATTR_DIMEN_WIDTH)); - - boolean featuredImageSupported = bundle.getBoolean(EXTRA_IMAGE_FEATURED); - if (featuredImageSupported) { - mFeaturedCheckBox.setVisibility(View.VISIBLE); - mIsFeatured = bundle.getBoolean(EXTRA_FEATURED, false); - mFeaturedCheckBox.setChecked(mIsFeatured); - } - } catch (JSONException e1) { - AppLog.d(AppLog.T.EDITOR, "Missing JSON properties"); - } - - // TODO: Unsupported in Aztec - remove once caption, alignment & link support added - if (bundle.getBoolean(EXTRA_ENABLED_AZTEC)) { - mCaptionText.setVisibility(View.GONE); - View label = view.findViewById(R.id.image_caption_label); - if (label != null) { - label.setVisibility(View.GONE); - } - - mLinkTo.setVisibility(View.GONE); - label = view.findViewById(R.id.image_link_to_label); - if (label != null) { - label.setVisibility(View.GONE); - } - - mAlignmentSpinner.setVisibility(View.GONE); - label = view.findViewById(R.id.alignment_spinner_label); - if (label != null) { - label.setVisibility(View.GONE); - } - } - } - - - mTitleText.requestFocus(); - - return view; - } - - @Override - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - ActionBar actionBar = getActionBar(); - if (actionBar != null) { - actionBar.show(); - } - } - - @Override - public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) { - menu.clear(); - } - - @Override - public boolean onOptionsItemSelected(@NonNull MenuItem item) { - int id = item.getItemId(); - - if (id == android.R.id.home) { - return true; - } - return super.onOptionsItemSelected(item); - } - - private ActionBar getActionBar() { - if (getActivity() instanceof AppCompatActivity) { - return ((AppCompatActivity) getActivity()).getSupportActionBar(); - } else { - return null; - } - } - - /** - * To be called when the fragment is being dismissed, either by ActionBar navigation or by pressing back in the - * navigation bar. - * Displays a confirmation dialog if there are unsaved changes, otherwise undoes the fragment's modifications to - * the ActionBar and restores the last visible fragment. - */ - public void dismissFragment() { - try { - JSONObject newImageMeta = extractMetaDataFromFields(new JSONObject()); - - for (int i = 0; i < newImageMeta.names().length(); i++) { - String name = newImageMeta.names().getString(i); - if (!newImageMeta.getString(name).equals(mImageMeta.getString(name))) { - showDiscardChangesDialog(); - return; - } - } - - if (mFeaturedCheckBox.isChecked() != mIsFeatured) { - // Featured image status has changed - showDiscardChangesDialog(); - return; - } - } catch (JSONException e) { - AppLog.d(AppLog.T.EDITOR, "Unable to update JSON array"); - } - - if (getArguments() != null) { - requireParentFragment().onActivityResult( - getArguments().getInt(ARG_REQUEST_CODE_KEY), - getArguments().getInt(ARG_REQUEST_CODE_KEY), - null - ); - } - - restorePreviousActionBar(); - getParentFragmentManager().popBackStack(); - } - - public void setImageLoader(ImageLoader imageLoader) { - mImageLoader = imageLoader; - } - - private void restorePreviousActionBar() { - ActionBar actionBar = getActionBar(); - if (actionBar != null) { - actionBar.setTitle(mPreviousActionBarTitle); - actionBar.setHomeAsUpIndicator(null); - actionBar.setDisplayHomeAsUpEnabled(mPreviousHomeAsUpEnabled); - - actionBar.setCustomView(mPreviousCustomView); - if (mPreviousCustomView == null) { - actionBar.setDisplayShowCustomEnabled(false); - } - } - } - - /** - * Displays a dialog asking the user to confirm that they want to exit, discarding unsaved changes. - */ - private void showDiscardChangesDialog() { - AlertDialog.Builder builder = new MaterialAlertDialogBuilder(requireActivity()); - builder.setTitle(getString(R.string.image_settings_dismiss_dialog_title)); - builder.setPositiveButton(getString(R.string.discard), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - if (getArguments() != null) { - requireParentFragment().onActivityResult( - getArguments().getInt(ARG_REQUEST_CODE_KEY), - getArguments().getInt(ARG_REQUEST_CODE_KEY), - null - ); - } - restorePreviousActionBar(); - getParentFragmentManager().popBackStack(); - } - }); - - builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.dismiss(); - } - }); - - AlertDialog dialog = builder.create(); - dialog.show(); - } - - /** - * Extracts the meta data from the dialog fields and updates the entries in the given JSONObject. - */ - private JSONObject extractMetaDataFromFields(JSONObject metaData) { - try { - metaData.put(ATTR_TITLE, mTitleText.getText().toString()); - metaData.put(ATTR_CAPTION, mCaptionText.getText().toString()); - metaData.put(ATTR_ALT, mAltText.getText().toString()); - if (mAlignmentSpinner.getSelectedItemPosition() < mAlignmentKeyArray.length) { - metaData.put(ATTR_ALIGN, mAlignmentKeyArray[mAlignmentSpinner.getSelectedItemPosition()]); - } - metaData.put(ATTR_URL_LINK, mLinkTo.getText().toString()); - - int newWidth = getEditTextIntegerClamped(mWidthText, 1, Integer.MAX_VALUE); - metaData.put(ATTR_DIMEN_WIDTH, newWidth); - metaData.put(ATTR_DIMEN_HEIGHT, getRelativeHeightFromWidth(newWidth)); - } catch (JSONException e) { - AppLog.d(AppLog.T.EDITOR, "Unable to build JSON object from new meta data"); - } - - return metaData; - } - - /** - * Loads the given network image URL into the {@link NetworkImageView}. - */ - private void loadThumbnail(String imageUrl) { - if (imageUrl == null || mImageLoader == null) { - showErrorImage(); - if (imageUrl == null) { - AppLog.e(AppLog.T.MEDIA, "Image url is null! Show the default error image."); - } - return; - } - - Uri uri = Uri.parse(imageUrl); - String filepath = uri.getLastPathSegment(); - - if (MediaUtils.isValidImage(filepath)) { - int size = DisplayUtils.dpToPx( - getActivity(), - getResources().getDimensionPixelSize(R.dimen.image_settings_dialog_thumbnail_size) - ); - mImageView.setVisibility(View.GONE); - mProgress.setVisibility(View.VISIBLE); - - mImageLoader.get(imageUrl, new ImageLoader.ImageListener() { - @Override - public void onResponse(ImageLoader.ImageContainer response, boolean isImmediate) { - if (!isAdded()) { - return; - } - if (response.getBitmap() != null) { - mImageView.setVisibility(View.VISIBLE); - mProgress.setVisibility(View.GONE); - mImageView.setImageBitmap(response.getBitmap()); - } else { - if (!isImmediate) { - showErrorImage(); - } - } - } - - @Override - public void onErrorResponse(VolleyError error) { - AppLog.e(AppLog.T.MEDIA, error); - if (!isAdded()) { - return; - } - showErrorImage(); - } - }, size, 0); - } else { - showErrorImage(); - } - } - - private void showErrorImage() { - mProgress.setVisibility(View.GONE); - mImageView.setVisibility(View.VISIBLE); - mImageView.setImageDrawable( - new ColorDrawable(ContextCompat.getColor(getActivity(), org.wordpress.aztec.R.color.grey_lighten_30)) - ); - } - - /** - * Initialize the image width SeekBar and accompanying EditText - */ - private void setupWidthSeekBar(final SeekBar widthSeekBar, final EditText widthText, int imageWidth) { - widthSeekBar.setMax(mMaxImageWidth / 10); - - if (imageWidth != 0) { - widthSeekBar.setProgress(imageWidth / 10); - widthText.setText(String.format(Locale.US, getString(R.string.pixel_suffix), imageWidth)); - } - - widthSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { - @Override - public void onStopTrackingTouch(SeekBar seekBar) { - } - - @Override - public void onStartTrackingTouch(SeekBar seekBar) { - } - - @Override - public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { - if (progress == 0) { - progress = 1; - } - widthText.setText(String.format(Locale.US, getString(R.string.pixel_suffix), progress * 10)); - } - }); - - widthText.setOnFocusChangeListener(new View.OnFocusChangeListener() { - @Override - public void onFocusChange(View v, boolean hasFocus) { - if (hasFocus) { - widthText.setText(""); - } - } - }); - - widthText.setOnEditorActionListener(new TextView.OnEditorActionListener() { - @Override - public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - int width = getEditTextIntegerClamped(widthText, 10, mMaxImageWidth); - - int progress = width / 10; - - // OnSeekBarChangeListener will not be triggered if progress have not changed - if (widthSeekBar.getProgress() == progress) { - widthText.setText(String.format(Locale.US, getString(R.string.pixel_suffix), progress * 10)); - } else { - widthSeekBar.setProgress(progress); - } - - widthText.setSelection((String.valueOf(width).length())); - - InputMethodManager imm = (InputMethodManager) getActivity() - .getSystemService(Context.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(widthText.getWindowToken(), - InputMethodManager.RESULT_UNCHANGED_SHOWN); - - return true; - } - }); - } - - - /** - * Return the integer value of the width EditText, adjusted to be within the given min and max, and stripped of the - * 'px' units - */ - private int getEditTextIntegerClamped(EditText editText, int minWidth, int maxWidth) { - int width = 10; - - try { - if (editText.getText() != null) { - width = Integer.parseInt(editText.getText().toString().replace("px", "")); - } - } catch (NumberFormatException e) { - AppLog.e(AppLog.T.EDITOR, e); - } - - width = Math.min(maxWidth, Math.max(width, minWidth)); - - return width; - } - - /** - * Given the new width, return the proportionally adjusted height, given the dimensions of the original image - */ - private int getRelativeHeightFromWidth(int width) { - int height = 0; - - try { - int naturalHeight = mImageMeta.getInt("naturalHeight"); - int naturalWidth = mImageMeta.getInt("naturalWidth"); - - float ratio = (float) naturalHeight / naturalWidth; - height = (int) (ratio * width); - } catch (JSONException e) { - AppLog.d(AppLog.T.EDITOR, "JSON object missing naturalHeight or naturalWidth property"); - } - - return height; - } -} diff --git a/libs/editor/src/main/res/layout/dialog_image_options.xml b/libs/editor/src/main/res/layout/dialog_image_options.xml deleted file mode 100644 index 9d30ecee39e7..000000000000 --- a/libs/editor/src/main/res/layout/dialog_image_options.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libs/editor/src/main/res/layout/image_settings_formatbar.xml b/libs/editor/src/main/res/layout/image_settings_formatbar.xml deleted file mode 100644 index 5021e4f17f51..000000000000 --- a/libs/editor/src/main/res/layout/image_settings_formatbar.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - diff --git a/libs/editor/src/main/res/values-w720dp/layouts.xml b/libs/editor/src/main/res/values-w720dp/layouts.xml deleted file mode 100644 index 4f645be6d215..000000000000 --- a/libs/editor/src/main/res/values-w720dp/layouts.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - true - diff --git a/libs/editor/src/main/res/values/dimens.xml b/libs/editor/src/main/res/values/dimens.xml index 75e91040cdec..1e12e2a8a00f 100644 --- a/libs/editor/src/main/res/values/dimens.xml +++ b/libs/editor/src/main/res/values/dimens.xml @@ -29,17 +29,13 @@ 15dp 15dp - 16dp 0dp 84dp 4dp 4dp 16dp - -4dp 16dp - 8dp 100dp - 50dp 4dp 8dp 16dp diff --git a/libs/editor/src/main/res/values/layouts.xml b/libs/editor/src/main/res/values/layouts.xml index a7738f722fa3..21d449e22e49 100644 --- a/libs/editor/src/main/res/values/layouts.xml +++ b/libs/editor/src/main/res/values/layouts.xml @@ -1,5 +1,4 @@ false - false diff --git a/libs/editor/src/main/res/values/styles.xml b/libs/editor/src/main/res/values/styles.xml index 170c82247bc5..894471abb1a9 100755 --- a/libs/editor/src/main/res/values/styles.xml +++ b/libs/editor/src/main/res/values/styles.xml @@ -39,16 +39,4 @@ @dimen/format_bar_button_group_tablet @dimen/format_bar_button_group_tablet - - - -