Bump version

imgly · Oct 10, 2017 · 464d5f9 · 464d5f9
1 parent 8cc52fc
commit 464d5f9
Show file tree

Hide file tree

Showing 33 changed files with 225 additions and 573 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # PhotoEditor SDK - Changelog
 
+## v5.0.5
+
+### Changed
+* Changed crop ratio name to 'Free'.
+* Set rotation control dots invisible behind the value.
+* Set item label to blue if the item is selected.
+
+### Fixed
+* Flipped image rotates in the wrong direction.
+* Sticker not loading.
+
 ## v5.0.4
 
 ### Changed

diff --git a/app/build.gradle b/app/build.gradle
@@ -52,7 +52,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile 'ly.img.android:photo-editor-sdk:5.0.4'
-        apt 'ly.img.android:build-processor:5.0.4'
+    compile 'ly.img.android:photo-editor-sdk:5.0.5'
+        apt 'ly.img.android:build-processor:5.0.5'
 
 }
diff --git a/default_res_files/res/color/imgly_lable_color_states.xml b/default_res_files/res/color/imgly_lable_color_states.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ This file is part of the PhotoEditor Software Development Kit.
+  ~
+  ~ Copyright (C) 2017 9elements GmbH <[email protected]>
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, without
+  ~ modification, are permitted provided that the following license agreement
+  ~ is approved and a legal/financial contract was signed by the user.
+  ~
+  ~ The license agreement can be found under the following link:
+  ~
+  ~ https://www.photoeditorsdk.com/LICENSE.txt
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+          android:color="@color/imgly_text_color_active"/>
+    <item android:color="@color/imgly_editor_text_color_secondary"/>
+</selector>
diff --git a/default_res_files/res/drawable/imgly_icon_redo.xml b/default_res_files/res/drawable/imgly_icon_redo.xml
@@ -14,19 +14,7 @@
   ~ https://www.photoeditorsdk.com/LICENSE.txt
   -->
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:width="24dp"
-    android:height="24dp">
-    <group
-        android:scaleX="-1"
-        android:translateX="23">
-        <!--path
-            android:pathData="M21 10L21 9L7 9L7 6L2 10L7 14L7 11L19 11L19 17L21 17L21 10"
-            android:fillColor="#000000" /-->
-        <path
-            android:pathData="M21 10L21 9L7 9L7 6L2 10L7 14L7 11L19 11L19 17L21 17L21 10"
-            android:fillColor="@color/imgly_icon_color" />
-    </group>
-</vector>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:drawable="@drawable/imgly_icon_redo_disabled"/>
+    <item android:state_enabled="true" android:drawable="@drawable/imgly_icon_redo_enabled"/>
+</selector>
diff --git a/default_res_files/res/drawable/imgly_icon_redo_disabled.xml b/default_res_files/res/drawable/imgly_icon_redo_disabled.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ This file is part of the PhotoEditor Software Development Kit.
+  ~
+  ~ Copyright (C) 2017 9elements GmbH <[email protected]>
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, without
+  ~ modification, are permitted provided that the following license agreement
+  ~ is approved and a legal/financial contract was signed by the user.
+  ~
+  ~ The license agreement can be found under the following link:
+  ~
+  ~ https://www.photoeditorsdk.com/LICENSE.txt
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:width="24dp"
+    android:height="24dp">
+    <group
+        android:scaleX="-1"
+        android:translateX="23">
+        <!--path
+            android:pathData="M21 10L21 9L7 9L7 6L2 10L7 14L7 11L19 11L19 17L21 17L21 10"
+            android:fillColor="#000000" /-->
+        <path
+            android:pathData="M21 10L21 9L7 9L7 6L2 10L7 14L7 11L19 11L19 17L21 17L21 10"
+            android:fillColor="@color/imgly_icon_color_disabled" />
+    </group>
+</vector>
diff --git a/default_res_files/res/drawable/imgly_icon_redo_enabled.xml b/default_res_files/res/drawable/imgly_icon_redo_enabled.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ This file is part of the PhotoEditor Software Development Kit.
+  ~
+  ~ Copyright (C) 2017 9elements GmbH <[email protected]>
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, without
+  ~ modification, are permitted provided that the following license agreement
+  ~ is approved and a legal/financial contract was signed by the user.
+  ~
+  ~ The license agreement can be found under the following link:
+  ~
+  ~ https://www.photoeditorsdk.com/LICENSE.txt
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:width="24dp"
+    android:height="24dp">
+    <group
+        android:scaleX="-1"
+        android:translateX="23">
+        <!--path
+            android:pathData="M21 10L21 9L7 9L7 6L2 10L7 14L7 11L19 11L19 17L21 17L21 10"
+            android:fillColor="#000000" /-->
+        <path
+            android:pathData="M21 10L21 9L7 9L7 6L2 10L7 14L7 11L19 11L19 17L21 17L21 10"
+            android:fillColor="@color/imgly_icon_color" />
+    </group>
+</vector>
diff --git a/...iles/res/drawable/imgly_icon_download.xml → ...es_files/res/drawable/imgly_icon_save.xml b/...iles/res/drawable/imgly_icon_download.xml → ...es_files/res/drawable/imgly_icon_save.xml
diff --git a/default_res_files/res/drawable/imgly_icon_undo.xml b/default_res_files/res/drawable/imgly_icon_undo.xml
@@ -14,15 +14,7 @@
   ~ https://www.photoeditorsdk.com/LICENSE.txt
   -->
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:width="24dp"
-    android:height="24dp">
-    <!--path
-        android:pathData="M21 10L21 9L7 9L7 6L2 10L7 14L7 11L19 11L19 17L21 17L21 10"
-        android:fillColor="#000000" /-->
-    <path
-        android:pathData="M21 10L21 9L7 9L7 6L2 10L7 14L7 11L19 11L19 17L21 17L21 10"
-        android:fillColor="@color/imgly_icon_color" />
-</vector>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:drawable="@drawable/imgly_icon_undo_disabled"/>
+    <item android:state_enabled="true" android:drawable="@drawable/imgly_icon_undo_enabled"/>
+</selector>
diff --git a/default_res_files/res/drawable/imgly_icon_undo_disabled.xml b/default_res_files/res/drawable/imgly_icon_undo_disabled.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ This file is part of the PhotoEditor Software Development Kit.
+  ~
+  ~ Copyright (C) 2017 9elements GmbH <[email protected]>
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, without
+  ~ modification, are permitted provided that the following license agreement
+  ~ is approved and a legal/financial contract was signed by the user.
+  ~
+  ~ The license agreement can be found under the following link:
+  ~
+  ~ https://www.photoeditorsdk.com/LICENSE.txt
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:width="24dp"
+    android:height="24dp">
+    <!--path
+        android:pathData="M21 10L21 9L7 9L7 6L2 10L7 14L7 11L19 11L19 17L21 17L21 10"
+        android:fillColor="#000000" /-->
+    <path
+        android:pathData="M21 10L21 9L7 9L7 6L2 10L7 14L7 11L19 11L19 17L21 17L21 10"
+        android:fillColor="@color/imgly_icon_color_disabled" />
+</vector>
diff --git a/default_res_files/res/drawable/imgly_icon_undo_enabled.xml b/default_res_files/res/drawable/imgly_icon_undo_enabled.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ This file is part of the PhotoEditor Software Development Kit.
+  ~
+  ~ Copyright (C) 2017 9elements GmbH <[email protected]>
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, without
+  ~ modification, are permitted provided that the following license agreement
+  ~ is approved and a legal/financial contract was signed by the user.
+  ~
+  ~ The license agreement can be found under the following link:
+  ~
+  ~ https://www.photoeditorsdk.com/LICENSE.txt
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:width="24dp"
+    android:height="24dp">
+    <!--path
+        android:pathData="M21 10L21 9L7 9L7 6L2 10L7 14L7 11L19 11L19 17L21 17L21 10"
+        android:fillColor="#000000" /-->
+    <path
+        android:pathData="M21 10L21 9L7 9L7 6L2 10L7 14L7 11L19 11L19 17L21 17L21 10"
+        android:fillColor="@color/imgly_icon_color" />
+</vector>
diff --git a/default_res_files/res/layout/imgly_list_item_crop.xml b/default_res_files/res/layout/imgly_list_item_crop.xml
@@ -28,12 +28,13 @@
         android:layout_centerInParent="true">
         <TextView
             android:id="@+id/label"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:text="@string/imgly_color_filter_name_default"
+            android:maxLines="5"
+            android:lines="5"
             android:gravity="center"
             style="@style/Imgly.Editor.Toolbar.Panels.Crop.ItemLabel"
-            android:lines="1"
             />
-    </ly.img.android.ui.widgets.AutoRotateLayout>>
+    </ly.img.android.ui.widgets.AutoRotateLayout>
 </RelativeLayout>
diff --git a/default_res_files/res/layout/imgly_panel_tool_adjust.xml b/default_res_files/res/layout/imgly_panel_tool_adjust.xml
@@ -20,6 +20,13 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
+    <ly.img.android.ui.widgets.HorizontalListView
+        android:id="@+id/quickOptionList"
+        android:layout_height="44dp"
+        android:layout_width="match_parent"
+        android:layout_marginBottom="10dp"
+        />
+
     <ly.img.android.ui.widgets.SeekSlider
         android:id="@+id/seekBar"
         android:layout_width="match_parent"

diff --git a/default_res_files/res/layout/imgly_panel_tool_brush.xml b/default_res_files/res/layout/imgly_panel_tool_brush.xml
@@ -36,6 +36,13 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"/>
+
+    <ly.img.android.ui.widgets.HorizontalListView
+        android:id="@+id/quickOptionList"
+        android:layout_height="44dp"
+        android:layout_width="match_parent"
+        android:layout_marginBottom="10dp"
+        />
     <ly.img.android.ui.widgets.SeekSlider
         android:id="@+id/seekBar"
         android:layout_width="match_parent"

diff --git a/default_res_files/res/layout/imgly_panel_tool_menu.xml b/default_res_files/res/layout/imgly_panel_tool_menu.xml
@@ -20,6 +20,15 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <include layout="@layout/imgly_option_list"/>
+    <ly.img.android.ui.widgets.HorizontalListView
+        android:id="@+id/quickOptionList"
+        android:layout_height="44dp"
+        android:layout_width="match_parent"
+        android:layout_marginBottom="10dp"
+        />
+    <include layout="@layout/imgly_option_list"
+             android:layout_width="match_parent"
+             android:layout_height="88dp"
+        />
 
 </LinearLayout>
diff --git a/default_res_files/res/layout/imgly_panel_tool_sticker_options.xml b/default_res_files/res/layout/imgly_panel_tool_sticker_options.xml
@@ -14,23 +14,29 @@
   ~ https://www.photoeditorsdk.com/LICENSE.txt
   -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/rootView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <ly.img.android.ui.widgets.HorizontalListView
         android:id="@+id/quickOptionList"
         android:layout_height="44dp"
         android:layout_width="match_parent"
         android:layout_marginTop="10dp"
-        android:layout_marginBottom="98dp"
-        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="10dp"
         />
+
+    <ly.img.android.ui.widgets.SeekSlider
+        android:id="@+id/seekBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="invisible"
+        style="@style/Imgly.SeekSlider"/>
+
     <include layout="@layout/imgly_option_list"
         android:layout_width="match_parent"
         android:layout_height="88dp"
-        android:layout_alignParentBottom="true"
         />
-</RelativeLayout>
+</LinearLayout>
diff --git a/default_res_files/res/layout/imgly_test.xml b/default_res_files/res/layout/imgly_test.xml
diff --git a/default_res_files/res/layout/imgly_widget_actionbar.xml b/default_res_files/res/layout/imgly_widget_actionbar.xml
@@ -22,7 +22,7 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         style="@style/Imgly.Editor.Header">
-        <ly.img.android.ui.widgets.AutoRotateImageSource
+        <ly.img.android.ui.widgets.buttons.CancelButton
             android:id="@+id/cancelButton"
             android:scaleType="center"
             style="@style/Imgly.Editor.Header.Button.CancelButton" />
@@ -32,7 +32,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"/>
 
-        <ly.img.android.ui.widgets.AutoRotateImageSource
+        <ly.img.android.ui.widgets.buttons.AcceptButton
             android:id="@+id/acceptButton"
             android:scaleType="center"
             style="@style/Imgly.Editor.Header.Button.AcceptButton" />