From 09f3655bb813c18d55f2d8a5172dc68bb512146d Mon Sep 17 00:00:00 2001 From: serso Date: Thu, 29 Jan 2015 10:06:39 +0100 Subject: [PATCH] Wizard: welcome step --- .idea/misc.xml | 2 +- android-app/src/main/AndroidManifest.xml | 4 ++-- .../android/calculator/ActivityUi.java | 7 ++---- .../main/res/drawable-xxhdpi/logo_wizard.png | Bin 0 -> 13381 bytes .../main/res/layout/cpp_activity_wizard.xml | 1 - .../res/layout/cpp_wizard_step_welcome.xml | 22 +++++++++++------- android-app/src/main/res/values/colors.xml | 1 + android-app/src/main/res/values/theme.xml | 9 +++++++ .../src/main/res/values/theme_metro_blue.xml | 5 ---- .../src/main/res/values/vpi__defaults.xml | 2 +- 10 files changed, 29 insertions(+), 24 deletions(-) create mode 100644 android-app/src/main/res/drawable-xxhdpi/logo_wizard.png diff --git a/.idea/misc.xml b/.idea/misc.xml index 41c22422..2907242d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -74,7 +74,7 @@ - + diff --git a/android-app/src/main/AndroidManifest.xml b/android-app/src/main/AndroidManifest.xml index b7776c9d..139846fa 100644 --- a/android-app/src/main/AndroidManifest.xml +++ b/android-app/src/main/AndroidManifest.xml @@ -60,7 +60,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/android-app/src/main/java/org/solovyev/android/calculator/ActivityUi.java b/android-app/src/main/java/org/solovyev/android/calculator/ActivityUi.java index 2048b6c7..2994a265 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/ActivityUi.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/ActivityUi.java @@ -32,13 +32,12 @@ import android.support.annotation.LayoutRes; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; import android.util.DisplayMetrics; -import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import android.support.v7.app.ActionBar; -import android.support.v7.app.ActionBarActivity; import org.solovyev.android.Activities; import org.solovyev.android.Views; import org.solovyev.android.sherlock.tabs.ActionBarFragmentTabListener; @@ -88,8 +87,6 @@ public class ActivityUi extends BaseUi { if (root != null) { processButtons(activity, root); addHelpInfo(activity, root); - } else { - Log.e(ActivityUi.class.getSimpleName(), "Root is null for " + activity.getClass().getName()); } } diff --git a/android-app/src/main/res/drawable-xxhdpi/logo_wizard.png b/android-app/src/main/res/drawable-xxhdpi/logo_wizard.png new file mode 100644 index 0000000000000000000000000000000000000000..e147372d6662238d1cc9df291584ca381fd73c79 GIT binary patch literal 13381 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 S2?4h<0YzCgnQAGEkpBV7dVxIv literal 0 HcmV?d00001 diff --git a/android-app/src/main/res/layout/cpp_activity_wizard.xml b/android-app/src/main/res/layout/cpp_activity_wizard.xml index d76948ad..82fb34a5 100644 --- a/android-app/src/main/res/layout/cpp_activity_wizard.xml +++ b/android-app/src/main/res/layout/cpp_activity_wizard.xml @@ -16,7 +16,6 @@ android:id="@+id/pager_indicator" android:layout_height="wrap_content" android:layout_width="match_parent" - my:fillColor="@color/cpp_metro_blue" my:radius="5dp" /> \ No newline at end of file diff --git a/android-app/src/main/res/layout/cpp_wizard_step_welcome.xml b/android-app/src/main/res/layout/cpp_wizard_step_welcome.xml index 14418ffe..b91c4373 100644 --- a/android-app/src/main/res/layout/cpp_wizard_step_welcome.xml +++ b/android-app/src/main/res/layout/cpp_wizard_step_welcome.xml @@ -22,13 +22,17 @@ ~ Site: http://se.solovyev.org --> - + a:layout_height="match_parent"> + + + diff --git a/android-app/src/main/res/values/colors.xml b/android-app/src/main/res/values/colors.xml index 812517ab..4f4c0e4e 100644 --- a/android-app/src/main/res/values/colors.xml +++ b/android-app/src/main/res/values/colors.xml @@ -29,6 +29,7 @@ #ffffffff #ffffff99 #ff000000 + #ff374248 #ff1f1f1f #ff000000 #212121 diff --git a/android-app/src/main/res/values/theme.xml b/android-app/src/main/res/values/theme.xml index 2f67786e..35affbcd 100644 --- a/android-app/src/main/res/values/theme.xml +++ b/android-app/src/main/res/values/theme.xml @@ -28,6 +28,15 @@ + + + + - -