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

Main menu implementation

Browse Source
This commit is contained in:
serso
2016-04-01 23:05:01 +02:00
parent 8d724e3e8b
commit f16c2a2eee
15 changed files with 277 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout-land/activity_main.xml
View File

@@ -27,7 +27,7 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical">
<include layout="@layout/activity_main_editor_with_toolbar" />
<include layout="@layout/activity_main_editor_with_overflow_menu" />
<LinearLayout
a:id="@+id/partial_keyboard"

8
app/src/main/res/layout-land/cpp_app_keyboard.xml
View File

@@ -34,9 +34,9 @@
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_copy" />
<include layout="@layout/cpp_app_button_left" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_app_button_right" />
<include layout="@layout/cpp_app_button_7" />
@@ -84,9 +84,9 @@
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_left" />
<include layout="@layout/cpp_app_button_copy" />
<include layout="@layout/cpp_app_button_right" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_app_button_1" />

2
app/src/main/res/layout/activity_main.xml
View File

@@ -30,7 +30,7 @@
a:layout_height="match_parent"
a:orientation="vertical">
<include layout="@layout/activity_main_editor_with_toolbar" />
<include layout="@layout/activity_main_editor_with_overflow_menu" />
<LinearLayout
a:id="@+id/partial_keyboard"

22
app/src/main/res/layout/activity_main_editor_with_overflow_menu.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="2"
a:orientation="horizontal"
tools:ignore="MergeRootFrame">
<FrameLayout
a:id="@+id/editor"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />
<ImageButton
style="?attr/actionOverflowButtonStyle"
a:id="@+id/main_menu"
a:layout_width="wrap_content"
a:layout_height="?actionBarSize"
a:layout_gravity="top|end" />
</LinearLayout>

19
app/src/main/res/layout/activity_main_editor_with_toolbar.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="2"
tools:ignore="MergeRootFrame">
<FrameLayout
a:id="@+id/editor"
a:layout_width="match_parent"
a:layout_height="match_parent" />
<android.support.v7.widget.Toolbar
a:id="@+id/toolbar"
a:layout_width="wrap_content"
a:layout_height="?actionBarSize"
a:layout_gravity="top|right" />
</FrameLayout>

8
app/src/main/res/layout/cpp_app_keyboard.xml
View File

@@ -32,9 +32,9 @@
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_app_button_vars" />
<include layout="@layout/cpp_app_button_left" />
<include layout="@layout/cpp_app_button_functions" />
<include layout="@layout/cpp_app_button_right" />
<include layout="@layout/cpp_app_button_percent" />
@@ -75,7 +75,7 @@
<include layout="@layout/cpp_app_button_multiplication" />
<include layout="@layout/cpp_app_button_copy" />
<include layout="@layout/cpp_app_button_vars" />
</LinearLayout>
@@ -92,7 +92,7 @@
<include layout="@layout/cpp_app_button_minus" />
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_app_button_functions" />
</LinearLayout>

35
app/src/main/res/layout/popup_menu_item_layout.xml Normal file
View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_vertical"
tools:ignore="PrivateResource"
android:paddingTop="8dp"
android:paddingBottom="8dp">
<include
android:id="@+id/menu_list_item_view"
layout="@layout/abc_popup_menu_item_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
tools:ignore="PrivateResource" />
<TextView
android:id="@+id/subtitle"
style="@style/RtlOverlay.Widget.AppCompat.PopupMenuItem.Text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:duplicateParentState="true"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:textAppearance="?attr/textAppearanceLargePopupMenu"
android:textSize="@dimen/abc_text_size_small_material" />
</LinearLayout>

12
app/src/main/res/menu/main.xml
View File

@@ -5,16 +5,8 @@
<item
android:id="@+id/menu_mode"
android:title="@string/cpp_mode"
app:showAsAction="never">
<menu>
<item
android:id="@+id/menu_mode_engineer"
android:title="@string/cpp_wizard_mode_engineer" />
<item
android:id="@+id/menu_mode_simple"
android:title="@string/cpp_wizard_mode_simple" />
</menu>
</item>
app:actionProviderClass="org.solovyev.android.calculator.MainMenu$ViewProvider"
app:showAsAction="never" />
<item
android:id="@+id/menu_settings"

2
app/src/main/res/values/ids.xml
View File

@@ -76,4 +76,6 @@
<item name="function_params_add" type="id" />
<!-- tag key to be used in CustomPopupMenu to identify default views -->
<item name="cpm_default_view_tag_key" type="id"/>
</resources>