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

Lint issues

Browse Source
This commit is contained in:
serso 2015-02-09 16:11:26 +01:00
parent bc0e6d2344
commit 32e755d2fc
156 changed files with 1757 additions and 2168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android-app/src/main/java/org/solovyev/android/calculator/release/ChooseThemeReleaseNoteFragment.java
View File

@ -13,6 +13,6 @@ public class ChooseThemeReleaseNoteFragment extends ChooseThemeWizardStep {
super.onViewCreated(root, savedInstanceState); super.onViewCreated(root, savedInstanceState);
final TextView title = (TextView) root.findViewById(R.id.wizard_theme_title); final TextView title = (TextView) root.findViewById(R.id.wizard_theme_title);
title.setText(R.string.release_notes_choose_theme); title.setText(R.string.cpp_release_notes_choose_theme);
} }
} }

2
android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
View File

@ -120,7 +120,7 @@ public class WizardActivity extends BaseActivity implements WizardsAware, Shared
} }
final AlertDialog.Builder b = new AlertDialog.Builder(this); final AlertDialog.Builder b = new AlertDialog.Builder(this);
b.setTitle(getString(R.string.wizard_finish_confirmation_title)). b.setTitle(getString(R.string.cpp_wizard_finish_confirmation_title)).
setMessage(R.string.cpp_wizard_finish_confirmation). setMessage(R.string.cpp_wizard_finish_confirmation).
setNegativeButton(R.string.c_no, dialogListener). setNegativeButton(R.string.c_no, dialogListener).
setPositiveButton(R.string.c_yes, dialogListener). setPositiveButton(R.string.c_yes, dialogListener).

10
android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardFragment.java
View File

@ -79,19 +79,19 @@ public abstract class WizardFragment extends Fragment implements View.OnClickLis
final boolean firstTimeWizard = TextUtils.equals(wizard.getName(), CalculatorWizards.FIRST_TIME_WIZARD); final boolean firstTimeWizard = TextUtils.equals(wizard.getName(), CalculatorWizards.FIRST_TIME_WIZARD);
if (canGoNext) { if (canGoNext) {
if (canGoPrev || !firstTimeWizard) { if (canGoPrev || !firstTimeWizard) {
setupNextButton(R.string.acl_wizard_next); setupNextButton(R.string.cpp_wizard_next);
} else { } else {
setupNextButton(R.string.acl_wizard_start); setupNextButton(R.string.cpp_wizard_start);
} }
} else { } else {
setupNextButton(R.string.acl_wizard_finish); setupNextButton(R.string.cpp_wizard_finish);
} }
if (canGoPrev) { if (canGoPrev) {
setupPrevButton(R.string.acl_wizard_back); setupPrevButton(R.string.cpp_wizard_back);
} else { } else {
if (firstTimeWizard) { if (firstTimeWizard) {
setupPrevButton(R.string.wizard_skip); setupPrevButton(R.string.cpp_wizard_skip);
} }
} }

31
android-app/src/main/res/layout-land/main_first_pane_mobile.xml
View File

@ -24,57 +24,60 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
a:orientation="vertical" a:layout_gravity="center"
a:layout_gravity="center"> a:orientation="vertical">
<LinearLayout <LinearLayout
a:id="@+id/editorContainer" a:id="@+id/editorContainer"
a:layout_weight="2"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"/> a:layout_height="0dp"
a:layout_weight="2"
a:orientation="horizontal" />
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1"
a:baselineAligned="false">
<include <include
layout="@layout/cpp_app_button_left" layout="@layout/cpp_app_button_left"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1"/> a:layout_weight="1" />
<include <include
layout="@layout/cpp_app_button_erase" layout="@layout/cpp_app_button_erase"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1"/> a:layout_weight="1" />
<FrameLayout <FrameLayout
a:id="@+id/displayContainer" a:id="@+id/displayContainer"
a:layout_height="match_parent"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_weight="4"/> a:layout_height="match_parent"
a:layout_weight="4" />
<include <include
layout="@layout/cpp_app_button_clear" layout="@layout/cpp_app_button_clear"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1"/> a:layout_weight="1" />
<include <include
layout="@layout/cpp_app_button_right" layout="@layout/cpp_app_button_right"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_weight="1"/> a:layout_weight="1" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:id="@+id/keyboardContainer" a:id="@+id/keyboardContainer"
a:layout_weight="3"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"/> a:layout_height="0dp"
a:layout_weight="3"
a:orientation="horizontal" />
</LinearLayout> </LinearLayout>

22
android-app/src/main/res/layout/about_fragment.xml
View File

@ -23,9 +23,9 @@
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="fill_parent"> a:layout_height="fill_parent"
a:orientation="vertical">
<ImageView <ImageView
a:layout_width="wrap_content" a:layout_width="wrap_content"
@ -47,27 +47,27 @@
<TextView <TextView
a:id="@+id/cpp_about_textview" a:id="@+id/cpp_about_textview"
a:text="@string/c_about_content" style="@style/CppText.About"
a:layout_height="match_parent"
a:layout_width="match_parent" a:layout_width="match_parent"
style="@style/CppText.About" /> a:layout_height="match_parent"
a:text="@string/c_about_content" />
<TextView <TextView
a:id="@+id/cpp_about_translators_text" a:id="@+id/cpp_about_translators_text"
a:text="@string/cpp_translators_text" style="@style/CppText.About"
a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"
a:paddingBottom="0dp" a:paddingBottom="0dp"
style="@style/CppText.About" /> a:text="@string/cpp_translators_text" />
<TextView <TextView
a:id="@+id/cpp_about_translators" a:id="@+id/cpp_about_translators"
a:text="@string/cpp_translators_list" style="@style/CppText.About"
a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"
a:paddingTop="0dp" a:paddingTop="0dp"
style="@style/CppText.About" /> a:text="@string/cpp_translators_list" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

4
android-app/src/main/res/layout/ad.xml
View File

@ -22,8 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.AdView xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.AdView a:id="@+id/ad"
a:id="@+id/ad" xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_gravity="center" a:layout_gravity="center"

6
android-app/src/main/res/layout/admob.xml
View File

@ -22,12 +22,12 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<com.google.android.gms.ads.AdView xmlns:a="http://schemas.android.com/apk/res/android" <com.google.android.gms.ads.AdView a:id="@+id/admob"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:ads="http://schemas.android.com/apk/res-auto" xmlns:ads="http://schemas.android.com/apk/res-auto"
a:id="@+id/admob"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_gravity="center" a:layout_gravity="center"
ads:adSize="BANNER"
a:visibility="gone" a:visibility="gone"
ads:adSize="BANNER"
ads:adUnitId="@string/admob" /> ads:adUnitId="@string/admob" />

8
android-app/src/main/res/layout/calc_plot_view.xml
View File

@ -22,11 +22,11 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout a:id="@+id/plot_view_container"
a:id="@+id/plot_view_container" xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="fill_parent"> a:layout_height="fill_parent"
a:orientation="vertical">
</LinearLayout> </LinearLayout>

6
android-app/src/main/res/layout/cpp_activity_settings.xml
View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/action_bar" android:id="@+id/action_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
app:theme="?attr/cpp_toolbar_theme"/> app:theme="?attr/cpp_toolbar_theme" />
<FrameLayout <FrameLayout
android:id="@+id/content_wrapper" android:id="@+id/content_wrapper"

18
android-app/src/main/res/layout/cpp_activity_wizard.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout style="@style/MaterialActivity"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:my="http://schemas.android.com/apk/res-auto" xmlns:my="http://schemas.android.com/apk/res-auto"
style="@style/MaterialActivity" android:orientation="vertical"
android:padding="0dp" android:padding="0dp">
android:orientation="vertical">
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
android:id="@+id/pager" android:id="@+id/pager"
@ -12,12 +12,12 @@
android:layout_weight="1" /> android:layout_weight="1" />
<com.viewpagerindicator.CirclePageIndicator <com.viewpagerindicator.CirclePageIndicator
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:id="@+id/pager_indicator" android:id="@+id/pager_indicator"
android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
my:radius="5dp" android:layout_height="wrap_content"
my:fillColor="?attr/colorAccent"/> android:paddingBottom="10dp"
android:paddingTop="10dp"
my:fillColor="?attr/colorAccent"
my:radius="5dp" />
</LinearLayout> </LinearLayout>

13
android-app/src/main/res/layout/cpp_app_button_0.xml
View File

@ -22,11 +22,14 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_0" a:id="@id/cpp_button_0"
c:textUp="00" style="?attr/cpp_button_style_digit"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="0" a:text="0"
c:textDown="000"
c:directionTextScale="0.5" c:directionTextScale="0.5"
style="?attr/cpp_button_style_digit"/> c:textDown="000"
c:textUp="00"
tools:ignore="HardcodedText" />

13
android-app/src/main/res/layout/cpp_app_button_1.xml
View File

@ -22,11 +22,14 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_1" a:id="@id/cpp_button_1"
style="?attr/cpp_button_style_digit"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="1" a:text="1"
c:textUp="sin"
c:textLeft="A"
c:textDown="asin" c:textDown="asin"
style="?attr/cpp_button_style_digit"/> c:textLeft="A"
c:textUp="sin"
tools:ignore="HardcodedText" />

13
android-app/src/main/res/layout/cpp_app_button_2.xml
View File

@ -22,11 +22,14 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_2" a:id="@id/cpp_button_2"
style="?attr/cpp_button_style_digit"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="2" a:text="2"
c:textUp="cos"
c:textLeft="B"
c:textDown="acos" c:textDown="acos"
style="?attr/cpp_button_style_digit"/> c:textLeft="B"
c:textUp="cos"
tools:ignore="HardcodedText" />

13
android-app/src/main/res/layout/cpp_app_button_3.xml
View File

@ -22,11 +22,14 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_3" a:id="@id/cpp_button_3"
style="?attr/cpp_button_style_digit"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="3" a:text="3"
c:textUp="tan"
c:textLeft="C"
c:textDown="atan" c:textDown="atan"
style="?attr/cpp_button_style_digit"/> c:textLeft="C"
c:textUp="tan"
tools:ignore="HardcodedText" />

13
android-app/src/main/res/layout/cpp_app_button_4.xml
View File

@ -21,11 +21,14 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_4" a:id="@id/cpp_button_4"
style="?attr/cpp_button_style_digit"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="4" a:text="4"
c:textUp="x"
c:textLeft="D"
c:textDown="y" c:textDown="y"
style="?attr/cpp_button_style_digit"/> c:textLeft="D"
c:textUp="x"
tools:ignore="HardcodedText" />

13
android-app/src/main/res/layout/cpp_app_button_5.xml
View File

@ -21,11 +21,14 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_5" a:id="@id/cpp_button_5"
style="?attr/cpp_button_style_digit"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="5" a:text="5"
c:textUp="t"
c:textLeft="E"
c:textDown="j" c:textDown="j"
style="?attr/cpp_button_style_digit"/> c:textLeft="E"
c:textUp="t"
tools:ignore="HardcodedText" />

15
android-app/src/main/res/layout/cpp_app_button_6.xml
View File

@ -22,12 +22,15 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.view.AngleUnitsButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.view.AngleUnitsButton
xmlns:c="http://schemas.android.com/apk/res-auto"
c:textUp="deg"
a:id="@id/cpp_button_6" a:id="@id/cpp_button_6"
style="?attr/cpp_button_style_digit"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="6" a:text="6"
c:textLeft="F"
c:textDown="rad"
c:directionTextScale="0.33;0.30;0.33;0.33" c:directionTextScale="0.33;0.30;0.33;0.33"
style="?attr/cpp_button_style_digit"/> c:textDown="rad"
c:textLeft="F"
c:textUp="deg"
tools:ignore="HardcodedText" />

15
android-app/src/main/res/layout/cpp_app_button_7.xml
View File

@ -22,12 +22,15 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_7" a:id="@id/cpp_button_7"
style="?attr/cpp_button_style_digit"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="7" a:text="7"
c:textUp="i"
c:textLeft="0b:"
c:textDown="!"
c:directionTextScale="0.5;0.5;0.5;0.33" c:directionTextScale="0.5;0.5;0.5;0.33"
style="?attr/cpp_button_style_digit"/> c:textDown="!"
c:textLeft="0b:"
c:textUp="i"
tools:ignore="HardcodedText" />

15
android-app/src/main/res/layout/cpp_app_button_8.xml
View File

@ -22,12 +22,15 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_8" a:id="@id/cpp_button_8"
style="?attr/cpp_button_style_digit"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="8" a:text="8"
c:textUp="ln"
c:textLeft="0d:"
c:textDown="lg"
c:directionTextScale="0.5;0.5;0.5;0.33" c:directionTextScale="0.5;0.5;0.5;0.33"
style="?attr/cpp_button_style_digit"/> c:textDown="lg"
c:textLeft="0d:"
c:textUp="ln"
tools:ignore="HardcodedText" />

11
android-app/src/main/res/layout/cpp_app_button_9.xml
View File

@ -22,12 +22,15 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_9" a:id="@id/cpp_button_9"
style="?attr/cpp_button_style_digit"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="9" a:text="9"
c:directionTextScale="0.5;0.5;0.5;0.33"
c:textDown="e" c:textDown="e"
c:textLeft="0x:" c:textLeft="0x:"
c:textUp="π" c:textUp="π"
c:directionTextScale="0.5;0.5;0.5;0.33" tools:ignore="HardcodedText" />
style="?attr/cpp_button_style_digit"/>

11
android-app/src/main/res/layout/cpp_app_button_clear.xml
View File

@ -22,12 +22,13 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.view.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.view.NumeralBasesButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_clear" a:id="@id/cpp_button_clear"
c:textUp="dec" style="?attr/cpp_button_style_control_image"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
a:text="@string/c_clear" a:text="@string/c_clear"
a:textStyle="bold"
c:textDown="bin" c:textDown="bin"
c:textLeft="hex" c:textLeft="hex"
a:textStyle="bold" c:textUp="dec" />
style="?attr/cpp_button_style_control_image"/>

7
android-app/src/main/res/layout/cpp_app_button_copy.xml
View File

@ -22,7 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android" <ImageButton
a:id="@id/cpp_button_copy" a:id="@id/cpp_button_copy"
a:src="@drawable/kb_copy" style="?attr/cpp_button_style_control_image"
style="?attr/cpp_button_style_control_image"/> xmlns:a="http://schemas.android.com/apk/res/android"
a:src="@drawable/kb_copy" />

13
android-app/src/main/res/layout/cpp_app_button_division.xml
View File

@ -22,11 +22,14 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_division" a:id="@id/cpp_button_division"
c:textUp="%" style="?attr/cpp_button_style_operation"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="/" a:text="/"
c:textDown="√"
c:directionTextScale="0.5" c:directionTextScale="0.5"
style="?attr/cpp_button_style_operation"/> c:textDown="√"
c:textUp="%"
tools:ignore="HardcodedText" />

7
android-app/src/main/res/layout/cpp_app_button_donate.xml
View File

@ -22,7 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android" <ImageButton
a:id="@id/cpp_button_like" a:id="@id/cpp_button_like"
a:src="@drawable/kb_share" style="?attr/cpp_button_style_control_image"
style="?attr/cpp_button_style_control_image"/> xmlns:a="http://schemas.android.com/apk/res/android"
a:src="@drawable/kb_share" />

11
android-app/src/main/res/layout/cpp_app_button_dot.xml
View File

@ -22,10 +22,13 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_period" a:id="@id/cpp_button_period"
style="?attr/cpp_button_style_digit"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="." a:text="."
c:textUp=","
c:directionTextScale="0.5" c:directionTextScale="0.5"
style="?attr/cpp_button_style_digit"/> c:textUp=","
tools:ignore="HardcodedText" />

2
android-app/src/main/res/layout/cpp_app_button_empty.xml
View File

@ -21,4 +21,4 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton style="?attr/cpp_button_style_control"/> <org.solovyev.android.calculator.drag.DirectionDragButton style="?attr/cpp_button_style_control" />

13
android-app/src/main/res/layout/cpp_app_button_equals.xml
View File

@ -21,11 +21,14 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_equals" a:id="@id/cpp_button_equals"
c:textUp="≡" style="?attr/cpp_button_style_control"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="=" a:text="="
c:textDown="@string/cpp_plot_button_text"
c:directionTextScale="0.5;0.5;0.33;0.5" c:directionTextScale="0.5;0.5;0.33;0.5"
style="?attr/cpp_button_style_control"/> c:textDown="@string/cpp_plot_button_text"
c:textUp="≡"
tools:ignore="HardcodedText" />

9
android-app/src/main/res/layout/cpp_app_button_equals_no_bg.xml
View File

@ -21,14 +21,17 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton a:id="@id/cpp_button_equals" <org.solovyev.android.calculator.drag.DirectionDragButton
a:id="@id/cpp_button_equals"
style="?attr/cpp_button_style_control" style="?attr/cpp_button_style_control"
xmlns:a="http://schemas.android.com/apk/res/android" xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto" xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:background="@drawable/button_no_bg"
a:text="=" a:text="="
a:textColor="?android:attr/textColorPrimary" a:textColor="?android:attr/textColorPrimary"
c:directionTextColor="?android:attr/textColorPrimary" c:directionTextColor="?android:attr/textColorPrimary"
c:directionTextScale="0.5;0.5;0.33;0.5" c:directionTextScale="0.5;0.5;0.33;0.5"
c:textDown="@string/cpp_plot_button_text" c:textDown="@string/cpp_plot_button_text"
a:background="@drawable/button_no_bg" c:textUp="≡"
c:textUp="≡" /> tools:ignore="HardcodedText" />

7
android-app/src/main/res/layout/cpp_app_button_erase.xml
View File

@ -22,7 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android" <ImageButton
a:id="@id/cpp_button_erase" a:id="@id/cpp_button_erase"
a:src="@drawable/kb_erase" style="?attr/cpp_button_style_control_image"
style="?attr/cpp_button_style_control_image"/> xmlns:a="http://schemas.android.com/apk/res/android"
a:src="@drawable/kb_erase" />

13
android-app/src/main/res/layout/cpp_app_button_functions.xml
View File

@ -22,11 +22,14 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_functions" a:id="@id/cpp_button_functions"
c:directionTextScale="0.4" style="?attr/cpp_button_style_control"
c:textUp="+ƒ" xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="ƒ(x)" a:text="ƒ(x)"
a:textStyle="italic" a:textStyle="italic"
style="?attr/cpp_button_style_control"/> c:directionTextScale="0.4"
c:textUp="+ƒ"
tools:ignore="HardcodedText" />

15
android-app/src/main/res/layout/cpp_app_button_history.xml
View File

@ -21,12 +21,13 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_history" a:id="@id/cpp_button_history"
a:text="@string/c_history_button"
c:textUp="@string/c_undo"
c:textDown="@string/c_redo"
c:directionTextScale="0.27"
style="?attr/cpp_button_style_control" style="?attr/cpp_button_style_control"
a:textStyle="bold"/> xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
a:text="@string/c_history_button"
a:textStyle="bold"
c:directionTextScale="0.27"
c:textDown="@string/c_redo"
c:textUp="@string/c_undo" />

11
android-app/src/main/res/layout/cpp_app_button_left.xml
View File

@ -22,10 +22,13 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_left" a:id="@id/cpp_button_left"
c:textUp="◁◁" style="?attr/cpp_button_style_control"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="◁" a:text="◁"
c:directionTextScale="0.5" c:directionTextScale="0.5"
style="?attr/cpp_button_style_control"/> c:textUp="◁◁"
tools:ignore="HardcodedText" />

13
android-app/src/main/res/layout/cpp_app_button_minus.xml
View File

@ -21,10 +21,13 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_subtraction" a:id="@id/cpp_button_subtraction"
c:textDown="∂,…" style="?attr/cpp_button_style_operation"
a:text="-" xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="−"
c:directionTextScale="0.4" c:directionTextScale="0.4"
style="?attr/cpp_button_style_operation"/> c:textDown="∂,…"
tools:ignore="HardcodedText" />

13
android-app/src/main/res/layout/cpp_app_button_multiplication.xml
View File

@ -22,12 +22,15 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_multiplication" a:id="@id/cpp_button_multiplication"
style="?attr/cpp_button_style_operation"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="×" a:text="×"
c:textUp="^" c:directionTextScale="0.5"
c:textDown="^2" c:textDown="^2"
c:textLeft="Π" c:textLeft="Π"
style="?attr/cpp_button_style_operation" c:textUp="^"
c:directionTextScale="0.5"/> tools:ignore="HardcodedText" />

7
android-app/src/main/res/layout/cpp_app_button_operators.xml
View File

@ -22,7 +22,10 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
a:id="@id/cpp_button_operators" a:id="@id/cpp_button_operators"
style="?attr/cpp_button_style_control"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
a:text="∂,…" a:text="∂,…"
style="?attr/cpp_button_style_control"/> tools:ignore="HardcodedText" />

7
android-app/src/main/res/layout/cpp_app_button_paste.xml
View File

@ -22,7 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android" <ImageButton
a:id="@id/cpp_button_paste" a:id="@id/cpp_button_paste"
a:src="@drawable/kb_paste" style="?attr/cpp_button_style_control_image"
style="?attr/cpp_button_style_control_image"/> xmlns:a="http://schemas.android.com/apk/res/android"
a:src="@drawable/kb_paste" />

15
android-app/src/main/res/layout/cpp_app_button_plus.xml
View File

@ -21,11 +21,14 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_plus" a:id="@id/cpp_button_plus"
c:directionTextScale="0.5" style="?attr/cpp_button_style_operation"
c:textUp="°" xmlns:a="http://schemas.android.com/apk/res/android"
c:textDown="E" xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="+" a:text="+"
style="?attr/cpp_button_style_operation"/> c:directionTextScale="0.5"
c:textDown="E"
c:textUp="°"
tools:ignore="HardcodedText" />

11
android-app/src/main/res/layout/cpp_app_button_right.xml
View File

@ -22,10 +22,13 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_right" a:id="@id/cpp_button_right"
c:textUp="▷▷" style="?attr/cpp_button_style_control"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="▷" a:text="▷"
c:directionTextScale="0.5" c:directionTextScale="0.5"
style="?attr/cpp_button_style_control"/> c:textUp="▷▷"
tools:ignore="HardcodedText" />

13
android-app/src/main/res/layout/cpp_app_button_round_brackets.xml
View File

@ -22,12 +22,15 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_round_brackets" a:id="@id/cpp_button_round_brackets"
c:textUp="(" style="?attr/cpp_button_style_digit"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="( )" a:text="( )"
c:directionTextScale="0.5;0.5;0.5;0.33"
c:textDown=")" c:textDown=")"
c:textLeft="(…)" c:textLeft="(…)"
c:directionTextScale="0.5;0.5;0.5;0.33" c:textUp="("
style="?attr/cpp_button_style_digit"/> tools:ignore="HardcodedText" />

13
android-app/src/main/res/layout/cpp_app_button_vars.xml
View File

@ -22,11 +22,14 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android" <org.solovyev.android.calculator.drag.DirectionDragButton
xmlns:c="http://schemas.android.com/apk/res-auto"
a:id="@id/cpp_button_vars" a:id="@id/cpp_button_vars"
c:directionTextScale="0.4" style="?attr/cpp_button_style_control"
c:textUp="+π" xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
a:text="π,…" a:text="π,…"
a:textStyle="italic" a:textStyle="italic"
style="?attr/cpp_button_style_control"/> c:directionTextScale="0.4"
c:textUp="+π"
tools:ignore="HardcodedText" />

7
android-app/src/main/res/layout/cpp_app_display.xml
View File

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

8
android-app/src/main/res/layout/cpp_app_display_mobile.xml
View File

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

10
android-app/src/main/res/layout/cpp_app_editor.xml
View File

@ -22,9 +22,9 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout a:id="@+id/main_fragment_layout"
a:id="@+id/main_fragment_layout"
style="@style/CppFragment" style="@style/CppFragment"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding"> a:padding="@dimen/cpp_editor_padding">
@ -32,9 +32,9 @@
<org.solovyev.android.calculator.AndroidCalculatorEditorView <org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculator_editor" a:id="@+id/calculator_editor"
style="@style/CppText.Editor" style="@style/CppText.Editor"
a:textIsSelectable="true" a:hint="@string/c_calc_editor_hint"
a:singleLine="false"
a:scrollbars="vertical" a:scrollbars="vertical"
a:hint="@string/c_calc_editor_hint"/> a:singleLine="false"
a:textIsSelectable="true" />
</LinearLayout> </LinearLayout>

10
android-app/src/main/res/layout/cpp_app_editor_mobile.xml
View File

@ -22,9 +22,9 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout a:id="@+id/main_fragment_layout"
a:id="@+id/main_fragment_layout"
style="@style/CppFragment" style="@style/CppFragment"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding"> a:padding="@dimen/cpp_editor_padding">
@ -32,9 +32,9 @@
<org.solovyev.android.calculator.AndroidCalculatorEditorView <org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculator_editor" a:id="@+id/calculator_editor"
style="@style/CppText.Editor.Mobile" style="@style/CppText.Editor.Mobile"
a:textIsSelectable="true" a:hint="@string/c_calc_editor_hint"
a:singleLine="false"
a:scrollbars="vertical" a:scrollbars="vertical"
a:hint="@string/c_calc_editor_hint"/> a:singleLine="false"
a:textIsSelectable="true" />
</LinearLayout> </LinearLayout>

70
android-app/src/main/res/layout/cpp_app_keyboard.xml
View File

@ -28,88 +28,88 @@
a:orientation="vertical"> a:orientation="vertical">
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_7"/> <include layout="@layout/cpp_app_button_7" />
<include layout="@layout/cpp_app_button_8"/> <include layout="@layout/cpp_app_button_8" />
<include layout="@layout/cpp_app_button_9"/> <include layout="@layout/cpp_app_button_9" />
<include layout="@layout/cpp_app_button_multiplication"/> <include layout="@layout/cpp_app_button_multiplication" />
<include layout="@layout/cpp_app_button_clear"/> <include layout="@layout/cpp_app_button_clear" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_4"/> <include layout="@layout/cpp_app_button_4" />
<include layout="@layout/cpp_app_button_5"/> <include layout="@layout/cpp_app_button_5" />
<include layout="@layout/cpp_app_button_6"/> <include layout="@layout/cpp_app_button_6" />
<include layout="@layout/cpp_app_button_division"/> <include layout="@layout/cpp_app_button_division" />
<include layout="@layout/cpp_app_button_erase"/> <include layout="@layout/cpp_app_button_erase" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_1"/> <include layout="@layout/cpp_app_button_1" />
<include layout="@layout/cpp_app_button_2"/> <include layout="@layout/cpp_app_button_2" />
<include layout="@layout/cpp_app_button_3"/> <include layout="@layout/cpp_app_button_3" />
<include layout="@layout/cpp_app_button_plus"/> <include layout="@layout/cpp_app_button_plus" />
<include layout="@layout/cpp_app_button_copy"/> <include layout="@layout/cpp_app_button_copy" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_round_brackets"/> <include layout="@layout/cpp_app_button_round_brackets" />
<include layout="@layout/cpp_app_button_0"/> <include layout="@layout/cpp_app_button_0" />
<include layout="@layout/cpp_app_button_dot"/> <include layout="@layout/cpp_app_button_dot" />
<include layout="@layout/cpp_app_button_minus"/> <include layout="@layout/cpp_app_button_minus" />
<include layout="@layout/cpp_app_button_paste"/> <include layout="@layout/cpp_app_button_paste" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_left"/> <include layout="@layout/cpp_app_button_left" />
<include layout="@layout/cpp_app_button_right"/> <include layout="@layout/cpp_app_button_right" />
<include layout="@layout/cpp_app_button_vars"/> <include layout="@layout/cpp_app_button_vars" />
<include layout="@layout/cpp_app_button_functions"/> <include layout="@layout/cpp_app_button_functions" />
<include layout="@layout/cpp_app_button_history"/> <include layout="@layout/cpp_app_button_history" />
</LinearLayout> </LinearLayout>

70
android-app/src/main/res/layout/cpp_app_keyboard_mobile.xml
View File

@ -28,88 +28,88 @@
a:orientation="vertical"> a:orientation="vertical">
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_7"/> <include layout="@layout/cpp_app_button_7" />
<include layout="@layout/cpp_app_button_8"/> <include layout="@layout/cpp_app_button_8" />
<include layout="@layout/cpp_app_button_9"/> <include layout="@layout/cpp_app_button_9" />
<include layout="@layout/cpp_app_button_multiplication"/> <include layout="@layout/cpp_app_button_multiplication" />
<include layout="@layout/cpp_app_button_clear"/> <include layout="@layout/cpp_app_button_clear" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_4"/> <include layout="@layout/cpp_app_button_4" />
<include layout="@layout/cpp_app_button_5"/> <include layout="@layout/cpp_app_button_5" />
<include layout="@layout/cpp_app_button_6"/> <include layout="@layout/cpp_app_button_6" />
<include layout="@layout/cpp_app_button_division"/> <include layout="@layout/cpp_app_button_division" />
<include layout="@layout/cpp_app_button_erase"/> <include layout="@layout/cpp_app_button_erase" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_1"/> <include layout="@layout/cpp_app_button_1" />
<include layout="@layout/cpp_app_button_2"/> <include layout="@layout/cpp_app_button_2" />
<include layout="@layout/cpp_app_button_3"/> <include layout="@layout/cpp_app_button_3" />
<include layout="@layout/cpp_app_button_plus"/> <include layout="@layout/cpp_app_button_plus" />
<include layout="@layout/cpp_app_button_copy"/> <include layout="@layout/cpp_app_button_copy" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_round_brackets"/> <include layout="@layout/cpp_app_button_round_brackets" />
<include layout="@layout/cpp_app_button_0"/> <include layout="@layout/cpp_app_button_0" />
<include layout="@layout/cpp_app_button_dot"/> <include layout="@layout/cpp_app_button_dot" />
<include layout="@layout/cpp_app_button_minus"/> <include layout="@layout/cpp_app_button_minus" />
<include layout="@layout/cpp_app_button_paste"/> <include layout="@layout/cpp_app_button_paste" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_left"/> <include layout="@layout/cpp_app_button_left" />
<include layout="@layout/cpp_app_button_right"/> <include layout="@layout/cpp_app_button_right" />
<include layout="@layout/cpp_app_button_vars"/> <include layout="@layout/cpp_app_button_vars" />
<include layout="@layout/cpp_app_button_functions"/> <include layout="@layout/cpp_app_button_functions" />
<include layout="@layout/cpp_app_button_history"/> <include layout="@layout/cpp_app_button_history" />
</LinearLayout> </LinearLayout>

4
android-app/src/main/res/layout/cpp_dialog.xml
View File

@ -22,9 +22,9 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout a:id="@+id/dialog_layout"
a:id="@+id/dialog_layout"
style="@style/CppDialog" style="@style/CppDialog"
xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical"> a:orientation="vertical">
</LinearLayout> </LinearLayout>

16
android-app/src/main/res/layout/cpp_dialog_fragment.xml
View File

@ -22,12 +22,12 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout a:id="@+id/main_fragment_layout"
a:id="@+id/main_fragment_layout"
style="@style/CppFragment" style="@style/CppFragment"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_gravity="center_horizontal"
a:orientation="vertical"> a:orientation="vertical">
<TextView <TextView
@ -35,7 +35,7 @@
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:maxLines="10" a:maxLines="10"
a:scrollbars="vertical"/> a:scrollbars="vertical" />
<LinearLayout <LinearLayout
a:layout_width="match_parent" a:layout_width="match_parent"
@ -44,18 +44,18 @@
<Button <Button
a:id="@+id/cpp_copy_button" a:id="@+id/cpp_copy_button"
a:text="@string/c_copy"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="1" a:layout_weight="1"
a:visibility="gone"/> a:text="@string/c_copy"
a:visibility="gone" />
<Button <Button
a:id="@+id/cpp_ok_button" a:id="@+id/cpp_ok_button"
a:text="@string/ok"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="1"/> a:layout_weight="1"
a:text="@string/ok" />
</LinearLayout> </LinearLayout>

16
android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml
View File

@ -22,32 +22,32 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout style="@style/CppDialog"
style="@style/CppDialog"> xmlns:a="http://schemas.android.com/apk/res/android">
<LinearLayout <LinearLayout
a:id="@+id/cpp_fixable_messages_container" a:id="@+id/cpp_fixable_messages_container"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:orientation="vertical"/> a:orientation="vertical" />
<CheckBox <CheckBox
a:id="@+id/cpp_do_not_show_fixable_messages_checkbox" a:id="@+id/cpp_do_not_show_fixable_messages_checkbox"
a:text="@string/do_not_show_messages_in_session"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:text="@string/do_not_show_messages_in_session" />
<LinearLayout <LinearLayout
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:orientation="horizontal" a:gravity="center"
a:gravity="center"> a:orientation="horizontal">
<Button <Button
a:id="@+id/close_button" a:id="@+id/close_button"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:text="@string/close"/> a:text="@string/close" />
</LinearLayout> </LinearLayout>

6
android-app/src/main/res/layout/cpp_fixable_messages_dialog_message.xml
View File

@ -32,15 +32,15 @@
a:id="@+id/cpp_fixable_messages_text_view" a:id="@+id/cpp_fixable_messages_text_view"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="5"
a:layout_gravity="fill" a:layout_gravity="fill"
a:text="@+id/cpp_fixable_messages_text_view"/> a:layout_weight="5"
a:text="@+id/cpp_fixable_messages_text_view" />
<Button <Button
a:id="@+id/cpp_fix_button" a:id="@+id/cpp_fix_button"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="2" a:layout_weight="2"
a:text="@string/fix"/> a:text="@string/fix" />
</LinearLayout> </LinearLayout>

10
android-app/src/main/res/layout/cpp_plot_fragment.xml
View File

@ -22,19 +22,19 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout a:id="@+id/main_fragment_layout"
a:id="@+id/main_fragment_layout"
style="@style/CppFragment" style="@style/CppFragment"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent"> a:layout_height="match_parent">
<TextView <TextView
a:id="@+id/fragment_title" a:id="@+id/fragment_title"
a:layout_height="wrap_content" style="@style/CppFragmentTitle"
a:layout_width="match_parent" a:layout_width="match_parent"
style="@style/CppFragmentTitle"/> a:layout_height="wrap_content" />
<include layout="@layout/ad"/> <include layout="@layout/ad" />
</LinearLayout> </LinearLayout>

10
android-app/src/main/res/layout/cpp_plot_function_list_item.xml
View File

@ -31,28 +31,28 @@
a:id="@+id/cpp_plot_function_expression_textview" a:id="@+id/cpp_plot_function_expression_textview"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="3"/> a:layout_weight="3" />
<CheckBox <CheckBox
a:id="@+id/cpp_plot_function_pinned_checkbox" a:id="@+id/cpp_plot_function_pinned_checkbox"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="1"/> a:layout_weight="1" />
<CheckBox <CheckBox
a:id="@+id/cpp_plot_function_visible_checkbox" a:id="@+id/cpp_plot_function_visible_checkbox"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="1"/> a:layout_weight="1" />
<ImageButton <ImageButton
a:id="@+id/cpp_plot_function_settings_button" a:id="@+id/cpp_plot_function_settings_button"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="1" a:layout_weight="1"
a:paddingTop="0dp"
a:paddingBottom="0dp" a:paddingBottom="0dp"
a:paddingTop="0dp"
a:scaleType="centerInside" a:scaleType="centerInside"
a:src="@drawable/kb_settings"/> a:src="@drawable/kb_settings" />
</LinearLayout> </LinearLayout>

6
android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
View File

@ -22,8 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout a:id="@+id/dialog_layout"
a:id="@+id/dialog_layout" style="@style/CppDialog"
style="@style/CppDialog"> xmlns:a="http://schemas.android.com/apk/res/android">
</LinearLayout> </LinearLayout>

42
android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml
View File

@ -22,63 +22,63 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout a:id="@+id/main_fragment_layout"
a:id="@+id/main_fragment_layout"
style="@style/CppFragment" style="@style/CppFragment"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_gravity="center_horizontal"
a:orientation="vertical"> a:orientation="vertical">
<include layout="@layout/ad"/> <include layout="@layout/ad" />
<TextView <TextView
a:text="@string/cpp_plot_function_line_color_type"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:text="@string/cpp_plot_function_line_color_type" />
<Spinner <Spinner
a:id="@+id/cpp_plot_function_line_color_type_spinner" a:id="@+id/cpp_plot_function_line_color_type_spinner"
a:entries="@array/cpp_plot_line_color_type_names"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:entries="@array/cpp_plot_line_color_type_names" />
<TextView <TextView
a:text="@string/cpp_plot_function_line_color"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:text="@string/cpp_plot_function_line_color" />
<Spinner <Spinner
a:id="@+id/cpp_plot_function_line_color_spinner" a:id="@+id/cpp_plot_function_line_color_spinner"
a:entries="@array/cpp_plot_line_color_names"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:entries="@array/cpp_plot_line_color_names" />
<TextView <TextView
a:text="@string/cpp_plot_function_line_style"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:text="@string/cpp_plot_function_line_style" />
<Spinner <Spinner
a:id="@+id/cpp_plot_function_line_style_spinner" a:id="@+id/cpp_plot_function_line_style_spinner"
a:entries="@array/cpp_plot_line_style_names"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:entries="@array/cpp_plot_line_style_names" />
<TextView <TextView
a:text="@string/cpp_plot_function_line_width"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:text="@string/cpp_plot_function_line_width" />
<SeekBar <SeekBar
a:id="@+id/cpp_plot_functions_line_width_seekbar" a:id="@+id/cpp_plot_functions_line_width_seekbar"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content" />
<Button <Button
a:id="@+id/cpp_apply_button" a:id="@+id/cpp_apply_button"
a:text="@string/cpp_apply"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:text="@string/cpp_apply" />
</LinearLayout> </LinearLayout>

16
android-app/src/main/res/layout/cpp_plot_functions_fragment.xml
View File

@ -22,13 +22,13 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout a:id="@+id/main_fragment_layout"
a:id="@+id/main_fragment_layout"
style="@style/CppFragment" style="@style/CppFragment"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent"> a:layout_height="match_parent">
<include layout="@layout/ad"/> <include layout="@layout/ad" />
<LinearLayout <LinearLayout
a:layout_width="match_parent" a:layout_width="match_parent"
@ -39,27 +39,27 @@
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="3" a:layout_weight="3"
a:text="@string/cpp_function"/> a:text="@string/cpp_function" />
<TextView <TextView
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="1" a:layout_weight="1"
a:text="@string/cpp_pinned"/> a:text="@string/cpp_pinned" />
<TextView <TextView
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="1" a:layout_weight="1"
a:text="@string/cpp_visible"/> a:text="@string/cpp_visible" />
<TextView <TextView
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_weight="1"/> a:layout_weight="1" />
</LinearLayout> </LinearLayout>
<ListView style="@style/CppListView"/> <ListView style="@style/CppListView" />
</LinearLayout> </LinearLayout>

52
android-app/src/main/res/layout/cpp_plot_range_fragment.xml
View File

@ -22,21 +22,21 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout a:id="@+id/main_fragment_layout"
a:id="@+id/main_fragment_layout"
style="@style/CppFragment" style="@style/CppFragment"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_gravity="center_horizontal"
a:orientation="vertical"> a:orientation="vertical">
<include layout="@layout/ad"/> <include layout="@layout/ad" />
<LinearLayout <LinearLayout
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:orientation="horizontal" a:baselineAligned="false"
a:baselineAligned="false"> a:orientation="horizontal">
<LinearLayout <LinearLayout
a:layout_width="0dp" a:layout_width="0dp"
@ -45,15 +45,15 @@
a:orientation="vertical"> a:orientation="vertical">
<TextView <TextView
a:text="@string/cpp_plot_range_x_min"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:text="@string/cpp_plot_range_x_min" />
<EditText <EditText
a:id="@+id/cpp_plot_range_x_min_editext" a:id="@+id/cpp_plot_range_x_min_editext"
a:inputType="numberDecimal|numberSigned"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:inputType="numberDecimal|numberSigned" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -63,15 +63,15 @@
a:orientation="vertical"> a:orientation="vertical">
<TextView <TextView
a:text="@string/cpp_plot_range_x_max"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:text="@string/cpp_plot_range_x_max" />
<EditText <EditText
a:id="@+id/cpp_plot_range_x_max_editext" a:id="@+id/cpp_plot_range_x_max_editext"
a:inputType="numberDecimal|numberSigned"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:inputType="numberDecimal|numberSigned" />
</LinearLayout> </LinearLayout>
@ -80,8 +80,8 @@
<LinearLayout <LinearLayout
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:orientation="horizontal" a:baselineAligned="false"
a:baselineAligned="false"> a:orientation="horizontal">
<LinearLayout <LinearLayout
a:layout_width="0dp" a:layout_width="0dp"
@ -90,15 +90,15 @@
a:orientation="vertical"> a:orientation="vertical">
<TextView <TextView
a:text="@string/cpp_plot_range_y_min"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:text="@string/cpp_plot_range_y_min" />
<EditText <EditText
a:id="@+id/cpp_plot_range_y_min_editext" a:id="@+id/cpp_plot_range_y_min_editext"
a:inputType="numberDecimal|numberSigned"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:inputType="numberDecimal|numberSigned" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -108,15 +108,15 @@
a:orientation="vertical"> a:orientation="vertical">
<TextView <TextView
a:text="@string/cpp_plot_range_y_max"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:text="@string/cpp_plot_range_y_max" />
<EditText <EditText
a:id="@+id/cpp_plot_range_y_max_editext" a:id="@+id/cpp_plot_range_y_max_editext"
a:inputType="numberDecimal|numberSigned"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:inputType="numberDecimal|numberSigned" />
</LinearLayout> </LinearLayout>
@ -124,8 +124,8 @@
<Button <Button
a:id="@+id/cpp_apply_button" a:id="@+id/cpp_apply_button"
a:text="@string/cpp_apply"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:text="@string/cpp_apply" />
</LinearLayout> </LinearLayout>

14
android-app/src/main/res/layout/cpp_purchase_dialog_fragment.xml
View File

@ -22,26 +22,26 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout a:id="@+id/main_fragment_layout"
a:id="@+id/main_fragment_layout"
style="@style/CppFragment" style="@style/CppFragment"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent" a:layout_height="match_parent"
a:layout_gravity="center_horizontal"
a:orientation="vertical"> a:orientation="vertical">
<TextView <TextView
a:id="@+id/cpp_purchase_text" a:id="@+id/cpp_purchase_text"
a:text="@string/cpp_purchase_text"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:maxLines="10" a:maxLines="10"
a:scrollbars="vertical"/> a:scrollbars="vertical"
a:text="@string/cpp_purchase_text" />
<Button <Button
a:id="@+id/cpp_continue_button" a:id="@+id/cpp_continue_button"
a:text="@string/cpp_continue"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"/> a:layout_height="wrap_content"
a:text="@string/cpp_continue" />
</LinearLayout> </LinearLayout>

12
android-app/src/main/res/layout/cpp_release_note_step.xml
View File

@ -25,21 +25,21 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
a:orientation="vertical" a:gravity="center"
a:gravity="center"> a:orientation="vertical">
<TextView <TextView
style="@style/WizardLabel"
a:id="@+id/release_note_title" a:id="@+id/release_note_title"
a:layout_height="wrap_content" style="@style/WizardLabel"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"
a:textAppearance="@android:style/TextAppearance.Large" /> a:textAppearance="@android:style/TextAppearance.Large" />
<TextView <TextView
style="@style/WizardLabel.Last"
a:id="@+id/release_note_message" a:id="@+id/release_note_message"
a:layout_height="wrap_content" style="@style/WizardLabel.Last"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"
a:textAppearance="@android:style/TextAppearance.Medium" /> a:textAppearance="@android:style/TextAppearance.Medium" />
</LinearLayout> </LinearLayout>

8
android-app/src/main/res/layout/cpp_simple_button_0.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_0"
a:id="@id/cpp_button_0" style="@style/cpp_simple_metro_digit_button_style"
a:text="0" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_digit_button_style"/> a:text="0" />

8
android-app/src/main/res/layout/cpp_simple_button_1.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_1"
a:id="@id/cpp_button_1" style="@style/cpp_simple_metro_digit_button_style"
a:text="1" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_digit_button_style"/> a:text="1" />

8
android-app/src/main/res/layout/cpp_simple_button_2.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_2"
a:id="@id/cpp_button_2" style="@style/cpp_simple_metro_digit_button_style"
a:text="2" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_digit_button_style"/> a:text="2" />

8
android-app/src/main/res/layout/cpp_simple_button_3.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_3"
a:id="@id/cpp_button_3" style="@style/cpp_simple_metro_digit_button_style"
a:text="3" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_digit_button_style"/> a:text="3" />

8
android-app/src/main/res/layout/cpp_simple_button_4.xml
View File

@ -21,7 +21,7 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_4"
a:id="@id/cpp_button_4" style="@style/cpp_simple_metro_digit_button_style"
a:text="4" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_digit_button_style"/> a:text="4" />

8
android-app/src/main/res/layout/cpp_simple_button_5.xml
View File

@ -21,7 +21,7 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_5"
a:id="@id/cpp_button_5" style="@style/cpp_simple_metro_digit_button_style"
a:text="5" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_digit_button_style"/> a:text="5" />

8
android-app/src/main/res/layout/cpp_simple_button_6.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_6"
a:id="@id/cpp_button_6" style="@style/cpp_simple_metro_digit_button_style"
a:text="6" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_digit_button_style"/> a:text="6" />

8
android-app/src/main/res/layout/cpp_simple_button_7.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_7"
a:id="@id/cpp_button_7" style="@style/cpp_simple_metro_digit_button_style"
a:text="7" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_digit_button_style"/> a:text="7" />

8
android-app/src/main/res/layout/cpp_simple_button_8.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_8"
a:id="@id/cpp_button_8" style="@style/cpp_simple_metro_digit_button_style"
a:text="8" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_digit_button_style"/> a:text="8" />

8
android-app/src/main/res/layout/cpp_simple_button_9.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_9"
a:id="@id/cpp_button_9" style="@style/cpp_simple_metro_digit_button_style"
a:text="9" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_digit_button_style"/> a:text="9" />

8
android-app/src/main/res/layout/cpp_simple_button_app.xml
View File

@ -22,8 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android" <ImageButton a:id="@id/cpp_button_app"
a:id="@id/cpp_button_app"
a:src="@drawable/kb_logo"
style="@style/cpp_simple_metro_control_image_button_style" style="@style/cpp_simple_metro_control_image_button_style"
a:contentDescription="App"/> xmlns:a="http://schemas.android.com/apk/res/android"
a:contentDescription="App"
a:src="@drawable/kb_logo" />

8
android-app/src/main/res/layout/cpp_simple_button_clear.xml
View File

@ -22,8 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_clear"
a:id="@id/cpp_button_clear" style="@style/cpp_simple_metro_control_button_style"
xmlns:a="http://schemas.android.com/apk/res/android"
a:text="@string/c_clear" a:text="@string/c_clear"
a:textStyle="bold" a:textStyle="bold" />
style="@style/cpp_simple_metro_control_button_style"/>

8
android-app/src/main/res/layout/cpp_simple_button_copy.xml
View File

@ -22,8 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android" <ImageButton a:id="@id/cpp_button_copy"
a:id="@id/cpp_button_copy"
a:src="@drawable/kb_copy"
style="@style/cpp_simple_metro_control_image_button_style" style="@style/cpp_simple_metro_control_image_button_style"
a:contentDescription="Copy"/> xmlns:a="http://schemas.android.com/apk/res/android"
a:contentDescription="Copy"
a:src="@drawable/kb_copy" />

8
android-app/src/main/res/layout/cpp_simple_button_division.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_division"
a:id="@id/cpp_button_division" style="@style/cpp_simple_metro_blue_operation_button_style"
a:text="/" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_blue_operation_button_style"/> a:text="/" />

8
android-app/src/main/res/layout/cpp_simple_button_dot.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_period"
a:id="@id/cpp_button_period" style="@style/cpp_simple_metro_digit_button_style"
a:text="." xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_digit_button_style"/> a:text="." />

8
android-app/src/main/res/layout/cpp_simple_button_equals.xml
View File

@ -21,7 +21,7 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_equals"
a:id="@id/cpp_button_equals" style="@style/cpp_simple_metro_control_button_style"
a:text="=" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_control_button_style"/> a:text="=" />

8
android-app/src/main/res/layout/cpp_simple_button_erase.xml
View File

@ -22,8 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android" <ImageButton a:id="@id/cpp_button_erase"
a:id="@id/cpp_button_erase"
a:src="@drawable/kb_erase"
style="@style/cpp_simple_metro_control_image_button_style" style="@style/cpp_simple_metro_control_image_button_style"
a:contentDescription="Erase"/> xmlns:a="http://schemas.android.com/apk/res/android"
a:contentDescription="Erase"
a:src="@drawable/kb_erase" />

8
android-app/src/main/res/layout/cpp_simple_button_functions.xml
View File

@ -22,8 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_functions"
a:id="@id/cpp_button_functions" style="@style/cpp_simple_metro_control_button_style"
xmlns:a="http://schemas.android.com/apk/res/android"
a:text="ƒ(x)" a:text="ƒ(x)"
a:textStyle="italic" a:textStyle="italic" />
style="@style/cpp_simple_metro_control_button_style"/>

8
android-app/src/main/res/layout/cpp_simple_button_history.xml
View File

@ -21,8 +21,8 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_history"
a:id="@id/cpp_button_history"
a:text="@string/c_history_button"
style="@style/cpp_simple_metro_control_button_style" style="@style/cpp_simple_metro_control_button_style"
a:textStyle="bold"/> xmlns:a="http://schemas.android.com/apk/res/android"
a:text="@string/c_history_button"
a:textStyle="bold" />

8
android-app/src/main/res/layout/cpp_simple_button_left.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_left"
a:id="@id/cpp_button_left" style="@style/cpp_simple_metro_control_button_style"
a:text="◁" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_control_button_style"/> a:text="◁" />

8
android-app/src/main/res/layout/cpp_simple_button_like.xml
View File

@ -22,8 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android" <ImageButton a:id="@id/cpp_button_like"
a:id="@id/cpp_button_like"
a:src="@drawable/kb_share"
style="@style/cpp_simple_metro_control_image_button_style" style="@style/cpp_simple_metro_control_image_button_style"
a:contentDescription="Like"/> xmlns:a="http://schemas.android.com/apk/res/android"
a:contentDescription="Like"
a:src="@drawable/kb_share" />

8
android-app/src/main/res/layout/cpp_simple_button_multiplication.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_multiplication"
a:id="@id/cpp_button_multiplication" style="@style/cpp_simple_metro_blue_operation_button_style"
a:text="×" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_blue_operation_button_style"/> a:text="×" />

8
android-app/src/main/res/layout/cpp_simple_button_operators.xml
View File

@ -22,8 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_operators"
a:id="@id/cpp_button_operators" style="@style/cpp_simple_metro_control_button_style"
xmlns:a="http://schemas.android.com/apk/res/android"
a:text="∂,…" a:text="∂,…"
a:textStyle="italic" a:textStyle="italic" />
style="@style/cpp_simple_metro_control_button_style"/>

8
android-app/src/main/res/layout/cpp_simple_button_paste.xml
View File

@ -22,8 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android" <ImageButton a:id="@id/cpp_button_paste"
a:id="@id/cpp_button_paste"
a:src="@drawable/kb_paste"
style="@style/cpp_simple_metro_control_image_button_style" style="@style/cpp_simple_metro_control_image_button_style"
a:contentDescription="Paste"/> xmlns:a="http://schemas.android.com/apk/res/android"
a:contentDescription="Paste"
a:src="@drawable/kb_paste" />

8
android-app/src/main/res/layout/cpp_simple_button_percent.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_percent"
a:id="@id/cpp_button_percent" style="@style/cpp_simple_metro_blue_operation_button_style"
a:text="%" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_blue_operation_button_style"/> a:text="%" />

8
android-app/src/main/res/layout/cpp_simple_button_plus.xml
View File

@ -21,7 +21,7 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_plus"
a:id="@id/cpp_button_plus" style="@style/cpp_simple_metro_blue_operation_button_style"
a:text="+" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_blue_operation_button_style"/> a:text="+" />

8
android-app/src/main/res/layout/cpp_simple_button_power.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_power"
a:id="@id/cpp_button_power" style="@style/cpp_simple_metro_blue_operation_button_style"
a:text="^" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_blue_operation_button_style"/> a:text="^" />

8
android-app/src/main/res/layout/cpp_simple_button_right.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_right"
a:id="@id/cpp_button_right" style="@style/cpp_simple_metro_control_button_style"
a:text="▷" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_control_button_style"/> a:text="▷" />

8
android-app/src/main/res/layout/cpp_simple_button_round_brackets.xml
View File

@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_round_brackets"
a:id="@id/cpp_button_round_brackets" style="@style/cpp_simple_metro_digit_button_style"
a:text="( )" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_digit_button_style"/> a:text="( )" />

8
android-app/src/main/res/layout/cpp_simple_button_settings.xml
View File

@ -22,8 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android" <ImageButton a:id="@id/cpp_button_settings"
a:id="@id/cpp_button_settings"
a:src="@drawable/kb_settings"
style="@style/cpp_simple_metro_control_image_button_style" style="@style/cpp_simple_metro_control_image_button_style"
a:contentDescription="Settings"/> xmlns:a="http://schemas.android.com/apk/res/android"
a:contentDescription="Settings"
a:src="@drawable/kb_settings" />

8
android-app/src/main/res/layout/cpp_simple_button_subtraction.xml
View File

@ -21,7 +21,7 @@
~ Email: se.solovyev@gmail.com ~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_subtraction"
a:id="@id/cpp_button_subtraction" style="@style/cpp_simple_metro_blue_operation_button_style"
a:text="-" xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_simple_metro_blue_operation_button_style"/> a:text="-" />

8
android-app/src/main/res/layout/cpp_simple_button_vars.xml
View File

@ -22,8 +22,8 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<Button xmlns:a="http://schemas.android.com/apk/res/android" <Button a:id="@id/cpp_button_vars"
a:id="@id/cpp_button_vars" style="@style/cpp_simple_metro_control_button_style"
xmlns:a="http://schemas.android.com/apk/res/android"
a:text="π,…" a:text="π,…"
a:textStyle="italic" a:textStyle="italic" />
style="@style/cpp_simple_metro_control_button_style"/>

80
android-app/src/main/res/layout/cpp_simple_keyboard.xml
View File

@ -28,98 +28,98 @@
a:orientation="vertical"> a:orientation="vertical">
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_7"/> <include layout="@layout/cpp_simple_button_7" />
<include layout="@layout/cpp_simple_button_8"/> <include layout="@layout/cpp_simple_button_8" />
<include layout="@layout/cpp_simple_button_9"/> <include layout="@layout/cpp_simple_button_9" />
<include layout="@layout/cpp_simple_button_multiplication"/> <include layout="@layout/cpp_simple_button_multiplication" />
<include layout="@layout/cpp_simple_button_percent"/> <include layout="@layout/cpp_simple_button_percent" />
<include layout="@layout/cpp_simple_button_clear"/> <include layout="@layout/cpp_simple_button_clear" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_4"/> <include layout="@layout/cpp_simple_button_4" />
<include layout="@layout/cpp_simple_button_5"/> <include layout="@layout/cpp_simple_button_5" />
<include layout="@layout/cpp_simple_button_6"/> <include layout="@layout/cpp_simple_button_6" />
<include layout="@layout/cpp_simple_button_division"/> <include layout="@layout/cpp_simple_button_division" />
<include layout="@layout/cpp_simple_button_power"/> <include layout="@layout/cpp_simple_button_power" />
<include layout="@layout/cpp_simple_button_erase"/> <include layout="@layout/cpp_simple_button_erase" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_1"/> <include layout="@layout/cpp_simple_button_1" />
<include layout="@layout/cpp_simple_button_2"/> <include layout="@layout/cpp_simple_button_2" />
<include layout="@layout/cpp_simple_button_3"/> <include layout="@layout/cpp_simple_button_3" />
<include layout="@layout/cpp_simple_button_plus"/> <include layout="@layout/cpp_simple_button_plus" />
<include layout="@layout/cpp_simple_button_settings"/> <include layout="@layout/cpp_simple_button_settings" />
<include layout="@layout/cpp_simple_button_copy"/> <include layout="@layout/cpp_simple_button_copy" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_round_brackets"/> <include layout="@layout/cpp_simple_button_round_brackets" />
<include layout="@layout/cpp_simple_button_0"/> <include layout="@layout/cpp_simple_button_0" />
<include layout="@layout/cpp_simple_button_dot"/> <include layout="@layout/cpp_simple_button_dot" />
<include layout="@layout/cpp_simple_button_subtraction"/> <include layout="@layout/cpp_simple_button_subtraction" />
<include layout="@layout/cpp_simple_button_app"/> <include layout="@layout/cpp_simple_button_app" />
<include layout="@layout/cpp_simple_button_paste"/> <include layout="@layout/cpp_simple_button_paste" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_left"/> <include layout="@layout/cpp_simple_button_left" />
<include layout="@layout/cpp_simple_button_right"/> <include layout="@layout/cpp_simple_button_right" />
<include layout="@layout/cpp_simple_button_vars"/> <include layout="@layout/cpp_simple_button_vars" />
<include layout="@layout/cpp_simple_button_functions"/> <include layout="@layout/cpp_simple_button_functions" />
<include layout="@layout/cpp_simple_button_operators"/> <include layout="@layout/cpp_simple_button_operators" />
<include layout="@layout/cpp_simple_button_history"/> <include layout="@layout/cpp_simple_button_history" />
</LinearLayout> </LinearLayout>

64
android-app/src/main/res/layout/cpp_simple_keyboard_lockscreen.xml
View File

@ -28,78 +28,78 @@
a:orientation="vertical"> a:orientation="vertical">
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_7"/> <include layout="@layout/cpp_simple_button_7" />
<include layout="@layout/cpp_simple_button_8"/> <include layout="@layout/cpp_simple_button_8" />
<include layout="@layout/cpp_simple_button_9"/> <include layout="@layout/cpp_simple_button_9" />
<include layout="@layout/cpp_simple_button_multiplication"/> <include layout="@layout/cpp_simple_button_multiplication" />
<include layout="@layout/cpp_simple_button_percent"/> <include layout="@layout/cpp_simple_button_percent" />
<include layout="@layout/cpp_simple_button_clear"/> <include layout="@layout/cpp_simple_button_clear" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_4"/> <include layout="@layout/cpp_simple_button_4" />
<include layout="@layout/cpp_simple_button_5"/> <include layout="@layout/cpp_simple_button_5" />
<include layout="@layout/cpp_simple_button_6"/> <include layout="@layout/cpp_simple_button_6" />
<include layout="@layout/cpp_simple_button_division"/> <include layout="@layout/cpp_simple_button_division" />
<include layout="@layout/cpp_simple_button_power"/> <include layout="@layout/cpp_simple_button_power" />
<include layout="@layout/cpp_simple_button_erase"/> <include layout="@layout/cpp_simple_button_erase" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_1"/> <include layout="@layout/cpp_simple_button_1" />
<include layout="@layout/cpp_simple_button_2"/> <include layout="@layout/cpp_simple_button_2" />
<include layout="@layout/cpp_simple_button_3"/> <include layout="@layout/cpp_simple_button_3" />
<include layout="@layout/cpp_simple_button_plus"/> <include layout="@layout/cpp_simple_button_plus" />
<include layout="@layout/cpp_simple_button_left"/> <include layout="@layout/cpp_simple_button_left" />
<include layout="@layout/cpp_simple_button_copy"/> <include layout="@layout/cpp_simple_button_copy" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_round_brackets"/> <include layout="@layout/cpp_simple_button_round_brackets" />
<include layout="@layout/cpp_simple_button_0"/> <include layout="@layout/cpp_simple_button_0" />
<include layout="@layout/cpp_simple_button_dot"/> <include layout="@layout/cpp_simple_button_dot" />
<include layout="@layout/cpp_simple_button_subtraction"/> <include layout="@layout/cpp_simple_button_subtraction" />
<include layout="@layout/cpp_simple_button_right"/> <include layout="@layout/cpp_simple_button_right" />
<include layout="@layout/cpp_simple_button_paste"/> <include layout="@layout/cpp_simple_button_paste" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

48
android-app/src/main/res/layout/cpp_simple_keyboard_lockscreen_collapsed.xml
View File

@ -28,59 +28,59 @@
a:orientation="vertical"> a:orientation="vertical">
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_7"/> <include layout="@layout/cpp_simple_button_7" />
<include layout="@layout/cpp_simple_button_8"/> <include layout="@layout/cpp_simple_button_8" />
<include layout="@layout/cpp_simple_button_9"/> <include layout="@layout/cpp_simple_button_9" />
<include layout="@layout/cpp_simple_button_multiplication"/> <include layout="@layout/cpp_simple_button_multiplication" />
<include layout="@layout/cpp_simple_button_plus"/> <include layout="@layout/cpp_simple_button_plus" />
<include layout="@layout/cpp_simple_button_clear"/> <include layout="@layout/cpp_simple_button_clear" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_4"/> <include layout="@layout/cpp_simple_button_4" />
<include layout="@layout/cpp_simple_button_5"/> <include layout="@layout/cpp_simple_button_5" />
<include layout="@layout/cpp_simple_button_6"/> <include layout="@layout/cpp_simple_button_6" />
<include layout="@layout/cpp_simple_button_division"/> <include layout="@layout/cpp_simple_button_division" />
<include layout="@layout/cpp_simple_button_subtraction"/> <include layout="@layout/cpp_simple_button_subtraction" />
<include layout="@layout/cpp_simple_button_erase"/> <include layout="@layout/cpp_simple_button_erase" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_weight="1"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp"> a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_1"/> <include layout="@layout/cpp_simple_button_1" />
<include layout="@layout/cpp_simple_button_2"/> <include layout="@layout/cpp_simple_button_2" />
<include layout="@layout/cpp_simple_button_3"/> <include layout="@layout/cpp_simple_button_3" />
<include layout="@layout/cpp_simple_button_0"/> <include layout="@layout/cpp_simple_button_0" />
<include layout="@layout/cpp_simple_button_percent"/> <include layout="@layout/cpp_simple_button_percent" />
<include layout="@layout/cpp_simple_button_dot"/> <include layout="@layout/cpp_simple_button_dot" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

52
android-app/src/main/res/layout/cpp_unit_converter.xml
View File

@ -25,85 +25,85 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="fill_parent" a:layout_height="fill_parent"
a:orientation="vertical"
a:paddingLeft="10dp" a:paddingLeft="10dp"
a:paddingRight="10dp" a:paddingRight="10dp">
a:orientation="vertical">
<LinearLayout <LinearLayout
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="fill_parent" a:layout_height="fill_parent"
a:paddingBottom="10dp" a:orientation="horizontal"
a:orientation="horizontal"> a:paddingBottom="10dp">
<Spinner <Spinner
a:id="@+id/unit_types_from" a:id="@+id/unit_types_from"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="fill_parent"/> a:layout_height="fill_parent" />
<EditText <EditText
a:id="@+id/units_from" a:id="@+id/units_from"
a:inputType="text"
a:singleLine="true"
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:layout_height="fill_parent"/> a:layout_height="fill_parent"
a:inputType="text"
a:singleLine="true" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:paddingBottom="10dp"
a:layout_height="fill_parent" a:layout_height="fill_parent"
a:orientation="horizontal"> a:orientation="horizontal"
a:paddingBottom="10dp">
<Spinner <Spinner
a:id="@+id/unit_types_to" a:id="@+id/unit_types_to"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="fill_parent"/> a:layout_height="fill_parent" />
<EditText <EditText
a:id="@+id/units_to" a:id="@+id/units_to"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:editable="false" a:editable="false"
a:inputType="none" a:inputType="none"
a:singleLine="true" a:singleLine="true" />
a:layout_width="fill_parent"
a:layout_height="fill_parent"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
a:layout_width="fill_parent" a:layout_width="fill_parent"
a:paddingBottom="10dp"
a:layout_height="fill_parent" a:layout_height="fill_parent"
a:gravity="center" a:gravity="center"
a:orientation="horizontal"> a:orientation="horizontal"
a:paddingBottom="10dp">
<Button <Button
a:id="@+id/unit_converter_ok_button" a:id="@+id/unit_converter_ok_button"
a:text="@android:string/ok" a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:paddingLeft="15dp" a:paddingLeft="15dp"
a:paddingRight="15dp" a:paddingRight="15dp"
a:singleLine="true" a:singleLine="true"
a:layout_width="wrap_content" a:text="@android:string/ok" />
a:layout_height="wrap_content"/>
<Button <Button
a:id="@+id/unit_converter_copy_button" a:id="@+id/unit_converter_copy_button"
a:text="@android:string/copy" a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:paddingLeft="15dp" a:paddingLeft="15dp"
a:paddingRight="15dp" a:paddingRight="15dp"
a:singleLine="true" a:singleLine="true"
a:layout_width="wrap_content" a:text="@android:string/copy" />
a:layout_height="wrap_content"/>
<Button <Button
a:id="@+id/unit_converter_custom_button" a:id="@+id/unit_converter_custom_button"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:ellipsize="end"
a:paddingLeft="15dp" a:paddingLeft="15dp"
a:paddingRight="15dp" a:paddingRight="15dp"
a:ellipsize="end" a:singleLine="true" />
a:singleLine="true"
a:layout_width="wrap_content"
a:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>

9
android-app/src/main/res/layout/cpp_wiki_page.xml
View File

@ -23,12 +23,13 @@
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent"> a:layout_height="match_parent"
a:orientation="vertical">
<WebView a:id="@+id/cpp_wiki_webview" <WebView
a:id="@+id/cpp_wiki_webview"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent"/> a:layout_height="match_parent" />
</LinearLayout> </LinearLayout>

22
android-app/src/main/res/layout/cpp_wizard.xml
View File

@ -22,43 +22,43 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout a:id="@+id/wizard_layout"
a:id="@+id/wizard_layout"
style="@style/CppDialog" style="@style/CppDialog"
xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical"> a:orientation="vertical">
<FrameLayout <FrameLayout
a:orientation="vertical"
a:id="@id/acl_wizard_content" a:id="@id/acl_wizard_content"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp" a:layout_height="0dp"
a:layout_weight="1" a:layout_weight="1"
a:padding="6dp" a:gravity="center"
a:gravity="center" /> a:orientation="vertical"
a:padding="6dp" />
<LinearLayout <LinearLayout
a:orientation="horizontal"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content"> a:layout_height="wrap_content"
a:orientation="horizontal">
<Button <Button
a:id="@id/acl_wizard_prev_button" a:id="@id/acl_wizard_prev_button"
a:layout_height="wrap_content"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1" a:layout_weight="1"
a:singleLine="true"
a:lines="1" a:lines="1"
a:maxLines="1" a:maxLines="1"
a:singleLine="true"
a:text="@string/cpp_wizard_back" /> a:text="@string/cpp_wizard_back" />
<Button <Button
a:id="@id/acl_wizard_next_button" a:id="@id/acl_wizard_next_button"
a:layout_height="wrap_content"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1" a:layout_weight="1"
a:singleLine="true"
a:lines="1" a:lines="1"
a:maxLines="1" a:maxLines="1"
a:singleLine="true"
a:text="@string/cpp_wizard_next" /> a:text="@string/cpp_wizard_next" />
</LinearLayout> </LinearLayout>

19
android-app/src/main/res/layout/cpp_wizard_step_choose_layout.xml
View File

@ -25,27 +25,26 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
a:orientation="vertical" a:gravity="center"
a:gravity="center"> a:orientation="vertical">
<TextView <TextView
style="@style/WizardLabel"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:textAppearance="@android:style/TextAppearance.Large" a:text="@string/cpp_wizard_layout_title"
style="@style/WizardLabel" a:textAppearance="@android:style/TextAppearance.Large" />
a:text="@string/cpp_wizard_layout_title" />
<Spinner <Spinner
a:id="@+id/wizard_layout_spinner" a:id="@+id/wizard_layout_spinner"
style="@style/WizardLabel"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content" />
style="@style/WizardLabel" />
<ImageView <ImageView
a:id="@+id/wizard_layout_image" a:id="@+id/wizard_layout_image"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
style="@style/WizardLabel.Last" style="@style/WizardLabel.Last"
/> a:layout_width="wrap_content"
a:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>

32
android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
View File

@ -26,51 +26,51 @@
xmlns:c="http://schemas.android.com/apk/res-auto" xmlns:c="http://schemas.android.com/apk/res-auto"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
a:orientation="vertical" a:gravity="center"
a:gravity="center"> a:orientation="vertical">
<TextView <TextView
style="@style/WizardLabel"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:textAppearance="@android:style/TextAppearance.Large"
style="@style/WizardLabel"
a:layout_marginBottom="20dp" a:layout_marginBottom="20dp"
a:text="@string/cpp_wizard_mode_title" /> a:text="@string/cpp_wizard_mode_title"
a:textAppearance="@android:style/TextAppearance.Large" />
<Spinner <Spinner
a:id="@+id/wizard_mode_spinner" a:id="@+id/wizard_mode_spinner"
style="@style/WizardLabel"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_marginBottom="20dp" a:layout_marginBottom="20dp" />
style="@style/WizardLabel" />
<LinearLayout <LinearLayout
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:orientation="vertical" a:gravity="center_horizontal|top"
a:gravity="center_horizontal|top"> a:orientation="vertical">
<FrameLayout <FrameLayout
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:padding="3dp"
a:layout_marginBottom="10dp" a:layout_marginBottom="10dp"
a:background="?attr/cpp_main_bg"> a:background="?attr/cpp_main_bg"
a:padding="3dp">
<org.solovyev.android.calculator.drag.DirectionDragButton <org.solovyev.android.calculator.drag.DirectionDragButton
a:id="@+id/wizard_mode_button" a:id="@+id/wizard_mode_button"
a:text="7" style="?attr/cpp_button_style_operation"
c:directionTextScale="0.5"
a:layout_width="100dp" a:layout_width="100dp"
a:layout_height="100dp" a:layout_height="100dp"
style="?attr/cpp_button_style_operation" /> a:text="7"
c:directionTextScale="0.5" />
</FrameLayout> </FrameLayout>
<TextView <TextView
a:id="@+id/wizard_mode_description" a:id="@+id/wizard_mode_description"
style="@style/WizardLabel.Last"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content" />
style="@style/WizardLabel.Last" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

21
android-app/src/main/res/layout/cpp_wizard_step_choose_theme.xml
View File

@ -25,29 +25,28 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent" a:layout_height="match_parent"
a:orientation="vertical" a:gravity="center"
a:gravity="center"> a:orientation="vertical">
<TextView <TextView
a:layout_width="wrap_content"
a:id="@+id/wizard_theme_title" a:id="@+id/wizard_theme_title"
a:layout_height="wrap_content"
a:textAppearance="@android:style/TextAppearance.Large"
style="@style/WizardLabel" style="@style/WizardLabel"
a:text="@string/cpp_wizard_theme_title" /> a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:text="@string/cpp_wizard_theme_title"
a:textAppearance="@android:style/TextAppearance.Large" />
<Spinner <Spinner
a:id="@+id/wizard_theme_spinner" a:id="@+id/wizard_theme_spinner"
style="@style/WizardLabel"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content" />
style="@style/WizardLabel" />
<FrameLayout <FrameLayout
a:id="@+id/wizard_theme_preview" a:id="@+id/wizard_theme_preview"
style="@style/WizardLabel.Last"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content"
style="@style/WizardLabel.Last" a:orientation="vertical" />
a:orientation="vertical"
/>
</LinearLayout> </LinearLayout>

10
android-app/src/main/res/layout/cpp_wizard_step_choose_theme_preview.xml
View File

@ -25,10 +25,10 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="wrap_content" a:layout_width="wrap_content"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:background="?attr/cpp_main_bg"
a:minWidth="200dp" a:minWidth="200dp"
a:orientation="vertical" a:orientation="vertical"
a:padding="3dp" a:padding="3dp">
a:background="?attr/cpp_main_bg">
<LinearLayout <LinearLayout
a:layout_width="match_parent" a:layout_width="match_parent"
@ -38,11 +38,11 @@
<include layout="@layout/cpp_app_button_equals_no_bg" /> <include layout="@layout/cpp_app_button_equals_no_bg" />
<TextView <TextView
style="@style/CppText.Display"
a:layout_width="0dp" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_height="match_parent"
style="@style/CppText.Display" a:layout_weight="2"
a:text="3.1415" a:text="3.1415" />
a:layout_weight="2"/>
</LinearLayout> </LinearLayout>

Some files were not shown because too many files have changed in this diff Show More