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

Wizard: welcome step

Browse Source
This commit is contained in:
serso 2015-01-29 10:06:39 +01:00
parent 099d330f9d
commit 09f3655bb8
10 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -74,7 +74,7 @@
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules /> <modules />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">

4
android-app/src/main/AndroidManifest.xml
View File

@ -60,7 +60,7 @@
<activity android:label="@string/c_vars_and_constants" android:name=".math.edit.CalculatorVarsActivity"/> <activity android:label="@string/c_vars_and_constants" android:name=".math.edit.CalculatorVarsActivity"/>
<activity android:name=".CalculatorWikiActivity"/> <activity android:name=".CalculatorWikiActivity"/>
<activity android:launchMode="singleTop" android:name=".wizard.WizardActivity" android:theme="@style/cpp_metro_blue_theme"> <activity android:launchMode="singleTop" android:name=".wizard.WizardActivity" android:theme="@style/Theme.Wizard">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
</intent-filter> </intent-filter>
@ -71,7 +71,7 @@
<activity android:label="@string/cpp_plot_function_settings" android:name=".plot.CalculatorPlotFunctionSettingsActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/> <activity android:label="@string/cpp_plot_function_settings" android:name=".plot.CalculatorPlotFunctionSettingsActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/>
<activity android:label="@string/cpp_plot_range" android:name=".plot.CalculatorPlotRangeActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/> <activity android:label="@string/cpp_plot_range" android:name=".plot.CalculatorPlotRangeActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/>
<activity android:label="@string/cpp_purchase_title" android:name=".preferences.PurchaseDialogActivity" android:theme="@style/Theme.Wizard"/> <activity android:label="@string/cpp_purchase_title" android:name=".preferences.PurchaseDialogActivity" android:theme="@style/Theme.Wizard.Purchase"/>
<activity android:name=".CalculatorDialogActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/> <activity android:name=".CalculatorDialogActivity" android:theme="@style/cpp_metro_blue_dialog_theme"/>

7
android-app/src/main/java/org/solovyev/android/calculator/ActivityUi.java
View File

@ -32,13 +32,12 @@ import android.support.annotation.LayoutRes;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; 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.DisplayMetrics;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; 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.Activities;
import org.solovyev.android.Views; import org.solovyev.android.Views;
import org.solovyev.android.sherlock.tabs.ActionBarFragmentTabListener; import org.solovyev.android.sherlock.tabs.ActionBarFragmentTabListener;
@ -88,8 +87,6 @@ public class ActivityUi extends BaseUi {
if (root != null) { if (root != null) {
processButtons(activity, root); processButtons(activity, root);
addHelpInfo(activity, root); addHelpInfo(activity, root);
} else {
Log.e(ActivityUi.class.getSimpleName(), "Root is null for " + activity.getClass().getName());
} }
} }

BIN
android-app/src/main/res/drawable-xxhdpi/logo_wizard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

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

@ -16,7 +16,6 @@
android:id="@+id/pager_indicator" android:id="@+id/pager_indicator"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
my:fillColor="@color/cpp_metro_blue"
my:radius="5dp" /> my:radius="5dp" />
</LinearLayout> </LinearLayout>

18
android-app/src/main/res/layout/cpp_wizard_step_welcome.xml
View File

@ -22,13 +22,17 @@
~ Site: http://se.solovyev.org ~ Site: http://se.solovyev.org
--> -->
<TextView xmlns:a="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:drawableTop="@drawable/icon" a:layout_width="match_parent"
a:drawablePadding="5dp" a:layout_height="match_parent">
<TextView
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:gravity="center"
a:layout_gravity="center" a:layout_gravity="center"
a:textColor="@color/material_text" a:drawablePadding="40dp"
a:textAppearance="@android:style/TextAppearance.Medium" a:drawableTop="@drawable/logo_wizard"
a:text="@string/c_first_start_text" /> a:gravity="center"
a:text="@string/c_first_start_text"
a:textAppearance="@android:style/TextAppearance.Medium" />
</FrameLayout>

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

@ -29,6 +29,7 @@
<color name="cpp_button_text_ce">#ffffffff</color> <color name="cpp_button_text_ce">#ffffffff</color>
<color name="cpp_selected_angle_unit_text">#ffffff99</color> <color name="cpp_selected_angle_unit_text">#ffffff99</color>
<color name="cpp_main_bg">#ff000000</color> <color name="cpp_main_bg">#ff000000</color>
<color name="cpp_wizard_bg">#ff374248</color>
<color name="cpp_pane_background">#ff1f1f1f</color> <color name="cpp_pane_background">#ff1f1f1f</color>
<color name="cpp_metro_button_dark">#ff000000</color> <color name="cpp_metro_button_dark">#ff000000</color>
<color name="cpp_metro_button">#212121</color> <color name="cpp_metro_button">#212121</color>

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

@ -28,6 +28,15 @@
<style name="Theme.Base" parent="@style/Theme.AppCompat"></style> <style name="Theme.Base" parent="@style/Theme.AppCompat"></style>
<style name="Theme.Base.Dialog" parent="@style/Theme.AppCompat.Dialog"></style> <style name="Theme.Base.Dialog" parent="@style/Theme.AppCompat.Dialog"></style>
<style name="Theme.Wizard.Purchase" parent="cpp_metro_blue_theme">
<item name="android:windowNoTitle">true</item>
<item name="android:background">@color/cpp_metro_button_light</item>
</style>
<style name="Theme.Wizard" parent="@style/cpp_metro_blue_theme">
<item name="android:windowBackground">@color/cpp_wizard_bg</item>
</style>
<style name="Theme.Settings" parent="@style/cpp_metro_blue_theme"> <style name="Theme.Settings" parent="@style/cpp_metro_blue_theme">
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
<item name="android:windowActionBar">false</item> <item name="android:windowActionBar">false</item>

5
android-app/src/main/res/values/theme_metro_blue.xml
View File

@ -48,11 +48,6 @@
<item name="android:padding">6dp</item> <item name="android:padding">6dp</item>
</style> </style>
<style name="Theme.Wizard" parent="cpp_metro_blue_theme">
<item name="android:windowNoTitle">true</item>
<item name="android:background">@color/cpp_metro_button_light</item>
</style>
<style name="cpp_metro_blue_theme" parent="cpp_gray_theme"> <style name="cpp_metro_blue_theme" parent="cpp_gray_theme">
<item name="cpp_digit_button_style">@style/metro_digit_button_style</item> <item name="cpp_digit_button_style">@style/metro_digit_button_style</item>
<item name="cpp_control_button_style">@style/metro_control_button_style</item> <item name="cpp_control_button_style">@style/metro_control_button_style</item>

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

@ -21,7 +21,7 @@
<integer name="default_circle_indicator_orientation">0</integer> <integer name="default_circle_indicator_orientation">0</integer>
<dimen name="default_circle_indicator_radius">3dp</dimen> <dimen name="default_circle_indicator_radius">3dp</dimen>
<bool name="default_circle_indicator_snap">false</bool> <bool name="default_circle_indicator_snap">false</bool>
<color name="default_circle_indicator_stroke_color">@color/cpp_metro_button_light</color> <color name="default_circle_indicator_stroke_color">#ffc2c2c2</color>
<dimen name="default_circle_indicator_stroke_width">1px</dimen> <dimen name="default_circle_indicator_stroke_width">1px</dimen>
<dimen name="default_line_indicator_line_width">12dp</dimen> <dimen name="default_line_indicator_line_width">12dp</dimen>