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

sherlock removed from wizard

Browse Source
This commit is contained in:
Sergey Solovyev 2013-06-26 00:07:15 +04:00
parent d800895380
commit d6b4863fa2
7 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android-app/res/layout/cpp_wizard.xml
View File

@ -11,6 +11,7 @@
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="0dp" a:layout_height="0dp"
a:layout_weight="1" a:layout_weight="1"
a:padding="6dp"
a:gravity="center"/> a:gravity="center"/>
<LinearLayout <LinearLayout

4
android-app/src/main/java/org/solovyev/android/calculator/wizard/CalculatorWizardActivity.java
View File

@ -4,10 +4,10 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
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.view.View; import android.view.View;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@ -22,7 +22,7 @@ import static org.solovyev.android.calculator.wizard.Wizards.STEP;
* Date: 6/16/13 * Date: 6/16/13
* Time: 9:07 PM * Time: 9:07 PM
*/ */
public final class CalculatorWizardActivity extends SherlockFragmentActivity { public final class CalculatorWizardActivity extends FragmentActivity {
/* /*
********************************************************************** **********************************************************************

12
android-app/src/main/java/org/solovyev/android/calculator/wizard/ChooseLayoutWizardStep.java
View File

@ -1,28 +1,24 @@
package org.solovyev.android.calculator.wizard; package org.solovyev.android.calculator.wizard;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment;
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.RadioButton; import android.widget.RadioButton;
import org.solovyev.android.calculator.R;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.solovyev.android.calculator.R; import static org.solovyev.android.calculator.wizard.CalculatorLayout.*;
import com.actionbarsherlock.app.SherlockFragment;
import static org.solovyev.android.calculator.wizard.CalculatorLayout.big_buttons;
import static org.solovyev.android.calculator.wizard.CalculatorLayout.getDefaultLayout;
import static org.solovyev.android.calculator.wizard.CalculatorLayout.optimized;
/** /**
* User: serso * User: serso
* Date: 6/19/13 * Date: 6/19/13
* Time: 12:33 AM * Time: 12:33 AM
*/ */
public class ChooseLayoutWizardStep extends SherlockFragment { public class ChooseLayoutWizardStep extends Fragment {
/* /*
********************************************************************** **********************************************************************

4
android-app/src/main/java/org/solovyev/android/calculator/wizard/ChooseModeWizardStep.java
View File

@ -1,11 +1,11 @@
package org.solovyev.android.calculator.wizard; package org.solovyev.android.calculator.wizard;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment;
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.RadioButton; import android.widget.RadioButton;
import com.actionbarsherlock.app.SherlockFragment;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@ -18,7 +18,7 @@ import static org.solovyev.android.calculator.wizard.CalculatorMode.*;
* Date: 6/16/13 * Date: 6/16/13
* Time: 9:59 PM * Time: 9:59 PM
*/ */
public class ChooseModeWizardStep extends SherlockFragment { public class ChooseModeWizardStep extends Fragment {
/* /*
********************************************************************** **********************************************************************

4
android-app/src/main/java/org/solovyev/android/calculator/wizard/DragButtonWizardStep.java
View File

@ -1,12 +1,12 @@
package org.solovyev.android.calculator.wizard; package org.solovyev.android.calculator.wizard;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
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 com.actionbarsherlock.app.SherlockFragment;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import org.solovyev.android.view.drag.DirectionDragButton; import org.solovyev.android.view.drag.DirectionDragButton;
import org.solovyev.android.view.drag.DragButton; import org.solovyev.android.view.drag.DragButton;
@ -18,7 +18,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
public class DragButtonWizardStep extends SherlockFragment { public class DragButtonWizardStep extends Fragment {
/* /*
********************************************************************** **********************************************************************

8
android-app/src/main/java/org/solovyev/android/calculator/wizard/OnScreenCalculatorWizardStep.java
View File

@ -1,19 +1,17 @@
package org.solovyev.android.calculator.wizard; package org.solovyev.android.calculator.wizard;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment;
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.CheckBox; import android.widget.CheckBox;
import javax.annotation.Nullable;
import org.solovyev.android.calculator.CalculatorPreferences; import org.solovyev.android.calculator.CalculatorPreferences;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import com.actionbarsherlock.app.SherlockFragment; import javax.annotation.Nullable;
public class OnScreenCalculatorWizardStep extends SherlockFragment { public class OnScreenCalculatorWizardStep extends Fragment {
/* /*
********************************************************************** **********************************************************************

4
android-app/src/main/java/org/solovyev/android/calculator/wizard/WelcomeWizardStep.java
View File

@ -1,10 +1,10 @@
package org.solovyev.android.calculator.wizard; package org.solovyev.android.calculator.wizard;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment;
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 com.actionbarsherlock.app.SherlockFragment;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
/** /**
@ -12,7 +12,7 @@ import org.solovyev.android.calculator.R;
* Date: 6/16/13 * Date: 6/16/13
* Time: 9:44 PM * Time: 9:44 PM
*/ */
public final class WelcomeWizardStep extends SherlockFragment { public final class WelcomeWizardStep extends Fragment {
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {