tweaks

Xlythe · Feb 6, 2013 · 54eb43d · 54eb43d
1 parent 65cbad5
commit 54eb43d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
@@ -79,8 +79,7 @@
         </LinearLayout>
         <RelativeLayout 
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="4">
+            android:layout_height="match_parent">
             <com.xlythe.slider.Slider
                 android:id="@+id/pulldown"
                 android:layout_width="match_parent"

diff --git a/res/layout-port/main.xml b/res/layout-port/main.xml
@@ -52,8 +52,7 @@
         </LinearLayout>
         <RelativeLayout 
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="11.5" >
+            android:layout_height="match_parent" >
             <com.android2.calculator3.view.CalculatorViewPager
                  android:id="@+id/panelswitch"
                  android:layout_width="match_parent"

diff --git a/res/layout-sw600dp-land/main.xml b/res/layout-sw600dp-land/main.xml
@@ -79,8 +79,7 @@
         </LinearLayout>
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="4">
+            android:layout_height="match_parent">
 
             <com.xlythe.slider.Slider
                  android:id="@+id/pulldown"

diff --git a/res/layout-sw600dp-port/main.xml b/res/layout-sw600dp-port/main.xml
@@ -78,8 +78,7 @@
         </LinearLayout>
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="7">
+            android:layout_height="match_parent">
             <com.xlythe.slider.Slider
                  android:id="@+id/pulldown"
                  android:layout_width="match_parent"

diff --git a/res/values/colors.xml b/res/values/colors.xml
@@ -18,8 +18,8 @@
     <color name="magic_flame">#00FFFFFF</color>
     <color name="button_text">#FFFFFFFF</color>
     <color name="pressed_color">#07547B</color>
-    <color name="history_input">#999999</color>
-    <color name="history_result">#E6E6E6</color>
+    <color name="history_input">#E6E6E6</color>
+    <color name="history_result">#999999</color>
     <color name="background">#FF000000</color>
     <color name="grey">#474747</color>
     <color name="graph_color">#31B6E7</color>

diff --git a/res/values/constants.xml b/res/values/constants.xml
@@ -22,6 +22,6 @@
     <item type="bool" name="BASIC">true</item>
     <item type="bool" name="ADVANCED">true</item>
     <item type="bool" name="MATRIX">true</item>
-    <item type="bool" name="RETURN_TO_BASIC">true</item>
+    <item type="bool" name="RETURN_TO_BASIC">false</item>
     <item type="bool" name="USE_RADIANS">true</item>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -186,7 +186,7 @@
     <string name="trigUnits">Trig Units</string>
     <string name="radians">RAD</string>
     <string name="degrees">DEG</string>
-    
+
     <!-- Clings -->
     <string name="cling_simple_title">Welcome</string>
     <string name="cling_simple_msg">Slide left and right to access more content. Unncessary pages can be disabled in the settings.</string>
@@ -196,4 +196,6 @@
     <string name="cling_hex_msg">Change between decimal (dec), binary (bin), and hexadecimal (hex).\n\nIf the calculator starts giving wrong results, make sure decimal is selected.</string>
     <string name="cling_graph_title">Graph</string>
     <string name="cling_graph_msg">Graphs will automatically show up here. Go to the advanced panel and build a function using X and Y.</string>
-    <string name="cling_dismiss">OK</string></resources>
+    <string name="cling_dismiss">OK</string>
+
+    <string name="easter_egg">Magikarp used splash but nothing happened.</string></resources>

diff --git a/src/com/android2/calculator3/EventListener.java b/src/com/android2/calculator3/EventListener.java
@@ -230,7 +230,7 @@ public void onClick(View view) {
             break;
 
         case R.id.easter:
-            Toast.makeText(mContext, "Magikarp used splash but nothing happened.", Toast.LENGTH_SHORT).show();
+            Toast.makeText(mContext, R.string.easter_egg, Toast.LENGTH_SHORT).show();
             break;
 
         default: