diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt index 32f21b09d..f05b2bc8f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt @@ -23,6 +23,7 @@ import com.simplemobiletools.gallery.extensions.config import com.simplemobiletools.gallery.extensions.openEditor import com.theartofdev.edmodo.cropper.CropImageView import kotlinx.android.synthetic.main.activity_edit.* +import kotlinx.android.synthetic.main.bottom_actions_aspect_ratio.* import kotlinx.android.synthetic.main.bottom_editor_actions.* import java.io.* @@ -159,6 +160,26 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener currPrimaryAction = if (currPrimaryAction == PRIMARY_ASPECT_RATIO) 0 else PRIMARY_ASPECT_RATIO updatePrimaryActions() } + + setupAspectRatios() + } + + private fun setupAspectRatios() { + bottom_aspect_ratio_free.setOnClickListener { + + } + + bottom_aspect_ratio_one_one.setOnClickListener { + + } + + bottom_aspect_ratio_four_three.setOnClickListener { + + } + + bottom_aspect_ratio_sixteen_nine.setOnClickListener { + + } } private fun updatePrimaryActions() { diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml index f922d6ad9..b5e0b67da 100644 --- a/app/src/main/res/layout/activity_edit.xml +++ b/app/src/main/res/layout/activity_edit.xml @@ -13,6 +13,14 @@ app:cropBackgroundColor="@color/crop_image_view_background" app:cropInitialCropWindowPaddingRatio="0"/> + + diff --git a/app/src/main/res/layout/bottom_actions_aspect_ratio.xml b/app/src/main/res/layout/bottom_actions_aspect_ratio.xml new file mode 100644 index 000000000..e2ccf6e00 --- /dev/null +++ b/app/src/main/res/layout/bottom_actions_aspect_ratio.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/layout/bottom_editor_actions.xml b/app/src/main/res/layout/bottom_editor_actions.xml index 7dcbb0a9d..04a19515d 100644 --- a/app/src/main/res/layout/bottom_editor_actions.xml +++ b/app/src/main/res/layout/bottom_editor_actions.xml @@ -6,62 +6,71 @@ android:layout_width="match_parent" android:layout_height="@dimen/bottom_actions_height" android:layout_alignParentBottom="true" - android:background="@drawable/gradient_background_lighter" - android:paddingTop="@dimen/medium_margin"> + android:background="@drawable/gradient_background_lighter"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintStart_toEndOf="@+id/bottom_rotate" + app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintStart_toEndOf="@+id/bottom_resize" + app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintStart_toEndOf="@+id/bottom_aspect_ratio" + app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintStart_toEndOf="@+id/bottom_flip_horizontally" + app:layout_constraintTop_toTopOf="parent"/> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index b8341aea3..ebc0e090f 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -88,13 +88,14 @@ قلب أفقيا قلب عموديا تعديل باستخدام + Free خلفية بسيطة تعيين كخلفية الشاشة فشل الإعداد كخلفية تعيين كخلفية بواسطة: - ... جار تعيين الخلفية ... + … جار تعيين الخلفية ... تم تعيبن الخلفية بنجاح صورة نسبة العرض إلى الارتفاع نسبة العرض إلى الارتفاع في المناظر الطبيعية diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 956049450..1ae2b8b27 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -84,6 +84,7 @@ Horizontalment Verticalment Editar amb + Free Fons de pantalla de Simple Gallery diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 839ba5747..f6d433af3 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -84,6 +84,7 @@ Překlopit vodorovně Překlopit svisle Edit with + Free Jednoduchá tapeta diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index b484fa566..0615f60e3 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -84,6 +84,7 @@ Spejlvend vandret Spejlvend lodret Rediger med + Free Simple Wallpaper diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index eeac88135..04c5d88e5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -84,6 +84,7 @@ Horizontal spiegeln Vertikal spiegeln Bearbeiten mit + Free Schlichter Hintergrund diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 896b60f55..43e7d8ef8 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -84,6 +84,7 @@ Οριζόντιο αναποδογύρισμα Κατακόρυφο αναποδογύρισμα Επεξεργασία με + Free Simple Wallpaper diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c248517d9..f32765509 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -84,6 +84,7 @@ Horizontalmente Verticalmente Editar con + Free Fondos de pantalla Simple Gallery diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 458998f34..b9c3fd0ce 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -84,6 +84,7 @@ Pyöräytä vaakasuoraan Pyöräytä pystysuoraan Muokkaa sovelluksella + Free Simple Wallpaper diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 09f03d474..f846d815c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -84,6 +84,7 @@ Retourner horizontalement Retourner verticalement Éditer avec + Free Simple fond d\'écran diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index af5896b71..fb3ea2570 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -84,6 +84,7 @@ Voltear horizontalmente Voltear verticalmente Editar con + Free Fondo de pantalla diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 053c8d7e9..922a3ce86 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -84,6 +84,7 @@ Okreni horizontalno Okreni vertikalno Uredi pomoću + Free Jednostavna pozadina diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 1e1af0626..fb4eb29db 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -84,6 +84,7 @@ Flip horizontally Flip vertically Edit with + Free Simple Wallpaper diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f1b94bca9..df170a074 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -84,6 +84,7 @@ Capovolgi orizzontalmente Capovolgi verticalmente Modifica con + Free Sfondo semplice diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2b5353f6b..a68a1a0e7 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -84,6 +84,7 @@ 水平方向に反転 垂直方向に反転 他のアプリで編集 + Free シンプル壁紙 diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 1269fb089..9d4cc89fe 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -84,6 +84,7 @@ 가로 반전 세로 반전 이미지편집 프로그램 연결 + Free Simple Wallpaper diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 7832548fb..44d6f6ac0 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -84,6 +84,7 @@ Apversti horizontaliai Apversti vertikaliai Redaguoti su + Free Paprastas darbalaukio fonas diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 8f34a3c0c..2d21ba305 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -84,6 +84,7 @@ Speilvend horisontalt Speilvend vertikalt Rediger med + Free Bakgrunnsbilde diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2a9746a01..3641d591a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -84,6 +84,7 @@ Horizontaal kantelen Verticaal kantelen Bewerken met + Free Achtergrond diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 24612502b..a32fd452b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -84,6 +84,7 @@ Przewróć w poziomie Przewróć w pionie Edytuj w: + Free Tapeta diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f65b83a7e..fee389a29 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -84,6 +84,7 @@ Horizontalmente Verticalmente Editar com + Free Simple Wallpaper diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index eb73d1ced..539afb935 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -84,6 +84,7 @@ Horizontalmente Verticalmente Editar com + Free Simple Wallpaper diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 41e327105..015011c1e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -84,6 +84,7 @@ По горизонтали По вертикали Редактировать в… + Free Простые обои diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index e6182ff57..8a599c80a 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -84,6 +84,7 @@ Preklopiť vodorovne Preklopiť zvisle Upraviť s + Voľný Jednoduchá tapeta diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 3391e6c72..47c17d58e 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -84,6 +84,7 @@ Vänd horisontellt Vänd vertikalt Redigera med + Free Bakgrund diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 32b92f5fa..ea4a9b010 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -84,6 +84,7 @@ Yatay Dikey Edit with + Free Basit Duvar Kağıdı diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d36cf3f1b..fcc89dda8 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -84,6 +84,7 @@ 水平翻转 垂直翻转 编辑方式 + Free 简约壁纸 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 38f656c18..f46e200a7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -84,6 +84,7 @@ 水平翻轉 垂直翻轉 用其他程式編輯 + Free 簡易桌布 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 3524f5ac0..81fefce87 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -10,5 +10,5 @@ 60dp 30dp 72dp - 60dp + 64dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e92a1d1da..6ea4fa6b4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -84,6 +84,7 @@ Flip horizontally Flip vertically Edit with + Free Simple Wallpaper