TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for wrong layout properties

Browse Source
This commit is contained in:
serso
2015-02-05 17:08:14 +01:00
parent 0c9cb6790c
commit fa5aaf93bd
4 changed files with 72 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
android-app/src/main/res/layout-land/cpp_app_keyboard.xml
View File

@@ -23,76 +23,82 @@
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
a:orientation="vertical"> a:orientation="vertical">
<LinearLayout <LinearLayout
a:layout_weight="1" a:layout_width="match_parent"
a:layout_width="match_parent" a:layout_height="0dp"
a:layout_height="0dp"> a:layout_weight="1"
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_drag_button_vars"/> <include layout="@layout/cpp_drag_button_vars" />
<include layout="@layout/cpp_app_button_copy"/> <include layout="@layout/cpp_app_button_copy" />
<include layout="@layout/cpp_drag_button_7"/> <include layout="@layout/cpp_drag_button_7" />
<include layout="@layout/cpp_drag_button_8"/> <include layout="@layout/cpp_drag_button_8" />
<include layout="@layout/cpp_drag_button_9"/> <include layout="@layout/cpp_drag_button_9" />
<include layout="@layout/cpp_drag_button_multiplication"/> <include layout="@layout/cpp_drag_button_multiplication" />
<include layout="@layout/cpp_drag_button_division"/> <include layout="@layout/cpp_drag_button_division" />
<include layout="@layout/cpp_drag_button_equals"/> <include layout="@layout/cpp_drag_button_equals" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1" a:layout_width="match_parent"
a:layout_width="match_parent" a:layout_height="0dp"
a:layout_height="0dp"> a:layout_weight="1"
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_drag_button_functions"/> <include layout="@layout/cpp_drag_button_functions" />
<include layout="@layout/cpp_app_button_paste"/> <include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_drag_button_4"/> <include layout="@layout/cpp_drag_button_4" />
<include layout="@layout/cpp_drag_button_5"/> <include layout="@layout/cpp_drag_button_5" />
<include layout="@layout/cpp_drag_button_6"/> <include layout="@layout/cpp_drag_button_6" />
<include layout="@layout/cpp_drag_button_plus"/> <include layout="@layout/cpp_drag_button_plus" />
<include layout="@layout/cpp_drag_button_subtraction"/> <include layout="@layout/cpp_drag_button_subtraction" />
<include layout="@layout/cpp_drag_button_round_brackets"/> <include layout="@layout/cpp_drag_button_round_brackets" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1" a:layout_width="match_parent"
a:layout_width="match_parent" a:layout_height="0dp"
a:layout_height="0dp"> a:layout_weight="1"
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_drag_button_operators"/> <include layout="@layout/cpp_drag_button_operators" />
<include layout="@layout/cpp_app_button_donate"/> <include layout="@layout/cpp_app_button_donate" />
<include layout="@layout/cpp_drag_button_1"/> <include layout="@layout/cpp_drag_button_1" />
<include layout="@layout/cpp_drag_button_2"/> <include layout="@layout/cpp_drag_button_2" />
<include layout="@layout/cpp_drag_button_3"/> <include layout="@layout/cpp_drag_button_3" />
<include layout="@layout/cpp_drag_button_0"/> <include layout="@layout/cpp_drag_button_0" />
<include layout="@layout/cpp_drag_button_dot"/> <include layout="@layout/cpp_drag_button_dot" />
<include layout="@layout/cpp_drag_button_history"/> <include layout="@layout/cpp_drag_button_history" />
</LinearLayout> </LinearLayout>

2
android-app/src/main/res/layout/cpp_drag_button_equals.xml
View File

@@ -28,7 +28,5 @@
a:text="=" a:text="="
c:textDown="@string/cpp_plot_button_text" c:textDown="@string/cpp_plot_button_text"
c:directionTextScale="0.5;0.5;0.33;0.5" c:directionTextScale="0.5;0.5;0.33;0.5"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="?cpp_control_button_style" style="?cpp_control_button_style"
a:onClick="equalsButtonClickHandler"/> a:onClick="equalsButtonClickHandler"/>

53
android-app/src/main/res/layout/main_calculator.xml
View File

@@ -22,42 +22,45 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout a:id="@+id/main_layout"
a:layout_width="match_parent" style="?cpp_main_layout_style"
a:layout_height="match_parent" xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout" a:layout_width="match_parent"
a:orientation="vertical" a:layout_height="match_parent"
style="?cpp_main_layout_style"> a:orientation="vertical">
<LinearLayout <LinearLayout
a:id="@+id/editorContainer" a:id="@+id/editorContainer"
a:layout_weight="2" a:layout_width="match_parent"
a:layout_width="match_parent" a:layout_height="0dp"
a:layout_height="0dp"/> a:layout_weight="2"
a:orientation="horizontal" />
<LinearLayout <LinearLayout
a:layout_weight="1" a:layout_width="match_parent"
a:layout_width="match_parent" a:layout_height="0dp"
a:layout_height="0dp"> a:layout_weight="1"
a:baselineAligned="false">
<include <include
layout="@layout/cpp_drag_button_equals" layout="@layout/cpp_drag_button_equals"
a:layout_weight="1" a:layout_width="0dp"
a:layout_width="0dp" a:layout_height="match_parent"
a:layout_height="match_parent"/> a:layout_weight="1" />
<FrameLayout <FrameLayout
a:id="@+id/displayContainer" a:id="@+id/displayContainer"
a:layout_weight="4" a:layout_width="0dp"
a:layout_width="0dp" a:layout_height="match_parent"
a:layout_height="match_parent"/> a:layout_weight="4" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:id="@+id/keyboardContainer" a:id="@+id/keyboardContainer"
a:layout_weight="5" a:layout_width="match_parent"
a:layout_width="match_parent" a:layout_height="0dp"
a:layout_height="0dp"/> a:layout_weight="5"
a:orientation="vertical" />
</LinearLayout> </LinearLayout>

4
android-app/src/main/res/values/styles.xml
View File

@@ -50,8 +50,8 @@
</style> </style>
<style name="cpp_keyboard_button_style"> <style name="cpp_keyboard_button_style">
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">0dp</item>
<item name="android:layout_height">fill_parent</item> <item name="android:layout_height">match_parent</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:focusable">true</item> <item name="android:focusable">true</item>
<item name="android:background">@drawable/metro_button_dark</item> <item name="android:background">@drawable/metro_button_dark</item>