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

history changes

Browse Source
This commit is contained in:
Sergey Solovyev
2011-12-18 17:05:44 +04:00
parent 9d785e4b1e
commit df392185f3
12 changed files with 521 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
res/layout/history.xml
View File

@@ -19,6 +19,38 @@
<TextView a:id="@+id/history_item"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:textColor="@color/button_operator_text_color"
style="@style/history_item"/>
<LinearLayout a:orientation="horizontal"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView a:id="@+id/history_item_comment_label"
a:layout_width="wrap_content"
a:layout_height="fill_parent"
a:text="@string/c_history_item_comment"
style="@style/history_item_label"/>
<TextView a:id="@+id/history_item_comment"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="@style/history_item"/>
</LinearLayout>
<LinearLayout a:orientation="horizontal"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView a:layout_width="wrap_content"
a:layout_height="fill_parent"
a:text="@string/c_history_item_status"
style="@style/history_item_label"/>
<TextView a:id="@+id/history_item_status"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="@style/history_item"/>
</LinearLayout>
</LinearLayout>

47
res/layout/history_edit.xml Normal file
View File

@@ -0,0 +1,47 @@
<?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
-->
<ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/history_edit"
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:scrollbars="vertical"
a:scrollbarAlwaysDrawVerticalTrack="true">
<TextView a:layout_height="fill_parent"
a:layout_width="fill_parent"
a:padding="6dp"
style="@style/default_text_size"
a:text="@string/c_history_expression"/>
<TextView a:id="@+id/history_edit_expression"
a:layout_width="fill_parent"
a:layout_height="wrap_content"
style="@style/default_text_size">
</TextView>
<TextView a:layout_height="fill_parent"
a:layout_width="fill_parent"
style="@style/default_text_size"
a:padding="6dp"
a:text="@string/c_history_comment"/>
<EditText a:id="@+id/history_edit_comment"
a:layout_width="fill_parent"
a:layout_height="wrap_content"
style="@style/default_text_size">
</EditText>
</LinearLayout>
</ScrollView>

12
res/values/strings.xml
View File

@@ -301,5 +301,17 @@ Check the \'Round result\' preference in application settings - it should be tur
<string name="c_comment">Comment</string>
<string name="c_history_item_saved">Saved</string>
<string name="c_history_item_not_saved">Not saved</string>
<string name="c_expression_copied">Expression copied to the clipboard</string>
<string name="c_history_item_status">Status: </string>
<string name="c_history_item_comment">Comment: </string>
<string name="c_use_expression">Use</string>
<string name="c_copy_expression">Copy expression</string>
<string name="c_copy_result">Copy result</string>
<string name="c_history_expression">Value</string>
<string name="c_history_comment">Comment</string>
<string name="c_save_history">Save history</string>
<string name="c_edit_history">Modify history</string>
<string name="c_edit">Modify</string>
</resources>

8
res/values/styles-common-history.xml
View File

@@ -6,10 +6,12 @@
<resources>
<style name="history_time" parent="var_text">
</style>
<style name="history_time" parent="var_text"/>
<style name="history_item" parent="var_description">
<style name="history_item" parent="var_description"/>
<style name="history_item_label" parent="var_description">
<item name="android:textStyle">bold</item>
<item name="android:textColor">@android:color/white</item>
</style>
</resources>