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

Buttons now use drawable padding (via InsetDrawable) to have some margins between them

Browse Source
This commit is contained in:
serso
2015-02-05 14:39:16 +01:00
parent c85f5a2f25
commit c5748e2d94
26 changed files with 178 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
android-app/src/main/res/layout-land/main_first_pane.xml
View File

@@ -31,44 +31,43 @@
a:id="@+id/editorContainer"
a:layout_weight="2"
a:layout_width="match_parent"
a:layout_height="0dp"/>
a:layout_height="0dp"
a:orientation="horizontal"/>
<LinearLayout
a:layout_weight="1"
a:layout_width="match_parent"
a:layout_height="0dp">
a:layout_height="0dp"
a:baselineAligned="false"
a:orientation="horizontal">
<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"/>
<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"/>
a:id="@+id/displayContainer"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="4"
a:orientation="horizontal" />
<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"/>
@@ -79,7 +78,8 @@
a:id="@+id/keyboardContainer"
a:layout_weight="3"
a:layout_width="match_parent"
a:layout_height="0dp"/>
a:layout_height="0dp"
a:orientation="horizontal"/>
</LinearLayout>

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

@@ -40,14 +40,12 @@
<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"/>
@@ -56,19 +54,16 @@
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"/>
a:layout_weight="4"/>
<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"/>