Material buttons
This commit is contained in:
parent
b81d55b8ef
commit
99961758a1
28
android-app/src/main/res/drawable-v21/metro_blue_button.xml
Normal file
28
android-app/src/main/res/drawable-v21/metro_blue_button.xml
Normal file
@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
~ Copyright 2013 serso aka se.solovyev
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
~
|
||||
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
~ Contact details
|
||||
~
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<ripple xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:color="?attr/colorControlHighlight">
|
||||
<item a:drawable="@drawable/metro_blue_button_shape" />
|
||||
</ripple>
|
28
android-app/src/main/res/drawable-v21/metro_button_dark.xml
Normal file
28
android-app/src/main/res/drawable-v21/metro_button_dark.xml
Normal file
@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
~ Copyright 2013 serso aka se.solovyev
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
~
|
||||
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
~ Contact details
|
||||
~
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<ripple xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:color="?attr/colorControlHighlight">
|
||||
<item a:drawable="@drawable/metro_button_dark_shape" />
|
||||
</ripple>
|
29
android-app/src/main/res/drawable-v21/metro_button_green.xml
Normal file
29
android-app/src/main/res/drawable-v21/metro_button_green.xml
Normal file
@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
~ Copyright 2013 serso aka se.solovyev
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
~
|
||||
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
~ Contact details
|
||||
~
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<ripple xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:color="?attr/colorControlHighlight">
|
||||
<item a:drawable="@drawable/metro_button_green_shape" />
|
||||
|
||||
</ripple>
|
28
android-app/src/main/res/drawable-v21/metro_button_light.xml
Normal file
28
android-app/src/main/res/drawable-v21/metro_button_light.xml
Normal file
@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
~ Copyright 2013 serso aka se.solovyev
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
~
|
||||
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
~ Contact details
|
||||
~
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<ripple xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:color="?attr/colorControlHighlight">
|
||||
<item a:drawable="@drawable/metro_button_light_shape" />
|
||||
</ripple>
|
@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
~ Copyright 2013 serso aka se.solovyev
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
~
|
||||
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
~ Contact details
|
||||
~
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<ripple xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:color="?attr/colorControlHighlight">
|
||||
<item a:drawable="@drawable/metro_button_purple_shape" />
|
||||
</ripple>
|
@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
~ Copyright 2013 serso aka se.solovyev
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
~
|
||||
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
~ Contact details
|
||||
~
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<ripple xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:color="@color/cpp_widget_ripple">
|
||||
<item a:drawable="@drawable/metro_blue_button_shape" />
|
||||
</ripple>
|
@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
~ Copyright 2013 serso aka se.solovyev
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
~
|
||||
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
~ Contact details
|
||||
~
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<ripple xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:color="@color/cpp_widget_ripple">
|
||||
<item a:drawable="@drawable/metro_button_dark_shape" />
|
||||
</ripple>
|
@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
~ Copyright 2013 serso aka se.solovyev
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
~
|
||||
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
~ Contact details
|
||||
~
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<ripple xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:color="@color/cpp_widget_ripple">
|
||||
<item a:drawable="@drawable/metro_button_light_shape" />
|
||||
</ripple>
|
@ -21,6 +21,6 @@
|
||||
-->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="@color/cpp_metro_blue_color"/>
|
||||
<solid android:color="@color/cpp_metro_blue"/>
|
||||
<corners android:radius="1dp"/>
|
||||
</shape>
|
@ -21,6 +21,6 @@
|
||||
-->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="#C9C9C9"/>
|
||||
<solid android:color="#ff4d4d4d"/>
|
||||
<corners android:radius="1dp"/>
|
||||
</shape>
|
31
android-app/src/main/res/drawable/metro_widget_button.xml
Normal file
31
android-app/src/main/res/drawable/metro_widget_button.xml
Normal file
@ -0,0 +1,31 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
~ Copyright 2013 serso aka se.solovyev
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
~
|
||||
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
~ Contact details
|
||||
~
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<selector xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item a:state_pressed="true" a:drawable="@drawable/metro_button_pressed"/>
|
||||
|
||||
<item a:drawable="@drawable/metro_blue_button_shape"/>
|
||||
|
||||
</selector>
|
@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
~ Copyright 2013 serso aka se.solovyev
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
~
|
||||
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
~ Contact details
|
||||
~
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<selector xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item a:state_pressed="true" a:drawable="@drawable/metro_button_pressed"/>
|
||||
|
||||
<item a:drawable="@drawable/metro_button_dark_shape"/>
|
||||
</selector>
|
@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
~ Copyright 2013 serso aka se.solovyev
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
~
|
||||
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
~ Contact details
|
||||
~
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<selector xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item a:state_pressed="true" a:drawable="@drawable/metro_button_pressed"/>
|
||||
|
||||
<item a:drawable="@drawable/metro_button_light_shape"/>
|
||||
</selector>
|
@ -25,4 +25,4 @@
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@id/cpp_button_period"
|
||||
a:text="."
|
||||
style="@style/metro_digit_button_style"/>
|
||||
style="@style/cpp_simple_metro_digit_button_style"/>
|
@ -32,11 +32,13 @@
|
||||
<color name="cpp_main_bg">#ff000000</color>
|
||||
<color name="cpp_pane_background">#ff1f1f1f</color>
|
||||
<color name="cpp_metro_button_background">#ff1f1f1f</color>
|
||||
<color name="cpp_metro_blue_color">#10648c</color>
|
||||
<color name="cpp_metro_blue">#10648c</color>
|
||||
<color name="cpp_metro_blue_dark">#ff092c39</color>
|
||||
<color name="cpp_metro_green_color">#088e3a</color>
|
||||
<color name="cpp_metro_purple_color">#651456</color>
|
||||
<color name="cpp_metro_light_button_background">#393939</color>
|
||||
<color name="cpp_widget_cursor_color">#ff707070</color>
|
||||
<color name="cpp_text_primary">#ddffffff</color>
|
||||
<color name="cpp_text_secondary">#89ffffff</color>
|
||||
<color name="cpp_widget_ripple">#40ffffff</color>
|
||||
</resources>
|
@ -109,17 +109,21 @@
|
||||
|
||||
<style name="cpp_simple_metro_digit_button_style" parent="metro_digit_button_style">
|
||||
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
|
||||
<item name="android:background">@drawable/metro_widget_button_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="cpp_simple_metro_control_button_style" parent="metro_control_button_style">
|
||||
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
|
||||
<item name="android:background">@drawable/metro_widget_button_light</item>
|
||||
</style>
|
||||
|
||||
<style name="cpp_simple_metro_blue_operation_button_style" parent="metro_blue_operation_button_style">
|
||||
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
|
||||
<item name="android:background">@drawable/metro_widget_button</item>
|
||||
</style>
|
||||
|
||||
<style name="cpp_simple_metro_control_image_button_style" parent="metro_control_image_button_style">
|
||||
<item name="android:background">@drawable/metro_widget_button_light</item>
|
||||
</style>
|
||||
|
||||
<style name="cpp_widget_main_layout_style" parent="cpp_default_main_layout_style">
|
||||
|
@ -36,6 +36,7 @@
|
||||
<item name="android:layout_weight">0</item>
|
||||
<item name="android:padding">0dp</item>
|
||||
<item name="android:textSize">@dimen/cpp_onscreen_header_button_text_size</item>
|
||||
<item name="android:background">@drawable/metro_widget_button_light</item>
|
||||
</style>
|
||||
|
||||
|
||||
@ -48,7 +49,7 @@
|
||||
</style>
|
||||
|
||||
<style name="cpp_metro_blue_theme" parent="cpp_gray_theme">
|
||||
<item name="android:colorAccent">@color/cpp_metro_blue_color</item>
|
||||
<item name="android:colorAccent">@color/cpp_metro_blue</item>
|
||||
|
||||
<item name="cpp_digit_button_style">@style/metro_digit_button_style</item>
|
||||
<item name="cpp_control_button_style">@style/metro_control_button_style</item>
|
||||
@ -57,7 +58,7 @@
|
||||
</style>
|
||||
|
||||
<style name="cpp_metro_blue_dialog_theme" parent="cpp_gray_dialog_theme">
|
||||
<item name="android:colorAccent">@color/cpp_metro_blue_color</item>
|
||||
<item name="android:colorAccent">@color/cpp_metro_blue</item>
|
||||
|
||||
<item name="cpp_digit_button_style">@style/metro_digit_button_style</item>
|
||||
<item name="cpp_control_button_style">@style/metro_control_button_style</item>
|
||||
|
Loading…
Reference in New Issue
Block a user