Style changes

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

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" />

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" />

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" />

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"/>

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>

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>

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="%" />