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

EditHistoryFragment

Browse Source
This commit is contained in:
serso
2016-01-14 17:34:19 +01:00
parent 6eb6b3cabe
commit 4dc87854d8
18 changed files with 342 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/res/layout/history_edit.xml
View File

@@ -23,8 +23,8 @@
-->
<ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
a:layout_width="wrap_content"
a:layout_height="wrap_content">
<LinearLayout
a:id="@+id/history_edit"
@@ -35,7 +35,6 @@
a:scrollbars="vertical">
<TextView
style="@style/cpp_default_text_size"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:padding="6dp"
@@ -43,14 +42,12 @@
<TextView
a:id="@+id/history_edit_expression"
style="@style/cpp_default_text_size"
a:layout_width="fill_parent"
a:layout_height="wrap_content"
a:padding="6dp"
a:textStyle="bold"></TextView>
a:textStyle="bold" />
<TextView
style="@style/cpp_default_text_size"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:padding="6dp"
@@ -58,12 +55,11 @@
<EditText
a:id="@+id/history_edit_comment"
style="@style/cpp_default_text_size"
a:layout_width="fill_parent"
a:layout_height="wrap_content"
a:gravity="top|left"
a:maxLines="4"
a:minLines="4"></EditText>
a:minLines="4"
a:inputType="text" />
</LinearLayout>

2
app/src/main/res/values/dimens.xml
View File

@@ -37,4 +37,6 @@
<dimen name="activity_vertical_margin">5dp</dimen>
<dimen name="control_margin">5dp</dimen>
<dimen name="cpp_onscreen_main_padding">1dp</dimen>
<dimen name="cpp_dialog_spacing">20dp</dimen>
</resources>

47
app/src/main/res/values/theme.xml
View File

@@ -68,6 +68,30 @@
<item name="cpp_text_color_error">@color/cpp_text_error</item>
</style>
<style name="Cpp.Theme.Dialog.Alert" parent="@style/Theme.AppCompat.Dialog.Alert">
<item name="colorPrimary">@color/cpp_metro_button</item>
<item name="android:colorPrimary">@color/cpp_metro_button</item>
<item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
<item name="android:colorPrimaryDark">@color/cpp_metro_button_dark</item>
<item name="colorAccent">@color/cpp_material_accent</item>
<item name="android:colorAccent">@color/cpp_material_accent</item>
<item name="android:colorEdgeEffect">@color/cpp_material_accent</item>
<item name="android:statusBarColor">@color/cpp_status_bar</item>
<item name="windowNoTitle">false</item>
<item name="android:windowNoTitle">false</item>
<item name="android:windowTitleBackgroundStyle">@android:color/transparent</item>
<item name="windowActionBar">false</item>
<item name="android:windowActionBar">false</item>
<item name="android:windowCloseOnTouchOutside">false</item>
<item name="cpp_main_bg">@color/cpp_main_bg</item>
<item name="cpp_pane_bg">@drawable/pane</item>
<item name="cpp_fab_bg">@color/cpp_material_grey</item>
<item name="cpp_text_color">@color/cpp_text</item>
<item name="cpp_text_color_error">@color/cpp_text_error</item>
</style>
<style name="Cpp.Theme.Light" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<item name="android:windowBackground">@color/cpp_main_bg_light</item>
@@ -112,6 +136,29 @@
<item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
</style>
<style name="Cpp.Theme.Light.Dialog.Alert" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
<item name="colorPrimary">@color/cpp_material_light</item>
<item name="android:colorPrimary">@color/cpp_material_light</item>
<item name="colorPrimaryDark">@color/cpp_material_light</item>
<item name="android:colorPrimaryDark">@color/cpp_material_light</item>
<item name="colorAccent">@color/cpp_material_light</item>
<item name="android:colorAccent">@color/cpp_material_light</item>
<item name="android:statusBarColor">@color/cpp_status_bar_light</item>
<item name="windowNoTitle">false</item>
<item name="android:windowNoTitle">false</item>
<item name="android:windowTitleBackgroundStyle">@android:color/transparent</item>
<item name="windowActionBar">false</item>
<item name="android:windowActionBar">false</item>
<item name="android:windowCloseOnTouchOutside">false</item>
<item name="cpp_main_bg">@color/cpp_main_bg_light</item>
<item name="cpp_pane_bg">@drawable/pane_light</item>
<item name="cpp_fab_bg">@color/cpp_material_light</item>
<item name="cpp_text_color">@color/cpp_text_inverse</item>
<item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
</style>
<style name="Cpp.Theme.Wizard" parent="Cpp.Theme.Material">
<item name="windowNoTitle">true</item>
<item name="android:windowNoTitle">true</item>

11
app/src/main/res/values/theme_material.xml
View File

@@ -68,7 +68,16 @@
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Operation</item>
</style>
<style name="Cpp.Theme.Dialog.Material" parent="Cpp.Theme.Dialog">
<style name="Cpp.Theme.Material.Dialog" parent="Cpp.Theme.Dialog">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control_image">
@style/CppKeyboardButton.Material.Control.Image
</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Operation</item>
</style>
<style name="Cpp.Theme.Material.Dialog.Alert" parent="Cpp.Theme.Dialog.Alert">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control_image">

12
app/src/main/res/values/theme_material_light.xml
View File

@@ -69,7 +69,17 @@
</item>
</style>
<style name="Cpp.Theme.Dialog.Material.Light" parent="Cpp.Theme.Light.Dialog">
<style name="Cpp.Theme.Material.Light.Dialog" parent="Cpp.Theme.Light.Dialog">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control_image">
@style/CppKeyboardButton.Material.Light.Control.Image
</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation
</item>
</style>
<style name="Cpp.Theme.Material.Light.Dialog.Alert" parent="Cpp.Theme.Light.Dialog.Alert">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control_image">

2
app/src/main/res/values/theme_metro_blue.xml
View File

@@ -66,7 +66,7 @@
<item name="android:background">@drawable/metro_widget_button_light</item>
</style>
<style name="cpp_metro_blue_theme" parent="Cpp.Theme">
<style name="Cpp.Theme.Metro.Blue" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Metro.Blue.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Metro.Blue.Control</item>
<item name="cpp_button_style_control_image">

2
app/src/main/res/values/theme_metro_green.xml
View File

@@ -26,7 +26,7 @@
<item name="android:background">@drawable/metro_button_green</item>
</style>
<style name="cpp_metro_green_theme" parent="cpp_metro_blue_theme">
<style name="Cpp.Theme.Metro.Green" parent="Cpp.Theme.Metro.Blue">
<item name="cpp_button_style_operation">@style/metro_green_operation_button_style</item>
</style>

2
app/src/main/res/values/theme_metro_purple.xml
View File

@@ -26,7 +26,7 @@
<item name="android:background">@drawable/metro_button_purple</item>
</style>
<style name="cpp_metro_purple_theme" parent="cpp_metro_blue_theme">
<style name="Cpp.Theme.Metro.Purple" parent="Cpp.Theme.Metro.Blue">
<item name="cpp_button_style_operation">@style/metro_purple_operation_button_style</item>
</style>