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

Styles

Browse Source
This commit is contained in:
Sergey Solovyev 2012-10-03 21:30:33 +04:00
parent d27c49db32
commit b3f8c4c356
19 changed files with 493 additions and 514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
calculatorpp/res/drawable-hdpi/icon_action_bar_long.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

2
calculatorpp/res/drawable/metro_button_blue_shape.xml
View File

@ -15,6 +15,6 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:startColor="#10648c" android:endColor="#10648c"/>
<solid android:color="@color/metro_blue_color"/>
<corners android:radius="1dp" />
</shape>

2
calculatorpp/res/drawable/metro_button_green_shape.xml
View File

@ -15,6 +15,6 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:startColor="#088e3a" android:endColor="#088e3a"/>
<solid android:color="@color/metro_green_color"/>
<corners android:radius="1dp" />
</shape>

2
calculatorpp/res/drawable/metro_button_light_shape.xml
View File

@ -15,6 +15,6 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:startColor="#393939" android:endColor="#393939"/>
<solid android:color="#393939"/>
<corners android:radius="1dp" />
</shape>

2
calculatorpp/res/drawable/metro_button_pressed.xml
View File

@ -15,6 +15,6 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:startColor="#C9C9C9" android:endColor="#C9C9C9"/>
<solid android:color="#C9C9C9"/>
<corners android:radius="1dp" />
</shape>

2
calculatorpp/res/drawable/metro_button_purple_shape.xml
View File

@ -15,6 +15,6 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:startColor="#651456" android:endColor="#651456"/>
<solid android:color="@color/metro_purple_color"/>
<corners android:radius="1dp" />
</shape>

3
calculatorpp/res/values/colors.xml
View File

@ -15,4 +15,7 @@
<color name="default_background">#ff000000</color>
<color name="pane_background">#ff1f1f1f</color>
<color name="metro_button_background">#ff1f1f1f</color>
<color name="metro_blue_color">#10648c</color>
<color name="metro_green_color">#088e3a</color>
<color name="metro_purple_color">#651456</color>
</resources>

49
calculatorpp/res/values/styles-common.xml
View File

@ -1,49 +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
-->
<resources>
<style name="button_style" parent="button_style_parent">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:focusable">true</item>
<item name="android:background">@drawable/metro_button_blue</item>
</style>
<style name="keyboard_button_style" parent="keyboard_button_style_parent">
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:focusable">true</item>
<item name="android:background">@drawable/default_button_dark</item>
<item name="android:layout_margin">@dimen/button_margin</item>
</style>
<style name="editor_style" parent="editor_style_parent">
<item name="android:gravity">left|top</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
</style>
<style name="display_style" parent="display_style_parent">
<item name="android:gravity">top|right</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
</style>
<style name="about_style" parent="about_style_parent">
<item name="android:gravity">center</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
</style>
<style name="default_text">
<item name="android:background">@android:color/transparent</item>
<item name="android:textColor">@color/default_text_color</item>
</style>
</resources>

53
calculatorpp/res/values/styles.xml
View File

@ -24,40 +24,51 @@
<item name="android:textSize">@dimen/text_size</item>
</style>
<style name="keyboard_button_style_parent">
<item name="android:textSize">@dimen/keyboard_button_text_size</item>
<item name="android:textColor">@color/button_text_color</item>
</style>
<style name="button_style_parent">
<style name="button_style">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:focusable">true</item>
<item name="android:background">@drawable/metro_button_blue</item>
<item name="android:textSize">@dimen/button_text_size</item>
<item name="android:textColor">@color/button_text_color</item>
</style>
<style name="display_style_parent" parent="default_text">
<item name="android:textSize">@dimen/display_text_size</item>
<style name="keyboard_button_style">
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:focusable">true</item>
<item name="android:background">@drawable/default_button_dark</item>
<item name="android:layout_margin">@dimen/button_margin</item>
<item name="android:textSize">@dimen/keyboard_button_text_size</item>
<item name="android:textColor">@color/button_text_color</item>
</style>
<style name="editor_style_parent" parent="default_text">
<style name="editor_style" parent="default_text">
<item name="android:gravity">left|top</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:textSize">@dimen/editor_text_size</item>
</style>
<style name="about_style_parent" parent="default_text">
<style name="display_style" parent="default_text">
<item name="android:gravity">top|right</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:textSize">@dimen/display_text_size</item>
</style>
<style name="about_style" parent="default_text">
<item name="android:gravity">center</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:textSize">15dp</item>
<item name="android:padding">5dp</item>
</style>
<style name="math_entity_text_parent">
<item name="android:textSize">@dimen/math_entity_text_size</item>
</style>
<style name="math_entity_description_parent">
<item name="android:textSize">@dimen/math_entity_description_text_size</item>
</style>
<style name="add_var_button_parent">
<item name="android:paddingLeft">40dp</item>
<item name="android:paddingRight">40dp</item>
<style name="default_text">
<item name="android:background">@android:color/transparent</item>
<item name="android:textColor">@color/default_text_color</item>
</style>
</resources>

0
calculatorpp/res/values/styles-common-history.xml → calculatorpp/res/values/styles_history.xml
View File

10
calculatorpp/res/values/styles-common-var.xml → calculatorpp/res/values/styles_var.xml
View File

@ -7,16 +7,20 @@
<resources>
<style name="math_entity_text" parent="math_entity_text_parent">
<style name="math_entity_text">
<item name="android:textStyle">bold</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">@dimen/math_entity_text_size</item>
</style>
<style name="math_entity_description" parent="math_entity_description_parent">
<style name="math_entity_description">
<item name="android:textColor">#bebebe</item>
<item name="android:textSize">@dimen/math_entity_description_text_size</item>
</style>
<style name="add_var_button" parent="add_var_button_parent">
<style name="add_var_button">
<item name="android:paddingLeft">40dp</item>
<item name="android:paddingRight">40dp</item>
</style>
</resources>

2
calculatorpp/res/values/text_strings.xml
View File

@ -216,7 +216,7 @@
<string name="crash_dialog_text">
Unfortunately, Calculator++ has been crashed.\n\n
In order to fix the problem we need some information about it. It\'s highly recommended to send crash report via email (after pressing \'Ok\' button you will see all sent data in the new window).\n\n
Do you want to send crash report via email?
Do you want to send crash report?
</string>
</resources>

10
calculatorpp/res/values/styles-default-theme.xml → calculatorpp/res/values/theme_default.xml
View File

@ -77,6 +77,12 @@
<item name="android:layout_width">match_parent</item>
</style>
<style name="default_actionbar_tab_style" parent="@style/Widget.Sherlock.ActionBar.TabView">
</style>
<style name="default_actionbar_tab_bar_style" parent="@style/Widget.Sherlock.ActionBar.TabBar">
</style>
<style name="default_theme" parent="Theme.Sherlock">
<item name="digitButtonStyle">@style/default_digit_button_style</item>
<item name="controlButtonStyle">@style/default_control_button_style</item>
@ -93,5 +99,9 @@
<item name="paneStyle">@style/default_pane_style</item>
<item name="paneStyleTransparent">@style/default_pane_style_transparent</item>
<!-- action bar-->
<item name="actionBarTabStyle">@style/default_actionbar_tab_style</item>
<item name="actionBarTabBarStyle">@style/default_actionbar_tab_bar_style</item>
</style>
</resources>

0
calculatorpp/res/values/styles-light-blue-theme.xml → calculatorpp/res/values/theme_light_blue.xml
View File

0
calculatorpp/res/values/styles-metro-blue-theme.xml → calculatorpp/res/values/theme_metro_blue.xml
View File

0
calculatorpp/res/values/styles-metro-green-theme.xml → calculatorpp/res/values/theme_metro_green.xml
View File

0
calculatorpp/res/values/styles-metro-purple-theme.xml → calculatorpp/res/values/theme_metro_purple.xml
View File

0
calculatorpp/res/values/styles-violet-theme.xml → calculatorpp/res/values/theme_violet.xml
View File

4
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferencesActivity.java
View File

@ -11,10 +11,10 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceManager;
import android.util.Log;
import android.widget.Toast;
import com.actionbarsherlock.app.SherlockPreferenceActivity;
import net.robotmedia.billing.BillingController;
import net.robotmedia.billing.IBillingObserver;
import net.robotmedia.billing.ResponseCode;
@ -31,7 +31,7 @@ import org.solovyev.android.view.VibratorContainer;
* Date: 7/16/11
* Time: 6:37 PM
*/
public class CalculatorPreferencesActivity extends PreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener, IBillingObserver {
public class CalculatorPreferencesActivity extends SherlockPreferenceActivity implements SharedPreferences.OnSharedPreferenceChangeListener, IBillingObserver {
public static final String CLEAR_BILLING_INFO = "clear_billing_info";