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 00000000..e147372d Binary files /dev/null and b/android-app/src/main/res/drawable-xxhdpi/logo_wizard.png differ 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 @@ + + + + - -