New icons
@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/>
|
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/>
|
||||||
|
|
||||||
<application android:allowBackup="true" android:hardwareAccelerated="true" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/Cpp.Theme.Material">
|
<application android:allowBackup="true" android:hardwareAccelerated="true" android:icon="@drawable/ic_launcher" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/Cpp.Theme.Material">
|
||||||
|
|
||||||
<activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:launchMode="singleTop" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
|
<activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:launchMode="singleTop" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
|
||||||
|
|
||||||
@ -45,8 +45,7 @@
|
|||||||
|
|
||||||
<activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:launchMode="singleTop" android:name=".CalculatorActivityMobile" android:windowSoftInputMode="adjustPan"/>
|
<activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:launchMode="singleTop" android:name=".CalculatorActivityMobile" android:windowSoftInputMode="adjustPan"/>
|
||||||
|
|
||||||
<!-- settings must use action bar icon-->
|
<activity android:label="@string/c_app_settings" android:name=".preferences.PreferencesActivity" android:theme="@style/Cpp.Theme.Settings"/>
|
||||||
<activity android:icon="@drawable/ab_icon" android:label="@string/c_app_settings" android:name=".preferences.PreferencesActivity" android:theme="@style/Cpp.Theme.Settings"/>
|
|
||||||
|
|
||||||
<activity android:label="@string/c_history" android:name=".history.CalculatorHistoryActivity"/>
|
<activity android:label="@string/c_history" android:name=".history.CalculatorHistoryActivity"/>
|
||||||
|
|
||||||
@ -88,12 +87,11 @@
|
|||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<!-- settings must use action bar icon-->
|
<activity android:label="@string/c_settings" android:name=".plot.PlotPreferenceActivity" android:theme="@style/Cpp.Theme.Settings"/>
|
||||||
<activity android:icon="@drawable/ab_icon" android:label="@string/c_settings" android:name=".plot.PlotPreferenceActivity" android:theme="@style/Cpp.Theme.Settings"/>
|
|
||||||
|
|
||||||
<!-- ONSCREEN CONFIG -->
|
<!-- ONSCREEN CONFIG -->
|
||||||
|
|
||||||
<activity android:icon="@drawable/icon_onscreen" android:label="@string/c_app_name_on_screen" android:launchMode="singleInstance" android:name=".onscreen.CalculatorOnscreenStartActivity" android:theme="@style/Cpp.Theme.Dialog.Material">
|
<activity android:icon="@drawable/ic_launcher_window" android:label="@string/c_app_name_on_screen" android:launchMode="singleInstance" android:name=".onscreen.CalculatorOnscreenStartActivity" android:theme="@style/Cpp.Theme.Dialog.Material">
|
||||||
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN"/>
|
<action android:name="android.intent.action.MAIN"/>
|
||||||
@ -119,7 +117,7 @@
|
|||||||
|
|
||||||
<!-- WIDGET CONFIG -->
|
<!-- WIDGET CONFIG -->
|
||||||
|
|
||||||
<receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_3x3_name" android:name=".widget.CalculatorWidgetProvider">
|
<receiver android:icon="@drawable/ic_launcher" android:label="@string/c_app_widget_3x3_name" android:name=".widget.CalculatorWidgetProvider">
|
||||||
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
||||||
@ -132,7 +130,7 @@
|
|||||||
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_3x3"/>
|
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_3x3"/>
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
<receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_3x4_name" android:name=".widget.CalculatorWidgetProvider3x4">
|
<receiver android:icon="@drawable/ic_launcher" android:label="@string/c_app_widget_3x4_name" android:name=".widget.CalculatorWidgetProvider3x4">
|
||||||
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
||||||
@ -145,7 +143,7 @@
|
|||||||
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_3x4"/>
|
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_3x4"/>
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
<receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_4x4_name" android:name=".widget.CalculatorWidgetProvider4x4">
|
<receiver android:icon="@drawable/ic_launcher" android:label="@string/c_app_widget_4x4_name" android:name=".widget.CalculatorWidgetProvider4x4">
|
||||||
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
||||||
@ -158,7 +156,7 @@
|
|||||||
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_4x4"/>
|
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_4x4"/>
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
<receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_4x5_name" android:name=".widget.CalculatorWidgetProvider4x5">
|
<receiver android:icon="@drawable/ic_launcher" android:label="@string/c_app_widget_4x5_name" android:name=".widget.CalculatorWidgetProvider4x5">
|
||||||
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
||||||
|
@ -25,7 +25,9 @@ package org.solovyev.android.calculator.about;
|
|||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.text.method.LinkMovementMethod;
|
import android.text.method.LinkMovementMethod;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
import android.widget.ImageView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import org.solovyev.android.calculator.App;
|
||||||
import org.solovyev.android.calculator.CalculatorFragment;
|
import org.solovyev.android.calculator.CalculatorFragment;
|
||||||
import org.solovyev.android.calculator.CalculatorFragmentType;
|
import org.solovyev.android.calculator.CalculatorFragmentType;
|
||||||
import org.solovyev.android.calculator.R;
|
import org.solovyev.android.calculator.R;
|
||||||
@ -48,6 +50,11 @@ public class CalculatorAboutFragment extends CalculatorFragment {
|
|||||||
public void onViewCreated(View root, Bundle savedInstanceState) {
|
public void onViewCreated(View root, Bundle savedInstanceState) {
|
||||||
super.onViewCreated(root, 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);
|
final TextView aboutTextView = (TextView) root.findViewById(R.id.cpp_about_textview);
|
||||||
aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
|
aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
|
||||||
|
|
||||||
|
@ -26,6 +26,8 @@ import android.os.Bundle;
|
|||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.CheckBox;
|
import android.widget.CheckBox;
|
||||||
import android.widget.CompoundButton;
|
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.Preferences;
|
||||||
import org.solovyev.android.calculator.R;
|
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 = (CheckBox) root.findViewById(R.id.wizard_onscreen_app_enabled_checkbox);
|
||||||
checkbox.setChecked(enabled);
|
checkbox.setChecked(enabled);
|
||||||
checkbox.setOnCheckedChangeListener(this);
|
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
|
@Nullable
|
||||||
|
@ -26,6 +26,8 @@ import android.os.Bundle;
|
|||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.TextView;
|
||||||
|
import org.solovyev.android.calculator.App;
|
||||||
import org.solovyev.android.calculator.R;
|
import org.solovyev.android.calculator.R;
|
||||||
|
|
||||||
public final class WelcomeWizardStep extends WizardFragment {
|
public final class WelcomeWizardStep extends WizardFragment {
|
||||||
@ -38,6 +40,10 @@ public final class WelcomeWizardStep extends WizardFragment {
|
|||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
final View view = super.onCreateView(inflater, container, 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));
|
prevButton.setTextColor(getResources().getColor(R.color.cpp_wizard_disabled_text));
|
||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
|
BIN
android-app/src/main/res/drawable-hdpi/ic_launcher.png
Normal file
After Width: | Height: | Size: 3.8 KiB |
BIN
android-app/src/main/res/drawable-hdpi/ic_launcher_window.png
Normal file
After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 8.0 KiB |
BIN
android-app/src/main/res/drawable-mdpi/ic_launcher.png
Normal file
After Width: | Height: | Size: 2.9 KiB |
BIN
android-app/src/main/res/drawable-mdpi/ic_launcher_window.png
Normal file
After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 11 KiB |
BIN
android-app/src/main/res/drawable-xhdpi/ic_launcher.png
Normal file
After Width: | Height: | Size: 4.7 KiB |
BIN
android-app/src/main/res/drawable-xhdpi/ic_launcher_window.png
Normal file
After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 4.0 KiB |
Before Width: | Height: | Size: 25 KiB |
BIN
android-app/src/main/res/drawable-xxhdpi/ic_launcher.png
Normal file
After Width: | Height: | Size: 7.0 KiB |
BIN
android-app/src/main/res/drawable-xxhdpi/ic_launcher_window.png
Normal file
After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 5.2 KiB |
BIN
android-app/src/main/res/drawable-xxhdpi/logo_wizard_light.png
Normal file
After Width: | Height: | Size: 12 KiB |
After Width: | Height: | Size: 12 KiB |
BIN
android-app/src/main/res/drawable-xxxhdpi/ic_launcher.png
Normal file
After Width: | Height: | Size: 9.3 KiB |
BIN
android-app/src/main/res/drawable-xxxhdpi/ic_launcher_window.png
Normal file
After Width: | Height: | Size: 7.6 KiB |
@ -28,12 +28,14 @@
|
|||||||
a:orientation="vertical">
|
a:orientation="vertical">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
a:layout_width="wrap_content"
|
a:id="@+id/about_image"
|
||||||
a:layout_height="wrap_content"
|
a:layout_width="200dp"
|
||||||
|
a:layout_height="200dp"
|
||||||
a:layout_gravity="center"
|
a:layout_gravity="center"
|
||||||
|
a:scaleType="center"
|
||||||
a:layout_weight="1"
|
a:layout_weight="1"
|
||||||
a:padding="6dp"
|
a:padding="6dp"
|
||||||
a:src="@drawable/logo" />
|
a:src="@drawable/logo_wizard" />
|
||||||
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
a:layout_width="fill_parent"
|
a:layout_width="fill_parent"
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
style="@style/WizardLabel"
|
style="@style/WizardLabel"
|
||||||
|
a:id="@+id/wizard_onscreen_message"
|
||||||
a:layout_width="wrap_content"
|
a:layout_width="wrap_content"
|
||||||
a:layout_height="wrap_content"
|
a:layout_height="wrap_content"
|
||||||
a:drawableTop="@drawable/logo_wizard_window"
|
a:drawableTop="@drawable/logo_wizard_window"
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
style="@style/WizardLabel.Last"
|
style="@style/WizardLabel.Last"
|
||||||
|
a:id="@+id/wizard_welcome_message"
|
||||||
a:drawableTop="@drawable/logo_wizard"
|
a:drawableTop="@drawable/logo_wizard"
|
||||||
a:text="@string/c_first_start_text" />
|
a:text="@string/c_first_start_text" />
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|