code reformat

This commit is contained in:
Sergey Solovyev
2013-06-15 00:31:49 +04:00
parent 30e8b55a73
commit e57ce8cf2c
523 changed files with 20785 additions and 19727 deletions

View File

@@ -1,176 +1,277 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="117" android:versionName="1.6.2" package="org.solovyev.android.calculator">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:installLocation="auto"
android:versionCode="117"
android:versionName="1.6.2"
package="org.solovyev.android.calculator">
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="com.android.vending.BILLING"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="com.android.vending.BILLING" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<!--TODO: REMOVE IN PRODUCTION-->
<!--<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>-->
<!--TODO: REMOVE IN PRODUCTION-->
<!--<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>-->
<!-- for onscreen -->
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<!-- for onscreen -->
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<supports-screens android:smallScreens="true"/>
<supports-screens android:normalScreens="true"/>
<supports-screens android:largeScreens="true"/>
<supports-screens android:xlargeScreens="true"/>
<supports-screens android:anyDensity="true"/>
<supports-screens android:smallScreens="true" />
<supports-screens android:normalScreens="true" />
<supports-screens android:largeScreens="true" />
<supports-screens android:xlargeScreens="true" />
<supports-screens android:anyDensity="true" />
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>
<uses-sdk
android:minSdkVersion="4"
android:targetSdkVersion="8" />
<application android:debuggable="false" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/cpp_metro_blue_theme">
<application
android:debuggable="false"
android:hardwareAccelerated="false"
android:icon="@drawable/icon"
android:label="@string/c_app_name"
android:name=".CalculatorApplication"
android:theme="@style/cpp_metro_blue_theme">
<activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivityMobile" android:windowSoftInputMode="adjustPan"/>
<!-- settings must use action bar icon-->
<activity android:icon="@drawable/ab_icon" android:label="@string/c_app_settings" android:name=".preferences.CalculatorPreferencesActivity"/>
<activity android:label="@string/c_history" android:name=".history.CalculatorHistoryActivity"/>
<activity android:excludeFromRecents="true" android:finishOnTaskLaunch="true" android:label="@string/calculation_messages_dialog_title" android:launchMode="singleTask" android:name=".FixableMessagesDialog" android:theme="@style/cpp_gray_dialog_theme"/>
<activity android:label="@string/c_about" android:name=".about.CalculatorAboutActivity"/>
<activity android:label="@string/c_help" android:name=".help.CalculatorHelpActivity"/>
<activity android:label="@string/c_functions" android:name=".math.edit.CalculatorFunctionsActivity"/>
<activity android:label="@string/c_operators" android:name=".math.edit.CalculatorOperatorsActivity"/>
<activity android:label="@string/c_vars_and_constants" android:name=".math.edit.CalculatorVarsActivity"/>
<activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/>
<activity android:label="@string/cpp_plot_functions" android:launchMode="singleTop" android:name=".plot.CalculatorPlotFunctionsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
<activity android:label="@string/cpp_plot_function_settings" android:launchMode="singleTop" android:name=".plot.CalculatorPlotFunctionSettingsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
<activity android:label="@string/cpp_plot_range" android:launchMode="singleTop" android:name=".plot.CalculatorPlotRangeActivity" android:theme="@style/cpp_gray_dialog_theme"/>
<activity android:label="@string/cpp_purchase_title" android:launchMode="singleTop" android:name=".preferences.CalculatorPurchaseDialogActivity" android:theme="@style/cpp_gray_dialog_theme"/>
<activity android:launchMode="singleTop" android:name=".CalculatorDialogActivity" android:theme="@style/cpp_gray_dialog_theme"/>
<!-- todo serso: strings-->
<activity android:label="@string/c_plot_graph" android:name=".matrix.CalculatorMatrixActivity"/>
<activity android:name=".widget.CalculatorWidgetConfigurationActivity" android:theme="@style/cpp_metro_blue_theme">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
</intent-filter>
</activity>
<!-- settings must use action bar icon-->
<activity android:icon="@drawable/ab_icon" android:label="@string/c_settings" android:name=".plot.CalculatorPlotPreferenceActivity"/>
<!-- ONSCREEN CONFIG -->
<activity android:icon="@drawable/icon_onscreen" android:label="@string/c_app_name_on_screen" android:launchMode="singleInstance" android:name=".onscreen.CalculatorOnscreenStartActivity" android:theme="@style/cpp_gray_dialog_theme">
<activity
android:clearTaskOnLaunch="true"
android:label="@string/c_app_name"
android:name=".CalculatorActivity"
android:windowSoftInputMode="adjustPan">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<service android:name=".onscreen.CalculatorOnscreenService">
<intent-filter>
<action android:name="org.solovyev.android.calculator.INIT"/>
<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
<action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
</intent-filter>
</service>
<activity
android:clearTaskOnLaunch="true"
android:label="@string/c_app_name"
android:name=".CalculatorActivityMobile"
android:windowSoftInputMode="adjustPan" />
<receiver android:name=".onscreen.CalculatorOnscreenBroadcastReceiver">
<intent-filter>
<action android:name="org.solovyev.android.calculator.INIT"/>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
<action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
</intent-filter>
</receiver>
<!-- settings must use action bar icon-->
<activity
android:icon="@drawable/ab_icon"
android:label="@string/c_app_settings"
android:name=".preferences.CalculatorPreferencesActivity" />
<!-- WIDGET CONFIG -->
<activity
android:label="@string/c_history"
android:name=".history.CalculatorHistoryActivity" />
<receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_3x3_name" android:name=".widget.CalculatorWidgetProvider">
<activity
android:excludeFromRecents="true"
android:finishOnTaskLaunch="true"
android:label="@string/calculation_messages_dialog_title"
android:launchMode="singleTask"
android:name=".FixableMessagesDialog"
android:theme="@style/cpp_gray_dialog_theme" />
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
<action android:name="org.solovyev.android.calculator.INIT"/>
<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
<action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
<action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED"/>
</intent-filter>
<activity
android:label="@string/c_about"
android:name=".about.CalculatorAboutActivity" />
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_3x3"/>
</receiver>
<activity
android:label="@string/c_help"
android:name=".help.CalculatorHelpActivity" />
<receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_3x4_name" android:name=".widget.CalculatorWidgetProvider3x4">
<activity
android:label="@string/c_functions"
android:name=".math.edit.CalculatorFunctionsActivity" />
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
<action android:name="org.solovyev.android.calculator.INIT"/>
<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
<action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
<action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED"/>
</intent-filter>
<activity
android:label="@string/c_operators"
android:name=".math.edit.CalculatorOperatorsActivity" />
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_3x4"/>
</receiver>
<activity
android:label="@string/c_vars_and_constants"
android:name=".math.edit.CalculatorVarsActivity" />
<receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_4x4_name" android:name=".widget.CalculatorWidgetProvider4x4">
<activity
android:label="@string/c_plot_graph"
android:name=".plot.CalculatorPlotActivity" />
<activity
android:label="@string/cpp_plot_functions"
android:launchMode="singleTop"
android:name=".plot.CalculatorPlotFunctionsActivity"
android:theme="@style/cpp_gray_dialog_theme" />
<activity
android:label="@string/cpp_plot_function_settings"
android:launchMode="singleTop"
android:name=".plot.CalculatorPlotFunctionSettingsActivity"
android:theme="@style/cpp_gray_dialog_theme" />
<activity
android:label="@string/cpp_plot_range"
android:launchMode="singleTop"
android:name=".plot.CalculatorPlotRangeActivity"
android:theme="@style/cpp_gray_dialog_theme" />
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
<action android:name="org.solovyev.android.calculator.INIT"/>
<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
<action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
<action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED"/>
</intent-filter>
<activity
android:label="@string/cpp_purchase_title"
android:launchMode="singleTop"
android:name=".preferences.CalculatorPurchaseDialogActivity"
android:theme="@style/cpp_gray_dialog_theme" />
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_4x4"/>
</receiver>
<activity
android:launchMode="singleTop"
android:name=".CalculatorDialogActivity"
android:theme="@style/cpp_gray_dialog_theme" />
<receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_4x5_name" android:name=".widget.CalculatorWidgetProvider4x5">
<!-- todo serso: strings-->
<activity
android:label="@string/c_plot_graph"
android:name=".matrix.CalculatorMatrixActivity" />
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
<action android:name="org.solovyev.android.calculator.INIT"/>
<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
<action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
<action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED"/>
</intent-filter>
<activity
android:name=".widget.CalculatorWidgetConfigurationActivity"
android:theme="@style/cpp_metro_blue_theme">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
</intent-filter>
</activity>
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_4x5"/>
</receiver>
<!-- settings must use action bar icon-->
<activity
android:icon="@drawable/ab_icon"
android:label="@string/c_settings"
android:name=".plot.CalculatorPlotPreferenceActivity" />
<!-- ADMOB + BILLING CONFIG -->
<!-- ONSCREEN CONFIG -->
<activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" android:name="com.google.ads.AdActivity"/>
<activity
android:icon="@drawable/icon_onscreen"
android:label="@string/c_app_name_on_screen"
android:launchMode="singleInstance"
android:name=".onscreen.CalculatorOnscreenStartActivity"
android:theme="@style/cpp_gray_dialog_theme">
<service android:name="net.robotmedia.billing.BillingService"/>
<receiver android:name="net.robotmedia.billing.BillingReceiver">
<intent-filter>
<action android:name="com.android.vending.billing.IN_APP_NOTIFY"/>
<action android:name="com.android.vending.billing.RESPONSE_CODE"/>
<action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED"/>
</intent-filter>
</receiver>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<!-- ACRA CONFIG -->
</activity>
<activity android:excludeFromRecents="true" android:finishOnTaskLaunch="true" android:launchMode="singleInstance" android:name="org.acra.CrashReportDialog" android:theme="@style/Theme.Sherlock.Dialog"/>
<service android:name=".onscreen.CalculatorOnscreenService">
<intent-filter>
<action android:name="org.solovyev.android.calculator.INIT" />
<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED" />
<action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED" />
</intent-filter>
</service>
</application>
<receiver android:name=".onscreen.CalculatorOnscreenBroadcastReceiver">
<intent-filter>
<action android:name="org.solovyev.android.calculator.INIT" />
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED" />
<action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED" />
</intent-filter>
</receiver>
<!-- WIDGET CONFIG -->
<receiver
android:icon="@drawable/icon"
android:label="@string/c_app_widget_3x3_name"
android:name=".widget.CalculatorWidgetProvider">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="org.solovyev.android.calculator.INIT" />
<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED" />
<action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED" />
<action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED" />
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/calculator_widget_info_3x3" />
</receiver>
<receiver
android:icon="@drawable/icon"
android:label="@string/c_app_widget_3x4_name"
android:name=".widget.CalculatorWidgetProvider3x4">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="org.solovyev.android.calculator.INIT" />
<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED" />
<action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED" />
<action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED" />
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/calculator_widget_info_3x4" />
</receiver>
<receiver
android:icon="@drawable/icon"
android:label="@string/c_app_widget_4x4_name"
android:name=".widget.CalculatorWidgetProvider4x4">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="org.solovyev.android.calculator.INIT" />
<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED" />
<action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED" />
<action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED" />
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/calculator_widget_info_4x4" />
</receiver>
<receiver
android:icon="@drawable/icon"
android:label="@string/c_app_widget_4x5_name"
android:name=".widget.CalculatorWidgetProvider4x5">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="org.solovyev.android.calculator.INIT" />
<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED" />
<action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED" />
<action android:name="org.solovyev.android.calculator.widget.BUTTON_PRESSED" />
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/calculator_widget_info_4x5" />
</receiver>
<!-- ADMOB + BILLING CONFIG -->
<activity
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
android:name="com.google.ads.AdActivity" />
<service android:name="net.robotmedia.billing.BillingService" />
<receiver android:name="net.robotmedia.billing.BillingReceiver">
<intent-filter>
<action android:name="com.android.vending.billing.IN_APP_NOTIFY" />
<action android:name="com.android.vending.billing.RESPONSE_CODE" />
<action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED" />
</intent-filter>
</receiver>
<!-- ACRA CONFIG -->
<activity
android:excludeFromRecents="true"
android:finishOnTaskLaunch="true"
android:launchMode="singleInstance"
android:name="org.acra.CrashReportDialog"
android:theme="@style/Theme.Sherlock.Dialog" />
</application>
</manifest>

View File

@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-parent</artifactId>
<version>1.6.3-SNAPSHOT</version>
</parent>
<parent>
<groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-parent</artifactId>
<version>1.6.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>
<groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-android-app</artifactId>
<packaging>apk</packaging>
<name>Calculator++ Application</name>
<groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-android-app</artifactId>
<packaging>apk</packaging>
<name>Calculator++ Application</name>
<dependencies>
<dependencies>
<!-- OWN -->
<!-- OWN -->
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-core</artifactId>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-core</artifactId>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
@@ -35,263 +35,270 @@
<type>apklib</type>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-android-app-onscreen</artifactId>
<type>apklib</type>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-android-app-onscreen</artifactId>
<type>apklib</type>
</dependency>
<dependency>
<groupId>org.solovyev</groupId>
<artifactId>common-core</artifactId>
</dependency>
<dependency>
<groupId>org.solovyev</groupId>
<artifactId>common-core</artifactId>
</dependency>
<dependency>
<groupId>org.solovyev</groupId>
<artifactId>common-text</artifactId>
</dependency>
<dependency>
<groupId>org.solovyev</groupId>
<artifactId>common-text</artifactId>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>android-common-all</artifactId>
<type>apklib</type>
</dependency>
<dependency>
<groupId>org.solovyev.android</groupId>
<artifactId>android-common-all</artifactId>
<type>apklib</type>
</dependency>
<dependency>
<groupId>org.solovyev</groupId>
<artifactId>jscl</artifactId>
</dependency>
<dependency>
<groupId>org.solovyev</groupId>
<artifactId>jscl</artifactId>
</dependency>
<!--OTHER-->
<dependency>
<groupId>ch.acra</groupId>
<artifactId>acra</artifactId>
<version>4.3.0</version>
</dependency>
<!--OTHER-->
<dependency>
<groupId>ch.acra</groupId>
<artifactId>acra</artifactId>
<version>4.3.0</version>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>support-v4</artifactId>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>support-v4</artifactId>
</dependency>
<dependency>
<groupId>com.actionbarsherlock</groupId>
<artifactId>library</artifactId>
<type>apklib</type>
</dependency>
<dependency>
<groupId>com.actionbarsherlock</groupId>
<artifactId>library</artifactId>
<type>apklib</type>
</dependency>
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.simpleframework</groupId>
<artifactId>simple-xml</artifactId>
</dependency>
<dependency>
<groupId>org.simpleframework</groupId>
<artifactId>simple-xml</artifactId>
</dependency>
<dependency>
<groupId>admob</groupId>
<artifactId>admob</artifactId>
<version>6.1.0</version>
</dependency>
<dependency>
<groupId>admob</groupId>
<artifactId>admob</artifactId>
<version>6.1.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.intellij</groupId>
<artifactId>annotations</artifactId>
</dependency>
<dependency>
<groupId>com.intellij</groupId>
<artifactId>annotations</artifactId>
</dependency>
<dependency>
<groupId>com.pivotallabs</groupId>
<artifactId>robolectric</artifactId>
<version>1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.pivotallabs</groupId>
<artifactId>robolectric</artifactId>
<version>1.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<manifest>
<debuggable>true</debuggable>
</manifest>
</configuration>
<executions>
<execution>
<id>manifestUpdate</id>
<phase>process-resources</phase>
<goals>
<goal>manifest-update</goal>
</goals>
</execution>
<execution>
<id>alignApk</id>
<phase>package</phase>
<goals>
<goal>zipalign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<manifest>
<debuggable>true</debuggable>
</manifest>
</configuration>
<executions>
<execution>
<id>manifestUpdate</id>
<phase>process-resources</phase>
<goals>
<goal>manifest-update</goal>
</goals>
</execution>
<execution>
<id>alignApk</id>
<phase>package</phase>
<goals>
<goal>zipalign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</plugins>
</build>
</build>
<profiles>
<profiles>
<profile>
<id>release</id>
<!-- via this activation the profile is automatically used when the release is done with the maven release
plugin -->
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<profile>
<id>release</id>
<!-- via this activation the profile is automatically used when the release is done with the maven release
plugin -->
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
<executions>
<execution>
<id>signing</id>
<goals>
<goal>sign</goal>
<goal>verify</goal>
</goals>
<phase>package</phase>
<inherited>true</inherited>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
<executions>
<execution>
<id>signing</id>
<goals>
<goal>sign</goal>
<goal>verify</goal>
</goals>
<phase>package</phase>
<inherited>true</inherited>
<configuration>
<removeExistingSignatures>true</removeExistingSignatures>
<includes>
<include>${project.build.directory}/${project.artifactId}-${project.version}.apk</include>
</includes>
<verbose>true</verbose>
</configuration>
<configuration>
<removeExistingSignatures>true</removeExistingSignatures>
<includes>
<include>
${project.build.directory}/${project.artifactId}-${project.version}.apk
</include>
</includes>
<verbose>true</verbose>
</configuration>
</execution>
</executions>
</plugin>
</execution>
</executions>
</plugin>
<!-- the signed apk then needs to be zipaligned and we activate proguard and we run the manifest
update -->
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<!-- the signed apk then needs to be zipaligned and we activate proguard and we run the manifest
update -->
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<sign>
<debug>false</debug>
</sign>
<sign>
<debug>false</debug>
</sign>
<zipalign>
<skip>false</skip>
<verbose>true</verbose>
<inputApk>${project.build.directory}/${project.artifactId}-${project.version}.apk</inputApk>
<outputApk>${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk</outputApk>
</zipalign>
<zipalign>
<skip>false</skip>
<verbose>true</verbose>
<inputApk>${project.build.directory}/${project.artifactId}-${project.version}.apk
</inputApk>
<outputApk>
${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk
</outputApk>
</zipalign>
<manifest>
<debuggable>false</debuggable>
<versionCodeAutoIncrement>true</versionCodeAutoIncrement>
</manifest>
<manifest>
<debuggable>false</debuggable>
<versionCodeAutoIncrement>true</versionCodeAutoIncrement>
</manifest>
<proguard>
<skip>false</skip>
</proguard>
</configuration>
<proguard>
<skip>false</skip>
</proguard>
</configuration>
<executions>
<execution>
<id>manifestUpdate</id>
<phase>process-resources</phase>
<goals>
<goal>manifest-update</goal>
</goals>
</execution>
<execution>
<id>alignApk</id>
<phase>package</phase>
<goals>
<goal>zipalign</goal>
</goals>
</execution>
</executions>
</plugin>
<executions>
<execution>
<id>manifestUpdate</id>
<phase>process-resources</phase>
<goals>
<goal>manifest-update</goal>
</goals>
</execution>
<execution>
<id>alignApk</id>
<phase>package</phase>
<goals>
<goal>zipalign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk</file>
<type>apk</type>
<classifier>signed-aligned</classifier>
</artifact>
<artifact>
<file>${project.build.directory}/proguard/mapping.txt</file>
<type>map</type>
<classifier>release</classifier>
</artifact>
</artifacts>
</configuration>
<executions>
<execution>
<id>attach-signed-aligned</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<configuration>
<artifacts>
<artifact>
<file>
${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk
</file>
<type>apk</type>
<classifier>signed-aligned</classifier>
</artifact>
<artifact>
<file>${project.build.directory}/proguard/mapping.txt</file>
<type>map</type>
<classifier>release</classifier>
</artifact>
</artifacts>
</configuration>
<executions>
<execution>
<id>attach-signed-aligned</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</plugins>
</build>
</profile>
</profiles>
</project>

View File

@@ -47,7 +47,7 @@
}
-keep @org.simpleframework.xml.Root public class * {
*;
*;
}
-dontwarn javax.xml.stream.**
@@ -113,11 +113,11 @@
# keep this class so that logging will show 'ACRA' and not a obfuscated name like 'a'.
# Note: if you are removing log messages elsewhere in this file then this isn't necessary
-keep class org.acra.ACRA {
*;
*;
}
-keep class org.acra.ReportField {
*;
*;
}

View File

@@ -1,53 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<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_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_drag_button_equals"/>
<include layout="@layout/cpp_drag_button_vars" />
</LinearLayout>
<include layout="@layout/cpp_app_button_copy" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_7" />
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_8" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_9" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_multiplication" />
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_drag_button_division" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_equals" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_functions" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_drag_button_4" />
<include layout="@layout/cpp_drag_button_5" />
<include layout="@layout/cpp_drag_button_6" />
<include layout="@layout/cpp_drag_button_plus" />
<include layout="@layout/cpp_drag_button_subtraction" />
<include layout="@layout/cpp_drag_button_round_brackets" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_operators" />
<include layout="@layout/cpp_app_button_donate" />
<include layout="@layout/cpp_drag_button_1" />
<include layout="@layout/cpp_drag_button_2" />
<include layout="@layout/cpp_drag_button_3" />
<include layout="@layout/cpp_drag_button_0" />
<include layout="@layout/cpp_drag_button_dot" />
<include layout="@layout/cpp_drag_button_history" />
</LinearLayout>
</LinearLayout>

View File

@@ -1,53 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<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_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_drag_button_equals"/>
<include layout="@layout/cpp_drag_button_vars" />
</LinearLayout>
<include layout="@layout/cpp_app_button_copy" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_7" />
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_8" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_9" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_multiplication" />
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_drag_button_division" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_equals" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_functions" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_drag_button_4" />
<include layout="@layout/cpp_drag_button_5" />
<include layout="@layout/cpp_drag_button_6" />
<include layout="@layout/cpp_drag_button_plus" />
<include layout="@layout/cpp_drag_button_subtraction" />
<include layout="@layout/cpp_drag_button_round_brackets" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_operators" />
<include layout="@layout/cpp_app_button_donate" />
<include layout="@layout/cpp_drag_button_1" />
<include layout="@layout/cpp_drag_button_2" />
<include layout="@layout/cpp_drag_button_3" />
<include layout="@layout/cpp_drag_button_0" />
<include layout="@layout/cpp_drag_button_dot" />
<include layout="@layout/cpp_drag_button_history" />
</LinearLayout>
</LinearLayout>

View File

@@ -5,12 +5,11 @@
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_layout_style">
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_layout_style">
<include layout="@layout/main_first_pane"/>
<include layout="@layout/main_first_pane" />
</LinearLayout>

View File

@@ -5,12 +5,11 @@
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_layout_style">
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_layout_style">
<include layout="@layout/main_first_pane_mobile"/>
<include layout="@layout/main_first_pane_mobile" />
</LinearLayout>

View File

@@ -5,58 +5,65 @@
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical"
a:layout_gravity="center">
<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">
<LinearLayout a:id="@+id/editorContainer"
a:layout_weight="2"
a:layout_width="match_parent"
a:layout_height="0dp"/>
<LinearLayout
a:id="@+id/editorContainer"
a:layout_weight="2"
a:layout_width="match_parent"
a:layout_height="0dp" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include
layout="@layout/cpp_drag_button_left"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />
<include layout="@layout/cpp_app_button_erase"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include
layout="@layout/cpp_app_button_erase"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />
<LinearLayout a:id="@+id/displayContainer"
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="4"
a:layout_margin="@dimen/cpp_display_margin_land"/>
<LinearLayout
a:id="@+id/displayContainer"
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="4"
a:layout_margin="@dimen/cpp_display_margin_land" />
<include layout="@layout/cpp_drag_button_clear"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include
layout="@layout/cpp_drag_button_clear"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />
<include layout="@layout/cpp_drag_button_right"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include
layout="@layout/cpp_drag_button_right"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<LinearLayout a:id="@+id/keyboardContainer"
a:layout_weight="3"
a:layout_width="match_parent"
a:layout_height="0dp"/>
<LinearLayout
a:id="@+id/keyboardContainer"
a:layout_weight="3"
a:layout_width="match_parent"
a:layout_height="0dp" />
</LinearLayout>

View File

@@ -5,58 +5,65 @@
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical"
a:layout_gravity="center">
<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">
<LinearLayout a:id="@+id/editorContainer"
a:layout_weight="2"
a:layout_width="match_parent"
a:layout_height="0dp"/>
<LinearLayout
a:id="@+id/editorContainer"
a:layout_weight="2"
a:layout_width="match_parent"
a:layout_height="0dp" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include
layout="@layout/cpp_drag_button_left"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />
<include layout="@layout/cpp_app_button_erase"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include
layout="@layout/cpp_app_button_erase"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />
<LinearLayout a:id="@+id/displayContainer"
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="4"
a:layout_margin="@dimen/cpp_display_margin_land"/>
<LinearLayout
a:id="@+id/displayContainer"
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="4"
a:layout_margin="@dimen/cpp_display_margin_land" />
<include layout="@layout/cpp_drag_button_clear"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include
layout="@layout/cpp_drag_button_clear"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />
<include layout="@layout/cpp_drag_button_right"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include
layout="@layout/cpp_drag_button_right"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<LinearLayout a:id="@+id/keyboardContainer"
a:layout_weight="3"
a:layout_width="match_parent"
a:layout_height="0dp"/>
<LinearLayout
a:id="@+id/keyboardContainer"
a:layout_weight="3"
a:layout_width="match_parent"
a:layout_height="0dp" />
</LinearLayout>

View File

@@ -1,60 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<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_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_drag_button_left" />
</LinearLayout>
<include layout="@layout/cpp_app_button_erase" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_app_button_donate" />
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_equals"/>
<include layout="@layout/cpp_drag_button_7" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_8" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_9" />
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_drag_button_multiplication" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_division" />
<include layout="@layout/cpp_drag_button_clear" />
<include layout="@layout/cpp_drag_button_right" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_vars" />
<include layout="@layout/cpp_drag_button_functions" />
<include layout="@layout/cpp_drag_button_empty" />
<include layout="@layout/cpp_drag_button_4" />
<include layout="@layout/cpp_drag_button_5" />
<include layout="@layout/cpp_drag_button_6" />
<include layout="@layout/cpp_drag_button_plus" />
<include layout="@layout/cpp_drag_button_subtraction" />
<include layout="@layout/cpp_app_button_copy" />
<include layout="@layout/cpp_drag_button_equals" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_empty" />
<include layout="@layout/cpp_drag_button_operators" />
<include layout="@layout/cpp_drag_button_dot" />
<include layout="@layout/cpp_drag_button_1" />
<include layout="@layout/cpp_drag_button_2" />
<include layout="@layout/cpp_drag_button_3" />
<include layout="@layout/cpp_drag_button_0" />
<include layout="@layout/cpp_drag_button_round_brackets" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_drag_button_history" />
</LinearLayout>
</LinearLayout>

View File

@@ -5,53 +5,56 @@
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_multi_pane_layout_style">
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_multi_pane_layout_style">
<LinearLayout
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="3"
a:orientation="horizontal"
a:baselineAligned="false">
<LinearLayout
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="3"
a:orientation="horizontal"
a:baselineAligned="false">
<LinearLayout
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
a:layout_gravity="center">
<LinearLayout
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
a:layout_gravity="center">
<LinearLayout a:id="@+id/editorContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="1"/>
<LinearLayout
a:id="@+id/editorContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="1" />
<LinearLayout a:id="@+id/displayContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="1"/>
<LinearLayout
a:id="@+id/displayContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<LinearLayout a:id="@+id/main_second_pane"
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
style="?cpp_pane_style"/>
<LinearLayout
a:id="@+id/main_second_pane"
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
style="?cpp_pane_style" />
</LinearLayout>
</LinearLayout>
<LinearLayout a:id="@+id/keyboardContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="2"
style="?cpp_pane_style_transparent"/>
<LinearLayout
a:id="@+id/keyboardContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="2"
style="?cpp_pane_style_transparent" />
</LinearLayout>

View File

@@ -7,22 +7,23 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
<TextView
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style" />
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
a:id="@+id/calculator_display"
style="@style/cpp_display_style"
a:inputType="textMultiLine"
a:maxLines="3"
a:scrollHorizontally="false"
a:scrollbars="none"/>
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
a:id="@+id/calculator_display"
style="@style/cpp_display_style"
a:inputType="textMultiLine"
a:maxLines="3"
a:scrollHorizontally="false"
a:scrollbars="none" />
</LinearLayout>

View File

@@ -7,22 +7,23 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
<TextView
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style" />
<org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculator_editor"
style="@style/cpp_editor_style"
a:textIsSelectable="true"
a:singleLine="false"
a:scrollbars="vertical"
a:hint ="@string/c_calc_editor_hint"/>
a:id="@+id/calculator_editor"
style="@style/cpp_editor_style"
a:textIsSelectable="true"
a:singleLine="false"
a:scrollbars="vertical"
a:hint="@string/c_calc_editor_hint" />
</LinearLayout>

View File

@@ -1,64 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
<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_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_drag_button_left" />
</LinearLayout>
<include layout="@layout/cpp_app_button_erase" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_7" />
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_8" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_9" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_multiplication" />
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_drag_button_equals"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_right" />
</LinearLayout>
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_drag_button_vars" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_clear" />
<include layout="@layout/cpp_drag_button_4" />
<include layout="@layout/cpp_drag_button_5" />
<include layout="@layout/cpp_drag_button_6" />
<include layout="@layout/cpp_drag_button_division" />
<include layout="@layout/cpp_app_button_copy" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_functions" />
<include layout="@layout/cpp_drag_button_equals" />
<include layout="@layout/cpp_drag_button_1" />
<include layout="@layout/cpp_drag_button_2" />
<include layout="@layout/cpp_drag_button_3" />
<include layout="@layout/cpp_drag_button_plus" />
<include layout="@layout/cpp_app_button_paste" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_operators" />
<include layout="@layout/cpp_app_button_donate" />
<include layout="@layout/cpp_drag_button_round_brackets" />
<include layout="@layout/cpp_drag_button_0" />
<include layout="@layout/cpp_drag_button_dot" />
<include layout="@layout/cpp_drag_button_subtraction" />
<include layout="@layout/cpp_drag_button_history" />
</LinearLayout>
</LinearLayout>

View File

@@ -5,53 +5,56 @@
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_multi_pane_layout_style">
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_multi_pane_layout_style">
<LinearLayout
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="3"
a:orientation="horizontal"
a:baselineAligned="false">
<LinearLayout
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="3"
a:orientation="horizontal"
a:baselineAligned="false">
<LinearLayout
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
a:layout_gravity="center">
<LinearLayout
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
a:layout_gravity="center">
<LinearLayout a:id="@+id/editorContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="3"/>
<LinearLayout
a:id="@+id/editorContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="3" />
<LinearLayout a:id="@+id/displayContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="1"/>
<LinearLayout
a:id="@+id/displayContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<LinearLayout a:id="@+id/main_second_pane"
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
style="?cpp_pane_style"/>
<LinearLayout
a:id="@+id/main_second_pane"
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
style="?cpp_pane_style" />
</LinearLayout>
</LinearLayout>
<LinearLayout a:id="@+id/keyboardContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="2"
style="?cpp_pane_style_transparent"/>
<LinearLayout
a:id="@+id/keyboardContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="2"
style="?cpp_pane_style_transparent" />
</LinearLayout>

View File

@@ -1,51 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<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_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_drag_button_equals"/>
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_drag_button_left" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_vars" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_app_button_copy" />
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_drag_button_6" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_7" />
<include layout="@layout/cpp_drag_button_8" />
<include layout="@layout/cpp_drag_button_9" />
<include layout="@layout/cpp_drag_button_0" />
<include layout="@layout/cpp_drag_button_multiplication" />
<include layout="@layout/cpp_drag_button_division" />
<include layout="@layout/cpp_drag_button_equals" />
<include layout="@layout/cpp_drag_button_operators" />
<include layout="@layout/cpp_app_button_donate" />
<include layout="@layout/cpp_drag_button_right" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_app_button_erase" />
<include layout="@layout/cpp_drag_button_functions" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_drag_button_1" />
<include layout="@layout/cpp_drag_button_2" />
<include layout="@layout/cpp_drag_button_3" />
<include layout="@layout/cpp_drag_button_4" />
<include layout="@layout/cpp_drag_button_5" />
<include layout="@layout/cpp_drag_button_plus" />
<include layout="@layout/cpp_drag_button_subtraction" />
<include layout="@layout/cpp_drag_button_round_brackets" />
<include layout="@layout/cpp_drag_button_dot" />
<include layout="@layout/cpp_drag_button_history" />
<include layout="@layout/cpp_drag_button_clear" />
</LinearLayout>
</LinearLayout>

View File

@@ -5,53 +5,56 @@
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_multi_pane_layout_style">
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_multi_pane_layout_style">
<LinearLayout
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="5"
a:orientation="horizontal"
a:baselineAligned="false">
<LinearLayout
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="5"
a:orientation="horizontal"
a:baselineAligned="false">
<LinearLayout
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
a:layout_gravity="center">
<LinearLayout
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
a:layout_gravity="center">
<LinearLayout a:id="@+id/editorContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="3"/>
<LinearLayout
a:id="@+id/editorContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="3" />
<LinearLayout a:id="@+id/displayContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="1"/>
<LinearLayout
a:id="@+id/displayContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<LinearLayout a:id="@+id/main_second_pane"
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
style="?cpp_pane_style"/>
<LinearLayout
a:id="@+id/main_second_pane"
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
style="?cpp_pane_style" />
</LinearLayout>
</LinearLayout>
<LinearLayout a:id="@+id/keyboardContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="1"
style="?cpp_pane_style_transparent"/>
<LinearLayout
a:id="@+id/keyboardContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="1"
style="?cpp_pane_style_transparent" />
</LinearLayout>

View File

@@ -7,22 +7,23 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
<TextView
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style" />
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
a:id="@+id/calculator_display"
style="@style/cpp_display_style"
a:inputType="textMultiLine"
a:maxLines="3"
a:scrollHorizontally="false"
a:scrollbars="none"/>
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
a:id="@+id/calculator_display"
style="@style/cpp_display_style"
a:inputType="textMultiLine"
a:maxLines="3"
a:scrollHorizontally="false"
a:scrollbars="none" />
</LinearLayout>

View File

@@ -7,22 +7,23 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
<TextView
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style" />
<org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculator_editor"
style="@style/cpp_editor_style"
a:textIsSelectable="true"
a:singleLine="false"
a:scrollbars="vertical"
a:hint ="@string/c_calc_editor_hint"/>
a:id="@+id/calculator_editor"
style="@style/cpp_editor_style"
a:textIsSelectable="true"
a:singleLine="false"
a:scrollbars="vertical"
a:hint="@string/c_calc_editor_hint" />
</LinearLayout>

View File

@@ -1,68 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
<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_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_drag_button_empty"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_drag_button_left" />
</LinearLayout>
<include layout="@layout/cpp_app_button_erase" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_empty" />
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_app_button_copy"/>
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_drag_button_equals"/>
<include layout="@layout/cpp_drag_button_empty" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_empty" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_empty" />
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_clear" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_right" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
</LinearLayout>
<include layout="@layout/cpp_drag_button_operators"/>
<include layout="@layout/cpp_app_button_donate"/>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_history"/>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
</LinearLayout>
<include layout="@layout/cpp_drag_button_vars" />
<include layout="@layout/cpp_app_button_copy" />
<include layout="@layout/cpp_drag_button_7" />
<include layout="@layout/cpp_drag_button_8" />
<include layout="@layout/cpp_drag_button_9" />
<include layout="@layout/cpp_drag_button_multiplication" />
<include layout="@layout/cpp_drag_button_division" />
<include layout="@layout/cpp_drag_button_equals" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_functions" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_drag_button_4" />
<include layout="@layout/cpp_drag_button_5" />
<include layout="@layout/cpp_drag_button_6" />
<include layout="@layout/cpp_drag_button_plus" />
<include layout="@layout/cpp_drag_button_subtraction" />
<include layout="@layout/cpp_drag_button_round_brackets" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_operators" />
<include layout="@layout/cpp_app_button_donate" />
<include layout="@layout/cpp_drag_button_1" />
<include layout="@layout/cpp_drag_button_2" />
<include layout="@layout/cpp_drag_button_3" />
<include layout="@layout/cpp_drag_button_0" />
<include layout="@layout/cpp_drag_button_dot" />
<include layout="@layout/cpp_drag_button_history" />
</LinearLayout>
</LinearLayout>

View File

@@ -5,53 +5,56 @@
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_multi_pane_layout_style">
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_multi_pane_layout_style">
<LinearLayout
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="3"
a:orientation="horizontal"
a:baselineAligned="false">
<LinearLayout
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="3"
a:orientation="horizontal"
a:baselineAligned="false">
<LinearLayout
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
a:layout_gravity="center">
<LinearLayout
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
a:layout_gravity="center">
<LinearLayout a:id="@+id/editorContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="4"/>
<LinearLayout
a:id="@+id/editorContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="4" />
<LinearLayout a:id="@+id/displayContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="1"/>
<LinearLayout
a:id="@+id/displayContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
style="?cpp_pane_style"
a:layout_weight="1" />
</LinearLayout>
</LinearLayout>
<LinearLayout a:id="@+id/main_second_pane"
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
style="?cpp_pane_style"/>
<LinearLayout
a:id="@+id/main_second_pane"
a:layout_height="match_parent"
a:layout_width="0dp"
a:layout_weight="1"
a:orientation="vertical"
style="?cpp_pane_style" />
</LinearLayout>
</LinearLayout>
<LinearLayout a:id="@+id/keyboardContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="1"
style="?cpp_pane_style_transparent"/>
<LinearLayout
a:id="@+id/keyboardContainer"
a:layout_height="0dp"
a:layout_width="match_parent"
a:layout_weight="1"
style="?cpp_pane_style_transparent" />
</LinearLayout>

View File

@@ -7,27 +7,28 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:background="#ff000000">
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:background="#ff000000">
<ImageView a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:layout_gravity="center"
a:layout_weight="1"
a:padding="6dp"
a:src="@drawable/logo"/>
<ImageView
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:layout_gravity="center"
a:layout_weight="1"
a:padding="6dp"
a:src="@drawable/logo" />
<TextView
a:id="@+id/aboutTextView"
a:text="@string/c_about_content"
a:layout_height="fill_parent"
a:layout_width="fill_parent"
a:layout_gravity="top|center_horizontal"
a:layout_weight="1"
a:scrollbars="vertical"
style="@style/cpp_about_style"/>
a:id="@+id/aboutTextView"
a:text="@string/c_about_content"
a:layout_height="fill_parent"
a:layout_width="fill_parent"
a:layout_gravity="top|center_horizontal"
a:layout_weight="1"
a:scrollbars="vertical"
style="@style/cpp_about_style" />
<!--
a:scrollbarFadeDuration="0" is not support in android_1.6_compatibility

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/ad_parent_view"
a:layout_width="match_parent"
a:layout_height="wrap_content"/>
a:id="@+id/ad_parent_view"
a:layout_width="match_parent"
a:layout_height="wrap_content" />

View File

@@ -7,10 +7,10 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/plot_view_container"
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
a:id="@+id/plot_view_container"
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
</LinearLayout>

View File

@@ -7,7 +7,7 @@
-->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_copy"
a:src="@drawable/kb_copy"
style="?cpp_control_image_button_style"
a:onClick="copyButtonClickHandler"/>
a:id="@id/cpp_button_copy"
a:src="@drawable/kb_copy"
style="?cpp_control_image_button_style"
a:onClick="copyButtonClickHandler" />

View File

@@ -7,7 +7,7 @@
-->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_like"
a:src="@drawable/kb_facebook"
style="?cpp_control_image_button_style"
a:onClick="likeButtonClickHandler"/>
a:id="@id/cpp_button_like"
a:src="@drawable/kb_facebook"
style="?cpp_control_image_button_style"
a:onClick="likeButtonClickHandler" />

View File

@@ -7,7 +7,7 @@
-->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_erase"
a:src="@drawable/kb_delete"
style="?cpp_control_image_button_style"
a:onClick="eraseButtonClickHandler"/>
a:id="@id/cpp_button_erase"
a:src="@drawable/kb_delete"
style="?cpp_control_image_button_style"
a:onClick="eraseButtonClickHandler" />

View File

@@ -7,7 +7,7 @@
-->
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_paste"
a:src="@drawable/kb_paste"
style="?cpp_control_image_button_style"
a:onClick="pasteButtonClickHandler"/>
a:id="@id/cpp_button_paste"
a:src="@drawable/kb_paste"
style="?cpp_control_image_button_style"
a:onClick="pasteButtonClickHandler" />

View File

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

View File

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

View File

@@ -7,18 +7,18 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding">
<org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculator_editor"
style="@style/cpp_editor_style"
a:textIsSelectable="true"
a:singleLine="false"
a:scrollbars="vertical"
a:hint="@string/c_calc_editor_hint"/>
<org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculator_editor"
style="@style/cpp_editor_style"
a:textIsSelectable="true"
a:singleLine="false"
a:scrollbars="vertical"
a:hint="@string/c_calc_editor_hint" />
</LinearLayout>

View File

@@ -7,18 +7,18 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding">
<org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculator_editor"
style="@style/cpp_editor_mobile_style"
a:textIsSelectable="true"
a:singleLine="false"
a:scrollbars="vertical"
a:hint="@string/c_calc_editor_hint"/>
<org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculator_editor"
style="@style/cpp_editor_mobile_style"
a:textIsSelectable="true"
a:singleLine="false"
a:scrollbars="vertical"
a:hint="@string/c_calc_editor_hint" />
</LinearLayout>

View File

@@ -1,69 +1,94 @@
<?xml version="1.0" encoding="utf-8"?>
<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_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_drag_button_7" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_8" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_9" />
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_drag_button_multiplication" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_clear" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
</LinearLayout>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_app_button_copy"/>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
</LinearLayout>
<include layout="@layout/cpp_drag_button_4" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_5" />
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_6" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_division" />
<include layout="@layout/cpp_app_button_erase" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_1" />
<include layout="@layout/cpp_drag_button_2" />
<include layout="@layout/cpp_drag_button_3" />
<include layout="@layout/cpp_drag_button_plus" />
<include layout="@layout/cpp_app_button_copy" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_round_brackets" />
<include layout="@layout/cpp_drag_button_0" />
<include layout="@layout/cpp_drag_button_dot" />
<include layout="@layout/cpp_drag_button_subtraction" />
<include layout="@layout/cpp_app_button_paste" />
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_drag_button_left" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_right" />
<include layout="@layout/cpp_drag_button_vars" />
<include layout="@layout/cpp_drag_button_functions" />
<include layout="@layout/cpp_drag_button_history" />
</LinearLayout>
</LinearLayout>

View File

@@ -1,69 +1,94 @@
<?xml version="1.0" encoding="utf-8"?>
<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_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_7"/>
<include layout="@layout/cpp_drag_button_8"/>
<include layout="@layout/cpp_drag_button_9"/>
<include layout="@layout/cpp_drag_button_multiplication"/>
<include layout="@layout/cpp_drag_button_clear"/>
<include layout="@layout/cpp_drag_button_7" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_8" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_9" />
<include layout="@layout/cpp_drag_button_4"/>
<include layout="@layout/cpp_drag_button_5"/>
<include layout="@layout/cpp_drag_button_6"/>
<include layout="@layout/cpp_drag_button_division"/>
<include layout="@layout/cpp_app_button_erase"/>
<include layout="@layout/cpp_drag_button_multiplication" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_clear" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
</LinearLayout>
<include layout="@layout/cpp_drag_button_1"/>
<include layout="@layout/cpp_drag_button_2"/>
<include layout="@layout/cpp_drag_button_3"/>
<include layout="@layout/cpp_drag_button_plus"/>
<include layout="@layout/cpp_app_button_copy"/>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
</LinearLayout>
<include layout="@layout/cpp_drag_button_4" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_5" />
<include layout="@layout/cpp_drag_button_round_brackets"/>
<include layout="@layout/cpp_drag_button_0"/>
<include layout="@layout/cpp_drag_button_dot"/>
<include layout="@layout/cpp_drag_button_subtraction"/>
<include layout="@layout/cpp_app_button_paste"/>
<include layout="@layout/cpp_drag_button_6" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_division" />
<include layout="@layout/cpp_app_button_erase" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_1" />
<include layout="@layout/cpp_drag_button_2" />
<include layout="@layout/cpp_drag_button_3" />
<include layout="@layout/cpp_drag_button_plus" />
<include layout="@layout/cpp_app_button_copy" />
</LinearLayout>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_round_brackets" />
<include layout="@layout/cpp_drag_button_0" />
<include layout="@layout/cpp_drag_button_dot" />
<include layout="@layout/cpp_drag_button_subtraction" />
<include layout="@layout/cpp_app_button_paste" />
</LinearLayout>
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_left"/>
<include layout="@layout/cpp_drag_button_right"/>
<include layout="@layout/cpp_drag_button_vars"/>
<include layout="@layout/cpp_drag_button_functions"/>
<include layout="@layout/cpp_drag_button_history"/>
<include layout="@layout/cpp_drag_button_left" />
</LinearLayout>
<include layout="@layout/cpp_drag_button_right" />
<include layout="@layout/cpp_drag_button_vars" />
<include layout="@layout/cpp_drag_button_functions" />
<include layout="@layout/cpp_drag_button_history" />
</LinearLayout>
</LinearLayout>

View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/dialog_layout"
style="?cpp_dialog_style"
a:orientation="vertical">
a:id="@+id/dialog_layout"
style="?cpp_dialog_style"
a:orientation="vertical">
</LinearLayout>

View File

@@ -1,40 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent"
a:orientation="vertical">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent"
a:orientation="vertical">
<TextView
a:id="@+id/cpp_dialog_message_textview"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:maxLines="10"
a:scrollbars="vertical"/>
<TextView
a:id="@+id/cpp_dialog_message_textview"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:maxLines="10"
a:scrollbars="vertical" />
<LinearLayout
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal">
<LinearLayout
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal">
<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:visibility="gone" />
<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: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" />
<Button
a:id="@+id/cpp_ok_button"
a:text="@string/ok"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

View File

@@ -7,11 +7,11 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_0"
c:textUp="00"
a:text="0"
c:textDown="000"
c:directionTextScale="0.5"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_0"
c:textUp="00"
a:text="0"
c:textDown="000"
c:directionTextScale="0.5"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,11 +7,11 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_1"
a:text="1"
c:textUp="sin"
c:textLeft="A"
c:textDown="asin"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_1"
a:text="1"
c:textUp="sin"
c:textLeft="A"
c:textDown="asin"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,11 +7,11 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_2"
a:text="2"
c:textUp="cos"
c:textLeft="B"
c:textDown="acos"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_2"
a:text="2"
c:textUp="cos"
c:textLeft="B"
c:textDown="acos"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,11 +7,11 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_3"
a:text="3"
c:textUp="tan"
c:textLeft="C"
c:textDown="atan"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_3"
a:text="3"
c:textUp="tan"
c:textLeft="C"
c:textDown="atan"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -6,11 +6,11 @@
~ or visit http://se.solovyev.org
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_4"
a:text="4"
c:textUp="x"
c:textLeft="D"
c:textDown="y"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_4"
a:text="4"
c:textUp="x"
c:textLeft="D"
c:textDown="y"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -6,11 +6,11 @@
~ or visit http://se.solovyev.org
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_5"
a:text="5"
c:textUp="t"
c:textLeft="E"
c:textDown="j"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_5"
a:text="5"
c:textUp="t"
c:textLeft="E"
c:textDown="j"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,12 +7,12 @@
-->
<org.solovyev.android.calculator.view.AngleUnitsButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
c:textUp="deg"
a:id="@id/cpp_button_6"
a:text="6"
c:textLeft="F"
c:textDown="rad"
c:directionTextScale="0.33;0.30;0.33;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
c:textUp="deg"
a:id="@id/cpp_button_6"
a:text="6"
c:textLeft="F"
c:textDown="rad"
c:directionTextScale="0.33;0.30;0.33;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,11 +7,12 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_7" a:text="7"
c:textUp="i"
c:textLeft="0b:"
c:textDown="!"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_7"
a:text="7"
c:textUp="i"
c:textLeft="0b:"
c:textDown="!"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,11 +7,12 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_8" a:text="8"
c:textUp="ln"
c:textLeft="0d:"
c:textDown="lg"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_8"
a:text="8"
c:textUp="ln"
c:textLeft="0d:"
c:textDown="lg"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,11 +7,12 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_9" a:text="9"
c:textDown="e"
c:textLeft="0x:"
c:textUp="π"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_9"
a:text="9"
c:textDown="e"
c:textLeft="0x:"
c:textUp="
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,12 +7,12 @@
-->
<org.solovyev.android.calculator.view.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_clear"
c:textUp="dec"
a:text="@string/c_clear"
c:textDown="bin"
c:textLeft="hex"
a:textStyle="bold"
style="?cpp_control_image_button_style"
a:onClick="clearButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_clear"
c:textUp="dec"
a:text="@string/c_clear"
c:textDown="bin"
c:textLeft="hex"
a:textStyle="bold"
style="?cpp_control_image_button_style"
a:onClick="clearButtonClickHandler" />

View File

@@ -7,11 +7,11 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_division"
c:textUp="%"
a:text="/"
c:textDown="√"
c:directionTextScale="0.5"
style="?cpp_operation_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_division"
c:textUp="%"
a:text="/"
c:textDown="√"
c:directionTextScale="0.5"
style="?cpp_operation_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,10 +7,10 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_period"
a:text="."
c:textUp=","
c:directionTextScale="0.5"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_period"
a:text="."
c:textUp=","
c:directionTextScale="0.5"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -5,6 +5,4 @@
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
style="?cpp_control_button_style"/>
<org.solovyev.android.view.drag.DirectionDragButton style="?cpp_control_button_style" />

View File

@@ -5,15 +5,14 @@
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<org.solovyev.android.view.drag.DirectionDragButton
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_equals"
c:textUp=""
a:text="="
c:textDown="@string/cpp_plot_button_text"
c:directionTextScale="0.5;0.5;0.33;0.5"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="?cpp_control_button_style"
a:onClick="equalsButtonClickHandler"/>
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_equals"
c:textUp="≡"
a:text="="
c:textDown="@string/cpp_plot_button_text"
c:directionTextScale="0.5;0.5;0.33;0.5"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="?cpp_control_button_style"
a:onClick="equalsButtonClickHandler" />

View File

@@ -7,11 +7,11 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_functions"
c:directionTextScale="0.5"
c:textUp="+ƒ"
a:text="ƒ(x)"
a:textStyle="italic"
a:onClick="functionsButtonClickHandler"
style="?cpp_control_button_style" />
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_functions"
c:directionTextScale="0.5"
c:textUp="+ƒ"
a:text="ƒ(x)"
a:textStyle="italic"
a:onClick="functionsButtonClickHandler"
style="?cpp_control_button_style" />

View File

@@ -6,12 +6,12 @@
~ or visit http://se.solovyev.org
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
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="?cpp_control_button_style"
a:textStyle="bold"
a:onClick="historyButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
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="?cpp_control_button_style"
a:textStyle="bold"
a:onClick="historyButtonClickHandler" />

View File

@@ -7,10 +7,10 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_left"
c:textUp="◀◀"
a:text="◀"
c:directionTextScale="0.5"
style="?cpp_control_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_left"
c:textUp="◀◀"
a:text="◀"
c:directionTextScale="0.5"
style="?cpp_control_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,12 +7,12 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_multiplication"
a:text="×"
c:textUp="^"
c:textDown="^2"
c:textLeft="Π"
style="?cpp_operation_button_style"
c:directionTextScale="0.5"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_multiplication"
a:text="×"
c:textUp="^"
c:textDown="^2"
c:textLeft="Π"
style="?cpp_operation_button_style"
c:directionTextScale="0.5"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,7 +7,7 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_operators"
a:text="∂,…"
a:onClick="operatorsButtonClickHandler"
style="?cpp_control_button_style"/>
a:id="@id/cpp_button_operators"
a:text="∂,…"
a:onClick="operatorsButtonClickHandler"
style="?cpp_control_button_style" />

View File

@@ -6,11 +6,11 @@
~ or visit http://se.solovyev.org
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_plus"
c:directionTextScale="0.5"
c:textUp="°"
c:textDown="E"
a:text="+"
style="?cpp_operation_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_plus"
c:directionTextScale="0.5"
c:textUp="°"
c:textDown="E"
a:text="+"
style="?cpp_operation_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,10 +7,10 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_right"
c:textUp="▶▶"
a:text="▶"
c:directionTextScale="0.5"
style="?cpp_control_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_right"
c:textUp="▶▶"
a:text="▶"
c:directionTextScale="0.5"
style="?cpp_control_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,12 +7,12 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_round_brackets"
c:textUp="("
a:text="()"
c:textDown=")"
c:textLeft="(…)"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_round_brackets"
c:textUp="("
a:text="()"
c:textDown=")"
c:textLeft="(…)"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -6,10 +6,10 @@
~ or visit http://se.solovyev.org
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_subtraction"
c:textDown="∂,…"
a:text="-"
c:directionTextScale="0.5"
style="?cpp_operation_button_style"
a:onClick="digitButtonClickHandler"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_subtraction"
c:textDown="∂,…"
a:text="-"
c:directionTextScale="0.5"
style="?cpp_operation_button_style"
a:onClick="digitButtonClickHandler" />

View File

@@ -7,11 +7,11 @@
-->
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_vars"
c:directionTextScale="0.5"
c:textUp="+π"
a:text="π,…"
a:textStyle="italic"
a:onClick="varsButtonClickHandler"
style="?cpp_control_button_style"/>
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:id="@id/cpp_button_vars"
c:directionTextScale="0.5"
c:textUp="+π"
a:text="π,…"
a:textStyle="italic"
a:onClick="varsButtonClickHandler"
style="?cpp_control_button_style" />

View File

@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
<TextView
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style" />
<include layout="@layout/ad"/>
<include layout="@layout/ad" />
</LinearLayout>

View File

@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal">
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal">
<TextView
a:id="@+id/cpp_plot_function_expression_textview"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="3"/>
<TextView
a:id="@+id/cpp_plot_function_expression_textview"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="3" />
<CheckBox
a:id="@+id/cpp_plot_function_pinned_checkbox"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"/>
<CheckBox
a:id="@+id/cpp_plot_function_pinned_checkbox"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1" />
<CheckBox
a:id="@+id/cpp_plot_function_visible_checkbox"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"/>
<CheckBox
a:id="@+id/cpp_plot_function_visible_checkbox"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1" />
<ImageButton
a:id="@+id/cpp_plot_function_settings_button"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:src="@drawable/ab_settings"/>
a:id="@+id/cpp_plot_function_settings_button"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:src="@drawable/ab_settings" />
</LinearLayout>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/dialog_layout"
style="?cpp_dialog_style">
a:id="@+id/dialog_layout"
style="?cpp_dialog_style">
</LinearLayout>

View File

@@ -1,53 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="wrap_content"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="wrap_content"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<include layout="@layout/ad" />
<include layout="@layout/ad" />
<TextView a:text="@string/cpp_plot_function_line_color_type"
a:layout_width="match_parent"
a:layout_height="wrap_content"/>
<TextView
a:text="@string/cpp_plot_function_line_color_type"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<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"/>
<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" />
<TextView a:text="@string/cpp_plot_function_line_color"
a:layout_width="match_parent"
a:layout_height="wrap_content"/>
<TextView
a:text="@string/cpp_plot_function_line_color"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<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"/>
<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" />
<TextView a:text="@string/cpp_plot_function_line_style"
a:layout_width="match_parent"
a:layout_height="wrap_content"/>
<TextView
a:text="@string/cpp_plot_function_line_style"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<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"/>
<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" />
<TextView a:text="@string/cpp_plot_function_line_width"
a:layout_width="match_parent"
a:layout_height="wrap_content"/>
<TextView
a:text="@string/cpp_plot_function_line_width"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<SeekBar a:id="@+id/cpp_plot_functions_line_width_seekbar"
a:layout_width="match_parent"
a:layout_height="wrap_content"/>
<SeekBar
a:id="@+id/cpp_plot_functions_line_width_seekbar"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<Button a:id="@+id/cpp_apply_button"
a:text="@string/cpp_apply"
a:layout_width="match_parent"
a:layout_height="wrap_content"/>
<Button
a:id="@+id/cpp_apply_button"
a:text="@string/cpp_apply"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
</LinearLayout>

View File

@@ -1,43 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<include layout="@layout/ad" />
<include layout="@layout/ad" />
<LinearLayout
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal">
<TextView
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="3"
a:text="@string/cpp_function"/>
<TextView
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:text="@string/cpp_pinned"/>
<TextView
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:text="@string/cpp_visible"/>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal">
<TextView
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"/>
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="3"
a:text="@string/cpp_function" />
</LinearLayout>
<TextView
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:text="@string/cpp_pinned" />
<ListView style="?cpp_fragment_list_view_style" />
<TextView
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:text="@string/cpp_visible" />
<TextView
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1" />
</LinearLayout>
<ListView style="?cpp_fragment_list_view_style" />
</LinearLayout>

View File

@@ -1,109 +1,109 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent"
a:orientation="vertical">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent"
a:orientation="vertical">
<include layout="@layout/ad" />
<include layout="@layout/ad" />
<LinearLayout
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal"
a:baselineAligned="false">
<LinearLayout
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal"
a:baselineAligned="false">
<LinearLayout
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:orientation="vertical">
<LinearLayout
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:orientation="vertical">
<TextView
a:text="@string/cpp_plot_range_x_min"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<TextView
a:text="@string/cpp_plot_range_x_min"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<EditText
a:id="@+id/cpp_plot_range_x_min_editext"
a:inputType="numberDecimal|numberSigned"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
</LinearLayout>
<EditText
a:id="@+id/cpp_plot_range_x_min_editext"
a:inputType="numberDecimal|numberSigned"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:orientation="vertical">
<LinearLayout
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:orientation="vertical">
<TextView
a:text="@string/cpp_plot_range_x_max"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<TextView
a:text="@string/cpp_plot_range_x_max"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<EditText
a:id="@+id/cpp_plot_range_x_max_editext"
a:inputType="numberDecimal|numberSigned"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
</LinearLayout>
<EditText
a:id="@+id/cpp_plot_range_x_max_editext"
a:inputType="numberDecimal|numberSigned"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal"
a:baselineAligned="false">
<LinearLayout
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal"
a:baselineAligned="false">
<LinearLayout
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:orientation="vertical">
<LinearLayout
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:orientation="vertical">
<TextView
a:text="@string/cpp_plot_range_y_min"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<TextView
a:text="@string/cpp_plot_range_y_min"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<EditText
a:id="@+id/cpp_plot_range_y_min_editext"
a:inputType="numberDecimal|numberSigned"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
</LinearLayout>
<EditText
a:id="@+id/cpp_plot_range_y_min_editext"
a:inputType="numberDecimal|numberSigned"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:orientation="vertical">
<LinearLayout
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:orientation="vertical">
<TextView
a:text="@string/cpp_plot_range_y_max"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<TextView
a:text="@string/cpp_plot_range_y_max"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<EditText
a:id="@+id/cpp_plot_range_y_max_editext"
a:inputType="numberDecimal|numberSigned"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
</LinearLayout>
<EditText
a:id="@+id/cpp_plot_range_y_max_editext"
a:inputType="numberDecimal|numberSigned"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<Button
a:id="@+id/cpp_apply_button"
a:text="@string/cpp_apply"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<Button
a:id="@+id/cpp_apply_button"
a:text="@string/cpp_apply"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
</LinearLayout>

View File

@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent"
a:orientation="vertical">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent"
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"/>
<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" />
<Button
a:id="@+id/cpp_continue_button"
a:text="@string/cpp_continue"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<Button
a:id="@+id/cpp_continue_button"
a:text="@string/cpp_continue"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
</LinearLayout>

View File

@@ -7,23 +7,22 @@
-->
<ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:scrollbars="vertical"
a:scrollbarAlwaysDrawVerticalTrack="true">
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:scrollbars="vertical"
a:scrollbarAlwaysDrawVerticalTrack="true">
<TextView
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/error_message_text_view"
a:layout_height="fill_parent"
a:layout_width="wrap_content"
a:padding="6dp"
style="@style/cpp_default_text_size"/>
<TextView xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/error_message_text_view"
a:layout_height="fill_parent"
a:layout_width="wrap_content"
a:padding="6dp"
style="@style/cpp_default_text_size" />
</LinearLayout>

View File

@@ -1,53 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:background="#ff000000">
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:background="#ff000000">
<LinearLayout
a:id="@+id/simplePad"
a:id="@+id/simplePad"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:orientation="vertical"
a:layout_gravity="center">
<LinearLayout
a:layout_weight="1"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:orientation="vertical"
a:layout_gravity="center">
a:layout_height="0dp">
<LinearLayout a:layout_weight="1" a:layout_width="fill_parent" a:layout_height="0dp">
<ImageView
a:id="@+id/calibrationArrowLeft"
a:layout_gravity="left"
a:layout_width="80dp"
a:layout_height="80dp" />
<ImageView a:id="@+id/calibrationArrowLeft"
a:layout_gravity="left"
a:layout_width="80dp"
a:layout_height="80dp"/>
<org.solovyev.android.view.drag.DirectionDragButton
a:id="@+id/calibrationButtonLeft"
a:text=""
c:textUp="@string/c_up"
c:textDown="@string/c_down"
a:layout_width="80dp"
a:layout_height="80dp"
style="?cpp_digit_button_style" />
<org.solovyev.android.view.drag.DirectionDragButton a:id="@+id/calibrationButtonLeft"
a:text=""
c:textUp="@string/c_up"
c:textDown="@string/c_down"
a:layout_width="80dp"
a:layout_height="80dp"
style="?cpp_digit_button_style"/>
<org.solovyev.android.view.drag.DirectionDragButton
a:id="@+id/calibrationButtonRight"
a:text=""
c:textUp="@string/c_up"
c:textDown="@string/c_down"
a:layout_width="80dp"
a:layout_height="80dp"
style="?cpp_digit_button_style" />
<org.solovyev.android.view.drag.DirectionDragButton a:id="@+id/calibrationButtonRight"
a:text=""
c:textUp="@string/c_up"
c:textDown="@string/c_down"
a:layout_width="80dp"
a:layout_height="80dp"
style="?cpp_digit_button_style"/>
<ImageView a:id="@+id/calibrationArrowRight"
a:layout_gravity="right"
a:layout_width="80dp"
a:layout_height="80dp"/>
<ImageView
a:id="@+id/calibrationArrowRight"
a:layout_gravity="right"
a:layout_width="80dp"
a:layout_height="80dp" />
</LinearLayout>
</LinearLayout>
<Button a:id="@+id/calibrationStart"
a:text="@string/c_restart"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:onClick="restartClickHandler"
a:layout_gravity="bottom"/>
<Button
a:id="@+id/calibrationStart"
a:text="@string/c_restart"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:onClick="restartClickHandler"
a:layout_gravity="bottom" />
</LinearLayout>

View File

@@ -7,13 +7,14 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView a:id="@+id/feedbackText"
style="@style/cpp_about_style"
a:layout_width="fill_parent"
a:text="@string/c_feedback_text"
a:layout_height="fill_parent"/>
<TextView
a:id="@+id/feedbackText"
style="@style/cpp_about_style"
a:layout_width="fill_parent"
a:text="@string/c_feedback_text"
a:layout_height="fill_parent" />
</LinearLayout>

View File

@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:orientation="horizontal">
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:orientation="horizontal">
<Button
a:id="@+id/function_add_param_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="+" />
<Button
a:id="@+id/function_add_param_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="+" />
<TextView
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="5"/>
<TextView
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="5" />
</LinearLayout>

View File

@@ -7,86 +7,97 @@
-->
<ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:minWidth="300dp">
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:minWidth="300dp">
<LinearLayout a:layout_height="wrap_content"
a:layout_width="match_parent"
a:orientation="vertical">
<LinearLayout
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:orientation="vertical">
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/cpp_default_text_size"
a:text="@string/c_function_name"/>
<TextView
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/cpp_default_text_size"
a:text="@string/c_function_name" />
<EditText a:id="@+id/function_edit_name"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:inputType="text"/>
<EditText
a:id="@+id/function_edit_name"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:inputType="text" />
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/cpp_default_text_size"
a:text="@string/c_function_parameters"/>
<TextView
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/cpp_default_text_size"
a:text="@string/c_function_parameters" />
<org.solovyev.android.calculator.function.FunctionParamsView
<org.solovyev.android.calculator.function.FunctionParamsView
a:id="@+id/function_params_layout"
a:layout_height="wrap_content"
a:layout_width="match_parent"/>
a:layout_height="wrap_content"
a:layout_width="match_parent" />
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:padding="6dp"
a:text="@string/c_function_value"/>
<TextView
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:padding="6dp"
a:text="@string/c_function_value" />
<EditText a:id="@+id/function_edit_value"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:inputType="text"/>
<EditText
a:id="@+id/function_edit_value"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:inputType="text" />
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/cpp_default_text_size"
a:text="@string/c_function_description"/>
<TextView
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/cpp_default_text_size"
a:text="@string/c_function_description" />
<EditText a:id="@+id/function_edit_description"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:inputType="text"/>
<EditText
a:id="@+id/function_edit_description"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:inputType="text" />
<LinearLayout
a:layout_height="wrap_content"
a:layout_width="match_parent">
<LinearLayout
a:layout_height="wrap_content"
a:layout_width="match_parent">
<Button a:id="@+id/cancel_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="@string/c_cancel"/>
<Button
a:id="@+id/cancel_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="@string/c_cancel" />
<Button a:id="@+id/remove_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="@string/c_remove"/>
<Button
a:id="@+id/remove_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="@string/c_remove" />
<Button a:id="@+id/save_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="@string/c_save"/>
<Button
a:id="@+id/save_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="@string/c_save" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>

View File

@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:orientation="horizontal">
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:orientation="horizontal">
<Button
a:id="@+id/function_remove_param_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="-" />
<Button
a:id="@+id/function_remove_param_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="-" />
<Button
a:id="@+id/function_up_param_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="↑" />
<Button
a:id="@+id/function_up_param_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="↑" />
<Button
a:id="@+id/function_down_param_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="↓" />
<Button
a:id="@+id/function_down_param_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="↓" />
<org.solovyev.android.calculator.function.FunctionParamEditText
a:id="@+id/function_param_edit_text"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="3"
style="@style/cpp_default_text_size"
a:inputType="text" />
<org.solovyev.android.calculator.function.FunctionParamEditText
a:id="@+id/function_param_edit_text"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="3"
style="@style/cpp_default_text_size"
a:inputType="text" />
</LinearLayout>

View File

@@ -7,30 +7,32 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
<TextView
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style" />
<include layout="@layout/ad"/>
<include layout="@layout/ad" />
<ScrollView a:layout_width="match_parent"
a:layout_height="wrap_content">
<ScrollView
a:layout_width="match_parent"
a:layout_height="wrap_content">
<TextView
a:text="@string/c_faq_content"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/cpp_about_style"/>
<TextView
a:text="@string/c_faq_content"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/cpp_about_style" />
</ScrollView>
</ScrollView>
</LinearLayout>

View File

@@ -6,29 +6,31 @@
~ or visit http://se.solovyev.org
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
<TextView
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style" />
<include layout="@layout/ad"/>
<include layout="@layout/ad" />
<ScrollView a:layout_width="match_parent"
a:layout_height="match_parent">
<ScrollView
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView
a:text="@string/c_hints_content"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/cpp_about_style"/>
<TextView
a:text="@string/c_hints_content"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/cpp_about_style" />
</ScrollView>
</ScrollView>
</LinearLayout>

View File

@@ -6,29 +6,31 @@
~ or visit http://se.solovyev.org
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
<TextView
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style" />
<include layout="@layout/ad"/>
<include layout="@layout/ad" />
<ScrollView a:layout_width="match_parent"
a:layout_height="match_parent">
<ScrollView
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView
a:text="@string/c_screens_content"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/cpp_about_style"/>
<TextView
a:text="@string/c_screens_content"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/cpp_about_style" />
</ScrollView>
</ScrollView>
</LinearLayout>

View File

@@ -7,45 +7,47 @@
-->
<ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/history_edit"
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:scrollbars="vertical"
a:scrollbarAlwaysDrawVerticalTrack="true">
a:id="@+id/history_edit"
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:scrollbars="vertical"
a:scrollbarAlwaysDrawVerticalTrack="true">
<TextView a:layout_height="fill_parent"
a:layout_width="fill_parent"
a:padding="6dp"
style="@style/cpp_default_text_size"
a:text="@string/c_history_expression"/>
<TextView
a:layout_height="fill_parent"
a:layout_width="fill_parent"
a:padding="6dp"
style="@style/cpp_default_text_size"
a:text="@string/c_history_expression" />
<TextView a:id="@+id/history_edit_expression"
a:layout_width="fill_parent"
a:padding="6dp"
a:textStyle="bold"
a:layout_height="wrap_content"
style="@style/cpp_default_text_size">
</TextView>
<TextView
a:id="@+id/history_edit_expression"
a:layout_width="fill_parent"
a:padding="6dp"
a:textStyle="bold"
a:layout_height="wrap_content"
style="@style/cpp_default_text_size"></TextView>
<TextView a:layout_height="fill_parent"
a:layout_width="fill_parent"
style="@style/cpp_default_text_size"
a:padding="6dp"
a:text="@string/c_history_comment"/>
<TextView
a:layout_height="fill_parent"
a:layout_width="fill_parent"
style="@style/cpp_default_text_size"
a:padding="6dp"
a:text="@string/c_history_comment" />
<EditText a:id="@+id/history_edit_comment"
a:layout_width="fill_parent"
a:layout_height="wrap_content"
a:minLines="4"
a:maxLines="4"
a:gravity="top|left"
style="@style/cpp_default_text_size">
</EditText>
<EditText
a:id="@+id/history_edit_comment"
a:layout_width="fill_parent"
a:layout_height="wrap_content"
a:minLines="4"
a:maxLines="4"
a:gravity="top|left"
style="@style/cpp_default_text_size"></EditText>
</LinearLayout>

View File

@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
<TextView
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style" />
<include layout="@layout/ad"/>
<include layout="@layout/ad" />
<ListView style="?cpp_fragment_list_view_style"/>
<ListView style="?cpp_fragment_list_view_style" />
</LinearLayout>

View File

@@ -7,35 +7,40 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical"
style="?cpp_fragment_list_view_item_style"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
a:orientation="vertical"
style="?cpp_fragment_list_view_item_style"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView a:id="@+id/history_time"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="@style/history_time"/>
<TextView
a:id="@+id/history_time"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="@style/history_time" />
<TextView a:id="@+id/history_item"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:textColor="@color/cpp_button_operator_text_color"
style="@style/history_item"/>
<TextView
a:id="@+id/history_item"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:textColor="@color/cpp_button_operator_text_color"
style="@style/history_item" />
<LinearLayout a:orientation="horizontal"
<LinearLayout
a:orientation="horizontal"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView
a:layout_width="wrap_content"
a:layout_height="fill_parent"
a:text="@string/c_history_item_status"
style="@style/history_item_label" />
<TextView
a:id="@+id/history_item_status"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView a:layout_width="wrap_content"
a:layout_height="fill_parent"
a:text="@string/c_history_item_status"
style="@style/history_item_label"/>
<TextView a:id="@+id/history_item_status"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="@style/history_item"/>
a:layout_height="fill_parent"
style="@style/history_item" />
</LinearLayout>
</LinearLayout>

View File

@@ -6,39 +6,43 @@
~ or visit http://se.solovyev.org
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_layout_style">
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_layout_style">
<LinearLayout a:id="@+id/editorContainer"
a:layout_weight="2"
a:layout_width="match_parent"
a:layout_height="0dp"/>
<LinearLayout
a:id="@+id/editorContainer"
a:layout_weight="2"
a:layout_width="match_parent"
a:layout_height="0dp" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_equals"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_weight="1"
a:layout_width="0dp"
a:layout_height="match_parent"/>
<include
layout="@layout/cpp_drag_button_equals"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_weight="1"
a:layout_width="0dp"
a:layout_height="match_parent" />
<LinearLayout a:id="@+id/displayContainer"
a:layout_weight="4"
a:layout_width="0dp"
a:layout_height="match_parent"/>
<LinearLayout
a:id="@+id/displayContainer"
a:layout_weight="4"
a:layout_width="0dp"
a:layout_height="match_parent" />
</LinearLayout>
</LinearLayout>
<LinearLayout a:id="@+id/keyboardContainer"
a:layout_weight="5"
a:layout_width="match_parent"
a:layout_height="0dp"/>
<LinearLayout
a:id="@+id/keyboardContainer"
a:layout_weight="5"
a:layout_width="match_parent"
a:layout_height="0dp" />
</LinearLayout>

View File

@@ -6,39 +6,43 @@
~ or visit http://se.solovyev.org
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_layout_style">
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_layout_style">
<LinearLayout a:id="@+id/editorContainer"
a:layout_weight="2"
a:layout_width="match_parent"
a:layout_height="0dp"/>
<LinearLayout
a:id="@+id/editorContainer"
a:layout_weight="2"
a:layout_width="match_parent"
a:layout_height="0dp" />
<LinearLayout a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
<include layout="@layout/cpp_drag_button_equals"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_weight="1"
a:layout_width="0dp"
a:layout_height="match_parent"/>
<include
layout="@layout/cpp_drag_button_equals"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_weight="1"
a:layout_width="0dp"
a:layout_height="match_parent" />
<LinearLayout a:id="@+id/displayContainer"
a:layout_weight="4"
a:layout_width="0dp"
a:layout_height="match_parent"/>
<LinearLayout
a:id="@+id/displayContainer"
a:layout_weight="4"
a:layout_width="0dp"
a:layout_height="match_parent" />
</LinearLayout>
</LinearLayout>
<LinearLayout a:id="@+id/keyboardContainer"
a:layout_weight="5"
a:layout_width="match_parent"
a:layout_height="0dp"/>
<LinearLayout
a:id="@+id/keyboardContainer"
a:layout_weight="5"
a:layout_width="match_parent"
a:layout_height="0dp" />
</LinearLayout>

View File

@@ -8,7 +8,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
style="?cpp_main_layout_style"
a:orientation="vertical">
style="?cpp_main_layout_style"
a:orientation="vertical">
</LinearLayout>

View File

@@ -8,7 +8,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
style="?cpp_main_multi_pane_layout_style"
a:orientation="vertical">
style="?cpp_main_multi_pane_layout_style"
a:orientation="vertical">
</LinearLayout>

View File

@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
<TextView
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style" />
<include layout="@layout/ad"/>
<include layout="@layout/ad" />
<ListView style="?cpp_fragment_list_view_style"/>
<ListView style="?cpp_fragment_list_view_style" />
</LinearLayout>

View File

@@ -7,22 +7,22 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_list_view_item_style"
a:paddingBottom="@dimen/cpp_pane_padding"
a:orientation="vertical">
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_list_view_item_style"
a:paddingBottom="@dimen/cpp_pane_padding"
a:orientation="vertical">
<TextView a:id="@+id/math_entity_text"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/math_entity_text">
</TextView>
<TextView
a:id="@+id/math_entity_text"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/math_entity_text"></TextView>
<TextView a:id="@+id/math_entity_description"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/math_entity_description">
</TextView>
<TextView
a:id="@+id/math_entity_description"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/math_entity_description"></TextView>
</LinearLayout>

View File

@@ -2,58 +2,66 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:picker="http://schemas.android.com/apk/res-auto"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
xmlns:picker="http://schemas.android.com/apk/res-auto"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragmentTitle"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
<TextView
a:id="@+id/fragmentTitle"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style" />
<include layout="@layout/ad"/>
<include layout="@layout/ad" />
<LinearLayout a:layout_height="match_parent"
a:layout_width="match_parent"
a:orientation="vertical">
<LinearLayout
a:layout_height="match_parent"
a:layout_width="match_parent"
a:orientation="vertical">
<org.solovyev.android.view.Picker a:id="@+id/matrix_cols_count_picker"
a:layout_height="wrap_content"
a:layout_width="wrap_content"
a:layout_gravity="center"
picker:orientation="horizontal"/>
<org.solovyev.android.view.Picker
a:id="@+id/matrix_cols_count_picker"
a:layout_height="wrap_content"
a:layout_width="wrap_content"
a:layout_gravity="center"
picker:orientation="horizontal" />
<LinearLayout a:layout_height="match_parent"
a:layout_width="match_parent"
a:orientation="horizontal"
a:gravity="center">
<LinearLayout
a:layout_height="match_parent"
a:layout_width="match_parent"
a:orientation="horizontal"
a:gravity="center">
<org.solovyev.android.view.Picker a:id="@+id/matrix_rows_count_picker"
a:layout_height="wrap_content"
a:layout_width="wrap_content"/>
<org.solovyev.android.view.Picker
a:id="@+id/matrix_rows_count_picker"
a:layout_height="wrap_content"
a:layout_width="wrap_content" />
<ScrollView a:layout_height="match_parent"
a:layout_width="match_parent"
a:scrollbars="vertical">
<ScrollView
a:layout_height="match_parent"
a:layout_width="match_parent"
a:scrollbars="vertical">
<HorizontalScrollView a:layout_height="wrap_content"
a:layout_width="match_parent"
a:minHeight="300dp">
<HorizontalScrollView
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:minHeight="300dp">
<org.solovyev.android.calculator.matrix.MatrixView a:id="@+id/matrix_layout"
a:layout_height="match_parent"
a:layout_width="match_parent"
a:minWidth="300dp"/>
<org.solovyev.android.calculator.matrix.MatrixView
a:id="@+id/matrix_layout"
a:layout_height="match_parent"
a:layout_width="match_parent"
a:minWidth="300dp" />
</HorizontalScrollView>
</HorizontalScrollView>
</ScrollView>
</ScrollView>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>

View File

@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_height="match_parent"
a:layout_width="match_parent">
a:layout_height="match_parent"
a:layout_width="match_parent">
<EditText a:id="@+id/matrix_element_edittext"
a:layout_height="match_parent"
a:layout_width="match_parent"
a:text="test"/>
<EditText
a:id="@+id/matrix_element_edittext"
a:layout_height="match_parent"
a:layout_width="match_parent"
a:text="test" />
</LinearLayout>

View File

@@ -7,13 +7,14 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView a:id="@+id/notespp_announce"
style="@style/cpp_about_style"
a:layout_width="fill_parent"
a:text="@string/c_notespp_announce_text"
a:layout_height="fill_parent"/>
<TextView
a:id="@+id/notespp_announce"
style="@style/cpp_about_style"
a:layout_width="fill_parent"
a:text="@string/c_notespp_announce_text"
a:layout_height="fill_parent" />
</LinearLayout>

View File

@@ -7,19 +7,19 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:background="#ff000000">
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:background="#ff000000">
<TextView
a:id="@+id/releaseNotesTextView"
a:layout_height="fill_parent"
a:layout_width="fill_parent"
a:layout_weight="1"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/cpp_about_style"/>
a:id="@+id/releaseNotesTextView"
a:layout_height="fill_parent"
a:layout_width="fill_parent"
a:layout_weight="1"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/cpp_about_style" />
<!--
a:scrollbarFadeDuration="0" is not support in android_1.6_compatibility

View File

@@ -7,36 +7,41 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical"
style="?cpp_fragment_list_view_item_style"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
a:orientation="vertical"
style="?cpp_fragment_list_view_item_style"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView a:id="@+id/history_time"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="@style/history_time"/>
<TextView
a:id="@+id/history_time"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="@style/history_time" />
<TextView a:id="@+id/history_item"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:textColor="@color/cpp_button_operator_text_color"
style="@style/history_item"/>
<TextView
a:id="@+id/history_item"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:textColor="@color/cpp_button_operator_text_color"
style="@style/history_item" />
<LinearLayout a:orientation="horizontal"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<LinearLayout
a:orientation="horizontal"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TextView a:id="@+id/history_item_comment_label"
a:layout_width="wrap_content"
a:layout_height="fill_parent"
a:text="@string/c_history_item_comment"
style="@style/history_item_label"/>
<TextView
a:id="@+id/history_item_comment_label"
a:layout_width="wrap_content"
a:layout_height="fill_parent"
a:text="@string/c_history_item_comment"
style="@style/history_item_label" />
<TextView a:id="@+id/history_item_comment"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="@style/history_item"/>
<TextView
a:id="@+id/history_item_comment"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
style="@style/history_item" />
</LinearLayout>
</LinearLayout>

View File

@@ -7,24 +7,24 @@
-->
<TabHost xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@android:id/tabhost"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
a:id="@android:id/tabhost"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<LinearLayout
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<LinearLayout
a:orientation="vertical"
a:layout_width="fill_parent"
a:layout_height="fill_parent">
<TabWidget
a:id="@android:id/tabs"
a:layout_width="fill_parent"
a:layout_height="wrap_content"/>
<TabWidget
a:id="@android:id/tabs"
a:layout_width="fill_parent"
a:layout_height="wrap_content" />
<FrameLayout
a:id="@android:id/tabcontent"
a:layout_width="fill_parent"
a:layout_height="fill_parent"/>
<FrameLayout
a:id="@android:id/tabcontent"
a:layout_width="fill_parent"
a:layout_height="fill_parent" />
</LinearLayout>
</LinearLayout>
</TabHost>

View File

@@ -7,75 +7,85 @@
-->
<ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:minWidth="300dp">
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:minWidth="300dp">
<LinearLayout a:layout_height="wrap_content"
a:layout_width="match_parent"
a:orientation="vertical">
<LinearLayout
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:orientation="vertical">
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/cpp_default_text_size"
a:text="@string/c_var_name"/>
<TextView
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/cpp_default_text_size"
a:text="@string/c_var_name" />
<EditText a:id="@+id/var_edit_name"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:inputType="text"/>
<EditText
a:id="@+id/var_edit_name"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:inputType="text" />
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:padding="6dp"
a:text="@string/c_var_value"/>
<TextView
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:padding="6dp"
a:text="@string/c_var_value" />
<EditText a:id="@+id/var_edit_value"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:inputType="numberDecimal"/>
<EditText
a:id="@+id/var_edit_value"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:inputType="numberDecimal" />
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/cpp_default_text_size"
a:text="@string/c_var_description"/>
<TextView
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/cpp_default_text_size"
a:text="@string/c_var_description" />
<EditText a:id="@+id/var_edit_description"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:inputType="text"/>
<EditText
a:id="@+id/var_edit_description"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/cpp_default_text_size"
a:inputType="text" />
<LinearLayout
a:layout_height="wrap_content"
a:layout_width="match_parent">
<LinearLayout
a:layout_height="wrap_content"
a:layout_width="match_parent">
<Button a:id="@+id/cancel_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="@string/c_cancel"/>
<Button
a:id="@+id/cancel_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="@string/c_cancel" />
<Button a:id="@+id/remove_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="@string/c_remove"/>
<Button
a:id="@+id/remove_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="@string/c_remove" />
<Button a:id="@+id/save_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="@string/c_save"/>
<Button
a:id="@+id/save_button"
a:layout_height="wrap_content"
a:layout_width="0dp"
a:layout_weight="1"
a:text="@string/c_save" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>

View File

@@ -7,18 +7,19 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
<TextView
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style" />
<include layout="@layout/ad"/>
<include layout="@layout/ad" />
<ListView style="?cpp_fragment_list_view_style"/>
<ListView style="?cpp_fragment_list_view_style" />
</LinearLayout>

View File

@@ -8,8 +8,9 @@
<menu xmlns:a="http://schemas.android.com/apk/res/android">
<item a:id="@+id/functions_menu_add_function"
a:title="@string/c_add"
a:icon="@drawable/ab_add"
a:showAsAction="always"/>
<item
a:id="@+id/functions_menu_add_function"
a:title="@string/c_add"
a:icon="@drawable/ab_add"
a:showAsAction="always" />
</menu>

View File

@@ -8,8 +8,9 @@
<menu xmlns:a="http://schemas.android.com/apk/res/android">
<item a:id="@+id/history_menu_clear_history"
a:title="@string/c_clear_history"
a:showAsAction="always"/>
<item
a:id="@+id/history_menu_clear_history"
a:title="@string/c_clear_history"
a:showAsAction="always" />
</menu>

View File

@@ -8,34 +8,40 @@
<menu xmlns:a="http://schemas.android.com/apk/res/android">
<item a:id="@+id/menu_plot_2d"
a:title="@string/cpp_plot_2d"
a:icon="@drawable/ab_plot_2d"
a:showAsAction="always"/>
<item
a:id="@+id/menu_plot_2d"
a:title="@string/cpp_plot_2d"
a:icon="@drawable/ab_plot_2d"
a:showAsAction="always" />
<item a:id="@+id/menu_plot_3d"
a:title="@string/cpp_plot_3d"
a:icon="@drawable/ab_plot_3d"
a:showAsAction="always"/>
<item
a:id="@+id/menu_plot_3d"
a:title="@string/cpp_plot_3d"
a:icon="@drawable/ab_plot_3d"
a:showAsAction="always" />
<item a:id="@+id/menu_plot_range"
a:title="@string/cpp_plot_range"
a:icon="@drawable/ab_plot_range"
a:showAsAction="always"/>
<item
a:id="@+id/menu_plot_range"
a:title="@string/cpp_plot_range"
a:icon="@drawable/ab_plot_range"
a:showAsAction="always" />
<item a:id="@+id/menu_plot_functions"
a:title="@string/cpp_plot_functions"
a:icon="@drawable/ab_list"
a:showAsAction="always"/>
<item
a:id="@+id/menu_plot_functions"
a:title="@string/cpp_plot_functions"
a:icon="@drawable/ab_list"
a:showAsAction="always" />
<item a:id="@+id/menu_plot_schreeshot"
a:title="@string/cpp_plot_screenshot"
a:icon="@drawable/ab_camera"
a:showAsAction="always"/>
<item
a:id="@+id/menu_plot_schreeshot"
a:title="@string/cpp_plot_screenshot"
a:icon="@drawable/ab_camera"
a:showAsAction="always" />
<item a:id="@+id/menu_plot_settings"
a:title="@string/c_settings"
a:icon="@drawable/ab_settings"
a:showAsAction="always"/>
<item
a:id="@+id/menu_plot_settings"
a:title="@string/c_settings"
a:icon="@drawable/ab_settings"
a:showAsAction="always" />
</menu>

View File

@@ -8,8 +8,9 @@
<menu xmlns:a="http://schemas.android.com/apk/res/android">
<item a:id="@+id/var_menu_add_var"
a:title="@string/c_add"
a:icon="@drawable/ab_add"
a:showAsAction="always"/>
<item
a:id="@+id/var_menu_add_var"
a:title="@string/c_add"
a:icon="@drawable/ab_add"
a:showAsAction="always" />
</menu>

View File

@@ -1,10 +1,10 @@
<resources>
<dimen name="cpp_editor_text_size">20sp</dimen>
<dimen name="cpp_editor_text_size_mobile">40sp</dimen>
<dimen name="cpp_editor_text_size">20sp</dimen>
<dimen name="cpp_editor_text_size_mobile">40sp</dimen>
<dimen name="cpp_display_text_size">20sp</dimen>
<dimen name="cpp_display_text_size_mobile">40sp</dimen>
<dimen name="cpp_display_text_size">20sp</dimen>
<dimen name="cpp_display_text_size_mobile">40sp</dimen>
<dimen name="cpp_keyboard_button_text_size">24dp</dimen>
<dimen name="cpp_keyboard_button_text_size_mobile">25dp</dimen>
<dimen name="cpp_keyboard_button_text_size">24dp</dimen>
<dimen name="cpp_keyboard_button_text_size_mobile">25dp</dimen>
</resources>

View File

@@ -1,10 +1,10 @@
<resources>
<dimen name="cpp_editor_text_size">25sp</dimen>
<dimen name="cpp_editor_text_size_mobile">45sp</dimen>
<dimen name="cpp_editor_text_size">25sp</dimen>
<dimen name="cpp_editor_text_size_mobile">45sp</dimen>
<dimen name="cpp_display_text_size">20sp</dimen>
<dimen name="cpp_display_text_size_mobile">35sp</dimen>
<dimen name="cpp_display_text_size">20sp</dimen>
<dimen name="cpp_display_text_size_mobile">35sp</dimen>
<dimen name="cpp_keyboard_button_text_size">35dp</dimen>
<dimen name="cpp_keyboard_button_text_size_mobile">45dp</dimen>
<dimen name="cpp_keyboard_button_text_size">35dp</dimen>
<dimen name="cpp_keyboard_button_text_size_mobile">45dp</dimen>
</resources>

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