commit 4235de9b477a67a911f8b5f7d2d5f87910d2cdf3 Author: Leszek Koltunski Date: Mon Feb 17 01:19:06 2020 +0000 Major rearrangement of the UI. diff --git a/src/main/java/org/distorted/magic/RubikActivity.java b/src/main/java/org/distorted/magic/RubikActivity.java index 3e8b4049..ddc9029f 100644 --- a/src/main/java/org/distorted/magic/RubikActivity.java +++ b/src/main/java/org/distorted/magic/RubikActivity.java @@ -19,59 +19,17 @@ package org.distorted.magic; -import android.content.SharedPreferences; -import android.opengl.GLSurfaceView; import android.os.Bundle; -import android.preference.PreferenceManager; import android.support.v7.app.AppCompatActivity; import android.view.View; -import org.distorted.component.HorizontalNumberPicker; import org.distorted.library.main.DistortedLibrary; -import org.distorted.effect.BaseEffect; /////////////////////////////////////////////////////////////////////////////////////////////////// public class RubikActivity extends AppCompatActivity implements View.OnClickListener { - public static final int MIN_SCRAMBLE = 1; - public static final int DEF_SCRAMBLE = 1; - public static final int MAX_SCRAMBLE = 18; - - private HorizontalNumberPicker mPicker; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void savePreferences() - { - SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); - SharedPreferences.Editor editor = preferences.edit(); - - for (int i=0; i< BaseEffect.Type.LENGTH; i++) - { - BaseEffect.Type.getType(i).savePreferences(editor); - } - - editor.putInt("scramble", mPicker.getValue() ); - - editor.apply(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void restorePreferences() - { - SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); - - for (int i=0; i< BaseEffect.Type.LENGTH; i++) - { - BaseEffect.Type.getType(i).restorePreferences(preferences); - } - - int scramble= preferences.getInt("scramble", DEF_SCRAMBLE); - - mPicker.setValue(scramble); - } + private RubikDialogMain mMain; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -81,15 +39,15 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList super.onCreate(savedState); setTheme(R.style.CustomActivityThemeNoActionBar); setContentView(R.layout.main); - RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); - view.addSizeButtons(this); - view.markButton(RubikSurfaceView.getRedButton()); - mPicker = findViewById(R.id.rubikNumberPicker); - mPicker.setMin(MIN_SCRAMBLE); - mPicker.setMax(MAX_SCRAMBLE); + RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); + view.enterMainState(this); - restorePreferences(); + if( savedState==null ) + { + mMain = new RubikDialogMain(); + mMain.show(getSupportFragmentManager(), null); + } } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -97,11 +55,11 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList @Override protected void onPause() { - GLSurfaceView view = findViewById(R.id.rubikSurfaceView); + RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); view.onPause(); DistortedLibrary.onPause(); RubikScoresDownloader.onPause(); - savePreferences(); + view.savePreferences(); super.onPause(); } @@ -111,8 +69,9 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList protected void onResume() { super.onResume(); - GLSurfaceView view = findViewById(R.id.rubikSurfaceView); + RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); view.onResume(); + view.restorePreferences(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -143,10 +102,30 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList view.markButton(id); } } + + if( id == RubikSurfaceView.BUTTON_ID_BACK ) + { + RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); + view.enterMainState(this); + mMain.show(getSupportFragmentManager(), null); + } + if( id == RubikSurfaceView.BUTTON_ID_EXIT ) + { + finish(); + } } /////////////////////////////////////////////////////////////////////////////////////////////////// // PUBLIC API +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void Play(View v) + { + mMain.dismiss(); + RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); + view.enterPlayState(this); + } + /////////////////////////////////////////////////////////////////////////////////////////////////// public void Settings(View v) @@ -159,9 +138,8 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList public void Scores(View v) { - RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); Bundle bundle = new Bundle(); - bundle.putInt("tab", view.getRedButton()); + bundle.putInt("tab", RubikSurfaceView.getRedButton()); RubikDialogScores scores = new RubikDialogScores(); scores.setArguments(bundle); @@ -180,11 +158,8 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList public void Scramble(View v) { - int scramble = mPicker.getValue(); - RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); - view.getRenderer().scrambleCube(scramble); - view.enterScrambleMode(); + view.scramble(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -193,6 +168,5 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList { RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); view.getRenderer().solveCube(); - view.leaveScrambleMode(); } } diff --git a/src/main/java/org/distorted/magic/RubikDialogAbout.java b/src/main/java/org/distorted/magic/RubikDialogAbout.java index 3b0a9dd8..647b2d05 100644 --- a/src/main/java/org/distorted/magic/RubikDialogAbout.java +++ b/src/main/java/org/distorted/magic/RubikDialogAbout.java @@ -28,12 +28,27 @@ import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatDialogFragment; import android.view.LayoutInflater; import android.view.View; +import android.view.Window; +import android.view.WindowManager; import android.widget.TextView; /////////////////////////////////////////////////////////////////////////////////////////////////// public class RubikDialogAbout extends AppCompatDialogFragment { + @Override + public void onStart() + { + super.onStart(); + + Window window = getDialog().getWindow(); + window.setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL, + WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL); + window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) @@ -43,7 +58,7 @@ public class RubikDialogAbout extends AppCompatDialogFragment AlertDialog.Builder builder = new AlertDialog.Builder(act); TextView tv = (TextView) inflater.inflate(R.layout.dialog_title, null); - tv.setText(R.string.about_title); + tv.setText(R.string.about); builder.setCustomTitle(tv); builder.setCancelable(true); diff --git a/src/main/java/org/distorted/magic/RubikDialogMain.java b/src/main/java/org/distorted/magic/RubikDialogMain.java index 171da73f..69a452ae 100644 --- a/src/main/java/org/distorted/magic/RubikDialogMain.java +++ b/src/main/java/org/distorted/magic/RubikDialogMain.java @@ -20,7 +20,6 @@ package org.distorted.magic; import android.app.Dialog; -import android.content.DialogInterface; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.app.FragmentActivity; @@ -28,34 +27,36 @@ import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatDialogFragment; import android.view.LayoutInflater; import android.view.View; +import android.view.Window; +import android.view.WindowManager; /////////////////////////////////////////////////////////////////////////////////////////////////// public class RubikDialogMain extends AppCompatDialogFragment { + @Override + public void onStart() + { + super.onStart(); + + Window window = getDialog().getWindow(); + window.setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL, + WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL); + window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { FragmentActivity act = getActivity(); AlertDialog.Builder builder = new AlertDialog.Builder(act); - - builder.setTitle(R.string.app_version); - builder.setIcon(R.drawable.button3); - builder.setCancelable(false); - builder.setPositiveButton( R.string.ok, new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int which) - { - - } - }); - LayoutInflater inflater = act.getLayoutInflater(); - final View view = inflater.inflate(R.layout.dialog_about, null); + final View view = inflater.inflate(R.layout.dialog_main, null); builder.setView(view); return builder.create(); } - } + } \ No newline at end of file diff --git a/src/main/java/org/distorted/magic/RubikDialogScores.java b/src/main/java/org/distorted/magic/RubikDialogScores.java index 5917e5e0..10e594cf 100644 --- a/src/main/java/org/distorted/magic/RubikDialogScores.java +++ b/src/main/java/org/distorted/magic/RubikDialogScores.java @@ -30,6 +30,8 @@ import android.support.v7.app.AppCompatDialogFragment; import android.support.design.widget.TabLayout; import android.view.LayoutInflater; import android.view.View; +import android.view.Window; +import android.view.WindowManager; import android.widget.ImageView; import android.widget.TextView; @@ -39,6 +41,19 @@ public class RubikDialogScores extends AppCompatDialogFragment { RubikDialogScoresPagerAdapter mPagerAdapter; +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void onStart() + { + super.onStart(); + + Window window = getDialog().getWindow(); + window.setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL, + WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL); + window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND); + } + /////////////////////////////////////////////////////////////////////////////////////////////////// @NonNull @@ -50,7 +65,7 @@ public class RubikDialogScores extends AppCompatDialogFragment LayoutInflater layoutInflater = act.getLayoutInflater(); TextView tv = (TextView) layoutInflater.inflate(R.layout.dialog_title, null); - tv.setText(R.string.scores_title); + tv.setText(R.string.scores); builder.setCustomTitle(tv); builder.setCancelable(true); diff --git a/src/main/java/org/distorted/magic/RubikDialogScoresPagerAdapter.java b/src/main/java/org/distorted/magic/RubikDialogScoresPagerAdapter.java index 723aa380..0d344f5e 100644 --- a/src/main/java/org/distorted/magic/RubikDialogScoresPagerAdapter.java +++ b/src/main/java/org/distorted/magic/RubikDialogScoresPagerAdapter.java @@ -81,7 +81,7 @@ class RubikDialogScoresPagerAdapter extends PagerAdapter implements RubikScoresD private void addPage(final RubikDialogScoresView view, final int[][] country, final String[][] name, final String[][] time) { - for(int section=0; section metrics.heightPixels ) - { - textH = 18; - layoH = 25; - margH = 5; - } - else - { - textH = 32; - layoH = 36; - margH = 10; - } -*/ + ///// OUTER LAYOUT /////////////////////////////////////////////////////////////////// int margin = (int)(scale*margH + 0.5f); @@ -201,6 +190,19 @@ public class RubikDialogSettings extends AppCompatDialogFragment implements Seek mDurationText = new TextView[BaseEffect.Type.LENGTH]; } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void onStart() + { + super.onStart(); + + Window window = getDialog().getWindow(); + window.setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL, + WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL); + window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND); + } + /////////////////////////////////////////////////////////////////////////////////////////////////// @NonNull @@ -211,7 +213,7 @@ public class RubikDialogSettings extends AppCompatDialogFragment implements Seek LayoutInflater inflater = act.getLayoutInflater(); AlertDialog.Builder builder = new AlertDialog.Builder(act); TextView tv = (TextView) inflater.inflate(R.layout.dialog_title, null); - tv.setText(R.string.settings_title); + tv.setText(R.string.settings); builder.setCustomTitle(tv); builder.setCancelable(true); diff --git a/src/main/java/org/distorted/magic/RubikRenderer.java b/src/main/java/org/distorted/magic/RubikRenderer.java index 9b7592e7..833ea422 100644 --- a/src/main/java/org/distorted/magic/RubikRenderer.java +++ b/src/main/java/org/distorted/magic/RubikRenderer.java @@ -242,7 +242,6 @@ public class RubikRenderer implements GLSurfaceView.Renderer, EffectListener mCanRotate = false; mCanUI = false; doEffectNow( BaseEffect.Type.WIN ); - mView.leaveScrambleModeNonUI(); } else { diff --git a/src/main/java/org/distorted/magic/RubikScoresDownloader.java b/src/main/java/org/distorted/magic/RubikScoresDownloader.java index 57d20b35..0a167f04 100644 --- a/src/main/java/org/distorted/magic/RubikScoresDownloader.java +++ b/src/main/java/org/distorted/magic/RubikScoresDownloader.java @@ -86,9 +86,9 @@ class RubikScoresDownloader implements Runnable private static String mPackageName; private static String mScores = ""; - private static int[][][] mCountry = new int [RubikSize.LENGTH][RubikActivity.MAX_SCRAMBLE][MAX_PLACES]; - private static String[][][] mName = new String[RubikSize.LENGTH][RubikActivity.MAX_SCRAMBLE][MAX_PLACES]; - private static String[][][] mTime = new String[RubikSize.LENGTH][RubikActivity.MAX_SCRAMBLE][MAX_PLACES]; + private static int[][][] mCountry = new int [RubikSize.LENGTH][RubikSurfaceView.MAX_SCRAMBLE][MAX_PLACES]; + private static String[][][] mName = new String[RubikSize.LENGTH][RubikSurfaceView.MAX_SCRAMBLE][MAX_PLACES]; + private static String[][][] mTime = new String[RubikSize.LENGTH][RubikSurfaceView.MAX_SCRAMBLE][MAX_PLACES]; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -129,7 +129,7 @@ class RubikScoresDownloader implements Runnable String country = row.substring(s5+1, s6); String realTime= String.valueOf(time/10.0f); - if(level>=0 && level=0 && place=0 && level=0 && place + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:gravity="center|fill_horizontal" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:layout_marginTop="10dp" + android:layout_marginBottom="10dp" + android:background="@color/grey" + android:orientation="vertical"> +