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

Use toolbar instead of action bar in main activity

Browse Source
This commit is contained in:
serso
2016-02-21 13:25:14 +01:00
parent e30e8ca2fe
commit 96b4290260
24 changed files with 179 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/res/layout-land/main_calculator.xml → app/src/main/res/layout-land/activity_main.xml
View File

@@ -26,12 +26,7 @@
xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical">
<LinearLayout
a:id="@+id/editor"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="2"
a:orientation="horizontal" />
<include layout="@layout/activity_main_editor_with_toolbar"/>
<LinearLayout
a:id="@+id/partial_keyboard"

9
app/src/main/res/layout/main_calculator.xml → app/src/main/res/layout/activity_main.xml
View File

@@ -23,19 +23,14 @@
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main"
style="@style/CppMain"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout
a:id="@+id/editor"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="2"
a:orientation="horizontal" />
<include layout="@layout/activity_main_editor_with_toolbar"/>
<LinearLayout
a:id="@+id/partial_keyboard"

17
app/src/main/res/layout/activity_main_editor_with_toolbar.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="2">
<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>

24
app/src/main/res/layout/cpp_app_editor.xml
View File

@@ -21,21 +21,11 @@
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<LinearLayout
<org.solovyev.android.calculator.EditorView a:id="@+id/calculator_editor"
style="@style/CppText.Editor"
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="@style/CppFragment"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding">
<org.solovyev.android.calculator.EditorView
a:id="@+id/calculator_editor"
style="@style/CppText.Editor"
a:hint="@string/c_calc_editor_hint"
a:scrollbars="vertical"
a:singleLine="false"
a:textIsSelectable="true" />
</LinearLayout>
a:hint="@string/c_calc_editor_hint"
a:padding="@dimen/cpp_editor_padding"
a:scrollbars="vertical"
a:singleLine="false"
a:textIsSelectable="true" />

1
app/src/main/res/values/attributes.xml
View File

@@ -33,5 +33,6 @@
<attr name="cpp_text_color" format="reference" />
<attr name="cpp_text_color_error" format="reference" />
<attr name="cpp_card_style" format="reference" />
</resources>

1
app/src/main/res/values/dimens.xml
View File

@@ -44,4 +44,5 @@
<dimen name="cpp_image_button_size">30dp</dimen>
<dimen name="cpp_image_button_padding">5dp</dimen>
<dimen name="cpp_dialog_width_max">400dp</dimen>
<dimen name="cpp_card_margin">4dp</dimen>
</resources>

4
app/src/main/res/values/styles.xml
View File

@@ -59,8 +59,8 @@
<style name="CppText.Editor">
<item name="android:text">""</item>
<item name="android:gravity">left|top</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:textSize">@dimen/cpp_editor_text_size</item>
<item name="android:textColor">?attr/cpp_text_color</item>
<item name="android:inputType">textMultiLine|textNoSuggestions</item>

7
app/src/main/res/values/theme.xml
View File

@@ -22,6 +22,11 @@
<resources>
<style name="Cpp.Theme.NoActionBar" parent="@style/Cpp.Theme">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Cpp.Theme" parent="@style/Theme.AppCompat">
<item name="colorPrimary">@color/cpp_metro_button</item>
<item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
@@ -36,6 +41,7 @@
<item name="cpp_fab_bg">@color/grey_900</item>
<item name="cpp_text_color">@color/cpp_text</item>
<item name="cpp_text_color_error">@color/cpp_text_error</item>
<item name="cpp_card_style">@style/CardView.Dark</item>
<item name="android:listDivider">@drawable/divider_dark</item>
</style>
@@ -94,6 +100,7 @@
<item name="cpp_fab_bg">@color/cpp_material_light</item>
<item name="cpp_text_color">@color/cpp_text_inverse</item>
<item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
<item name="cpp_card_style">@style/CardView.Light</item>
<item name="android:listDivider">@drawable/divider</item>
</style>

5
app/src/main/res/values/theme_material.xml
View File

@@ -59,6 +59,11 @@
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
</style>
<style name="Cpp.Theme.Material.NoActionBar" parent="Cpp.Theme.Material">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Cpp.Theme.Material" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Digit</item>

5
app/src/main/res/values/theme_material_light.xml
View File

@@ -59,6 +59,11 @@
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
</style>
<style name="Cpp.Theme.Material.Light.NoActionBar" parent="Cpp.Theme.Material.Light">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Cpp.Theme.Material.Light" parent="Cpp.Theme.Light">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>

9
app/src/main/res/values/theme_metro_blue.xml
View File

@@ -65,12 +65,15 @@
<item name="android:padding">@dimen/cpp_keyboard_simple_image_button_padding</item>
</style>
<style name="Cpp.Theme.Metro.Blue.NoActionBar" parent="Cpp.Theme.Metro.Blue">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Cpp.Theme.Metro.Blue" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Metro.Blue.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Metro.Blue.Control</item>
<item name="cpp_button_style_control_image">
@style/CppKeyboardButton.Metro.Blue.Control.Image
</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Metro.Blue.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Metro.Blue.Operation</item>
</style>

5
app/src/main/res/values/theme_metro_green.xml
View File

@@ -26,6 +26,11 @@
<item name="android:background">@drawable/metro_button_green</item>
</style>
<style name="Cpp.Theme.Metro.Green.NoActionBar" parent="Cpp.Theme.Metro.Green">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Cpp.Theme.Metro.Green" parent="Cpp.Theme.Metro.Blue">
<item name="cpp_button_style_operation">@style/metro_green_operation_button_style</item>
</style>

5
app/src/main/res/values/theme_metro_purple.xml
View File

@@ -26,6 +26,11 @@
<item name="android:background">@drawable/metro_button_purple</item>
</style>
<style name="Cpp.Theme.Metro.Purple.NoActionBar" parent="Cpp.Theme.Metro.Purple">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Cpp.Theme.Metro.Purple" parent="Cpp.Theme.Metro.Blue">
<item name="cpp_button_style_operation">@style/metro_purple_operation_button_style</item>
</style>

8
app/src/main/res/values/theme_old_blue.xml
View File

@@ -36,11 +36,15 @@
<style name="CppKeyboardButton.Blue.Control.Image" parent="CppKeyboardButton.Blue.Control"/>
<style name="Cpp.Theme.Blue.NoActionBar" parent="Cpp.Theme.Blue">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Cpp.Theme.Blue" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Blue.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Blue.Control</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Blue.Control.Image
</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Blue.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Blue.Operation</item>
</style>

11
app/src/main/res/values/theme_old_gray.xml
View File

@@ -36,19 +36,22 @@
<style name="CppKeyboardButton.Gray.Control.Image" parent="CppKeyboardButton.Gray.Control"/>
<style name="Cpp.Theme.Gray.NoActionBar" parent="Cpp.Theme.Gray">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Cpp.Theme.Gray" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Gray.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Gray.Control</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Gray.Control.Image
</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Gray.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Gray.Operation</item>
</style>
<style name="Cpp.Theme.Dialog.Gray" parent="Cpp.Theme.Dialog">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Gray.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Gray.Control</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Gray.Control.Image
</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Gray.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Gray.Operation</item>
</style>

8
app/src/main/res/values/theme_old_violet.xml
View File

@@ -36,11 +36,15 @@
<style name="CppKeyboardButton.Violet.Control.Image" parent="CppKeyboardButton.Violet.Control"/>
<style name="Cpp.Theme.Violet.NoActionBar" parent="Cpp.Theme.Violet">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Cpp.Theme.Violet" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Violet.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Violet.Control</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Violet.Control.Image
</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Violet.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Violet.Operation</item>
</style>
</resources>