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

Merge branch 'dev-matrix-support' into dev

Browse Source 
Conflicts:
	calculatorpp/AndroidManifest.xml
	calculatorpp/project.properties
	calculatorpp/res/layout/calc_vars_button.xml
	calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
This commit is contained in:
Sergey Solovyev
2012-12-01 21:29:35 +04:00
parent a2009599e4 be6dce7c4f
commit 40741566ec
9 changed files with 609 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
calculatorpp/res/layout/calc_vars_button.xml
View File

@@ -11,6 +11,7 @@
a:id="@+id/vars_button"
c:directionTextScale="0.5"
c:textUp="+π"
c:textDown="+m"
a:text="π,…"
a:textStyle="italic"
a:onClick="varsButtonClickHandler"

59
calculatorpp/res/layout/matrix_edit_fragment.xml Normal file
View File

@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:picker="http://schemas.android.com/apk/res-auto"
a:id="@+id/main_fragment_layout"
style="?fragmentLayoutStyle"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragmentTitle"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?fragmentTitleStyle"/>
<include layout="@layout/ad"/>
<LinearLayout a:layout_height="match_parent"
a:layout_width="match_parent"
a:orientation="vertical">
<org.solovyev.android.view.Picker a:id="@+id/matrix_cols_count_picker"
a:layout_height="wrap_content"
a:layout_width="wrap_content"
a:layout_gravity="center"
picker:orientation="horizontal"/>
<LinearLayout a:layout_height="match_parent"
a:layout_width="match_parent"
a:orientation="horizontal"
a:gravity="center">
<org.solovyev.android.view.Picker a:id="@+id/matrix_rows_count_picker"
a:layout_height="wrap_content"
a:layout_width="wrap_content"/>
<ScrollView a:layout_height="match_parent"
a:layout_width="match_parent"
a:scrollbars="vertical">
<HorizontalScrollView a:layout_height="wrap_content"
a:layout_width="match_parent"
a:minHeight="300dp">
<org.solovyev.android.calculator.matrix.MatrixView a:id="@+id/matrix_layout"
a:layout_height="match_parent"
a:layout_width="match_parent"
a:minWidth="300dp"/>
</HorizontalScrollView>
</ScrollView>
</LinearLayout>
</LinearLayout>
</LinearLayout>

12
calculatorpp/res/layout/matrix_edit_fragment_item.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_height="match_parent"
a:layout_width="match_parent">
<EditText a:id="@+id/matrix_element_edittext"
a:layout_height="match_parent"
a:layout_width="match_parent"
a:text="test"/>
</LinearLayout>