diff --git a/android-app/src/main/AndroidManifest.xml b/android-app/src/main/AndroidManifest.xml
index d58b3045..4a81e4f0 100644
--- a/android-app/src/main/AndroidManifest.xml
+++ b/android-app/src/main/AndroidManifest.xml
@@ -26,7 +26,7 @@
-
+
@@ -45,8 +45,7 @@
-
-
+
@@ -88,12 +87,11 @@
-
-
+
-
+
@@ -119,7 +117,7 @@
-
+
@@ -132,7 +130,7 @@
-
+
@@ -145,7 +143,7 @@
-
+
@@ -158,7 +156,7 @@
-
+
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutFragment.java
index bc8ae5ed..361f14d7 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/about/CalculatorAboutFragment.java
@@ -25,7 +25,9 @@ package org.solovyev.android.calculator.about;
import android.os.Bundle;
import android.text.method.LinkMovementMethod;
import android.view.View;
+import android.widget.ImageView;
import android.widget.TextView;
+import org.solovyev.android.calculator.App;
import org.solovyev.android.calculator.CalculatorFragment;
import org.solovyev.android.calculator.CalculatorFragmentType;
import org.solovyev.android.calculator.R;
@@ -48,6 +50,11 @@ public class CalculatorAboutFragment extends CalculatorFragment {
public void onViewCreated(View root, Bundle savedInstanceState) {
super.onViewCreated(root, savedInstanceState);
+ if (App.getTheme().isLight()) {
+ final ImageView image = (ImageView) root.findViewById(R.id.about_image);
+ image.setImageResource(R.drawable.logo_wizard_light);
+ }
+
final TextView aboutTextView = (TextView) root.findViewById(R.id.cpp_about_textview);
aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/OnScreenCalculatorWizardStep.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/OnScreenCalculatorWizardStep.java
index 87d23363..6fd1ea6d 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/OnScreenCalculatorWizardStep.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/OnScreenCalculatorWizardStep.java
@@ -26,6 +26,8 @@ import android.os.Bundle;
import android.view.View;
import android.widget.CheckBox;
import android.widget.CompoundButton;
+import android.widget.TextView;
+import org.solovyev.android.calculator.App;
import org.solovyev.android.calculator.Preferences;
import org.solovyev.android.calculator.R;
@@ -51,6 +53,11 @@ public class OnScreenCalculatorWizardStep extends WizardFragment implements Comp
checkbox = (CheckBox) root.findViewById(R.id.wizard_onscreen_app_enabled_checkbox);
checkbox.setChecked(enabled);
checkbox.setOnCheckedChangeListener(this);
+
+ if (App.getTheme().isLight()) {
+ final TextView message = (TextView) root.findViewById(R.id.wizard_onscreen_message);
+ message.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.logo_wizard_window_light, 0, 0);
+ }
}
@Nullable
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/WelcomeWizardStep.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/WelcomeWizardStep.java
index 19d68767..13ab8c0a 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/WelcomeWizardStep.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/WelcomeWizardStep.java
@@ -26,6 +26,8 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.TextView;
+import org.solovyev.android.calculator.App;
import org.solovyev.android.calculator.R;
public final class WelcomeWizardStep extends WizardFragment {
@@ -38,6 +40,10 @@ public final class WelcomeWizardStep extends WizardFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
final View view = super.onCreateView(inflater, container, savedInstanceState);
+ if (App.getTheme().isLight()) {
+ final TextView message = (TextView) view.findViewById(R.id.wizard_welcome_message);
+ message.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.logo_wizard_light, 0, 0);
+ }
prevButton.setTextColor(getResources().getColor(R.color.cpp_wizard_disabled_text));
return view;
}
diff --git a/android-app/src/main/res/drawable-hdpi/ic_launcher.png b/android-app/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 00000000..747c7265
Binary files /dev/null and b/android-app/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/android-app/src/main/res/drawable-hdpi/ic_launcher_window.png b/android-app/src/main/res/drawable-hdpi/ic_launcher_window.png
new file mode 100644
index 00000000..61bca911
Binary files /dev/null and b/android-app/src/main/res/drawable-hdpi/ic_launcher_window.png differ
diff --git a/android-app/src/main/res/drawable-hdpi/icon.png b/android-app/src/main/res/drawable-hdpi/icon.png
deleted file mode 100644
index 6c973a2c..00000000
Binary files a/android-app/src/main/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-hdpi/icon_onscreen.png b/android-app/src/main/res/drawable-hdpi/icon_onscreen.png
deleted file mode 100644
index 8cc83036..00000000
Binary files a/android-app/src/main/res/drawable-hdpi/icon_onscreen.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-hdpi/logo.png b/android-app/src/main/res/drawable-hdpi/logo.png
deleted file mode 100644
index d01e1796..00000000
Binary files a/android-app/src/main/res/drawable-hdpi/logo.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-ldpi/logo.png b/android-app/src/main/res/drawable-ldpi/logo.png
deleted file mode 100644
index 3b0debcd..00000000
Binary files a/android-app/src/main/res/drawable-ldpi/logo.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-mdpi/ic_launcher.png b/android-app/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 00000000..fe5f3748
Binary files /dev/null and b/android-app/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/android-app/src/main/res/drawable-mdpi/ic_launcher_window.png b/android-app/src/main/res/drawable-mdpi/ic_launcher_window.png
new file mode 100644
index 00000000..84029e99
Binary files /dev/null and b/android-app/src/main/res/drawable-mdpi/ic_launcher_window.png differ
diff --git a/android-app/src/main/res/drawable-mdpi/icon.png b/android-app/src/main/res/drawable-mdpi/icon.png
deleted file mode 100644
index dae53607..00000000
Binary files a/android-app/src/main/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-mdpi/icon_onscreen.png b/android-app/src/main/res/drawable-mdpi/icon_onscreen.png
deleted file mode 100644
index d110cf18..00000000
Binary files a/android-app/src/main/res/drawable-mdpi/icon_onscreen.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-mdpi/logo.png b/android-app/src/main/res/drawable-mdpi/logo.png
deleted file mode 100644
index 2d2fccd0..00000000
Binary files a/android-app/src/main/res/drawable-mdpi/logo.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-xhdpi/ic_launcher.png b/android-app/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..66698950
Binary files /dev/null and b/android-app/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/android-app/src/main/res/drawable-xhdpi/ic_launcher_window.png b/android-app/src/main/res/drawable-xhdpi/ic_launcher_window.png
new file mode 100644
index 00000000..56f8c28d
Binary files /dev/null and b/android-app/src/main/res/drawable-xhdpi/ic_launcher_window.png differ
diff --git a/android-app/src/main/res/drawable-xhdpi/icon.png b/android-app/src/main/res/drawable-xhdpi/icon.png
deleted file mode 100644
index 755b0909..00000000
Binary files a/android-app/src/main/res/drawable-xhdpi/icon.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-xhdpi/icon_onscreen.png b/android-app/src/main/res/drawable-xhdpi/icon_onscreen.png
deleted file mode 100644
index 656c2bcb..00000000
Binary files a/android-app/src/main/res/drawable-xhdpi/icon_onscreen.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-xhdpi/logo.png b/android-app/src/main/res/drawable-xhdpi/logo.png
deleted file mode 100644
index fd9e5571..00000000
Binary files a/android-app/src/main/res/drawable-xhdpi/logo.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-xxhdpi/ic_launcher.png b/android-app/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..224d1d61
Binary files /dev/null and b/android-app/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/android-app/src/main/res/drawable-xxhdpi/ic_launcher_window.png b/android-app/src/main/res/drawable-xxhdpi/ic_launcher_window.png
new file mode 100644
index 00000000..8470164f
Binary files /dev/null and b/android-app/src/main/res/drawable-xxhdpi/ic_launcher_window.png differ
diff --git a/android-app/src/main/res/drawable-xxhdpi/icon.png b/android-app/src/main/res/drawable-xxhdpi/icon.png
deleted file mode 100644
index b53de2d7..00000000
Binary files a/android-app/src/main/res/drawable-xxhdpi/icon.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-xxhdpi/icon_onscreen.png b/android-app/src/main/res/drawable-xxhdpi/icon_onscreen.png
deleted file mode 100644
index 58f53103..00000000
Binary files a/android-app/src/main/res/drawable-xxhdpi/icon_onscreen.png and /dev/null differ
diff --git a/android-app/src/main/res/drawable-xxhdpi/logo_wizard_light.png b/android-app/src/main/res/drawable-xxhdpi/logo_wizard_light.png
new file mode 100644
index 00000000..9193a8f4
Binary files /dev/null and b/android-app/src/main/res/drawable-xxhdpi/logo_wizard_light.png differ
diff --git a/android-app/src/main/res/drawable-xxhdpi/logo_wizard_window_light.png b/android-app/src/main/res/drawable-xxhdpi/logo_wizard_window_light.png
new file mode 100644
index 00000000..f7d2b3e7
Binary files /dev/null and b/android-app/src/main/res/drawable-xxhdpi/logo_wizard_window_light.png differ
diff --git a/android-app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/android-app/src/main/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..5c480e8c
Binary files /dev/null and b/android-app/src/main/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/android-app/src/main/res/drawable-xxxhdpi/ic_launcher_window.png b/android-app/src/main/res/drawable-xxxhdpi/ic_launcher_window.png
new file mode 100644
index 00000000..34659bac
Binary files /dev/null and b/android-app/src/main/res/drawable-xxxhdpi/ic_launcher_window.png differ
diff --git a/android-app/src/main/res/layout/about_fragment.xml b/android-app/src/main/res/layout/about_fragment.xml
index 70c36a89..9b363dd8 100644
--- a/android-app/src/main/res/layout/about_fragment.xml
+++ b/android-app/src/main/res/layout/about_fragment.xml
@@ -28,12 +28,14 @@
a:orientation="vertical">
+ a:src="@drawable/logo_wizard" />