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

Style fixing

Browse Source
This commit is contained in:
serso
2016-03-13 23:45:54 +01:00
parent 4434973733
commit 1dcd43258c
32 changed files with 221 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/res/layout-land/activity_main.xml
View File

@@ -38,13 +38,7 @@
a:orientation="horizontal">
<include
layout="@layout/cpp_app_button_left"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />
<include
layout="@layout/cpp_app_button_erase"
layout="@layout/cpp_app_button_equals_no_bg"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />
@@ -53,17 +47,17 @@
a:id="@+id/display"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="4"
a:layout_weight="5"
a:orientation="horizontal" />
<include
layout="@layout/cpp_app_button_clear"
layout="@layout/cpp_app_button_erase"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />
<include
layout="@layout/cpp_app_button_right"
layout="@layout/cpp_app_button_clear"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />

14
app/src/main/res/layout-land/cpp_app_keyboard.xml
View File

@@ -34,10 +34,10 @@
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_vars" />
<include layout="@layout/cpp_app_button_copy" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_app_button_7" />
<include layout="@layout/cpp_app_button_8" />
@@ -48,7 +48,7 @@
<include layout="@layout/cpp_app_button_division" />
<include layout="@layout/cpp_app_button_equals" />
<include layout="@layout/cpp_app_button_memory" />
</LinearLayout>
@@ -59,9 +59,9 @@
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_functions" />
<include layout="@layout/cpp_app_button_vars" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_app_button_functions" />
<include layout="@layout/cpp_app_button_4" />
@@ -84,9 +84,9 @@
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_operators" />
<include layout="@layout/cpp_app_button_left" />
<include layout="@layout/cpp_app_button_donate" />
<include layout="@layout/cpp_app_button_right" />
<include layout="@layout/cpp_app_button_1" />

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

@@ -29,5 +29,6 @@
a:id="@id/cpp_button_6"
style="?attr/cpp_button_style_digit"
a:text="6"
c:directionTextUp="√"
c:directionTextLeft="F"
tools:ignore="HardcodedText" />

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

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

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

@@ -22,9 +22,12 @@
~ Site: http://se.solovyev.org
-->
<Button
<org.solovyev.android.views.dragbutton.DirectionDragButton
a:id="@id/cpp_button_clear"
style="?attr/cpp_button_style_control_image"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:a="http://schemas.android.com/apk/res/android"
a:background="@color/grey_850"
a:text="@string/c_clear"
app:directionTextUp="MC"
a:textStyle="bold"/>

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

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

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

@@ -29,8 +29,7 @@
style="?attr/cpp_button_style_control"
a:background="@drawable/button_no_bg"
a:text="="
a:textColor="?android:attr/textColorPrimary"
c:directionTextColor="?android:attr/textColorPrimary"
a:textColor="?attr/cpp_text_color"
c:directionTextDown="@string/cpp_plot_button_text"
c:directionTextUp="≡"
tools:ignore="HardcodedText" />

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

@@ -25,5 +25,6 @@
<ImageButton
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_erase"
a:background="@color/cpp_material_light_darker"
style="?attr/cpp_button_style_control_image"
a:src="@drawable/ic_backspace_white_48dp" />

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

@@ -31,4 +31,5 @@
a:text="@string/cpp_kb_functions"
a:textStyle="italic"
c:directionTextUp="+ƒ"
c:directionTextDown="+π"
tools:ignore="HardcodedText" />

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

@@ -27,5 +27,5 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
a:text="@string/cpp_kb_memory_recall"
app:directionTextDown="@string/cpp_kb_memory_minus"
app:directionTextLeft="@string/cpp_kb_memory_clear"
app:directionTextUp="@string/cpp_kb_memory_plus" />
app:directionTextUp="@string/cpp_kb_memory_plus"
a:textStyle="bold"/>

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

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

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

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

34
app/src/main/res/layout/cpp_app_button_percent.xml Normal file
View File

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<org.solovyev.android.views.dragbutton.DirectionDragButton
a:id="@id/cpp_button_percent"
style="?attr/cpp_button_style_digit"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="%"
app:directionTextDown="^2"
app:directionTextUp="^"
tools:ignore="HardcodedText" />

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

@@ -30,6 +30,6 @@
style="?attr/cpp_button_style_digit"
a:text="( )"
c:directionTextDown=")"
c:directionTextLeft="(.)"
c:directionTextLeft="(…)"
c:directionTextUp="("
tools:ignore="HardcodedText" />

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

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

51
app/src/main/res/layout/cpp_app_keyboard.xml
View File

@@ -27,6 +27,23 @@
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_vars" />
<include layout="@layout/cpp_app_button_functions" />
<include layout="@layout/cpp_app_button_percent" />
<include layout="@layout/cpp_app_button_erase" />
<include layout="@layout/cpp_app_button_clear" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
@@ -38,9 +55,10 @@
<include layout="@layout/cpp_app_button_9" />
<include layout="@layout/cpp_app_button_multiplication" />
<include layout="@layout/cpp_app_button_division" />
<include layout="@layout/cpp_app_button_memory" />
<include layout="@layout/cpp_app_button_clear" />
</LinearLayout>
@@ -55,9 +73,9 @@
<include layout="@layout/cpp_app_button_6" />
<include layout="@layout/cpp_app_button_division" />
<include layout="@layout/cpp_app_button_multiplication" />
<include layout="@layout/cpp_app_button_erase" />
<include layout="@layout/cpp_app_button_copy" />
</LinearLayout>
@@ -72,23 +90,6 @@
<include layout="@layout/cpp_app_button_3" />
<include layout="@layout/cpp_app_button_plus" />
<include layout="@layout/cpp_app_button_copy" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_round_brackets" />
<include layout="@layout/cpp_app_button_0" />
<include layout="@layout/cpp_app_button_dot" />
<include layout="@layout/cpp_app_button_minus" />
<include layout="@layout/cpp_app_button_paste" />
@@ -101,13 +102,13 @@
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_left" />
<include layout="@layout/cpp_app_button_round_brackets" />
<include layout="@layout/cpp_app_button_right" />
<include layout="@layout/cpp_app_button_0" />
<include layout="@layout/cpp_app_button_vars" />
<include layout="@layout/cpp_app_button_dot" />
<include layout="@layout/cpp_app_button_functions" />
<include layout="@layout/cpp_app_button_plus" />
<include layout="@layout/cpp_app_button_history" />

5
app/src/main/res/values-land/dimens.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="cpp_direction_text_scale" format="float" type="dimen">0.45</item>
<item name="cpp_direction_text_scale_units" format="float" type="dimen">0.45</item>
</resources>

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

@@ -60,5 +60,6 @@
<color name="grey_900">#212121</color>
<color name="grey_950">#101010</color>
<color name="grey_800">#424242</color>
<color name="grey_850">#313131</color>
</resources>

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

@@ -10,8 +10,8 @@
<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.45</item>
<item name="cpp_direction_text_scale_units" format="float" type="dimen">0.35</item>
<item name="cpp_direction_text_scale" format="float" type="dimen">0.35</item>
<item name="cpp_direction_text_scale_units" format="float" type="dimen">0.3</item>
<dimen name="cpp_button_corner">1dp</dimen>
<dimen name="cpp_keyboard_button_direction_text_padding">4dp</dimen>

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>

7
app/src/main/res/xml/preferences_appearance.xml
View File

@@ -64,13 +64,6 @@
a:key="autoOrientation"
a:title="@string/cpp_prefs_auto_rotate_screen" />
<android.preference.CheckBoxPreference
a:defaultValue="true"
a:key="showEqualsButton"
a:summary="@string/c_show_equals_button_summary"
a:title="@string/c_show_equals_button_title" />
<android.preference.CheckBoxPreference
a:key="gui.keepScreenOn"
a:title="@string/cpp_prefs_keep_screen_on" />