code reformat
This commit is contained in:
@@ -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_onscreen_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_onscreen_display_style"
|
||||
a:padding="@dimen/cpp_display_padding"
|
||||
a:inputType="textMultiLine"
|
||||
a:maxLines="3"
|
||||
a:scrollHorizontally="false"
|
||||
a:scrollbars="none" />
|
@@ -7,16 +7,16 @@
|
||||
-->
|
||||
|
||||
<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_onscreen_editor_style"
|
||||
a:textIsSelectable="true"
|
||||
a:hint="@string/c_calc_editor_hint"/>
|
||||
a:id="@+id/calculator_editor"
|
||||
style="@style/cpp_onscreen_editor_style"
|
||||
a:textIsSelectable="true"
|
||||
a:hint="@string/c_calc_editor_hint" />
|
||||
|
||||
</LinearLayout>
|
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
</LinearLayout>
|
@@ -1,36 +1,41 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<RelativeLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="30dp">
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="30dp">
|
||||
|
||||
<LinearLayout a:id="@+id/onscreen_header_buttons"
|
||||
a:layout_width="wrap_content"
|
||||
a:layout_height="match_parent"
|
||||
a:layout_alignParentRight="true">
|
||||
<LinearLayout
|
||||
a:id="@+id/onscreen_header_buttons"
|
||||
a:layout_width="wrap_content"
|
||||
a:layout_height="match_parent"
|
||||
a:layout_alignParentRight="true">
|
||||
|
||||
<ImageButton a:id="@+id/onscreen_fold_button"
|
||||
style="@style/onscreen_header_button_style"
|
||||
a:src="@drawable/cpp_onscreen_button_fold"/>
|
||||
<ImageButton
|
||||
a:id="@+id/onscreen_fold_button"
|
||||
style="@style/onscreen_header_button_style"
|
||||
a:src="@drawable/cpp_onscreen_button_fold" />
|
||||
|
||||
<ImageButton a:id="@+id/onscreen_minimize_button"
|
||||
style="@style/onscreen_header_button_style"
|
||||
a:src="@drawable/cpp_onscreen_button_minimize"/>
|
||||
<ImageButton
|
||||
a:id="@+id/onscreen_minimize_button"
|
||||
style="@style/onscreen_header_button_style"
|
||||
a:src="@drawable/cpp_onscreen_button_minimize" />
|
||||
|
||||
<ImageButton a:id="@+id/onscreen_close_button"
|
||||
style="@style/onscreen_header_button_style"
|
||||
a:src="@drawable/cpp_onscreen_button_close"/>
|
||||
<ImageButton
|
||||
a:id="@+id/onscreen_close_button"
|
||||
style="@style/onscreen_header_button_style"
|
||||
a:src="@drawable/cpp_onscreen_button_close" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView a:id="@+id/onscreen_title"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:src="@drawable/cpp_onscreen_header_logo"
|
||||
a:scaleType="fitStart"
|
||||
a:paddingLeft="6dp"
|
||||
a:paddingTop="2dp"
|
||||
a:paddingBottom="2dp"
|
||||
a:layout_toLeftOf="@id/onscreen_header_buttons"/>
|
||||
<ImageView
|
||||
a:id="@+id/onscreen_title"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:src="@drawable/cpp_onscreen_header_logo"
|
||||
a:scaleType="fitStart"
|
||||
a:paddingLeft="6dp"
|
||||
a:paddingTop="2dp"
|
||||
a:paddingBottom="2dp"
|
||||
a:layout_toLeftOf="@id/onscreen_header_buttons" />
|
||||
|
||||
</RelativeLayout>
|
@@ -1,69 +1,89 @@
|
||||
<?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_simple_button_7"/>
|
||||
<include layout="@layout/cpp_simple_button_8"/>
|
||||
<include layout="@layout/cpp_simple_button_9"/>
|
||||
<include layout="@layout/cpp_simple_button_multiplication"/>
|
||||
<include layout="@layout/cpp_simple_button_erase"/>
|
||||
<include layout="@layout/cpp_simple_button_7" />
|
||||
|
||||
</LinearLayout>
|
||||
<include layout="@layout/cpp_simple_button_8" />
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
<include layout="@layout/cpp_simple_button_9" />
|
||||
|
||||
<include layout="@layout/cpp_simple_button_4"/>
|
||||
<include layout="@layout/cpp_simple_button_5"/>
|
||||
<include layout="@layout/cpp_simple_button_6"/>
|
||||
<include layout="@layout/cpp_simple_button_division"/>
|
||||
<include layout="@layout/cpp_simple_button_percent"/>
|
||||
<include layout="@layout/cpp_simple_button_multiplication" />
|
||||
|
||||
<include layout="@layout/cpp_simple_button_erase" />
|
||||
|
||||
</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_simple_button_1"/>
|
||||
<include layout="@layout/cpp_simple_button_2"/>
|
||||
<include layout="@layout/cpp_simple_button_3"/>
|
||||
<include layout="@layout/cpp_simple_button_plus"/>
|
||||
<include layout="@layout/cpp_simple_button_power"/>
|
||||
</LinearLayout>
|
||||
<include layout="@layout/cpp_simple_button_4" />
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
<include layout="@layout/cpp_simple_button_5" />
|
||||
|
||||
<include layout="@layout/cpp_simple_button_round_brackets"/>
|
||||
<include layout="@layout/cpp_simple_button_0"/>
|
||||
<include layout="@layout/cpp_simple_button_dot"/>
|
||||
<include layout="@layout/cpp_simple_button_subtraction"/>
|
||||
<include layout="@layout/cpp_simple_button_app"/>
|
||||
<include layout="@layout/cpp_simple_button_6" />
|
||||
|
||||
<include layout="@layout/cpp_simple_button_division" />
|
||||
|
||||
<include layout="@layout/cpp_simple_button_percent" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/cpp_simple_button_1" />
|
||||
|
||||
<include layout="@layout/cpp_simple_button_2" />
|
||||
|
||||
<include layout="@layout/cpp_simple_button_3" />
|
||||
|
||||
<include layout="@layout/cpp_simple_button_plus" />
|
||||
|
||||
<include layout="@layout/cpp_simple_button_power" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/cpp_simple_button_round_brackets" />
|
||||
|
||||
<include layout="@layout/cpp_simple_button_0" />
|
||||
|
||||
<include layout="@layout/cpp_simple_button_dot" />
|
||||
|
||||
<include layout="@layout/cpp_simple_button_subtraction" />
|
||||
|
||||
<include layout="@layout/cpp_simple_button_app" />
|
||||
|
||||
</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/widget_left_button"/>
|
||||
<include layout="@layout/widget_right_button"/>
|
||||
<include layout="@layout/widget_vars_button"/>
|
||||
<include layout="@layout/widget_functions_button"/>
|
||||
<include layout="@layout/widget_app_button"/>
|
||||
<include layout="@layout/widget_history_button"/>
|
||||
<include layout="@layout/widget_left_button"/>
|
||||
<include layout="@layout/widget_right_button"/>
|
||||
<include layout="@layout/widget_vars_button"/>
|
||||
<include layout="@layout/widget_functions_button"/>
|
||||
<include layout="@layout/widget_app_button"/>
|
||||
<include layout="@layout/widget_history_button"/>
|
||||
|
||||
</LinearLayout>-->
|
||||
</LinearLayout>-->
|
||||
|
||||
</LinearLayout>
|
@@ -1,43 +1,51 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:orientation="vertical"
|
||||
style="@style/cpp_onscreen_main_layout_style">
|
||||
a:orientation="vertical"
|
||||
style="@style/cpp_onscreen_main_layout_style">
|
||||
|
||||
<include a:id="@+id/onscreen_header" layout="@layout/onscreen_header"/>
|
||||
<include
|
||||
a:id="@+id/onscreen_header"
|
||||
layout="@layout/onscreen_header" />
|
||||
|
||||
<LinearLayout a:id="@+id/onscreen_content"
|
||||
a:orientation="vertical"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
<LinearLayout
|
||||
a:id="@+id/onscreen_content"
|
||||
a:orientation="vertical"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<include layout="@layout/onscreen_editor"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="wrap_content"/>
|
||||
<include
|
||||
layout="@layout/onscreen_editor"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="wrap_content" />
|
||||
|
||||
<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_simple_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_simple_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/onscreen_display"
|
||||
a:layout_weight="4"
|
||||
a:layout_width="0dp"
|
||||
a:layout_height="wrap_content"/>
|
||||
<include
|
||||
layout="@layout/onscreen_display"
|
||||
a:layout_weight="4"
|
||||
a:layout_width="0dp"
|
||||
a:layout_height="wrap_content" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<include layout="@layout/onscreen_keyboard"
|
||||
a:layout_weight="4"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp"/>
|
||||
<include
|
||||
layout="@layout/onscreen_keyboard"
|
||||
a:layout_weight="4"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp" />
|
||||
</LinearLayout>
|
||||
|
||||
<include layout="@layout/onscreen_footer"/>
|
||||
<include layout="@layout/onscreen_footer" />
|
||||
|
||||
</LinearLayout>
|
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="cpp_onscreen_cursor_color">#ff707070</color>
|
||||
<color name="cpp_onscreen_cursor_color">#ff707070</color>
|
||||
</resources>
|
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="cpp_onscreen_main_layout_style" parent="cpp_default_main_layout_style">
|
||||
<item name="android:padding">1dp</item>
|
||||
</style>
|
||||
<style name="cpp_onscreen_main_layout_style" parent="cpp_default_main_layout_style">
|
||||
<item name="android:padding">1dp</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
Reference in New Issue
Block a user