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

Reimplement drag button

Browse Source
This commit is contained in:
serso
2016-03-08 17:23:53 +01:00
parent fe8f99491d
commit 56d1d2b249
55 changed files with 849 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,6 @@
a:id="@id/cpp_button_0"
style="?attr/cpp_button_style_digit"
a:text="0"
c:textDown="000"
c:textUp="00"
c:directionTextDown="000"
c:directionTextUp="00"
tools:ignore="HardcodedText" />

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

@@ -29,7 +29,7 @@
a:id="@id/cpp_button_1"
style="?attr/cpp_button_style_digit"
a:text="1"
c:textDown="asin"
c:textLeft="A"
c:textUp="sin"
c:directionTextDown="asin"
c:directionTextLeft="A"
c:directionTextUp="sin"
tools:ignore="HardcodedText" />

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

@@ -29,7 +29,7 @@
a:id="@id/cpp_button_2"
style="?attr/cpp_button_style_digit"
a:text="2"
c:textDown="acos"
c:textLeft="B"
c:textUp="cos"
c:directionTextDown="acos"
c:directionTextLeft="B"
c:directionTextUp="cos"
tools:ignore="HardcodedText" />

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

@@ -29,7 +29,7 @@
a:id="@id/cpp_button_3"
style="?attr/cpp_button_style_digit"
a:text="3"
c:textDown="atan"
c:textLeft="C"
c:textUp="tan"
c:directionTextDown="atan"
c:directionTextLeft="C"
c:directionTextUp="tan"
tools:ignore="HardcodedText" />

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

@@ -28,7 +28,7 @@
a:id="@id/cpp_button_4"
style="?attr/cpp_button_style_digit"
a:text="4"
c:textDown="y"
c:textLeft="D"
c:textUp="x"
c:directionTextDown="y"
c:directionTextLeft="D"
c:directionTextUp="x"
tools:ignore="HardcodedText" />

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

@@ -28,7 +28,7 @@
a:id="@id/cpp_button_5"
style="?attr/cpp_button_style_digit"
a:text="5"
c:textDown="j"
c:textLeft="E"
c:textUp="t"
c:directionTextDown="j"
c:directionTextLeft="E"
c:directionTextUp="t"
tools:ignore="HardcodedText" />

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

@@ -29,7 +29,7 @@
a:id="@id/cpp_button_6"
style="?attr/cpp_button_style_digit"
a:text="6"
c:textDown="rad"
c:textLeft="F"
c:textUp="deg"
c:directionTextDown="rad"
c:directionTextLeft="F"
c:directionTextUp="deg"
tools:ignore="HardcodedText" />

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

@@ -29,7 +29,7 @@
a:id="@id/cpp_button_7"
style="?attr/cpp_button_style_digit"
a:text="7"
c:textDown="!"
c:textLeft="0b:"
c:textUp="i"
c:directionTextDown="!"
c:directionTextLeft="0b:"
c:directionTextUp="i"
tools:ignore="HardcodedText" />

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

@@ -29,7 +29,7 @@
a:id="@id/cpp_button_8"
style="?attr/cpp_button_style_digit"
a:text="8"
c:textDown="lg"
c:textLeft="0d:"
c:textUp="ln"
c:directionTextDown="lg"
c:directionTextLeft="0d:"
c:directionTextUp="ln"
tools:ignore="HardcodedText" />

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

@@ -29,7 +29,7 @@
a:id="@id/cpp_button_9"
style="?attr/cpp_button_style_digit"
a:text="9"
c:textDown="e"
c:textLeft="0x:"
c:textUp="π"
c:directionTextDown="e"
c:directionTextLeft="0x:"
c:directionTextUp="π"
tools:ignore="HardcodedText" />

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

@@ -29,6 +29,6 @@
style="?attr/cpp_button_style_control_image"
a:text="@string/c_clear"
a:textStyle="bold"
c:textDown="bin"
c:textLeft="hex"
c:textUp="dec" />
c:directionTextDown="bin"
c:directionTextLeft="hex"
c:directionTextUp="dec" />

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

@@ -29,6 +29,6 @@
a:id="@id/cpp_button_division"
style="?attr/cpp_button_style_operation"
a:text="/"
c:textDown="√"
c:textUp="%"
c:directionTextDown="√"
c:directionTextUp="%"
tools:ignore="HardcodedText" />

2
app/src/main/res/layout/cpp_app_button_dot.xml
View File

@@ -29,5 +29,5 @@
a:id="@id/cpp_button_period"
style="?attr/cpp_button_style_digit"
a:text="."
c:textUp=","
c:directionTextUp=","
tools:ignore="HardcodedText" />

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

@@ -28,6 +28,6 @@
a:id="@id/cpp_button_equals"
style="?attr/cpp_button_style_control"
a:text="="
c:textDown="@string/cpp_plot_button_text"
c:textUp="≡"
c:directionTextDown="@string/cpp_plot_button_text"
c:directionTextUp="≡"
tools:ignore="HardcodedText" />

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

@@ -31,6 +31,6 @@
a:text="="
a:textColor="?android:attr/textColorPrimary"
c:directionTextColor="?android:attr/textColorPrimary"
c:textDown="@string/cpp_plot_button_text"
c:textUp="≡"
c:directionTextDown="@string/cpp_plot_button_text"
c:directionTextUp="≡"
tools:ignore="HardcodedText" />

2
app/src/main/res/layout/cpp_app_button_functions.xml
View File

@@ -30,5 +30,5 @@
style="?attr/cpp_button_style_control"
a:text="@string/cpp_kb_functions"
a:textStyle="italic"
c:textUp="+ƒ"
c:directionTextUp="+ƒ"
tools:ignore="HardcodedText" />

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

@@ -28,5 +28,5 @@
style="?attr/cpp_button_style_control"
a:text="@string/c_history_button"
a:textStyle="bold"
c:textDown="@string/cpp_kb_redo"
c:textUp="@string/cpp_kb_undo" />
c:directionTextDown="@string/cpp_kb_redo"
c:directionTextUp="@string/cpp_kb_undo" />

2
app/src/main/res/layout/cpp_app_button_left.xml
View File

@@ -29,5 +29,5 @@
a:id="@id/cpp_button_left"
style="?attr/cpp_button_style_control"
a:text="◁"
c:textUp="◁◁"
c:directionTextUp="◁◁"
tools:ignore="HardcodedText" />

2
app/src/main/res/layout/cpp_app_button_minus.xml
View File

@@ -28,5 +28,5 @@
a:id="@id/cpp_button_subtraction"
style="?attr/cpp_button_style_operation"
a:text="−"
c:textDown="@string/cpp_kb_operators"
c:directionTextDown="@string/cpp_kb_operators"
tools:ignore="HardcodedText" />

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

@@ -29,7 +29,7 @@
a:id="@id/cpp_button_multiplication"
style="?attr/cpp_button_style_operation"
a:text="×"
c:textDown="^2"
c:textLeft="Π"
c:textUp="^"
c:directionTextDown="^2"
c:directionTextLeft="Π"
c:directionTextUp="^"
tools:ignore="HardcodedText" />

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

@@ -28,6 +28,6 @@
a:id="@id/cpp_button_plus"
style="?attr/cpp_button_style_operation"
a:text="+"
c:textDown="E"
c:textUp="°"
c:directionTextDown="E"
c:directionTextUp="°"
tools:ignore="HardcodedText" />

2
app/src/main/res/layout/cpp_app_button_right.xml
View File

@@ -29,5 +29,5 @@
a:id="@id/cpp_button_right"
style="?attr/cpp_button_style_control"
a:text="▷"
c:textUp="▷▷"
c:directionTextUp="▷▷"
tools:ignore="HardcodedText" />

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

@@ -29,7 +29,7 @@
a:id="@id/cpp_button_round_brackets"
style="?attr/cpp_button_style_digit"
a:text="( )"
c:textDown=")"
c:textLeft="(…)"
c:textUp="("
c:directionTextDown=")"
c:directionTextLeft="(…)"
c:directionTextUp="("
tools:ignore="HardcodedText" />

2
app/src/main/res/layout/cpp_app_button_vars.xml
View File

@@ -30,5 +30,5 @@
style="?attr/cpp_button_style_control"
a:text="@string/cpp_kb_variables"
a:textStyle="italic"
c:textUp="+π"
c:directionTextUp="+π"
tools:ignore="HardcodedText" />

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

@@ -53,7 +53,7 @@
a:minHeight="100dp"
a:minWidth="100dp"
a:text="9"
c:textDown="^2"
c:textUp="%" />
c:directionTextDown="^2"
c:directionTextUp="%" />
</LinearLayout>

4
app/src/main/res/values-land/text_non_translatable.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="cpp_direction_text_size" translatable="false">0.4;0.4;0.4;0.4</string>
</resources>

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

@@ -21,8 +21,8 @@
-->
<resources>
<dimen name="cpp_fragment_text_size">15sp</dimen>
<dimen name="cpp_min_editor_text_size">18sp</dimen>
<dimen name="cpp_display_text_size">20sp</dimen>
<dimen name="cpp_clickable_area_size">40dp</dimen>
<dimen name="cpp_keyboard_button_direction_text_padding">1dp</dimen>
</resources>

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

@@ -8,8 +8,12 @@
<dimen name="min_expanded_height_lock_screen">300dp</dimen>
<dimen name="cpp_text_size">20sp</dimen>
<dimen name="cpp_button_padding">1px</dimen>
<dimen name="cpp_direction_text_default_padding">2dp</dimen>
<dimen name="cpp_direction_text_min_size">9dp</dimen>
<item name="cpp_direction_text_scale" format="float" type="dimen">0.3</item>
<dimen name="cpp_button_corner">1dp</dimen>
<dimen name="cpp_keyboard_button_direction_text_padding">4dp</dimen>
<dimen name="cpp_keyboard_button_text_size">30dp</dimen>
<dimen name="cpp_keyboard_simple_image_button_padding">12dp</dimen>

17
app/src/main/res/values/drag_attrs.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="DirectionText">
<attr name="directionTextColor" format="color"/>
<attr name="directionTextAlpha" format="float"/>
<attr name="directionTextUp" format="string"/>
<attr name="directionTextDown" format="string"/>
<attr name="directionTextRight" format="string"/>
<attr name="directionTextLeft" format="string"/>
<attr name="directionTextScale" format="float"/>
<attr name="directionTextPadding" format="dimension"/>
<attr name="directionTextScaleUp" format="float"/>
<attr name="directionTextScaleDown" format="float"/>
<attr name="directionTextScaleRight" format="float"/>
<attr name="directionTextScaleLeft" format="float"/>
</declare-styleable>
</resources>

4
app/src/main/res/values/drag_dimens.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="drag_min_distance">25dp</dimen>
</resources>

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

@@ -39,7 +39,8 @@
<item name="android:textColor">@color/cpp_button_text</item>
<item name="android:scaleType">centerInside</item>
<item name="directionTextColor">@color/cpp_button_text</item>
<item name="directionTextScale">@string/cpp_direction_text_size</item>
<item name="directionTextScale">@dimen/cpp_direction_text_scale</item>
<item name="directionTextPadding">@dimen/cpp_keyboard_button_direction_text_padding</item>
</style>
<style name="CppText.Editor.Onscreen.Light" parent="CppText.Editor.Onscreen">

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

@@ -5,7 +5,6 @@
<string name="cpp_kb_operators" translatable="false">∂</string>
<string name="cpp_kb_undo" translatable="false">↶</string>
<string name="cpp_kb_redo" translatable="false">↷</string>
<string name="cpp_direction_text_size" translatable="false">0.3;0.3;0.3;0.3</string>
<string name="cpp_plot_add_function" translatable="false">+</string>
<string name="cpp_plot_zoom_in" translatable="false">+</string>
<string name="cpp_plot_zoom_reset" translatable="false">0</string>