history activity
This commit is contained in:
@@ -17,15 +17,27 @@
|
||||
|
||||
<LinearLayout a:layout_weight="1" a:layout_width="match_parent" a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/calc_left_button"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:layout_weight="1.5"/>
|
||||
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
|
||||
a:id="@+id/leftButton"
|
||||
calc:textUp="↞"
|
||||
a:text="←"
|
||||
style="@style/control_button_style"
|
||||
a:onClick="moveLeftButtonClickHandler"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:layout_weight="1.5"/>
|
||||
|
||||
<include layout="@layout/calc_erase_button"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:layout_weight="1.5"/>
|
||||
|
||||
<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
|
||||
a:id="@+id/eraseButton"
|
||||
a:drawableTop="@drawable/sym_keyboard_delete"
|
||||
style="@style/control_image_button_style"
|
||||
a:onClick="eraseButtonClickHandler"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:layout_weight="1.5"/>
|
||||
|
||||
|
||||
<include layout="@layout/calc_display"
|
||||
@@ -33,15 +45,27 @@
|
||||
a:layout_height="match_parent"
|
||||
a:layout_weight="1"/>
|
||||
|
||||
<include layout="@layout/calc_clear_button"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:layout_weight="1.5"/>
|
||||
<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
|
||||
a:id="@+id/clearButton"
|
||||
a:text="@string/c_clear"
|
||||
a:textStyle="bold"
|
||||
style="@style/control_image_button_style"
|
||||
a:onClick="clearButtonClickHandler"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:layout_weight="1.5"/>
|
||||
|
||||
<include layout="@layout/calc_right_button"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:layout_weight="1.5"/>
|
||||
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
|
||||
a:id="@+id/rightButton"
|
||||
calc:textUp="↠"
|
||||
a:text="→"
|
||||
style="@style/control_button_style"
|
||||
a:onClick="moveRightButtonClickHandler"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:layout_weight="1.5"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
@@ -8,7 +8,10 @@
|
||||
<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
|
||||
a:id="@+id/historyButton"
|
||||
a:text=""
|
||||
a:text="@string/c_history_button"
|
||||
calc:textUp="@string/c_undo"
|
||||
calc:textDown="@string/c_redo"
|
||||
style="@style/control_button_style"/>
|
||||
style="@style/control_button_style"
|
||||
a:textSize="18dp"
|
||||
a:textStyle="bold"
|
||||
a:onClick="historyButtonClickHandler"/>
|
29
res/layout/history.xml
Normal file
29
res/layout/history.xml
Normal file
@@ -0,0 +1,29 @@
|
||||
<?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:orientation="vertical"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<TextView a:id="@+id/history_time"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:textColor="@android:color/white"
|
||||
a:paddingLeft="6dp"
|
||||
a:paddingRight="6dp"
|
||||
a:textStyle="bold"/>
|
||||
|
||||
<TextView a:id="@+id/history_item"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:paddingBottom="6dp"
|
||||
a:paddingLeft="6dp"
|
||||
a:paddingRight="6dp"/>
|
||||
|
||||
</LinearLayout>
|
20
res/layout/history_activity.xml
Normal file
20
res/layout/history_activity.xml
Normal file
@@ -0,0 +1,20 @@
|
||||
<?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:orientation="vertical"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<ListView
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:layout_weight="1"
|
||||
a:id="@android:id/list"/>
|
||||
|
||||
</LinearLayout>
|
@@ -20,6 +20,7 @@
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:textSize="20dp"
|
||||
a:textColor="@android:color/white"
|
||||
a:paddingBottom="3dp"
|
||||
a:paddingLeft="6dp"
|
||||
a:paddingRight="6dp"
|
||||
|
@@ -5,6 +5,9 @@
|
||||
<item a:id="@+id/main_menu_item_settings"
|
||||
a:title="@string/c_settings"/>
|
||||
|
||||
<item a:id="@+id/main_menu_item_history"
|
||||
a:title="@string/c_history"/>
|
||||
|
||||
<item a:id="@+id/main_menu_item_about"
|
||||
a:title="@string/c_about"/>
|
||||
|
||||
|
@@ -70,4 +70,9 @@
|
||||
http://paypal.com</a>\n
|
||||
</string>
|
||||
|
||||
<string name="c_history">История</string>
|
||||
<string name="c_history_button">M</string>
|
||||
<string name="c_history_is_empty">История пуста!</string>
|
||||
<string name="c_app_history">История</string>
|
||||
|
||||
</resources>
|
||||
|
@@ -70,4 +70,8 @@
|
||||
<string name="c_donate_text">You can thank the author of this program by email\n\n
|
||||
<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>\n\n
|
||||
or donate money via\n\n<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=se%2esolovyev%40gmail%2ecom&lc=RU&item_name=Android%20Calculator&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted">http://paypal.com</a>\n</string>
|
||||
<string name="c_history">History</string>
|
||||
<string name="c_history_button">M</string>
|
||||
<string name="c_history_is_empty">History is empty!</string>
|
||||
<string name="c_app_history">History</string>
|
||||
</resources>
|
||||
|
Reference in New Issue
Block a user