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

Changes

Browse Source
This commit is contained in:
serso
2016-01-16 15:32:21 +01:00
parent 4323c688c5
commit 45a71817c8
35 changed files with 384 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/res/values/colors.xml
View File

@@ -29,14 +29,14 @@
<color name="cpp_button_text">#ffffffff</color>
<color name="cpp_button_text_operator">#ffffff99</color>
<color name="cpp_selected_angle_unit_text">#ffffff99</color>
<color name="cpp_main_bg">#101010</color>
<color name="cpp_main_bg">@color/grey_950</color>
<color name="cpp_main_bg_light">#fff6f1ef</color>
<color name="cpp_wizard_button_normal">#424242</color>
<color name="cpp_wizard_button_disabled">#616161</color>
<color name="cpp_wizard_button_pressed">#757575</color>
<color name="cpp_metro_button_dark">#ff000000</color>
<color name="cpp_metro_button">@color/cpp_material_grey</color>
<color name="cpp_metro_button_light">@color/cpp_material_grey_light</color>
<color name="cpp_metro_button">@color/grey_900</color>
<color name="cpp_metro_button_light">@color/grey_800</color>
<color name="cpp_metro_blue">#10648c</color>
<color name="cpp_material_blue">#ff0d4663</color>
<color name="cpp_material_blue_lighter">#ff0d668d</color>
@@ -53,12 +53,15 @@
<color name="cpp_wizard_disabled_text">#66ffffff</color>
<color name="cpp_material_accent">#FAFAFA</color>
<color name="cpp_material_grey">#212121</color>
<color name="cpp_material_grey_light">#393939</color>
<color name="cpp_material_actionbar">@color/cpp_material_grey</color>
<color name="cpp_material_actionbar_light">@color/cpp_material_grey_light</color>
<color name="cpp_material_actionbar">@color/grey_900</color>
<color name="cpp_material_actionbar_light">@color/grey_800</color>
<color name="cpp_pane_bg">@color/cpp_material_grey</color>
<color name="cpp_pane_bg">@color/grey_900</color>
<color name="cpp_pane_bg_light">#ffeae5e3</color>
<color name="grey_900">#212121</color>
<color name="grey_950">#101010</color>
<color name="grey_600">#757575</color>
<color name="grey_800">#424242</color>
<color name="blue_grey_800">#37474F</color>
</resources>

39
app/src/main/res/values/styles.xml
View File

@@ -253,15 +253,23 @@
<item name="android:layout_gravity">center_horizontal</item>
</style>
<style name="CppListViewItem">
<style name="CppListItem.OneLine" parent="CppListItem">
<item name="android:minHeight">48dp</item>
</style>
<style name="CppListItem.TwoLines" parent="CppListItem">
<item name="android:minHeight">72dp</item>
</style>
<style name="CppListItem">
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<item name="android:paddingBottom">20dp</item>
<item name="android:paddingTop">20dp</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:paddingTop">8dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:minHeight">72dp</item>
<item name="android:gravity">center_vertical|left</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
</style>
<style name="CppFab">
@@ -274,10 +282,23 @@
<item name="fab_colorRipple">?attr/colorControlHighlight</item>
</style>
<style name="CppListViewItemTextPrimary">
<item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
<style name="CppListItemText">
<item name="android:textSize">@dimen/list_item_text_size</item>
</style>
<style name="CppListItemText.Primary" parent="CppListItemText">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">@dimen/cpp_li_text_size</item>
</style>
<style name="CppListItemText.Secondary" parent="CppListItemText">
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="CppListItemText.Secondary.OneLine" parent="CppListItemText.Secondary">
<item name="android:singleLine">true</item>
<item name="android:minLines">1</item>
<item name="android:maxLines">1</item>
<item name="android:ellipsize">end</item>
</style>
<style name="CppListViewItemTextSecondary">
@@ -286,7 +307,7 @@
<item name="android:textSize">@dimen/cpp_li_secondary_text_size</item>
</style>
<style name="CppListViewItemTextPrimary.History" parent="CppListViewItemTextPrimary">
<style name="CppListViewItemTextPrimary.History" parent="CppListItemText.Primary">
<item name="android:maxLines">2</item>
<item name="android:ellipsize">end</item>
</style>
@@ -321,4 +342,6 @@
<item name="android:backgroundSplit">@color/cpp_material_actionbar_light</item>
</style>
<dimen name="list_item_text_size">16sp</dimen>
<dimen name="list_item_text_size_small">14sp</dimen>
</resources>

3
app/src/main/res/values/text_strings.xml
View File

@@ -103,7 +103,8 @@
<string name="c_save_history">Save history</string>
<string name="c_edit_history">Modify history</string>
<string name="c_edit">Modify</string>
<string name="c_saved_history">Saved history</string>
<string name="cpp_history_tab_saved">Saved</string>
<string name="cpp_history_tab_recent">Recent</string>
<string name="c_history_already_saved">History was already saved!</string>
<string name="c_history_must_be_saved">History must be saved before editing!</string>
<string name="c_history_was_removed">History has been successfully removed!</string>

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

@@ -33,9 +33,11 @@
<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_fab_bg">@color/grey_900</item>
<item name="cpp_text_color">@color/cpp_text</item>
<item name="cpp_text_color_error">@color/cpp_text_error</item>
<item name="android:listDivider">@drawable/divider</item>
</style>
<style name="Cpp.Theme.Dialog" parent="@style/Theme.AppCompat.Dialog">
@@ -50,9 +52,11 @@
<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_fab_bg">@color/grey_900</item>
<item name="cpp_text_color">@color/cpp_text</item>
<item name="cpp_text_color_error">@color/cpp_text_error</item>
<item name="android:listDivider">@drawable/divider</item>
</style>
<style name="Cpp.Theme.Dialog.Alert" parent="@style/Theme.AppCompat.Dialog.Alert">
@@ -62,9 +66,11 @@
<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_fab_bg">@color/grey_900</item>
<item name="cpp_text_color">@color/cpp_text</item>
<item name="cpp_text_color_error">@color/cpp_text_error</item>
<item name="android:listDivider">@drawable/divider</item>
</style>
<style name="Cpp.Theme.Light" parent="@style/Theme.AppCompat.Light.DarkActionBar">
@@ -81,6 +87,8 @@
<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>
<item name="android:listDivider">@drawable/divider</item>
</style>
<style name="Cpp.Theme.Light.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
@@ -98,6 +106,8 @@
<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>
<item name="android:listDivider">@drawable/divider</item>
</style>
<style name="Cpp.Theme.Light.Dialog.Alert" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
@@ -110,6 +120,8 @@
<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>
<item name="android:listDivider">@drawable/divider</item>
</style>
<style name="Cpp.Theme.Wizard" parent="Cpp.Theme.Material">