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

Style changes

Browse Source
This commit is contained in:
serso
2016-03-19 23:18:38 +01:00
parent a3d786b191
commit bf420d9bcd
19 changed files with 89 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
app/src/main/res/layout-sw600dp/activity_main.xml
View File

@@ -1,79 +0,0 @@
<?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
-->
<LinearLayout
a:id="@+id/main"
style="@style/CppMain"
xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical">
<FrameLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="3">
<android.support.v7.widget.Toolbar
a:id="@+id/toolbar"
a:layout_width="match_parent"
a:layout_height="?actionBarSize" />
<android.support.v7.widget.CardView
a:id="@+id/card"
style="?attr/cpp_card_style"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:layout_margin="@dimen/cpp_card_margin">
<LinearLayout
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<FrameLayout
a:id="@+id/editor"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="2" />
<View
a:layout_width="match_parent"
a:layout_height="1px"
a:background="?android:attr/listDivider" />
<FrameLayout
a:id="@+id/display"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1" />
</LinearLayout>
</android.support.v7.widget.CardView>
</FrameLayout>
<FrameLayout
a:id="@+id/keyboard"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="4" />
</LinearLayout>

122
app/src/main/res/layout-sw600dp/cpp_app_keyboard.xml
View File

@@ -1,122 +0,0 @@
<?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
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1"
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_left" />
<include layout="@layout/cpp_app_button_erase" />
<include layout="@layout/cpp_app_button_copy" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_app_button_donate" />
<include layout="@layout/cpp_app_button_clear" />
<include layout="@layout/cpp_app_button_right" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1"
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_vars" />
<include layout="@layout/cpp_app_button_7" />
<include layout="@layout/cpp_app_button_8" />
<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_equals" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1"
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_functions" />
<include layout="@layout/cpp_app_button_4" />
<include layout="@layout/cpp_app_button_5" />
<include layout="@layout/cpp_app_button_6" />
<include layout="@layout/cpp_app_button_plus" />
<include layout="@layout/cpp_app_button_minus" />
<include layout="@layout/cpp_app_button_round_brackets" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1"
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_operators" />
<include layout="@layout/cpp_app_button_1" />
<include layout="@layout/cpp_app_button_2" />
<include layout="@layout/cpp_app_button_3" />
<include layout="@layout/cpp_app_button_0" />
<include layout="@layout/cpp_app_button_dot" />
<include layout="@layout/cpp_app_button_history" />
</LinearLayout>
</LinearLayout>

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

@@ -28,6 +28,7 @@
xmlns:tools="http://schemas.android.com/tools"
a:id="@id/cpp_button_period"
style="?attr/cpp_button_style_digit"
c:directionTextScale="0.6"
a:text="."
c:directionTextUp=","
tools:ignore="HardcodedText" />

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

@@ -30,6 +30,7 @@
a:background="@drawable/button_no_bg"
a:text="="
a:textColor="?attr/cpp_text_color"
c:directionTextColor="?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_history.xml
View File

@@ -27,5 +27,6 @@
a:id="@id/cpp_button_history"
style="?attr/cpp_button_style_control"
a:src="@drawable/ic_history_white_48dp"
app:directionTextScale="0.5"
app:directionTextDown="@string/cpp_kb_redo"
app:directionTextUp="@string/cpp_kb_undo" />

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

@@ -25,5 +25,6 @@
<org.solovyev.android.calculator.DisplayView
android:id="@+id/calculator_display"
style="@style/CppText.Display"
xmlns:android="http://schemas.android.com/apk/res/android"
android:padding="@dimen/cpp_display_padding" />
android:paddingLeft="@dimen/cpp_display_padding_side"
android:paddingRight="@dimen/cpp_display_padding_side"
xmlns:android="http://schemas.android.com/apk/res/android"/>

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

@@ -59,8 +59,8 @@
<org.solovyev.android.views.dragbutton.DirectionDragButton
a:id="@+id/wizard_mode_button"
style="?attr/cpp_button_style_operation"
a:layout_width="100dp"
a:layout_height="100dp"
a:layout_width="@dimen/cpp_wizard_preview_button_size"
a:layout_height="@dimen/cpp_wizard_preview_button_size"
a:text="7" />
</FrameLayout>

20
app/src/main/res/layout/cpp_wizard_step_choose_theme_preview.xml
View File

@@ -27,14 +27,14 @@
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:background="?attr/cpp_editor_bg"
a:minWidth="200dp"
a:minWidth="@dimen/cpp_wizard_preview_width"
a:orientation="vertical"
a:padding="3dp"
tools:ignore="Overdraw">
<LinearLayout
a:layout_width="match_parent"
a:layout_height="60dp"
a:layout_height="@dimen/cpp_wizard_preview_row_height"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_equals_no_bg" />
@@ -51,27 +51,27 @@
<LinearLayout
a:layout_width="match_parent"
a:layout_height="60dp"
a:layout_height="@dimen/cpp_wizard_preview_row_height"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_0" />
<include layout="@layout/cpp_app_button_copy" />
<include layout="@layout/cpp_app_button_1" />
<include layout="@layout/cpp_app_button_plus" />
<include layout="@layout/cpp_app_button_clear" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="60dp"
a:layout_height="@dimen/cpp_wizard_preview_row_height"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_1" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_app_button_0" />
<include layout="@layout/cpp_app_button_minus" />
<include layout="@layout/cpp_app_button_memory" />
</LinearLayout>
</LinearLayout>

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

@@ -45,13 +45,11 @@
<org.solovyev.android.views.dragbutton.DirectionDragButton
a:id="@+id/wizard_dragbutton"
style="?attr/cpp_button_style_operation"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:layout_width="@dimen/cpp_wizard_preview_button_size"
a:layout_height="@dimen/cpp_wizard_preview_button_size"
a:layout_weight="0"
a:layout_gravity="center"
a:layout_margin="0dp"
a:layout_weight="0"
a:minHeight="100dp"
a:minWidth="100dp"
a:text="9"
c:directionTextDown="^2"
c:directionTextUp="%" />

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

@@ -24,5 +24,6 @@
<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>
<dimen name="cpp_keyboard_button_direction_text_padding_updown">1dp</dimen>
<dimen name="cpp_keyboard_button_direction_text_padding_left">1dp</dimen>
</resources>

11
app/src/main/res/values-sw600dp/dimens.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="cpp_keyboard_button_direction_text_padding_updown">16dp</dimen>
<dimen name="cpp_keyboard_button_direction_text_padding_left">16dp</dimen>
<dimen name="cpp_display_padding_side">16dp</dimen>
<dimen name="cpp_wizard_preview_width">400dp</dimen>
<dimen name="cpp_wizard_preview_row_height">133dp</dimen>
<dimen name="cpp_wizard_max_width">400dp</dimen>
<dimen name="cpp_wizard_preview_button_size">150dp</dimen>
</resources>

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

@@ -13,7 +13,8 @@
<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>
<dimen name="cpp_keyboard_button_direction_text_padding_updown">4dp</dimen>
<dimen name="cpp_keyboard_button_direction_text_padding_left">2dp</dimen>
<dimen name="cpp_keyboard_button_text_size">30dp</dimen>
<dimen name="cpp_keyboard_simple_image_button_padding">12dp</dimen>
@@ -27,6 +28,7 @@
<!--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>
@@ -46,4 +48,8 @@
<dimen name="cpp_card_margin">4dp</dimen>
<dimen name="list_item_height">48dp</dimen>
<dimen name="cpp_wizard_preview_width">200dp</dimen>
<dimen name="cpp_wizard_preview_row_height">64dp</dimen>
<dimen name="cpp_wizard_max_width">300dp</dimen>
<dimen name="cpp_wizard_preview_button_size">100dp</dimen>
</resources>

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

@@ -9,6 +9,10 @@
<attr name="directionTextLeft" format="string"/>
<attr name="directionTextScale" format="float"/>
<attr name="directionTextPadding" format="dimension"/>
<attr name="directionTextPaddingUp" format="dimension"/>
<attr name="directionTextPaddingDown" format="dimension"/>
<attr name="directionTextPaddingRight" format="dimension"/>
<attr name="directionTextPaddingLeft" format="dimension"/>
<attr name="directionTextScaleUp" format="float"/>
<attr name="directionTextScaleDown" format="float"/>
<attr name="directionTextScaleRight" format="float"/>

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

@@ -36,7 +36,10 @@
<item name="android:scaleType">centerInside</item>
<item name="directionTextColor">@color/cpp_button_text</item>
<item name="directionTextScale">@dimen/cpp_direction_text_scale</item>
<item name="directionTextPadding">@dimen/cpp_keyboard_button_direction_text_padding</item>
<item name="directionTextPaddingUp">@dimen/cpp_keyboard_button_direction_text_padding_updown</item>
<item name="directionTextPaddingDown">@dimen/cpp_keyboard_button_direction_text_padding_updown</item>
<item name="directionTextPaddingRight">@dimen/cpp_keyboard_button_direction_text_padding_updown</item>
<item name="directionTextPaddingLeft">@dimen/cpp_keyboard_button_direction_text_padding_left</item>
</style>
<style name="CppText.Editor.Onscreen.Light" parent="CppText.Editor.Onscreen">
@@ -75,6 +78,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>
</style>
<style name="CppImageButton">