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

Fix text auto resizing in DisplayView

Browse Source
This commit is contained in:
serso
2016-02-06 23:57:00 +01:00
parent 667583f95f
commit 191feb6044
17 changed files with 38 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,11 +23,7 @@
-->
<org.solovyev.android.calculator.DisplayView
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculator_display"
android:id="@+id/calculator_display"
style="@style/CppText.Display"
a:inputType="textMultiLine"
a:maxLines="3"
a:padding="@dimen/cpp_display_padding"
a:scrollHorizontally="false"
a:scrollbars="none" />
xmlns:android="http://schemas.android.com/apk/res/android"
android:padding="@dimen/cpp_display_padding" />

10
app/src/main/res/layout/cpp_app_display_mobile.xml
View File

@@ -23,11 +23,7 @@
-->
<org.solovyev.android.calculator.DisplayView
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculator_display"
android:id="@+id/calculator_display"
style="@style/CppText.Display"
a:inputType="textMultiLine"
a:maxLines="3"
a:padding="@dimen/cpp_display_padding"
a:scrollHorizontally="false"
a:scrollbars="none" />
xmlns:android="http://schemas.android.com/apk/res/android"
android:padding="@dimen/cpp_display_padding" />

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

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

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

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

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

@@ -35,7 +35,7 @@
<include
layout="@layout/onscreen_display"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_height="match_parent"
a:layout_weight="4" />
</LinearLayout>

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

@@ -35,7 +35,7 @@
<include
layout="@layout/onscreen_display"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_height="match_parent"
a:layout_weight="4" />
</LinearLayout>

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

@@ -35,7 +35,7 @@
<include
layout="@layout/onscreen_display_light"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_height="match_parent"
a:layout_weight="4" />
</LinearLayout>

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

@@ -12,5 +12,4 @@
style="@style/CppText.Display.Widget"
a:padding="@dimen/cpp_display_padding"
a:scrollbars="vertical"
a:singleLine="false"
a:textIsSelectable="true" />

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

@@ -12,5 +12,4 @@
style="@style/CppText.Display.Widget.Light"
a:padding="@dimen/cpp_display_padding"
a:scrollbars="vertical"
a:singleLine="false"
a:textIsSelectable="true" />

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

@@ -28,7 +28,7 @@
<include
layout="@layout/widget_display"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_height="match_parent"
a:layout_weight="5" />
</LinearLayout>

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

@@ -43,7 +43,6 @@
a:layout_weight="2"
a:padding="@dimen/cpp_display_padding"
a:scrollbars="vertical"
a:singleLine="false"
a:textIsSelectable="true"
a:textSize="@dimen/cpp_widget_display_text_size_collapsed" />

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

@@ -28,7 +28,7 @@
<include
layout="@layout/widget_display"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_height="match_parent"
a:layout_weight="5" />
</LinearLayout>

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

@@ -28,7 +28,7 @@
<include
layout="@layout/widget_display_light"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_height="match_parent"
a:layout_weight="5" />
</LinearLayout>