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

New main menu

Browse Source
This commit is contained in:
serso
2016-04-02 14:16:21 +02:00
parent f16c2a2eee
commit 92dffb9850
37 changed files with 599 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/res/drawable/ic_chevron_left_24dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#ffffff"
android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
</vector>

35
app/src/main/res/layout/activity_main_editor_with_overflow_menu.xml
View File

@@ -1,22 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="2"
a:orientation="horizontal"
tools:ignore="MergeRootFrame">
<FrameLayout
a:id="@+id/editor"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />
a:layout_width="match_parent"
a:layout_height="match_parent" />
<ImageButton
style="?attr/actionOverflowButtonStyle"
<!-- make clickable area bigger -->
<FrameLayout
a:id="@+id/main_menu"
a:layout_width="wrap_content"
a:layout_height="?actionBarSize"
a:layout_gravity="top|end" />
</LinearLayout>
style="?attr/actionOverflowButtonStyle"
a:layout_width="40dp"
a:paddingLeft="0dp"
a:paddingRight="0dp"
a:layout_height="?attr/actionBarSize"
a:layout_gravity="top|end">
<ImageButton
style="?attr/actionOverflowButtonStyle"
a:paddingLeft="0dp"
a:paddingRight="0dp"
a:layout_width="20dp"
a:layout_height="36dp"
a:clickable="false"
a:focusable="false"
a:focusableInTouchMode="false"
a:layout_gravity="top|end" />
</FrameLayout>
</FrameLayout>

7
app/src/main/res/layout/cpp_app_button_copy.xml
View File

@@ -26,9 +26,4 @@
android:id="@id/cpp_button_copy"
style="?attr/cpp_button_style_control"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:src="@drawable/ic_content_copy_white_48dp"
app:directionTextScale="@dimen/cpp_direction_text_scale_units"
app:directionTextDown="bin"
app:directionTextLeft="hex"
app:directionTextUp="dec"/>
android:src="@drawable/ic_content_copy_white_48dp" />

6
app/src/main/res/layout/cpp_app_button_paste.xml
View File

@@ -26,8 +26,4 @@
android:id="@id/cpp_button_paste"
style="?attr/cpp_button_style_control"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
app:directionTextScale="@dimen/cpp_direction_text_scale_units"
android:src="@drawable/ic_content_paste_white_48dp"
app:directionTextDown="rad"
app:directionTextUp="deg"/>
android:src="@drawable/ic_content_paste_white_48dp" />

4
app/src/main/res/layout/cpp_app_editor.xml
View File

@@ -24,4 +24,6 @@
<org.solovyev.android.calculator.EditorView
a:id="@+id/calculator_editor"
style="@style/CppText.Editor"
xmlns:a="http://schemas.android.com/apk/res/android"/>
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_marginEnd="16dp"
a:layout_marginRight="16dp" />

6
app/src/main/res/layout/onscreen_display.xml
View File

@@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org
-->
<org.solovyev.android.calculator.DisplayView a:id="@+id/calculator_display"
<org.solovyev.android.calculator.DisplayView
a:id="@+id/calculator_display"
style="@style/CppText.Display.Onscreen"
xmlns:a="http://schemas.android.com/apk/res/android"
a:padding="@dimen/cpp_display_padding" />
xmlns:a="http://schemas.android.com/apk/res/android" />

6
app/src/main/res/layout/onscreen_display_light.xml
View File

@@ -6,7 +6,7 @@
~ or visit http://se.solovyev.org
-->
<org.solovyev.android.calculator.DisplayView a:id="@+id/calculator_display"
<org.solovyev.android.calculator.DisplayView
a:id="@+id/calculator_display"
style="@style/CppText.Display.Onscreen.Light"
xmlns:a="http://schemas.android.com/apk/res/android"
a:padding="@dimen/cpp_display_padding" />
xmlns:a="http://schemas.android.com/apk/res/android" />

6
app/src/main/res/layout/widget_display.xml
View File

@@ -6,10 +6,8 @@
~ or visit http://se.solovyev.org
-->
<TextView
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculator_display"
<TextView a:id="@+id/calculator_display"
style="@style/CppText.Display.Widget"
a:padding="@dimen/cpp_display_padding"
xmlns:a="http://schemas.android.com/apk/res/android"
a:scrollbars="vertical"
a:textIsSelectable="true" />

6
app/src/main/res/layout/widget_display_light.xml
View File

@@ -6,10 +6,8 @@
~ or visit http://se.solovyev.org
-->
<TextView
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculator_display"
<TextView a:id="@+id/calculator_display"
style="@style/CppText.Display.Widget.Light"
a:padding="@dimen/cpp_display_padding"
xmlns:a="http://schemas.android.com/apk/res/android"
a:scrollbars="vertical"
a:textIsSelectable="true" />

1
app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
View File

@@ -38,7 +38,6 @@
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="2"
a:padding="@dimen/cpp_display_padding"
a:scrollbars="vertical"
a:textIsSelectable="true"
a:textSize="@dimen/cpp_widget_display_text_size_collapsed" />

70
app/src/main/res/menu/main.xml
View File

@@ -5,7 +5,75 @@
<item
android:id="@+id/menu_mode"
android:title="@string/cpp_mode"
app:actionProviderClass="org.solovyev.android.calculator.MainMenu$ViewProvider"
app:showAsAction="never">
<menu>
<item
android:icon="@drawable/ic_chevron_left_24dp"
android:title="@string/cpp_mode"
app:showAsAction="never" />
<item
android:title=""
app:actionViewClass="org.solovyev.android.widget.menu.MenuItemDivider"
app:showAsAction="never" />
<item
android:id="@+id/menu_mode_engineer"
android:title="@string/cpp_wizard_mode_engineer" />
<item
android:id="@+id/menu_mode_simple"
android:title="@string/cpp_wizard_mode_simple" />
</menu>
</item>
<item
android:id="@+id/menu_angle_units"
android:title="@string/cpp_angles"
app:showAsAction="never">
<menu>
<item
android:icon="@drawable/ic_chevron_left_24dp"
android:title="@string/cpp_angles"
app:showAsAction="never" />
<item
android:title=""
app:actionViewClass="org.solovyev.android.widget.menu.MenuItemDivider"
app:showAsAction="never" />
<item
android:id="@+id/menu_au_deg"
android:title="@string/p_deg" />
<item
android:id="@+id/menu_au_rad"
android:title="@string/p_rad" />
</menu>
</item>
<item
android:id="@+id/menu_numeral_base"
android:title="@string/cpp_radix"
app:showAsAction="never">
<menu>
<item
android:icon="@drawable/ic_chevron_left_24dp"
android:title="@string/cpp_radix"
app:showAsAction="never" />
<item
android:title=""
app:actionViewClass="org.solovyev.android.widget.menu.MenuItemDivider"
app:showAsAction="never" />
<item
android:id="@+id/menu_nb_bin"
android:title="@string/p_bin" />
<item
android:id="@+id/menu_nb_dec"
android:title="@string/p_dec" />
<item
android:id="@+id/menu_nb_hex"
android:title="@string/p_hex" />
</menu>
</item>
<item
android:title=""
app:actionViewClass="org.solovyev.android.widget.menu.MenuItemDivider"
app:showAsAction="never" />
<item

2
app/src/main/res/values-ru/text_strings.xml
View File

@@ -143,4 +143,6 @@
<string name="cpp_fn_parameter">Параметр</string>
<string name="cpp_fn_duplicate_parameter">Параметр с таким именем уже существует</string>
<string name="cpp_invalid_name">Имя содержит недопустимые символы</string>
<string name="cpp_angles">Углы</string>
<string name="cpp_radix">Система</string>
</resources>

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

@@ -24,9 +24,6 @@
<dimen name="cpp_onscreen_display_text_size">20sp</dimen>
<dimen name="cpp_onscreen_header_button_text_size">10dp</dimen>
<!--only for not multipane-->
<dimen name="cpp_editor_padding">5dp</dimen>
<dimen name="cpp_display_padding">3dp</dimen>
<dimen name="cpp_display_padding_side">10dp</dimen>
<dimen name="cpp_widget_keyboard_button_text_size">20dp</dimen>

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

@@ -67,7 +67,10 @@
<item name="android:textColor">?attr/cpp_text_color</item>
<item name="android:inputType">textMultiLine|textNoSuggestions</item>
<item name="android:scrollbars">vertical</item>
<item name="android:padding">@dimen/cpp_editor_padding</item>
<item name="android:paddingRight">3dp</item>
<item name="android:paddingLeft">3dp</item>
<item name="android:paddingTop">3dp</item>
<item name="android:paddingBottom">3dp</item>
</style>
<style name="CppText.Display" parent="CppText">
@@ -78,10 +81,10 @@
<item name="android:textSize">@dimen/cpp_display_text_size</item>
<item name="android:scrollHorizontally">false</item>
<item name="android:scrollbars">none</item>
<item name="android:paddingRight">@dimen/cpp_display_padding</item>
<item name="android:paddingLeft">@dimen/cpp_display_padding</item>
<item name="android:paddingTop">@dimen/cpp_display_padding</item>
<item name="android:paddingBottom">@dimen/cpp_display_padding</item>
<item name="android:paddingRight">3dp</item>
<item name="android:paddingLeft">3dp</item>
<item name="android:paddingTop">3dp</item>
<item name="android:paddingBottom">3dp</item>
</style>
<style name="CppImageButton">

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="cpp_kb_variables" translatable="false">π…</string>
<string name="cpp_kb_variables" translatable="false">π</string>
<string name="cpp_kb_functions" translatable="false">ƒ</string>
<string name="cpp_kb_operators" translatable="false">∂</string>
<string name="cpp_kb_undo" translatable="false">↶</string>

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

@@ -122,4 +122,6 @@
<string name="cpp_new_in_version">New in %1$s version</string>
<string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
<string name="cpp_system_language">System language</string>
<string name="cpp_angles">Angles</string>
<string name="cpp_radix">Radix</string>
</resources>

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

@@ -41,6 +41,7 @@
<item name="cpp_toolbar_style">@style/CppToolbar</item>
<item name="android:listDivider">@drawable/divider_dark</item>
<item name="actionOverflowMenuStyle">@style/Cpp.Widget.AppCompat.PopupMenu.Overflow</item>
</style>
<style name="Cpp.Theme.Translucent" parent="@style/Theme.AppCompat.Dialog">
@@ -97,6 +98,7 @@
<item name="cpp_toolbar_style">@style/CppToolbar.Light</item>
<item name="android:listDivider">@drawable/divider</item>
<item name="actionOverflowMenuStyle">@style/Cpp.Widget.AppCompat.Light.PopupMenu.Overflow</item>
</style>
<style name="Cpp.Theme.Light.Dialog" parent="@style/Theme.AppCompat.Light.DialogWhenLarge">
@@ -147,4 +149,12 @@
<item name="cpp_wizard_button_bg">@color/cpp_wizard_button_selector_light</item>
</style>
<style name="Cpp.Widget.AppCompat.PopupMenu.Overflow" parent="Widget.AppCompat.PopupMenu.Overflow">
<item name="android:dropDownVerticalOffset">4dip</item>
</style>
<style name="Cpp.Widget.AppCompat.Light.PopupMenu.Overflow" parent="Widget.AppCompat.Light.PopupMenu.Overflow">
<item name="android:dropDownVerticalOffset">4dip</item>
</style>
</resources>

14
app/src/main/res/xml/preferences_calculations.xml
View File

@@ -50,13 +50,6 @@
a:summary="@string/c_calc_grouping_separator_summary"
a:title="@string/c_calc_grouping_separator" />
<ListPreference
a:entries="@array/p_angle_units_names"
a:entryValues="@array/p_angle_units"
a:key="preferred_angle_units"
a:summary="@string/p_preferred_angle_units_summary"
a:title="@string/p_preferred_angle_units_title" />
<ListPreference
a:entries="@array/p_angle_units_names"
a:entryValues="@array/p_angle_units"
@@ -64,13 +57,6 @@
a:summary="@string/c_angle_units_summary"
a:title="@string/c_calc_angle_units" />
<ListPreference
a:entries="@array/p_numeral_bases_names"
a:entryValues="@array/p_numeral_bases"
a:key="preferred_numeral_base"
a:summary="@string/p_preferred_numeral_base_summary"
a:title="@string/p_preferred_numeral_base_title" />
<ListPreference
a:entries="@array/p_numeral_bases_names"
a:entryValues="@array/p_numeral_bases"