Calculator-in-a-window wizard step

This commit is contained in:
serso 2015-01-29 20:31:28 +01:00
parent e0eabca868
commit 3d358b60bf
7 changed files with 30 additions and 24 deletions

View File

@ -23,18 +23,16 @@
package org.solovyev.android.calculator.wizard;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
import org.solovyev.android.calculator.Preferences;
import org.solovyev.android.calculator.R;
import javax.annotation.Nullable;
public class OnScreenCalculatorWizardStep extends Fragment {
public class OnScreenCalculatorWizardStep extends WizardFragment {
/*
**********************************************************************
@ -74,7 +72,15 @@ public class OnScreenCalculatorWizardStep extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return inflater.inflate(R.layout.cpp_wizard_step_onscreen, null);
final View view = super.onCreateView(inflater, container, savedInstanceState);
setupNextButton(R.string.acl_wizard_next);
setupPrevButton(R.string.acl_wizard_back);
return view;
}
@Override
protected int getViewResId() {
return R.layout.cpp_wizard_step_onscreen;
}
@Override

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -33,21 +33,18 @@
a:layout_height="wrap_content"
a:textAppearance="@android:style/TextAppearance.Large"
style="@style/WizardLabel"
a:text="Choose mode"
a:layout_marginBottom="40dp" />
a:text="Choose mode"/>
<Spinner
a:id="@+id/wizard_mode_spinner"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
style="@style/WizardLabel"
a:layout_marginBottom="40dp" />
style="@style/WizardLabel"/>
<TextView
a:id="@+id/wizard_mode_description"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
style="@style/WizardLabel"
a:text="Choose mode" />
style="@style/WizardLabel"/>
</LinearLayout>

View File

@ -23,19 +23,23 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
a:layout_width="match_parent"
a:layout_height="match_parent"
a:gravity="center"
a:orientation="vertical">
<TextView
a:text="@string/cpp_wizard_onscreen_description"
a:layout_height="wrap_content"
a:layout_width="match_parent"/>
a:drawableTop="@drawable/logo_wizard_window"
a:text="@string/cpp_wizard_onscreen_description"
a:layout_height="wrap_content"
a:layout_width="wrap_content"
style="@style/WizardLabel" />
<CheckBox
a:id="@+id/wizard_onscreen_app_enabled_checkbox"
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:text="@string/cpp_wizard_onscreen_checkbox"/>
a:id="@+id/wizard_onscreen_app_enabled_checkbox"
a:layout_height="wrap_content"
a:layout_width="wrap_content"
a:text="@string/cpp_wizard_onscreen_checkbox"
style="@style/WizardLabel" />
</LinearLayout>

View File

@ -30,7 +30,7 @@
<string name="cpp_wizard_final_translate">Перевести язык</string>
<string name="cpp_wizard_final_contribute">Поучавствовать в разработке</string>
<string name="cpp_wizard_onscreen_description">Калькулятор в отдельном окне позволяет вам произодить вычисления не закрывая при этом другие приложения</string>
<string name="cpp_wizard_onscreen_checkbox">Включить калькулятор в отдельном окне (вторая иконка появится в списке приложений)</string>
<string name="cpp_wizard_onscreen_checkbox">Включить</string>
<string name="cpp_wizard_dragbutton_description">Специально разработанные кнопки позволяют быстро и просто использовать дополнительные возможности калькулятора
</string>
<string name="cpp_wizard_finish_confirmation">Вы действительно хотите завершить визард?</string>

View File

@ -150,6 +150,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center</item>
<item name="android:drawablePadding">40dp</item>
<item name="android:layout_marginBottom">40dp</item>
<item name="android:gravity">center</item>
<item name="android:textAppearance">@android:style/TextAppearance.Medium</item>
</style>

View File

@ -41,9 +41,7 @@
<string name="cpp_wizard_onscreen_description">Calculator in separate window allows you to do calculations while
using other apps on your device
</string>
<string name="cpp_wizard_onscreen_checkbox">Enable calculator in separate window (second icon will appear in the
apps list)
</string>
<string name="cpp_wizard_onscreen_checkbox">Enable</string>
<string name="cpp_wizard_dragbutton_description">Drag button is an exclusive feature of Calculator++ which provides
fast access to the secondary functions
</string>