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

Wizard changes

Browse Source
This commit is contained in:
serso
2015-02-01 18:05:59 +01:00
parent f2320fbe8a
commit a56756e8ce
10 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android-app/src/main/res/layout/cpp_activity_wizard.xml
View File

@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:my="http://schemas.android.com/apk/res-auto"
style="@style/MaterialActivity"
android:padding="0dp"
android:orientation="vertical">
<android.support.v4.view.ViewPager

2
android-app/src/main/res/layout/cpp_wizard_step_choose_layout.xml
View File

@@ -33,7 +33,7 @@
a:layout_height="wrap_content"
a:textAppearance="@android:style/TextAppearance.Large"
style="@style/WizardLabel"
a:text="Choose layout" />
a:text="@string/cpp_wizard_layout_title" />
<Spinner
a:id="@+id/wizard_layout_spinner"

2
android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
View File

@@ -33,7 +33,7 @@
a:layout_height="wrap_content"
a:textAppearance="@android:style/TextAppearance.Large"
style="@style/WizardLabel"
a:text="Choose mode"/>
a:text="@string/cpp_wizard_mode_title"/>
<Spinner
a:id="@+id/wizard_mode_spinner"

2
android-app/src/main/res/layout/fragment_wizard_buttons.xml
View File

@@ -10,6 +10,7 @@
<org.solovyev.android.material.MaterialButton
style="@style/MaterialButton.Wizard"
a:id="@+id/wizard_prev"
a:visibility="gone"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1" />
@@ -17,6 +18,7 @@
<org.solovyev.android.material.MaterialButton
style="@style/MaterialButton.Wizard"
a:id="@+id/wizard_next"
a:visibility="gone"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1" />

9
android-app/src/main/res/values-v21/theme.xml
View File

@@ -32,4 +32,13 @@
<item name="android:colorPrimaryDark">@color/cpp_metro_button_dark</item>
</style>
<style name="Theme.Wizard" parent="@style/cpp_metro_blue_theme">
<item name="android:windowBackground">@color/cpp_wizard_bg</item>
<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
<item name="colorAccent">@color/cpp_wizard_primary</item>
<item name="android:colorAccent">@color/cpp_wizard_primary</item>
<item name="android:textColorSecondary">@color/cpp_wizard_primary</item>
<item name="android:textColorPrimary">@color/cpp_wizard_primary</item>
</style>
</resources>

2
android-app/src/main/res/values/colors.xml
View File

@@ -29,7 +29,9 @@
<color name="cpp_button_text_ce">#ffffffff</color>
<color name="cpp_selected_angle_unit_text">#ffffff99</color>
<color name="cpp_main_bg">#ff000000</color>
<color name="cpp_wizard_primary">#FAFAFA</color>
<color name="cpp_wizard_bg">#212121</color>
<color name="cpp_wizard_overscroll">#FAFAFA</color>
<color name="cpp_wizard_button_normal">#424242</color>
<color name="cpp_wizard_button_disabled">#616161</color>
<color name="cpp_wizard_button_pressed">#757575</color>