Changeset 14247

Timestamp:

01/14/13 21:01:31 (12 years ago)

Author:

ltnguyen

Message:

Change:slider orientation, button background

Location:

issm/trunk-jpl/src/android/ISSM

Files:

• res/drawable-mdpi/btn_lightblue_glossy.9.png (added)
• res/layout/issmcore.xml (modified) (3 diffs)
• src/com/example/issm/VerticalSeekBar.java (modified) (2 diffs)

issm/trunk-jpl/src/android/ISSM/res/layout/issmcore.xml

@@ -27 +27 @@
         android:textColor="#FF0000"
         android:text="100%" />
+
+    <com.example.issm.VerticalSeekBar
+        android:id="@+id/seekbar"
+        android:layout_width="wrap_content"
+        android:layout_height="300dp"
+        android:layout_above="@+id/back"
+        android:layout_marginBottom="50dp"
+        android:max="490"
+        android:progress="100"
+        android:progressDrawable="@layout/seekbar_progress"
+        android:thumb="@drawable/thumb" />
       
-    <com.example.issm.VerticalSeekBar
-                android:id="@+id/seekbar"
-                android:layout_width="wrap_content"
-                android:layout_below="@+id/value"
-                android:layout_height="420dp"
-                android:progress="100"
-                android:max="490"
-                android:progressDrawable="@layout/seekbar_progress"
-            android:thumb="@drawable/thumb"/>
-
     <FrameLayout
         android:id="@+id/frame"
@@ -47 +48 @@
         android:layout_marginBottom="12dp" >
     </FrameLayout>
+    
+
+    <Button
+        android:id="@+id/back"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginBottom="17dp"
+        android:background="@drawable/btn_lightblue_glossy"
+        android:text="Back"/>
 
     <Button
@@ -52 +64 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="58dp"
-        android:text="Solve" />
-
-    <Button
-        android:id="@+id/back"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/frame"
-        android:layout_alignParentBottom="true"
-        android:text="Back to \n Map Selection Screen " />
+        android:layout_alignBaseline="@+id/back"
+        android:layout_alignBottom="@+id/back"
+        android:layout_marginLeft="14dp"
+        android:layout_toRightOf="@+id/back"
+        android:background="@drawable/btn_lightblue_glossy"
+        android:text="Solve"/>
 
 </RelativeLayout>

issm/trunk-jpl/src/android/ISSM/src/com/example/issm/VerticalSeekBar.java

@@ -33 +33 @@
 
     protected void onDraw(Canvas c) {
-        c.rotate(90);
-        c.translate(0, -getWidth());
+        c.rotate(-90);
+        c.translate(-getHeight(),0);
         super.onDraw(c);
     }
@@ -49 +49 @@
             case MotionEvent.ACTION_UP:
                 i = getMax() - (int) (getMax() * event.getY() / getHeight());
-                setProgress(MAX_SIZE-i);
+                setProgress(i);
                 onSizeChanged(getWidth(), getHeight(), 0, 0);
                 break;