Lint issues

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

@@ -13,6 +13,6 @@ public class ChooseThemeReleaseNoteFragment extends ChooseThemeWizardStep {
 		super.onViewCreated(root, savedInstanceState);
 
 		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);
 	}
 }

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

@@ -120,7 +120,7 @@ public class WizardActivity extends BaseActivity implements WizardsAware, Shared
 			}
 
 			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).
 					setNegativeButton(R.string.c_no, dialogListener).
 					setPositiveButton(R.string.c_yes, dialogListener).

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

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

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

@@ -24,19 +24,21 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
-			  a:orientation="vertical"
+	a:layout_gravity="center"
-			  a:layout_gravity="center">
+	a:orientation="vertical">
 
 	<LinearLayout
 		a:id="@+id/editorContainer"
-			a:layout_weight="2"
 		a:layout_width="match_parent"
-			a:layout_height="0dp"/>
+		a:layout_height="0dp"
+		a:layout_weight="2"
+		a:orientation="horizontal" />
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1"
+		a:baselineAligned="false">
 
 		<include
 			layout="@layout/cpp_app_button_left"
@@ -52,8 +54,8 @@
 
 		<FrameLayout
 			a:id="@+id/displayContainer"
-				a:layout_height="match_parent"
 			a:layout_width="0dp"
+			a:layout_height="match_parent"
 			a:layout_weight="4" />
 
 		<include
@@ -72,9 +74,10 @@
 
 	<LinearLayout
 		a:id="@+id/keyboardContainer"
-			a:layout_weight="3"
 		a:layout_width="match_parent"
-			a:layout_height="0dp"/>
+		a:layout_height="0dp"
+		a:layout_weight="3"
+		a:orientation="horizontal" />
 
 
 </LinearLayout>

android-app/src/main/res/layout/about_fragment.xml

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

android-app/src/main/res/layout/ad.xml

@@ -22,8 +22,8 @@
   ~ 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_height="wrap_content"
 	a:layout_gravity="center"

android-app/src/main/res/layout/admob.xml

@@ -22,12 +22,12 @@
   ~ 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"
-	a:id="@+id/admob"
 	a:layout_width="match_parent"
 	a:layout_height="wrap_content"
 	a:layout_gravity="center"
-    ads:adSize="BANNER"
 	a:visibility="gone"
+	ads:adSize="BANNER"
 	ads:adUnitId="@string/admob" />

android-app/src/main/res/layout/calc_plot_view.xml

@@ -22,11 +22,11 @@
   ~ 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_height="fill_parent">
+	a:layout_height="fill_parent"
+	a:orientation="vertical">
 
 
 </LinearLayout>

android-app/src/main/res/layout/cpp_activity_settings.xml

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

android-app/src/main/res/layout/cpp_activity_wizard.xml

@@ -1,9 +1,9 @@
 <?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"
-	style="@style/MaterialActivity"
+	android:orientation="vertical"
-	android:padding="0dp"
+	android:padding="0dp">
-	android:orientation="vertical">
 
 	<android.support.v4.view.ViewPager
 		android:id="@+id/pager"
@@ -12,12 +12,12 @@
 		android:layout_weight="1" />
 
 	<com.viewpagerindicator.CirclePageIndicator
-		android:paddingTop="10dp"
-		android:paddingBottom="10dp"
 		android:id="@+id/pager_indicator"
-		android:layout_height="wrap_content"
 		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>

android-app/src/main/res/layout/cpp_app_button_0.xml

@@ -22,11 +22,14 @@
   ~ 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"
-													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"
-													c:textDown="000"
 	c:directionTextScale="0.5"
-													style="?attr/cpp_button_style_digit"/>
+	c:textDown="000"
+	c:textUp="00"
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_1.xml

@@ -22,11 +22,14 @@
   ~ 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"
+	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"
-													c:textUp="sin"
-													c:textLeft="A"
 	c:textDown="asin"
-													style="?attr/cpp_button_style_digit"/>
+	c:textLeft="A"
+	c:textUp="sin"
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_2.xml

@@ -22,11 +22,14 @@
   ~ 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"
+	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"
-													c:textUp="cos"
-													c:textLeft="B"
 	c:textDown="acos"
-													style="?attr/cpp_button_style_digit"/>
+	c:textLeft="B"
+	c:textUp="cos"
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_3.xml

@@ -22,11 +22,14 @@
   ~ 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"
+	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"
-													c:textUp="tan"
-													c:textLeft="C"
 	c:textDown="atan"
-													style="?attr/cpp_button_style_digit"/>
+	c:textLeft="C"
+	c:textUp="tan"
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_4.xml

@@ -21,11 +21,14 @@
   ~ Email: se.solovyev@gmail.com
   ~ 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"
+	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"
-													c:textUp="x"
-													c:textLeft="D"
 	c:textDown="y"
-													style="?attr/cpp_button_style_digit"/>
+	c:textLeft="D"
+	c:textUp="x"
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_5.xml

@@ -21,11 +21,14 @@
   ~ Email: se.solovyev@gmail.com
   ~ 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"
+	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"
-													c:textUp="t"
-													c:textLeft="E"
 	c:textDown="j"
-													style="?attr/cpp_button_style_digit"/>
+	c:textLeft="E"
+	c:textUp="t"
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_6.xml

@@ -22,12 +22,15 @@
   ~ 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"
+	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"
-													   c:textLeft="F"
-													   c:textDown="rad"
 	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" />

android-app/src/main/res/layout/cpp_app_button_7.xml

@@ -22,12 +22,15 @@
   ~ 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"
+	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"
-													c:textUp="i"
-													c:textLeft="0b:"
-													c:textDown="!"
 	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" />

android-app/src/main/res/layout/cpp_app_button_8.xml

@@ -22,12 +22,15 @@
   ~ 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"
+	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"
-													c:textUp="ln"
-													c:textLeft="0d:"
-													c:textDown="lg"
 	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" />

android-app/src/main/res/layout/cpp_app_button_9.xml

@@ -22,12 +22,15 @@
   ~ 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"
+	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"
+	c:directionTextScale="0.5;0.5;0.5;0.33"
 	c:textDown="e"
 	c:textLeft="0x:"
 	c:textUp="π"
-													c:directionTextScale="0.5;0.5;0.5;0.33"
+	tools:ignore="HardcodedText" />
-													style="?attr/cpp_button_style_digit"/>

android-app/src/main/res/layout/cpp_app_button_clear.xml

@@ -22,12 +22,13 @@
   ~ 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"
-														 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:textStyle="bold"
 	c:textDown="bin"
 	c:textLeft="hex"
-														 a:textStyle="bold"
+	c:textUp="dec" />
-														 style="?attr/cpp_button_style_control_image"/>

android-app/src/main/res/layout/cpp_app_button_copy.xml

@@ -22,7 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
+<ImageButton
 	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" />

android-app/src/main/res/layout/cpp_app_button_division.xml

@@ -22,11 +22,14 @@
   ~ 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"
-													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="/"
-													c:textDown="√"
 	c:directionTextScale="0.5"
-													style="?attr/cpp_button_style_operation"/>
+	c:textDown="√"
+	c:textUp="%"
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_donate.xml

@@ -22,7 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
+<ImageButton
 	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" />

android-app/src/main/res/layout/cpp_app_button_dot.xml

@@ -22,10 +22,13 @@
   ~ 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"
+	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="."
-													c:textUp=","
 	c:directionTextScale="0.5"
-													style="?attr/cpp_button_style_digit"/>
+	c:textUp=","
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_equals.xml

@@ -21,11 +21,14 @@
   ~ Email: se.solovyev@gmail.com
   ~ 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"
-													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="="
-													c:textDown="@string/cpp_plot_button_text"
 	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" />

android-app/src/main/res/layout/cpp_app_button_equals_no_bg.xml

@@ -21,14 +21,17 @@
   ~ Email: se.solovyev@gmail.com
   ~ 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"
 	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:background="@drawable/button_no_bg"
 	a:text="="
 	a:textColor="?android:attr/textColorPrimary"
 	c:directionTextColor="?android:attr/textColorPrimary"
 	c:directionTextScale="0.5;0.5;0.33;0.5"
 	c:textDown="@string/cpp_plot_button_text"
-	a:background="@drawable/button_no_bg"
+	c:textUp="≡"
-	c:textUp="≡" />
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_erase.xml

@@ -22,7 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
+<ImageButton
 	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" />

android-app/src/main/res/layout/cpp_app_button_functions.xml

@@ -22,11 +22,14 @@
   ~ 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"
-													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:textStyle="italic"
-													style="?attr/cpp_button_style_control"/>
+	c:directionTextScale="0.4"
+	c:textUp="+ƒ"
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_history.xml

@@ -21,12 +21,13 @@
   ~ Email: se.solovyev@gmail.com
   ~ 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: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"
-													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" />

android-app/src/main/res/layout/cpp_app_button_left.xml

@@ -22,10 +22,13 @@
   ~ 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"
-													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="◁"
 	c:directionTextScale="0.5"
-													style="?attr/cpp_button_style_control"/>
+	c:textUp="◁◁"
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_minus.xml

@@ -21,10 +21,13 @@
   ~ Email: se.solovyev@gmail.com
   ~ 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"
-													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"
-													style="?attr/cpp_button_style_operation"/>
+	c:textDown="∂,…"
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_multiplication.xml

@@ -22,12 +22,15 @@
   ~ 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"
+	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="×"
-													c:textUp="^"
+	c:directionTextScale="0.5"
 	c:textDown="^2"
 	c:textLeft="Π"
-													style="?attr/cpp_button_style_operation"
+	c:textUp="^"
-													c:directionTextScale="0.5"/>
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_operators.xml

@@ -22,7 +22,10 @@
   ~ 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"
+	style="?attr/cpp_button_style_control"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	a:text="∂,…"
-													style="?attr/cpp_button_style_control"/>
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_paste.xml

@@ -22,7 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
+<ImageButton
 	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" />

android-app/src/main/res/layout/cpp_app_button_plus.xml

@@ -21,11 +21,14 @@
   ~ Email: se.solovyev@gmail.com
   ~ 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"
-													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="+"
-													style="?attr/cpp_button_style_operation"/>
+	c:directionTextScale="0.5"
+	c:textDown="E"
+	c:textUp="°"
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_right.xml

@@ -22,10 +22,13 @@
   ~ 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"
-													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="▷"
 	c:directionTextScale="0.5"
-													style="?attr/cpp_button_style_control"/>
+	c:textUp="▷▷"
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_round_brackets.xml

@@ -22,12 +22,15 @@
   ~ 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"
-													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="( )"
+	c:directionTextScale="0.5;0.5;0.5;0.33"
 	c:textDown=")"
 	c:textLeft="(…)"
-													c:directionTextScale="0.5;0.5;0.5;0.33"
+	c:textUp="("
-													style="?attr/cpp_button_style_digit"/>
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_button_vars.xml

@@ -22,11 +22,14 @@
   ~ 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"
-													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:textStyle="italic"
-													style="?attr/cpp_button_style_control"/>
+	c:directionTextScale="0.4"
+	c:textUp="+π"
+	tools:ignore="HardcodedText" />

android-app/src/main/res/layout/cpp_app_display.xml

@@ -22,11 +22,12 @@
   ~ 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"
 	style="@style/CppText.Display"
-															  a:padding="@dimen/cpp_display_padding"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:inputType="textMultiLine"
 	a:maxLines="3"
+	a:padding="@dimen/cpp_display_padding"
 	a:scrollHorizontally="false"
 	a:scrollbars="none" />

android-app/src/main/res/layout/cpp_app_display_mobile.xml

@@ -22,11 +22,11 @@
   ~ 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"
-															  a:padding="@dimen/cpp_display_padding"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:inputType="textMultiLine"
 	a:maxLines="3"
+	a:padding="@dimen/cpp_display_padding"
 	a:scrollHorizontally="false"
 	a:scrollbars="none" />

android-app/src/main/res/layout/cpp_app_editor.xml

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

android-app/src/main/res/layout/cpp_app_editor_mobile.xml

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

android-app/src/main/res/layout/cpp_app_keyboard.xml

@@ -28,9 +28,9 @@
 	a:orientation="vertical">
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_app_button_7" />
 
@@ -45,9 +45,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_app_button_4" />
 
@@ -62,9 +62,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_app_button_1" />
 
@@ -79,9 +79,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		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" />
 
@@ -97,9 +97,9 @@
 
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_app_button_left" />
 

android-app/src/main/res/layout/cpp_app_keyboard_mobile.xml

@@ -28,9 +28,9 @@
 	a:orientation="vertical">
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_app_button_7" />
 
@@ -45,9 +45,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_app_button_4" />
 
@@ -62,9 +62,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_app_button_1" />
 
@@ -79,9 +79,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		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" />
 
@@ -97,9 +97,9 @@
 
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_app_button_left" />
 

android-app/src/main/res/layout/cpp_dialog.xml

@@ -22,9 +22,9 @@
   ~ 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"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:orientation="vertical">
 
 </LinearLayout>

android-app/src/main/res/layout/cpp_dialog_fragment.xml

@@ -22,12 +22,12 @@
   ~ 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"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
-			  a:layout_gravity="center_horizontal"
 	a:layout_height="match_parent"
+	a:layout_gravity="center_horizontal"
 	a:orientation="vertical">
 
 	<TextView
@@ -44,18 +44,18 @@
 
 		<Button
 			a:id="@+id/cpp_copy_button"
-				a:text="@string/c_copy"
 			a:layout_width="0dp"
 			a:layout_height="wrap_content"
 			a:layout_weight="1"
+			a:text="@string/c_copy"
 			a:visibility="gone" />
 
 		<Button
 			a:id="@+id/cpp_ok_button"
-				a:text="@string/ok"
 			a:layout_width="0dp"
 			a:layout_height="wrap_content"
-				a:layout_weight="1"/>
+			a:layout_weight="1"
+			a:text="@string/ok" />
 
 	</LinearLayout>
 

android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml

@@ -22,8 +22,8 @@
   ~ 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
 		a:id="@+id/cpp_fixable_messages_container"
@@ -33,15 +33,15 @@
 
 	<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_height="wrap_content"/>
+		a:layout_height="wrap_content"
+		a:text="@string/do_not_show_messages_in_session" />
 
 	<LinearLayout
 		a:layout_width="match_parent"
 		a:layout_height="wrap_content"
-			a:orientation="horizontal"
+		a:gravity="center"
-			a:gravity="center">
+		a:orientation="horizontal">
 
 		<Button
 			a:id="@+id/close_button"

android-app/src/main/res/layout/cpp_fixable_messages_dialog_message.xml

@@ -32,8 +32,8 @@
 		a:id="@+id/cpp_fixable_messages_text_view"
 		a:layout_width="0dp"
 		a:layout_height="wrap_content"
-			a:layout_weight="5"
 		a:layout_gravity="fill"
+		a:layout_weight="5"
 		a:text="@+id/cpp_fixable_messages_text_view" />
 
 	<Button

android-app/src/main/res/layout/cpp_plot_fragment.xml

@@ -22,17 +22,17 @@
   ~ 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"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent">
 
 	<TextView
 		a:id="@+id/fragment_title"
-			a:layout_height="wrap_content"
+		style="@style/CppFragmentTitle"
 		a:layout_width="match_parent"
-			style="@style/CppFragmentTitle"/>
+		a:layout_height="wrap_content" />
 
 	<include layout="@layout/ad" />
 

android-app/src/main/res/layout/cpp_plot_function_list_item.xml

@@ -50,8 +50,8 @@
 		a:layout_width="0dp"
 		a:layout_height="wrap_content"
 		a:layout_weight="1"
-			a:paddingTop="0dp"
 		a:paddingBottom="0dp"
+		a:paddingTop="0dp"
 		a:scaleType="centerInside"
 		a:src="@drawable/kb_settings" />
 

android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml

@@ -22,8 +22,8 @@
   ~ 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>

android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml

@@ -22,53 +22,53 @@
   ~ 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"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="wrap_content"
-			  a:layout_gravity="center_horizontal"
 	a:layout_height="match_parent"
+	a:layout_gravity="center_horizontal"
 	a:orientation="vertical">
 
 	<include layout="@layout/ad" />
 
 	<TextView
-			a:text="@string/cpp_plot_function_line_color_type"
 		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
 		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_height="wrap_content"/>
+		a:layout_height="wrap_content"
+		a:entries="@array/cpp_plot_line_color_type_names" />
 
 	<TextView
-			a:text="@string/cpp_plot_function_line_color"
 		a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:layout_height="wrap_content"
+		a:text="@string/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_height="wrap_content"/>
+		a:layout_height="wrap_content"
+		a:entries="@array/cpp_plot_line_color_names" />
 
 	<TextView
-			a:text="@string/cpp_plot_function_line_style"
 		a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:layout_height="wrap_content"
+		a:text="@string/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_height="wrap_content"/>
+		a:layout_height="wrap_content"
+		a:entries="@array/cpp_plot_line_style_names" />
 
 	<TextView
-			a:text="@string/cpp_plot_function_line_width"
 		a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:layout_height="wrap_content"
+		a:text="@string/cpp_plot_function_line_width" />
 
 	<SeekBar
 		a:id="@+id/cpp_plot_functions_line_width_seekbar"
@@ -77,8 +77,8 @@
 
 	<Button
 		a:id="@+id/cpp_apply_button"
-			a:text="@string/cpp_apply"
 		a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:layout_height="wrap_content"
+		a:text="@string/cpp_apply" />
 
 </LinearLayout>

android-app/src/main/res/layout/cpp_plot_functions_fragment.xml

@@ -22,9 +22,9 @@
   ~ 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"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent">
 

android-app/src/main/res/layout/cpp_plot_range_fragment.xml

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

android-app/src/main/res/layout/cpp_purchase_dialog_fragment.xml

@@ -22,26 +22,26 @@
   ~ 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"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
-			  a:layout_gravity="center_horizontal"
 	a:layout_height="match_parent"
+	a:layout_gravity="center_horizontal"
 	a:orientation="vertical">
 
 	<TextView
 		a:id="@+id/cpp_purchase_text"
-			a:text="@string/cpp_purchase_text"
 		a:layout_width="match_parent"
 		a:layout_height="wrap_content"
 		a:maxLines="10"
-			a:scrollbars="vertical"/>
+		a:scrollbars="vertical"
+		a:text="@string/cpp_purchase_text" />
 
 	<Button
 		a:id="@+id/cpp_continue_button"
-			a:text="@string/cpp_continue"
 		a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:layout_height="wrap_content"
+		a:text="@string/cpp_continue" />
 
 </LinearLayout>

android-app/src/main/res/layout/cpp_release_note_step.xml

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

android-app/src/main/res/layout/cpp_simple_button_0.xml

@@ -22,7 +22,7 @@
   ~ 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" />

android-app/src/main/res/layout/cpp_simple_button_1.xml

@@ -22,7 +22,7 @@
   ~ 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" />

android-app/src/main/res/layout/cpp_simple_button_2.xml

@@ -22,7 +22,7 @@
   ~ 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" />

android-app/src/main/res/layout/cpp_simple_button_3.xml

@@ -22,7 +22,7 @@
   ~ 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" />

android-app/src/main/res/layout/cpp_simple_button_4.xml

@@ -21,7 +21,7 @@
   ~ Email: se.solovyev@gmail.com
   ~ 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" />

android-app/src/main/res/layout/cpp_simple_button_5.xml

@@ -21,7 +21,7 @@
   ~ Email: se.solovyev@gmail.com
   ~ 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" />

android-app/src/main/res/layout/cpp_simple_button_6.xml

@@ -22,7 +22,7 @@
   ~ 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" />

android-app/src/main/res/layout/cpp_simple_button_7.xml

@@ -22,7 +22,7 @@
   ~ 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" />

android-app/src/main/res/layout/cpp_simple_button_8.xml

@@ -22,7 +22,7 @@
   ~ 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" />

android-app/src/main/res/layout/cpp_simple_button_9.xml

@@ -22,7 +22,7 @@
   ~ 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" />

android-app/src/main/res/layout/cpp_simple_button_app.xml

@@ -22,8 +22,8 @@
   ~ 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"
-			 a:contentDescription="App"/>
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:contentDescription="App"
+	a:src="@drawable/kb_logo" />

android-app/src/main/res/layout/cpp_simple_button_clear.xml

@@ -22,8 +22,8 @@
   ~ 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:textStyle="bold"
+	a:textStyle="bold" />
-		style="@style/cpp_simple_metro_control_button_style"/>

android-app/src/main/res/layout/cpp_simple_button_copy.xml

@@ -22,8 +22,8 @@
   ~ 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"
-			 a:contentDescription="Copy"/>
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:contentDescription="Copy"
+	a:src="@drawable/kb_copy" />

android-app/src/main/res/layout/cpp_simple_button_division.xml

@@ -22,7 +22,7 @@
   ~ 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="/" />

android-app/src/main/res/layout/cpp_simple_button_dot.xml

@@ -22,7 +22,7 @@
   ~ 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="." />

android-app/src/main/res/layout/cpp_simple_button_equals.xml

@@ -21,7 +21,7 @@
   ~ Email: se.solovyev@gmail.com
   ~ 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="=" />

android-app/src/main/res/layout/cpp_simple_button_erase.xml

@@ -22,8 +22,8 @@
   ~ 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"
-			 a:contentDescription="Erase"/>
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:contentDescription="Erase"
+	a:src="@drawable/kb_erase" />

android-app/src/main/res/layout/cpp_simple_button_functions.xml

@@ -22,8 +22,8 @@
   ~ 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:textStyle="italic"
+	a:textStyle="italic" />
-		style="@style/cpp_simple_metro_control_button_style"/>

android-app/src/main/res/layout/cpp_simple_button_history.xml

@@ -21,8 +21,8 @@
   ~ Email: se.solovyev@gmail.com
   ~ 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"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="@string/c_history_button"
 	a:textStyle="bold" />

android-app/src/main/res/layout/cpp_simple_button_left.xml

@@ -22,7 +22,7 @@
   ~ 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="◁" />

android-app/src/main/res/layout/cpp_simple_button_like.xml

@@ -22,8 +22,8 @@
   ~ 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"
-			 a:contentDescription="Like"/>
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:contentDescription="Like"
+	a:src="@drawable/kb_share" />

android-app/src/main/res/layout/cpp_simple_button_multiplication.xml

@@ -22,7 +22,7 @@
   ~ 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="×" />

android-app/src/main/res/layout/cpp_simple_button_operators.xml

@@ -22,8 +22,8 @@
   ~ 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:textStyle="italic"
+	a:textStyle="italic" />
-		style="@style/cpp_simple_metro_control_button_style"/>

android-app/src/main/res/layout/cpp_simple_button_paste.xml

@@ -22,8 +22,8 @@
   ~ 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"
-			 a:contentDescription="Paste"/>
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:contentDescription="Paste"
+	a:src="@drawable/kb_paste" />

android-app/src/main/res/layout/cpp_simple_button_percent.xml

@@ -22,7 +22,7 @@
   ~ 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="%" />

android-app/src/main/res/layout/cpp_simple_button_plus.xml

@@ -21,7 +21,7 @@
   ~ Email: se.solovyev@gmail.com
   ~ 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="+" />

android-app/src/main/res/layout/cpp_simple_button_power.xml

@@ -22,7 +22,7 @@
   ~ 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="^" />

android-app/src/main/res/layout/cpp_simple_button_right.xml

@@ -22,7 +22,7 @@
   ~ 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="▷" />

android-app/src/main/res/layout/cpp_simple_button_round_brackets.xml

@@ -22,7 +22,7 @@
   ~ 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="(  )" />

android-app/src/main/res/layout/cpp_simple_button_settings.xml

@@ -22,8 +22,8 @@
   ~ 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"
-			 a:contentDescription="Settings"/>
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:contentDescription="Settings"
+	a:src="@drawable/kb_settings" />

android-app/src/main/res/layout/cpp_simple_button_subtraction.xml

@@ -21,7 +21,7 @@
   ~ Email: se.solovyev@gmail.com
   ~ 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="-" />

android-app/src/main/res/layout/cpp_simple_button_vars.xml

@@ -22,8 +22,8 @@
   ~ 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:textStyle="italic"
+	a:textStyle="italic" />
-		style="@style/cpp_simple_metro_control_button_style"/>

android-app/src/main/res/layout/cpp_simple_keyboard.xml

@@ -28,9 +28,9 @@
 	a:orientation="vertical">
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_simple_button_7" />
 
@@ -47,9 +47,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_simple_button_4" />
 
@@ -66,9 +66,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_simple_button_1" />
 
@@ -85,9 +85,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		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" />
 
@@ -105,9 +105,9 @@
 
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_simple_button_left" />
 

android-app/src/main/res/layout/cpp_simple_keyboard_lockscreen.xml

@@ -28,9 +28,9 @@
 	a:orientation="vertical">
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_simple_button_7" />
 
@@ -47,9 +47,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_simple_button_4" />
 
@@ -66,9 +66,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_simple_button_1" />
 
@@ -85,9 +85,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		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" />
 

android-app/src/main/res/layout/cpp_simple_keyboard_lockscreen_collapsed.xml

@@ -28,9 +28,9 @@
 	a:orientation="vertical">
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_simple_button_7" />
 
@@ -47,9 +47,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_simple_button_4" />
 
@@ -66,9 +66,9 @@
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
 		a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include layout="@layout/cpp_simple_button_1" />
 

android-app/src/main/res/layout/cpp_unit_converter.xml

@@ -25,15 +25,15 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="fill_parent"
 	a:layout_height="fill_parent"
+	a:orientation="vertical"
 	a:paddingLeft="10dp"
-			  a:paddingRight="10dp"
+	a:paddingRight="10dp">
-			  a:orientation="vertical">
 
 	<LinearLayout
 		a:layout_width="fill_parent"
 		a:layout_height="fill_parent"
-			a:paddingBottom="10dp"
+		a:orientation="horizontal"
-			a:orientation="horizontal">
+		a:paddingBottom="10dp">
 
 		<Spinner
 			a:id="@+id/unit_types_from"
@@ -43,18 +43,18 @@
 
 		<EditText
 			a:id="@+id/units_from"
-				a:inputType="text"
-				a:singleLine="true"
 			a:layout_width="fill_parent"
-				a:layout_height="fill_parent"/>
+			a:layout_height="fill_parent"
+			a:inputType="text"
+			a:singleLine="true" />
 
 	</LinearLayout>
 
 	<LinearLayout
 		a:layout_width="fill_parent"
-			a:paddingBottom="10dp"
 		a:layout_height="fill_parent"
-			a:orientation="horizontal">
+		a:orientation="horizontal"
+		a:paddingBottom="10dp">
 
 		<Spinner
 			a:id="@+id/unit_types_to"
@@ -63,47 +63,47 @@
 
 		<EditText
 			a:id="@+id/units_to"
+			a:layout_width="fill_parent"
+			a:layout_height="fill_parent"
 			a:editable="false"
 			a:inputType="none"
-				a:singleLine="true"
+			a:singleLine="true" />
-				a:layout_width="fill_parent"
-				a:layout_height="fill_parent"/>
 
 	</LinearLayout>
 
 	<LinearLayout
 		a:layout_width="fill_parent"
-			a:paddingBottom="10dp"
 		a:layout_height="fill_parent"
 		a:gravity="center"
-			a:orientation="horizontal">
+		a:orientation="horizontal"
+		a:paddingBottom="10dp">
 
 		<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:paddingRight="15dp"
 			a:singleLine="true"
-				a:layout_width="wrap_content"
+			a:text="@android:string/ok" />
-				a:layout_height="wrap_content"/>
 
 		<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:paddingRight="15dp"
 			a:singleLine="true"
-				a:layout_width="wrap_content"
+			a:text="@android:string/copy" />
-				a:layout_height="wrap_content"/>
 
 		<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:paddingRight="15dp"
-				a:ellipsize="end"
+			a:singleLine="true" />
-				a:singleLine="true"
-				a:layout_width="wrap_content"
-				a:layout_height="wrap_content"/>
 
 	</LinearLayout>
 

android-app/src/main/res/layout/cpp_wiki_page.xml

@@ -23,11 +23,12 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:orientation="vertical"
 	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_height="match_parent" />
 

android-app/src/main/res/layout/cpp_wizard.xml

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

android-app/src/main/res/layout/cpp_wizard_step_choose_layout.xml

@@ -25,27 +25,26 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
-	a:orientation="vertical"
+	a:gravity="center"
-	a:gravity="center">
+	a:orientation="vertical">
 
 	<TextView
+		style="@style/WizardLabel"
 		a:layout_width="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
 		a:id="@+id/wizard_layout_spinner"
+		style="@style/WizardLabel"
 		a:layout_width="wrap_content"
-		a:layout_height="wrap_content"
+		a:layout_height="wrap_content" />
-		style="@style/WizardLabel" />
 
 	<ImageView
 		a:id="@+id/wizard_layout_image"
-		a:layout_width="wrap_content"
-		a:layout_height="wrap_content"
 		style="@style/WizardLabel.Last"
-		/>
+		a:layout_width="wrap_content"
+		a:layout_height="wrap_content" />
 
 </LinearLayout>

android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml

@@ -26,51 +26,51 @@
 	xmlns:c="http://schemas.android.com/apk/res-auto"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
-	a:orientation="vertical"
+	a:gravity="center"
-	a:gravity="center">
+	a:orientation="vertical">
 
 	<TextView
+		style="@style/WizardLabel"
 		a:layout_width="wrap_content"
 		a:layout_height="wrap_content"
-		a:textAppearance="@android:style/TextAppearance.Large"
-		style="@style/WizardLabel"
 		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
 		a:id="@+id/wizard_mode_spinner"
+		style="@style/WizardLabel"
 		a:layout_width="wrap_content"
 		a:layout_height="wrap_content"
-		a:layout_marginBottom="20dp"
+		a:layout_marginBottom="20dp" />
-		style="@style/WizardLabel" />
 
 	<LinearLayout
 		a:layout_width="wrap_content"
 		a:layout_height="wrap_content"
-		a:orientation="vertical"
+		a:gravity="center_horizontal|top"
-		a:gravity="center_horizontal|top">
+		a:orientation="vertical">
 
 		<FrameLayout
 			a:layout_width="wrap_content"
 			a:layout_height="wrap_content"
-			a:padding="3dp"
 			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
 				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_height="100dp"
-				style="?attr/cpp_button_style_operation" />
+				a:text="7"
+				c:directionTextScale="0.5" />
 		</FrameLayout>
 
 		<TextView
 			a:id="@+id/wizard_mode_description"
+			style="@style/WizardLabel.Last"
 			a:layout_width="wrap_content"
-			a:layout_height="wrap_content"
+			a:layout_height="wrap_content" />
-			style="@style/WizardLabel.Last" />
 	</LinearLayout>
 
 </LinearLayout>

android-app/src/main/res/layout/cpp_wizard_step_choose_theme.xml

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

android-app/src/main/res/layout/cpp_wizard_step_choose_theme_preview.xml

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

android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml

@@ -31,30 +31,30 @@
 
 	<TextView
 		a:id="@+id/wizard_dragbutton_description_textview"
-		a:text="@string/cpp_wizard_dragbutton_description"
+		style="@style/WizardLabel"
-		style="@style/WizardLabel" />
+		a:text="@string/cpp_wizard_dragbutton_description" />
 
 	<TextView
 		a:id="@+id/wizard_dragbutton_action_textview"
-		a:textStyle="bold"
-		a:text="@string/cpp_wizard_dragbutton_action_center"
 		style="@style/WizardLabel"
+		a:maxLines="3"
 		a:minLines="3"
-		a:maxLines="3"/>
+		a:text="@string/cpp_wizard_dragbutton_action_center"
+		a:textStyle="bold" />
 
 	<org.solovyev.android.calculator.drag.DirectionDragButton
-		a:layout_margin="0dp"
-		a:layout_height="wrap_content"
-		a:layout_width="wrap_content"
-		a:minWidth="100dp"
-		a:minHeight="100dp"
-		a:layout_weight="0"
-		a:layout_gravity="center"
 		a:id="@+id/wizard_dragbutton"
+		style="?attr/cpp_button_style_operation"
+		a:layout_width="wrap_content"
+		a:layout_height="wrap_content"
+		a:layout_gravity="center"
+		a:layout_margin="0dp"
+		a:layout_weight="0"
+		a:minHeight="100dp"
+		a:minWidth="100dp"
 		a:text="9"
-		c:textDown="^2"
-		c:textUp="%"
 		c:directionTextScale="0.5;0.5;0.5;0.33"
-		style="?attr/cpp_button_style_operation" />
+		c:textDown="^2"
+		c:textUp="%" />
 
 </LinearLayout>