math entities list activities refactored + categories added

This commit is contained in:
Sergey Solovyev
2011-12-22 01:53:39 +04:00
parent 2db82269b2
commit 5233ba9e18
29 changed files with 1012 additions and 663 deletions

View File

@@ -1,30 +0,0 @@
<?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
-->
<TabHost xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@android:id/tabhost"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<LinearLayout
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TabWidget
a:id="@android:id/tabs"
a:layout_width="fill_parent"
a:layout_height="wrap_content"/>
<FrameLayout
a:id="@android:id/tabcontent"
a:layout_width="fill_parent"
a:layout_height="fill_parent"/>
</LinearLayout>
</TabHost>

View File

@@ -16,18 +16,18 @@
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView a:id="@+id/var_text"
<TextView a:id="@+id/math_entity_text"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="@style/var_text">
style="@style/math_entity_text">
</TextView>
</LinearLayout>
<TextView a:id="@+id/var_description"
<TextView a:id="@+id/math_entity_description"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="@style/var_description">
style="@style/math_entity_description">
</TextView>
</LinearLayout>

View File

@@ -1,20 +0,0 @@
<?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="fill_parent"
a:layout_height="fill_parent">
<ListView
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:layout_weight="1"
a:id="@android:id/list"/>
</LinearLayout>

30
res/layout/tabs.xml Normal file
View File

@@ -0,0 +1,30 @@
<?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
-->
<TabHost xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@android:id/tabhost"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<LinearLayout
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TabWidget
a:id="@android:id/tabs"
a:layout_width="fill_parent"
a:layout_height="wrap_content"/>
<FrameLayout
a:id="@android:id/tabcontent"
a:layout_width="fill_parent"
a:layout_height="fill_parent"/>
</LinearLayout>
</TabHost>

View File

@@ -30,11 +30,11 @@
<item name="android:padding">5dp</item>
</style>
<style name="var_text_parent">
<style name="math_entity_text_parent">
<item name="android:textSize">20dp</item>
</style>
<style name="var_description_parent">
<style name="math_entity_description_parent">
<item name="android:textSize">15dp</item>
</style>

View File

@@ -30,11 +30,11 @@
<item name="android:padding">5dp</item>
</style>
<style name="var_text_parent">
<style name="math_entity_text_parent">
<item name="android:textSize">20dp</item>
</style>
<style name="var_description_parent">
<style name="math_entity_description_parent">
<item name="android:textSize">15dp</item>
</style>

View File

@@ -30,11 +30,11 @@
<item name="android:padding">5dp</item>
</style>
<style name="var_text_parent">
<style name="math_entity_text_parent">
<item name="android:textSize">20dp</item>
</style>
<style name="var_description_parent">
<style name="math_entity_description_parent">
<item name="android:textSize">15dp</item>
</style>

View File

@@ -321,4 +321,13 @@ Check the \'Round result\' preference in application settings - it should be tur
<string name="c_history_was_removed">History was successfully removed!</string>
<string name="c_history_saved">History was successfully saved!</string>
<string name="c_fun_category_trig">Trigonometric</string>
<string name="c_fun_category_hyper_trig">Hyperbolic trigonometric</string>
<string name="c_fun_category_comparison">Comparison</string>
<string name="c_fun_category_common">Common</string>
<string name="c_var_system">System</string>
<string name="c_var_my">My</string>
</resources>

View File

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

View File

@@ -7,7 +7,7 @@
<resources>
<style name="var_text" parent="var_text_parent">
<style name="math_entity_text" parent="math_entity_text_parent">
<item name="android:paddingTop">6dp</item>
<item name="android:paddingLeft">6dp</item>
<item name="android:paddingRight">6dp</item>
@@ -16,7 +16,7 @@
<item name="android:textColor">@android:color/white</item>
</style>
<style name="var_description" parent="var_description_parent">
<style name="math_entity_description" parent="math_entity_description_parent">
<item name="android:paddingTop">0dp</item>
<item name="android:paddingLeft">6dp</item>
<item name="android:paddingRight">6dp</item>

View File

@@ -44,11 +44,11 @@
<item name="android:padding">5dp</item>
</style>
<style name="var_text_parent">
<style name="math_entity_text_parent">
<item name="android:textSize">20dp</item>
</style>
<style name="var_description_parent">
<style name="math_entity_description_parent">
<item name="android:textSize">15dp</item>
</style>