Disposition enhancements

* Defaults portrait and landscape disposition
* Fix disposition calculation
* Disposition Preference: Resize widgets (not finished)
* CleanUp

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

6 files changed, 35 insertions, 13 deletions

diff --git a/res/drawable-hdpi/resize_frame_holo.9.png b/res/drawable-hdpi/resize_frame.9.png
index 059a9d6..059a9d6 100644
--- a/res/drawable-hdpi/resize_frame_holo.9.png
+++ b/res/drawable-hdpi/resize_frame.9.png
diff --git a/res/drawable-mdpi/resize_frame_holo.9.png b/res/drawable-mdpi/resize_frame.9.png
index 435f3aa..435f3aa 100644
--- a/res/drawable-mdpi/resize_frame_holo.9.png
+++ b/res/drawable-mdpi/resize_frame.9.png
diff --git a/res/drawable-xhdpi/resize_frame_holo.9.png b/res/drawable-xhdpi/resize_frame.9.png
index 270c9b7..270c9b7 100644
--- a/res/drawable-xhdpi/resize_frame_holo.9.png
+++ b/res/drawable-xhdpi/resize_frame.9.png
diff --git a/res/layout/choose_disposition_fragment.xml b/res/layout/choose_disposition_fragment.xml
index 166f715..1569ecd 100644
--- a/res/layout/choose_disposition_fragment.xml
+++ b/res/layout/choose_disposition_fragment.xml
@@ -14,22 +14,22 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="@dimen/default_margin"
-    android:layout_marginBottom="@dimen/default_margin"
+    android:layout_marginTop="@dimen/small_margin"
+    android:layout_marginBottom="@dimen/small_margin"
     android:orientation="vertical">
 
-    <TextView android:id="@+id/description"
+    <TextView android:id="@+id/advise"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/holo_blue_light"
-        android:layout_marginEnd="8dip"
-        android:layout_marginStart="8dip"
-        android:padding="4dip"
+        android:layout_marginStart="@dimen/disposition_frame_margin"
+        android:layout_marginEnd="@dimen/disposition_frame_margin"
+        android:padding="@dimen/disposition_advise_frame_padding"
         android:gravity="center_horizontal"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/notification_text_color"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:text="@string/pref_disposition_description" />
 
@@ -37,6 +37,24 @@
         android:id="@+id/disposition_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/default_margin"
-        android:layout_marginBottom="@dimen/default_margin" />
-</LinearLayout>
+        android:padding="@dimen/disposition_frame_margin"
+        android:layout_below="@id/advise"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignLeft="@id/disposition_view"
+        android:layout_alignRight="@id/disposition_view"
+        android:layout_alignTop="@id/disposition_view"
+        android:layout_alignBottom="@id/disposition_view">
+        <org.cyanogenmod.wallpapers.photophase.widgets.ResizeFrame 
+            android:id="@+id/resize_frame"
+            android:layout_width="1dp"
+            android:layout_height="1dp">
+        </org.cyanogenmod.wallpapers.photophase.widgets.ResizeFrame>
+    </FrameLayout>
+
+</RelativeLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 3fc07e1..92e4643 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -45,5 +45,10 @@
     <dimen name="small_margin">8dp</dimen>
     <dimen name="small_padding">5dp</dimen>
 
+    <dimen name="disposition_frame_margin">12dp</dimen>
     <dimen name="disposition_frame_padding">1dp</dimen>
+    <dimen name="disposition_advise_frame_padding">4dp</dimen>
+    <dimen name="resize_frame_padding">12dp</dimen>
+    <dimen name="resize_frame_extra_handling_space">16dp</dimen>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index eec1105..93b8824 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -72,8 +72,7 @@
     <string name="pref_disposition_portrait_summary">Select how pictures are disposed on a portrait screen</string>
     <string name="pref_disposition_landscape">Landscape disposition</string>
     <string name="pref_disposition_landscape_summary">Select how pictures are disposed on a landscape screen</string>
-    <string name="pref_disposition_description">Tap a frame to select it. Then drag \u0026 drop the borders of the frame to resize it.
-        Tap the split buttons to split the frame horizontally or vertically.</string>
+    <string name="pref_disposition_description">Long tap a frame to select it. Then drag \u0026 drop the borders of the frame to resize it.</string>
 
     <string name="pref_about">About</string>
     <string name="pref_about_summary">PhotoPhase v<xliff:g id="version">%1$s</xliff:g>\nCopyright \u00A9 2013 The CyanogenMod Project</string>