New main menu

app/src/main/res/layout/activity_main_editor_with_overflow_menu.xml

@@ -1,22 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+<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"
-    a:orientation="horizontal"
     tools:ignore="MergeRootFrame">
 
     <FrameLayout
         a:id="@+id/editor"
-        a:layout_width="0dp"
-        a:layout_height="match_parent"
-        a:layout_weight="1" />
+        a:layout_width="match_parent"
+        a:layout_height="match_parent" />
 
-    <ImageButton
-        style="?attr/actionOverflowButtonStyle"
+    <!-- make clickable area bigger -->
+    <FrameLayout
         a:id="@+id/main_menu"
-        a:layout_width="wrap_content"
-        a:layout_height="?actionBarSize"
-        a:layout_gravity="top|end" />
-</LinearLayout>
+        style="?attr/actionOverflowButtonStyle"
+        a:layout_width="40dp"
+        a:paddingLeft="0dp"
+        a:paddingRight="0dp"
+        a:layout_height="?attr/actionBarSize"
+        a:layout_gravity="top|end">
+
+        <ImageButton
+            style="?attr/actionOverflowButtonStyle"
+            a:paddingLeft="0dp"
+            a:paddingRight="0dp"
+            a:layout_width="20dp"
+            a:layout_height="36dp"
+            a:clickable="false"
+            a:focusable="false"
+            a:focusableInTouchMode="false"
+            a:layout_gravity="top|end" />
+    </FrameLayout>
+</FrameLayout>

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

@@ -26,9 +26,4 @@
     android:id="@id/cpp_button_copy"
     style="?attr/cpp_button_style_control"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:src="@drawable/ic_content_copy_white_48dp"
-    app:directionTextScale="@dimen/cpp_direction_text_scale_units"
-    app:directionTextDown="bin"
-    app:directionTextLeft="hex"
-    app:directionTextUp="dec"/>
+    android:src="@drawable/ic_content_copy_white_48dp" />

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

@@ -26,8 +26,4 @@
     android:id="@id/cpp_button_paste"
     style="?attr/cpp_button_style_control"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:directionTextScale="@dimen/cpp_direction_text_scale_units"
-    android:src="@drawable/ic_content_paste_white_48dp"
-    app:directionTextDown="rad"
-    app:directionTextUp="deg"/>
+    android:src="@drawable/ic_content_paste_white_48dp" />

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

@@ -24,4 +24,6 @@
 <org.solovyev.android.calculator.EditorView
     a:id="@+id/calculator_editor"
     style="@style/CppText.Editor"
-    xmlns:a="http://schemas.android.com/apk/res/android"/>
+    xmlns:a="http://schemas.android.com/apk/res/android"
+    a:layout_marginEnd="16dp"
+    a:layout_marginRight="16dp" />

app/src/main/res/layout/onscreen_display.xml

@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.DisplayView a:id="@+id/calculator_display"
+<org.solovyev.android.calculator.DisplayView
+    a:id="@+id/calculator_display"
     style="@style/CppText.Display.Onscreen"
-    xmlns:a="http://schemas.android.com/apk/res/android"
-    a:padding="@dimen/cpp_display_padding" />
+    xmlns:a="http://schemas.android.com/apk/res/android" />

app/src/main/res/layout/onscreen_display_light.xml

@@ -6,7 +6,7 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.DisplayView a:id="@+id/calculator_display"
+<org.solovyev.android.calculator.DisplayView
+    a:id="@+id/calculator_display"
     style="@style/CppText.Display.Onscreen.Light"
-    xmlns:a="http://schemas.android.com/apk/res/android"
-    a:padding="@dimen/cpp_display_padding" />
+    xmlns:a="http://schemas.android.com/apk/res/android" />

app/src/main/res/layout/widget_display.xml

@@ -6,10 +6,8 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<TextView
-    xmlns:a="http://schemas.android.com/apk/res/android"
-    a:id="@+id/calculator_display"
+<TextView a:id="@+id/calculator_display"
     style="@style/CppText.Display.Widget"
-    a:padding="@dimen/cpp_display_padding"
+    xmlns:a="http://schemas.android.com/apk/res/android"
     a:scrollbars="vertical"
     a:textIsSelectable="true" />

app/src/main/res/layout/widget_display_light.xml

@@ -6,10 +6,8 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<TextView
-    xmlns:a="http://schemas.android.com/apk/res/android"
-    a:id="@+id/calculator_display"
+<TextView a:id="@+id/calculator_display"
     style="@style/CppText.Display.Widget.Light"
-    a:padding="@dimen/cpp_display_padding"
+    xmlns:a="http://schemas.android.com/apk/res/android"
     a:scrollbars="vertical"
     a:textIsSelectable="true" />

app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml

@@ -38,7 +38,6 @@
             a:layout_width="0dp"
             a:layout_height="wrap_content"
             a:layout_weight="2"
-            a:padding="@dimen/cpp_display_padding"
             a:scrollbars="vertical"
             a:textIsSelectable="true"
             a:textSize="@dimen/cpp_widget_display_text_size_collapsed" />