Mobile layout for tablets

2012-10-26 23:29:05 +04:00
parent ef141ed054
commit 0ab3afa453
23 changed files with 920 additions and 539 deletions
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorButtons.java
@@ -69,7 +69,8 @@ public final class CalculatorButtons {
                                          @NotNull Activity activity) {
        preferences = preferences == null ? PreferenceManager.getDefaultSharedPreferences(activity) : preferences;

-        final boolean large = AndroidUtils.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE, activity.getResources().getConfiguration());
+        final boolean large = AndroidUtils.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE, activity.getResources().getConfiguration()) &&
+                                CalculatorPreferences.Gui.getLayout(preferences) != CalculatorPreferences.Gui.Layout.main_calculator_mobile;

        if (!large) {
            if (AndroidUtils.getScreenOrientation(activity) == Configuration.ORIENTATION_PORTRAIT
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplayFragment.java
@@ -1,6 +1,8 @@
 package org.solovyev.android.calculator;

+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,12 +17,20 @@ import org.jetbrains.annotations.NotNull;
 public class CalculatorDisplayFragment extends SherlockFragment {

    @NotNull
-    private final CalculatorFragmentHelper fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_display, R.string.result);
+    private CalculatorFragmentHelper fragmentHelper;

    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.getActivity());
+        final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(prefs);
+        if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
+            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_display_mobile, R.string.result);
+        } else {
+            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_display, R.string.result);
+        }
+
        fragmentHelper.onCreate(this);
    }

--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorEditorFragment.java
@@ -1,64 +1,122 @@
-package org.solovyev.android.calculator;
-
-import android.os.Bundle;
-import android.view.View;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
-import com.actionbarsherlock.view.MenuItem;
-import org.jetbrains.annotations.NotNull;
-import org.solovyev.android.calculator.about.CalculatorFragmentType;
-import org.solovyev.android.menu.ActivityMenu;
-import org.solovyev.android.menu.ListActivityMenu;
-import org.solovyev.android.sherlock.menu.SherlockMenuHelper;
-
-/**
- * User: Solovyev_S
- * Date: 25.09.12
- * Time: 10:49
- */
-public class CalculatorEditorFragment extends CalculatorFragment {
-
-    @NotNull
-    private ActivityMenu<Menu, MenuItem> menu = ListActivityMenu.fromList(CalculatorMenu.class, SherlockMenuHelper.getInstance());
-
-    public CalculatorEditorFragment() {
-        super(CalculatorFragmentType.editor);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        ((AndroidCalculator) CalculatorLocatorImpl.getInstance().getCalculator()).setEditor(getActivity());
-    }
-
-    /*
-    **********************************************************************
-    *
-    *                           MENU
-    *
-    **********************************************************************
-    */
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        this.menu.onCreateOptionsMenu(this.getActivity(), menu);
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        this.menu.onPrepareOptionsMenu(this.getActivity(), menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        return this.menu.onOptionsItemSelected(this.getActivity(), item);
-    }
-}
+package org.solovyev.android.calculator;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.actionbarsherlock.app.SherlockFragment;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+import org.jetbrains.annotations.NotNull;
+import org.solovyev.android.menu.ActivityMenu;
+import org.solovyev.android.menu.ListActivityMenu;
+import org.solovyev.android.sherlock.menu.SherlockMenuHelper;
+
+/**
+ * User: Solovyev_S
+ * Date: 25.09.12
+ * Time: 10:49
+ */
+public class CalculatorEditorFragment extends SherlockFragment {
+
+    @NotNull
+    private CalculatorFragmentHelper fragmentHelper;
+
+    @NotNull
+    private ActivityMenu<Menu, MenuItem> menu = ListActivityMenu.fromList(CalculatorMenu.class, SherlockMenuHelper.getInstance());
+
+    public CalculatorEditorFragment() {
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        fragmentHelper.onViewCreated(this, view);
+
+        ((AndroidCalculator) CalculatorLocatorImpl.getInstance().getCalculator()).setEditor(getActivity());
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.getActivity());
+        final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(prefs);
+        if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
+            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_editor_mobile, R.string.result);
+        } else {
+            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_editor, R.string.result);
+        }
+
+        fragmentHelper.onCreate(this);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return fragmentHelper.onCreateView(this, inflater, container);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        this.fragmentHelper.onResume(this);
+    }
+
+    @Override
+    public void onPause() {
+        this.fragmentHelper.onPause(this);
+
+        super.onPause();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onDestroy() {
+        fragmentHelper.onDestroy(this);
+        super.onDestroy();
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+    }
+
+    /*
+    **********************************************************************
+    *
+    *                           MENU
+    *
+    **********************************************************************
+    */
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        this.menu.onCreateOptionsMenu(this.getActivity(), menu);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        this.menu.onPrepareOptionsMenu(this.getActivity(), menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        return this.menu.onOptionsItemSelected(this.getActivity(), item);
+    }
+}
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorKeyboardFragment.java
@@ -30,7 +30,13 @@ public class CalculatorKeyboardFragment extends SherlockFragment implements Shar

        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this.getActivity());

-        fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_keyboard);
+        final CalculatorPreferences.Gui.Layout layout = CalculatorPreferences.Gui.getLayout(preferences);
+        if (layout == CalculatorPreferences.Gui.Layout.main_calculator_mobile) {
+            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_keyboard_mobile);
+        } else {
+            fragmentHelper = CalculatorApplication.getInstance().createFragmentHelper(R.layout.calc_keyboard);
+        }
+
        fragmentHelper.onCreate(this);

        preferences.registerOnSharedPreferenceChangeListener(this);
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java
@@ -95,6 +95,7 @@ public final class CalculatorPreferences {

        public static enum Layout {
            main_calculator(R.layout.main_calculator),
+            main_calculator_mobile(R.layout.main_calculator_mobile),

            // not used anymore
            @Deprecated