adding editor buttons for aspect ratios

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() {

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

@@ -13,6 +13,14 @@
         app:cropBackgroundColor="@color/crop_image_view_background"
         app:cropInitialCropWindowPaddingRatio="0"/>
 
+    <include
+        android:id="@+id/bottom_aspect_ratios"
+        layout="@layout/bottom_actions_aspect_ratio"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/bottom_editor_actions"
+        android:visibility="gone"/>
+
     <include
         android:id="@+id/bottom_editor_actions"
         layout="@layout/bottom_editor_actions"/>

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

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/bottom_aspect_ratios_wrapper"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/bottom_actions_height"
+    android:paddingTop="@dimen/medium_margin">
+
+    <TextView
+        android:id="@+id/bottom_aspect_ratio_free"
+        style="@style/MyBorderlessBackgroundStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/activity_margin"
+        android:text="@string/free_aspect_ratio"
+        android:textAllCaps="true"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/big_text_size"
+        app:layout_constraintEnd_toStartOf="@+id/bottom_aspect_ratio_one_one"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"/>
+
+    <TextView
+        android:id="@+id/bottom_aspect_ratio_one_one"
+        style="@style/MyBorderlessBackgroundStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/activity_margin"
+        android:text="1:1"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/big_text_size"
+        app:layout_constraintEnd_toStartOf="@+id/bottom_aspect_ratio_four_three"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/bottom_aspect_ratio_free"/>
+
+    <TextView
+        android:id="@+id/bottom_aspect_ratio_four_three"
+        style="@style/MyBorderlessBackgroundStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/activity_margin"
+        android:text="4:3"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/big_text_size"
+        app:layout_constraintEnd_toStartOf="@+id/bottom_aspect_ratio_sixteen_nine"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/bottom_aspect_ratio_one_one"/>
+
+    <TextView
+        android:id="@+id/bottom_aspect_ratio_sixteen_nine"
+        style="@style/MyBorderlessBackgroundStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/activity_margin"
+        android:text="16:9"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/big_text_size"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/bottom_aspect_ratio_four_three"/>
+
+</android.support.constraint.ConstraintLayout>

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:background="@drawable/gradient_background_lighter">
-    android:paddingTop="@dimen/medium_margin">
 
     <ImageView
         android:id="@+id/bottom_rotate"
         style="@style/MyBorderlessBackgroundStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="@dimen/medium_margin"
+        android:padding="@dimen/normal_margin"
         android:src="@drawable/ic_rotate_right"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_resize"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <ImageView
         android:id="@+id/bottom_resize"
         style="@style/MyBorderlessBackgroundStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="@dimen/medium_margin"
+        android:padding="@dimen/normal_margin"
         android:src="@drawable/ic_minimize"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_aspect_ratio"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/bottom_rotate"/>
+        app:layout_constraintStart_toEndOf="@+id/bottom_rotate"
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <ImageView
         android:id="@+id/bottom_aspect_ratio"
         style="@style/MyBorderlessBackgroundStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="@dimen/medium_margin"
+        android:padding="@dimen/normal_margin"
         android:src="@drawable/ic_aspect_ratio"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_flip_horizontally"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/bottom_resize"/>
+        app:layout_constraintStart_toEndOf="@+id/bottom_resize"
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <ImageView
         android:id="@+id/bottom_flip_horizontally"
         style="@style/MyBorderlessBackgroundStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="@dimen/medium_margin"
+        android:padding="@dimen/normal_margin"
         android:src="@drawable/ic_flip_horizontally"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_flip_vertically"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/bottom_aspect_ratio"/>
+        app:layout_constraintStart_toEndOf="@+id/bottom_aspect_ratio"
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <ImageView
         android:id="@+id/bottom_flip_vertically"
         style="@style/MyBorderlessBackgroundStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="@dimen/medium_margin"
+        android:padding="@dimen/normal_margin"
         android:src="@drawable/ic_flip_vertically"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/bottom_flip_horizontally"/>
+        app:layout_constraintStart_toEndOf="@+id/bottom_flip_horizontally"
+        app:layout_constraintTop_toTopOf="parent"/>
 
 </android.support.constraint.ConstraintLayout>

app/src/main/res/values-ar/strings.xml

@@ -88,13 +88,14 @@
     <string name="flip_horizontally">قلب أفقيا</string>
     <string name="flip_vertically">قلب عموديا</string>
     <string name="edit_with">تعديل باستخدام</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">خلفية بسيطة</string>
     <string name="set_as_wallpaper">تعيين كخلفية الشاشة</string>
     <string name="set_as_wallpaper_failed">فشل الإعداد كخلفية</string>
     <string name="set_as_wallpaper_with">تعيين كخلفية بواسطة:</string>
-    <string name="setting_wallpaper">... جار تعيين الخلفية ...</string>
+    <string name="setting_wallpaper">… جار تعيين الخلفية ...</string>
     <string name="wallpaper_set_successfully">تم تعيبن الخلفية بنجاح</string>
     <string name="portrait_aspect_ratio">صورة نسبة العرض إلى الارتفاع</string>
     <string name="landscape_aspect_ratio">نسبة العرض إلى الارتفاع في المناظر الطبيعية</string>

app/src/main/res/values-ca/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Horizontalment</string>
     <string name="flip_vertically">Verticalment</string>
     <string name="edit_with">Editar amb</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Fons de pantalla de Simple Gallery</string>

app/src/main/res/values-cs/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Překlopit vodorovně</string>
     <string name="flip_vertically">Překlopit svisle</string>
     <string name="edit_with">Edit with</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Jednoduchá tapeta</string>

app/src/main/res/values-da/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Spejlvend vandret</string>
     <string name="flip_vertically">Spejlvend lodret</string>
     <string name="edit_with">Rediger med</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Simple Wallpaper</string>

app/src/main/res/values-de/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Horizontal spiegeln</string>
     <string name="flip_vertically">Vertikal spiegeln</string>
     <string name="edit_with">Bearbeiten mit</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Schlichter Hintergrund</string>

app/src/main/res/values-el/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Οριζόντιο αναποδογύρισμα</string>
     <string name="flip_vertically">Κατακόρυφο αναποδογύρισμα</string>
     <string name="edit_with">Επεξεργασία με</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Simple Wallpaper</string>

app/src/main/res/values-es/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Horizontalmente</string>
     <string name="flip_vertically">Verticalmente</string>
     <string name="edit_with">Editar con</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Fondos de pantalla Simple Gallery</string>

app/src/main/res/values-fi/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Pyöräytä vaakasuoraan</string>
     <string name="flip_vertically">Pyöräytä pystysuoraan</string>
     <string name="edit_with">Muokkaa sovelluksella</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Simple Wallpaper</string>

app/src/main/res/values-fr/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Retourner horizontalement</string>
     <string name="flip_vertically">Retourner verticalement</string>
     <string name="edit_with">Éditer avec</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Simple fond d\'écran</string>

app/src/main/res/values-gl/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Voltear horizontalmente</string>
     <string name="flip_vertically">Voltear verticalmente</string>
     <string name="edit_with">Editar con</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Fondo de pantalla</string>

app/src/main/res/values-hr/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Okreni horizontalno</string>
     <string name="flip_vertically">Okreni vertikalno</string>
     <string name="edit_with">Uredi pomoću</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Jednostavna pozadina</string>

app/src/main/res/values-hu/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Flip horizontally</string>
     <string name="flip_vertically">Flip vertically</string>
     <string name="edit_with">Edit with</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Simple Wallpaper</string>

app/src/main/res/values-it/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Capovolgi orizzontalmente</string>
     <string name="flip_vertically">Capovolgi verticalmente</string>
     <string name="edit_with">Modifica con</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Sfondo semplice</string>

app/src/main/res/values-ja/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">水平方向に反転</string>
     <string name="flip_vertically">垂直方向に反転</string>
     <string name="edit_with">他のアプリで編集</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">シンプル壁紙</string>

app/src/main/res/values-ko-rKR/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">가로 반전</string>
     <string name="flip_vertically">세로 반전</string>
     <string name="edit_with">이미지편집 프로그램 연결</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Simple Wallpaper</string>

app/src/main/res/values-lt/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Apversti horizontaliai</string>
     <string name="flip_vertically">Apversti vertikaliai</string>
     <string name="edit_with">Redaguoti su</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Paprastas darbalaukio fonas</string>

app/src/main/res/values-nb/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Speilvend horisontalt</string>
     <string name="flip_vertically">Speilvend vertikalt</string>
     <string name="edit_with">Rediger med</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Bakgrunnsbilde</string>

app/src/main/res/values-nl/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Horizontaal kantelen</string>
     <string name="flip_vertically">Verticaal kantelen</string>
     <string name="edit_with">Bewerken met</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Achtergrond</string>

app/src/main/res/values-pl/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Przewróć w poziomie</string>
     <string name="flip_vertically">Przewróć w pionie</string>
     <string name="edit_with">Edytuj w:</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Tapeta</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Horizontalmente</string>
     <string name="flip_vertically">Verticalmente</string>
     <string name="edit_with">Editar com</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Simple Wallpaper</string>

app/src/main/res/values-pt/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Horizontalmente</string>
     <string name="flip_vertically">Verticalmente</string>
     <string name="edit_with">Editar com</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Simple Wallpaper</string>

app/src/main/res/values-ru/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">По горизонтали</string>
     <string name="flip_vertically">По вертикали</string>
     <string name="edit_with">Редактировать в…</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Простые обои</string>

app/src/main/res/values-sk/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Preklopiť vodorovne</string>
     <string name="flip_vertically">Preklopiť zvisle</string>
     <string name="edit_with">Upraviť s</string>
+    <string name="free_aspect_ratio">Voľný</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Jednoduchá tapeta</string>

app/src/main/res/values-sv/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Vänd horisontellt</string>
     <string name="flip_vertically">Vänd vertikalt</string>
     <string name="edit_with">Redigera med</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Bakgrund</string>

app/src/main/res/values-tr/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Yatay</string>
     <string name="flip_vertically">Dikey</string>
     <string name="edit_with">Edit with</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Basit Duvar Kağıdı</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">水平翻转</string>
     <string name="flip_vertically">垂直翻转</string>
     <string name="edit_with">编辑方式</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">简约壁纸</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">水平翻轉</string>
     <string name="flip_vertically">垂直翻轉</string>
     <string name="edit_with">用其他程式編輯</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">簡易桌布</string>

app/src/main/res/values/dimens.xml

@@ -10,5 +10,5 @@
     <dimen name="media_side_slider_width">60dp</dimen>
     <dimen name="instant_change_bar_width">30dp</dimen>
     <dimen name="list_view_folder_thumbnail_size">72dp</dimen>
-    <dimen name="bottom_actions_height">60dp</dimen>
+    <dimen name="bottom_actions_height">64dp</dimen>
 </resources>

app/src/main/res/values/strings.xml

@@ -84,6 +84,7 @@
     <string name="flip_horizontally">Flip horizontally</string>
     <string name="flip_vertically">Flip vertically</string>
     <string name="edit_with">Edit with</string>
+    <string name="free_aspect_ratio">Free</string>              <!-- available as an option: 1:1, 4:3, 16:9, free -->
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Simple Wallpaper</string>