Calculator Onscreen

This commit is contained in:
Sergey Solovyev
2012-11-23 17:39:58 +04:00
parent ddbb9b3bef
commit b71a21a05f
21 changed files with 320 additions and 112 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 235 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 333 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculator_display"
style="@style/cpp_onscreen_display_style"
a:padding="@dimen/cpp_display_padding"
a:inputType="textMultiLine"
a:maxLines="3"
a:scrollHorizontally="false"
a:scrollbars="none"/>

View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding">
<org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculator_editor"
style="@style/cpp_onscreen_editor_style"
a:textIsSelectable="true"
a:hint="@string/c_calc_editor_hint"/>
</LinearLayout>

View File

@@ -9,24 +9,28 @@
a:layout_height="match_parent"
a:layout_alignParentRight="true">
<Button a:id="@+id/onscreen_fold_button"
<ImageButton a:id="@+id/onscreen_fold_button"
style="@style/onscreen_header_button_style"
a:text="_"/>
a:src="@drawable/cpp_onscreen_button_fold"/>
<Button a:id="@+id/onscreen_minimize_button"
<ImageButton a:id="@+id/onscreen_minimize_button"
style="@style/onscreen_header_button_style"
a:text="_"/>
a:src="@drawable/cpp_onscreen_button_minimize"/>
<Button a:id="@+id/onscreen_close_button"
<ImageButton a:id="@+id/onscreen_close_button"
style="@style/onscreen_header_button_style"
a:text="x"/>
a:src="@drawable/cpp_onscreen_button_close"/>
</LinearLayout>
<TextView a:id="@+id/onscreen_title"
a:text="@string/c_app_name"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:layout_toLeftOf="@id/onscreen_header_buttons"/>
<ImageView a:id="@+id/onscreen_title"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:src="@drawable/cpp_onscreen_header_logo"
a:scaleType="fitStart"
a:paddingLeft="6dp"
a:paddingTop="2dp"
a:paddingBottom="2dp"
a:layout_toLeftOf="@id/onscreen_header_buttons"/>
</RelativeLayout>

View File

@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/widget_seven_digit_button"/>
<include layout="@layout/widget_eight_digit_button"/>
<include layout="@layout/widget_nine_digit_button"/>
<include layout="@layout/widget_multiplication_button"/>
<include layout="@layout/widget_erase_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/widget_four_digit_button"/>
<include layout="@layout/widget_five_digit_button"/>
<include layout="@layout/widget_six_digit_button"/>
<include layout="@layout/widget_division_button"/>
<include layout="@layout/widget_percent_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/widget_one_digit_button"/>
<include layout="@layout/widget_two_digit_button"/>
<include layout="@layout/widget_three_digit_button"/>
<include layout="@layout/widget_plus_button"/>
<include layout="@layout/widget_power_button"/>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/widget_round_brackets_button"/>
<include layout="@layout/widget_zero_digit_button"/>
<include layout="@layout/widget_dot_button"/>
<include layout="@layout/widget_subtraction_button"/>
<include layout="@layout/widget_app_button"/>
</LinearLayout>
<!-- <LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/widget_left_button"/>
<include layout="@layout/widget_right_button"/>
<include layout="@layout/widget_vars_button"/>
<include layout="@layout/widget_functions_button"/>
<include layout="@layout/widget_app_button"/>
<include layout="@layout/widget_history_button"/>
</LinearLayout>-->
</LinearLayout>

View File

@@ -4,17 +4,16 @@
a:orientation="vertical"
style="@style/cpp_widget_main_layout_style">
<include layout="@layout/onscreen_header"/>
<include a:id="@+id/onscreen_header" layout="@layout/onscreen_header"/>
<LinearLayout a:id="@+id/onscreen_content"
a:orientation="vertical"
a:layout_width="match_parent"
a:layout_height="match_parent">
<include layout="@layout/widget_editor"
a:layout_weight="2"
<include layout="@layout/onscreen_editor"
a:layout_width="match_parent"
a:layout_height="0dp"/>
a:layout_height="wrap_content"/>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
@@ -26,15 +25,15 @@
a:layout_width="0dp"
a:layout_height="match_parent"/>
<include layout="@layout/widget_display"
a:layout_weight="5"
<include layout="@layout/onscreen_display"
a:layout_weight="4"
a:layout_width="0dp"
a:layout_height="wrap_content"/>
</LinearLayout>
<include layout="@layout/widget_keyboard"
a:layout_weight="5"
<include layout="@layout/onscreen_keyboard"
a:layout_weight="4"
a:layout_width="match_parent"
a:layout_height="0dp"/>
</LinearLayout>

View File

@@ -25,7 +25,8 @@
<dimen name="cpp_widget_display_text_size">25sp</dimen>
<dimen name="cpp_widget_margin">6dp</dimen>
<dimen name="cpp_onscreen_header_button_text_size">10dp</dimen>
<dimen name="cpp_onscreen_display_text_size">20sp</dimen>
<dimen name="cpp_onscreen_header_button_text_size">10dp</dimen>
<!--only for not multipane-->
<dimen name="cpp_editor_padding">5dp</dimen>

View File

@@ -44,6 +44,12 @@
<item name="android:textColor">@color/cpp_button_text_color</item>
</style>
<style name="cpp_onscreen_editor_style" parent="cpp_editor_style">
<item name="android:ellipsize">none</item>
<item name="android:singleLine">true</item>
<item name="android:scrollbars">horizontal</item>
</style>
<style name="cpp_editor_style" parent="cpp_default_text">
<item name="android:gravity">left|top</item>
<item name="android:layout_width">fill_parent</item>
@@ -66,6 +72,10 @@
<item name="android:textSize">@dimen/cpp_widget_editor_text_size</item>
</style>
<style name="cpp_onscreen_display_style" parent="cpp_display_style">
<item name="android:textSize">@dimen/cpp_onscreen_display_text_size</item>
</style>
<style name="cpp_widget_display_style" parent="cpp_display_style">
<item name="android:textSize">@dimen/cpp_widget_display_text_size</item>
</style>