commit 4c0cd60057d21d2f931b070b2498d9d3f6c99017 Author: Leszek Koltunski Date: Wed Mar 25 18:24:40 2020 +0000 Change the series of Object buttons in the Play state into a PopupWindow. diff --git a/src/main/java/org/distorted/dialog/RubikDialogEffects.java b/src/main/java/org/distorted/dialog/RubikDialogEffects.java new file mode 100644 index 00000000..4e63f695 --- /dev/null +++ b/src/main/java/org/distorted/dialog/RubikDialogEffects.java @@ -0,0 +1,282 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2019 Leszek Koltunski // +// // +// This file is part of Magic Cube. // +// // +// Magic Cube is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Magic Cube is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Magic Cube. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.dialog; + +import android.app.Dialog; +import android.content.DialogInterface; +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.v4.app.FragmentActivity; +import android.support.v4.content.ContextCompat; +import android.support.v7.app.AlertDialog; +import android.support.v7.app.AppCompatDialogFragment; +import android.util.DisplayMetrics; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.Window; +import android.view.WindowManager; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.LinearLayout; +import android.widget.SeekBar; +import android.widget.Spinner; +import android.widget.TextView; + +import org.distorted.effect.BaseEffect; +import org.distorted.magic.R; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikDialogEffects extends AppCompatDialogFragment implements SeekBar.OnSeekBarChangeListener, AdapterView.OnItemSelectedListener + { + private TextView[] mDurationText; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void addSettingsSection(FragmentActivity act, LinearLayout layout, int index) + { + BaseEffect.Type beType = BaseEffect.Type.getType(index); + DisplayMetrics metrics = act.getResources().getDisplayMetrics(); + float scale = metrics.density; + + int textH=32; + int layoH=36; + int margH=10; + + ///// OUTER LAYOUT /////////////////////////////////////////////////////////////////// + + int margin = (int)(scale*margH + 0.5f); + int color = ContextCompat.getColor(act, R.color.grey); + LinearLayout outerLayout = new LinearLayout(act); + LinearLayout.LayoutParams outerLayoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT, 0.5f); + outerLayoutParams.topMargin = margin; + outerLayoutParams.bottomMargin = 0; + outerLayoutParams.leftMargin = margin; + outerLayoutParams.rightMargin = margin; + + outerLayout.setLayoutParams(outerLayoutParams); + outerLayout.setGravity(Gravity.CENTER|Gravity.FILL_HORIZONTAL); + outerLayout.setBackgroundColor(color); + outerLayout.setOrientation(LinearLayout.VERTICAL); + layout.addView(outerLayout); + + ///// TEXT /////////////////////////////////////////////////////////////////////////// + + int layoutHeight = (int)(scale*textH + 0.5f); + int padding = (int)(scale*10 + 0.5f); + + LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,layoutHeight); + + TextView textView = new TextView(act); + textView.setText(beType.getText()); + textView.setLayoutParams(textParams); + textView.setGravity(Gravity.CENTER); + textView.setPadding(padding,0,padding,0); + textView.setTextAppearance(android.R.style.TextAppearance_Small); + outerLayout.addView(textView); + + ///// INNER LAYOUT1 ////////////////////////////////////////////////////////////////// + + int innerLayout1Height = (int)(scale*layoH + 0.5f); + LinearLayout innerLayout1 = new LinearLayout(act); + LinearLayout.LayoutParams innerLayout1Params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,innerLayout1Height); + + innerLayout1.setLayoutParams(innerLayout1Params); + innerLayout1.setGravity(Gravity.CENTER|Gravity.FILL_HORIZONTAL); + innerLayout1.setOrientation(LinearLayout.HORIZONTAL); + outerLayout.addView(innerLayout1); + + ///// STUFF INSIDE INNER LAYOUT1 ///////////////////////////////////////////////////// + + int text1Padding = (int)(scale*5 + 0.5f); + LinearLayout.LayoutParams text1LayoutParams = new LinearLayout.LayoutParams(0,layoutHeight,0.2f); + + TextView text1View = new TextView(act); + text1View.setText(R.string.duration); + text1View.setLayoutParams(text1LayoutParams); + text1View.setGravity(Gravity.START|Gravity.CENTER); + text1View.setPadding(text1Padding,0,text1Padding,0); + text1View.setTextAppearance(android.R.style.TextAppearance_Small); + innerLayout1.addView(text1View); + ////////////////////////////////////////////////////////////////// + int text2Padding = (int)(scale*5 + 0.5f); + LinearLayout.LayoutParams text2LayoutParams = new LinearLayout.LayoutParams(0,layoutHeight,0.2f); + + mDurationText[index] = new TextView(act); + mDurationText[index].setLayoutParams(text2LayoutParams); + mDurationText[index].setGravity(Gravity.END|Gravity.CENTER); + mDurationText[index].setPadding(text2Padding,0,text2Padding,0); + mDurationText[index].setTextAppearance(android.R.style.TextAppearance_Small); + innerLayout1.addView(mDurationText[index]); + ////////////////////////////////////////////////////////////////// + int seekPadding = (int)(scale*10 + 0.5f); + LinearLayout.LayoutParams seekLayoutParams = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,0.6f); + + SeekBar seekBar = new SeekBar(act); + seekBar.setLayoutParams(seekLayoutParams); + seekBar.setPadding(seekPadding,0,seekPadding,0); + seekBar.setId(index); + innerLayout1.addView(seekBar); + + seekBar.setOnSeekBarChangeListener(this); + seekBar.setProgress(beType.getCurrentPos()); + + ///// INNER LAYOUT2 ////////////////////////////////////////////////////////////////// + + int innerLayout2Height = (int)(scale*layoH + 0.5f); + LinearLayout innerLayout2 = new LinearLayout(act); + LinearLayout.LayoutParams innerLayout2Params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,innerLayout2Height); + + innerLayout2.setLayoutParams(innerLayout2Params); + innerLayout2.setGravity(Gravity.CENTER|Gravity.FILL_HORIZONTAL); + innerLayout2.setOrientation(LinearLayout.HORIZONTAL); + outerLayout.addView(innerLayout2); + + ///// STUFF INSIDE INNER LAYOUT2 ///////////////////////////////////////////////////// + + int text3Padding = (int)(scale*5 + 0.5f); + LinearLayout.LayoutParams text3LayoutParams = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,0.4f); + + TextView text3View = new TextView(act); + text3View.setText(R.string.type); + text3View.setLayoutParams(text3LayoutParams); + text3View.setGravity(Gravity.START|Gravity.CENTER); + text3View.setPadding(text3Padding,0,text3Padding,0); + text3View.setTextAppearance(android.R.style.TextAppearance_Small); + innerLayout2.addView(text3View); + ////////////////////////////////////////////////////////////////// + int spinnerPadding = (int)(scale*10 + 0.5f); + LinearLayout.LayoutParams spinnerLayoutParams = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,0.6f); + + Spinner spinner = new Spinner(act); + spinner.setLayoutParams(spinnerLayoutParams); + spinner.setPadding(spinnerPadding,0,spinnerPadding,0); + spinner.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); + spinner.setId(index+BaseEffect.Type.LENGTH); + innerLayout2.addView(spinner); + + spinner.setOnItemSelectedListener(this); + String[] appear = BaseEffect.Type.getType(index).getNames(); + + ArrayAdapter adapterType = new ArrayAdapter<>(act,android.R.layout.simple_spinner_item, appear); + adapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + spinner.setAdapter(adapterType); + spinner.setSelection(beType.getCurrentType()); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// PUBLIC API +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public RubikDialogEffects() + { + 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 + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) + { + FragmentActivity act = getActivity(); + 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.effects); + builder.setCustomTitle(tv); + + builder.setCancelable(true); + builder.setPositiveButton( R.string.ok, new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dialog, int which) + { + + } + }); + + final View view = inflater.inflate(R.layout.dialog_settings, null); + builder.setView(view); + + LinearLayout linearLayout = view.findViewById(R.id.settingsLayout); + + if( linearLayout!=null ) + { + for (int i=0; i< BaseEffect.Type.LENGTH; i++) + { + addSettingsSection(act,linearLayout,i); + } + } + else + { + android.util.Log.e("dialog_settings", "linearLayout NULL!"); + } + + return builder.create(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onItemSelected(AdapterView parent, View view, int pos, long id) + { + int parentID = parent.getId(); + int len = BaseEffect.Type.LENGTH; + + if( parentID>=len && parentID< 2*len) // ith spinner's ID is equal to i+LENGTH (see createSettingSection) + { + BaseEffect.Type.getType(parentID-len).setCurrentType(pos); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) + { + int barID = bar.getId(); + + if( barID>=0 && barID< BaseEffect.Type.LENGTH) // ith seekbar's ID is equal to i (see createSettingSection) + { + BaseEffect.Type.getType(barID).setCurrentPos(progress); + int ms = BaseEffect.Type.translatePos(progress); + mDurationText[barID].setText(getString(R.string.ms_placeholder,ms)); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onNothingSelected(AdapterView parent) { } + public void onStartTrackingTouch(SeekBar bar) { } + public void onStopTrackingTouch(SeekBar bar) { } + } diff --git a/src/main/java/org/distorted/dialog/RubikDialogScoresPagerAdapter.java b/src/main/java/org/distorted/dialog/RubikDialogScoresPagerAdapter.java index 2006f332..ac646813 100644 --- a/src/main/java/org/distorted/dialog/RubikDialogScoresPagerAdapter.java +++ b/src/main/java/org/distorted/dialog/RubikDialogScoresPagerAdapter.java @@ -82,12 +82,14 @@ class RubikDialogScoresPagerAdapter extends PagerAdapter implements RubikScoresD /////////////////////////////////////////////////////////////////////////////////////////////////// - public void serverError(final String error) + public void error(final String error) { char errorNumber = error.charAt(0); switch(errorNumber) { + case '1': message("Client error"); + break; case '2': RubikScores scores = RubikScores.getInstance(); Bundle bundle = new Bundle(); bundle.putString("name", scores.getName() ); @@ -101,6 +103,7 @@ class RubikDialogScoresPagerAdapter extends PagerAdapter implements RubikScoresD break; case '3': message("Server error"); break; + default : message("Unexpected error"); } } diff --git a/src/main/java/org/distorted/dialog/RubikDialogSettings.java b/src/main/java/org/distorted/dialog/RubikDialogSettings.java deleted file mode 100644 index a3a09a32..00000000 --- a/src/main/java/org/distorted/dialog/RubikDialogSettings.java +++ /dev/null @@ -1,282 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2019 Leszek Koltunski // -// // -// This file is part of Magic Cube. // -// // -// Magic Cube is free software: you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation, either version 2 of the License, or // -// (at your option) any later version. // -// // -// Magic Cube is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with Magic Cube. If not, see . // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.dialog; - -import android.app.Dialog; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.FragmentActivity; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatDialogFragment; -import android.util.DisplayMetrics; -import android.view.Gravity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.Window; -import android.view.WindowManager; -import android.widget.AdapterView; -import android.widget.ArrayAdapter; -import android.widget.LinearLayout; -import android.widget.SeekBar; -import android.widget.Spinner; -import android.widget.TextView; - -import org.distorted.effect.BaseEffect; -import org.distorted.magic.R; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class RubikDialogSettings extends AppCompatDialogFragment implements SeekBar.OnSeekBarChangeListener, AdapterView.OnItemSelectedListener - { - private TextView[] mDurationText; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void addSettingsSection(FragmentActivity act, LinearLayout layout, int index) - { - BaseEffect.Type beType = BaseEffect.Type.getType(index); - DisplayMetrics metrics = act.getResources().getDisplayMetrics(); - float scale = metrics.density; - - int textH=32; - int layoH=36; - int margH=10; - - ///// OUTER LAYOUT /////////////////////////////////////////////////////////////////// - - int margin = (int)(scale*margH + 0.5f); - int color = ContextCompat.getColor(act, R.color.grey); - LinearLayout outerLayout = new LinearLayout(act); - LinearLayout.LayoutParams outerLayoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,LinearLayout.LayoutParams.MATCH_PARENT, 0.5f); - outerLayoutParams.topMargin = margin; - outerLayoutParams.bottomMargin = 0; - outerLayoutParams.leftMargin = margin; - outerLayoutParams.rightMargin = margin; - - outerLayout.setLayoutParams(outerLayoutParams); - outerLayout.setGravity(Gravity.CENTER|Gravity.FILL_HORIZONTAL); - outerLayout.setBackgroundColor(color); - outerLayout.setOrientation(LinearLayout.VERTICAL); - layout.addView(outerLayout); - - ///// TEXT /////////////////////////////////////////////////////////////////////////// - - int layoutHeight = (int)(scale*textH + 0.5f); - int padding = (int)(scale*10 + 0.5f); - - LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,layoutHeight); - - TextView textView = new TextView(act); - textView.setText(beType.getText()); - textView.setLayoutParams(textParams); - textView.setGravity(Gravity.CENTER); - textView.setPadding(padding,0,padding,0); - textView.setTextAppearance(android.R.style.TextAppearance_Small); - outerLayout.addView(textView); - - ///// INNER LAYOUT1 ////////////////////////////////////////////////////////////////// - - int innerLayout1Height = (int)(scale*layoH + 0.5f); - LinearLayout innerLayout1 = new LinearLayout(act); - LinearLayout.LayoutParams innerLayout1Params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,innerLayout1Height); - - innerLayout1.setLayoutParams(innerLayout1Params); - innerLayout1.setGravity(Gravity.CENTER|Gravity.FILL_HORIZONTAL); - innerLayout1.setOrientation(LinearLayout.HORIZONTAL); - outerLayout.addView(innerLayout1); - - ///// STUFF INSIDE INNER LAYOUT1 ///////////////////////////////////////////////////// - - int text1Padding = (int)(scale*5 + 0.5f); - LinearLayout.LayoutParams text1LayoutParams = new LinearLayout.LayoutParams(0,layoutHeight,0.2f); - - TextView text1View = new TextView(act); - text1View.setText(R.string.duration); - text1View.setLayoutParams(text1LayoutParams); - text1View.setGravity(Gravity.START|Gravity.CENTER); - text1View.setPadding(text1Padding,0,text1Padding,0); - text1View.setTextAppearance(android.R.style.TextAppearance_Small); - innerLayout1.addView(text1View); - ////////////////////////////////////////////////////////////////// - int text2Padding = (int)(scale*5 + 0.5f); - LinearLayout.LayoutParams text2LayoutParams = new LinearLayout.LayoutParams(0,layoutHeight,0.2f); - - mDurationText[index] = new TextView(act); - mDurationText[index].setLayoutParams(text2LayoutParams); - mDurationText[index].setGravity(Gravity.END|Gravity.CENTER); - mDurationText[index].setPadding(text2Padding,0,text2Padding,0); - mDurationText[index].setTextAppearance(android.R.style.TextAppearance_Small); - innerLayout1.addView(mDurationText[index]); - ////////////////////////////////////////////////////////////////// - int seekPadding = (int)(scale*10 + 0.5f); - LinearLayout.LayoutParams seekLayoutParams = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,0.6f); - - SeekBar seekBar = new SeekBar(act); - seekBar.setLayoutParams(seekLayoutParams); - seekBar.setPadding(seekPadding,0,seekPadding,0); - seekBar.setId(index); - innerLayout1.addView(seekBar); - - seekBar.setOnSeekBarChangeListener(this); - seekBar.setProgress(beType.getCurrentPos()); - - ///// INNER LAYOUT2 ////////////////////////////////////////////////////////////////// - - int innerLayout2Height = (int)(scale*layoH + 0.5f); - LinearLayout innerLayout2 = new LinearLayout(act); - LinearLayout.LayoutParams innerLayout2Params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,innerLayout2Height); - - innerLayout2.setLayoutParams(innerLayout2Params); - innerLayout2.setGravity(Gravity.CENTER|Gravity.FILL_HORIZONTAL); - innerLayout2.setOrientation(LinearLayout.HORIZONTAL); - outerLayout.addView(innerLayout2); - - ///// STUFF INSIDE INNER LAYOUT2 ///////////////////////////////////////////////////// - - int text3Padding = (int)(scale*5 + 0.5f); - LinearLayout.LayoutParams text3LayoutParams = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,0.4f); - - TextView text3View = new TextView(act); - text3View.setText(R.string.type); - text3View.setLayoutParams(text3LayoutParams); - text3View.setGravity(Gravity.START|Gravity.CENTER); - text3View.setPadding(text3Padding,0,text3Padding,0); - text3View.setTextAppearance(android.R.style.TextAppearance_Small); - innerLayout2.addView(text3View); - ////////////////////////////////////////////////////////////////// - int spinnerPadding = (int)(scale*10 + 0.5f); - LinearLayout.LayoutParams spinnerLayoutParams = new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.MATCH_PARENT,0.6f); - - Spinner spinner = new Spinner(act); - spinner.setLayoutParams(spinnerLayoutParams); - spinner.setPadding(spinnerPadding,0,spinnerPadding,0); - spinner.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); - spinner.setId(index+BaseEffect.Type.LENGTH); - innerLayout2.addView(spinner); - - spinner.setOnItemSelectedListener(this); - String[] appear = BaseEffect.Type.getType(index).getNames(); - - ArrayAdapter adapterType = new ArrayAdapter<>(act,android.R.layout.simple_spinner_item, appear); - adapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - spinner.setAdapter(adapterType); - spinner.setSelection(beType.getCurrentType()); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// PUBLIC API -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public RubikDialogSettings() - { - 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 - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) - { - FragmentActivity act = getActivity(); - 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); - builder.setCustomTitle(tv); - - builder.setCancelable(true); - builder.setPositiveButton( R.string.ok, new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int which) - { - - } - }); - - final View view = inflater.inflate(R.layout.dialog_settings, null); - builder.setView(view); - - LinearLayout linearLayout = view.findViewById(R.id.settingsLayout); - - if( linearLayout!=null ) - { - for (int i=0; i< BaseEffect.Type.LENGTH; i++) - { - addSettingsSection(act,linearLayout,i); - } - } - else - { - android.util.Log.e("dialog_settings", "linearLayout NULL!"); - } - - return builder.create(); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onItemSelected(AdapterView parent, View view, int pos, long id) - { - int parentID = parent.getId(); - int len = BaseEffect.Type.LENGTH; - - if( parentID>=len && parentID< 2*len) // ith spinner's ID is equal to i+LENGTH (see createSettingSection) - { - BaseEffect.Type.getType(parentID-len).setCurrentType(pos); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onProgressChanged(SeekBar bar, int progress, boolean fromUser) - { - int barID = bar.getId(); - - if( barID>=0 && barID< BaseEffect.Type.LENGTH) // ith seekbar's ID is equal to i (see createSettingSection) - { - BaseEffect.Type.getType(barID).setCurrentPos(progress); - int ms = BaseEffect.Type.translatePos(progress); - mDurationText[barID].setText(getString(R.string.ms_placeholder,ms)); - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onNothingSelected(AdapterView parent) { } - public void onStartTrackingTouch(SeekBar bar) { } - public void onStopTrackingTouch(SeekBar bar) { } - } diff --git a/src/main/java/org/distorted/magic/RubikActivity.java b/src/main/java/org/distorted/magic/RubikActivity.java index 852aeeb3..ace9252f 100644 --- a/src/main/java/org/distorted/magic/RubikActivity.java +++ b/src/main/java/org/distorted/magic/RubikActivity.java @@ -27,7 +27,7 @@ import android.view.View; import org.distorted.dialog.RubikDialogAbout; import org.distorted.dialog.RubikDialogScores; -import org.distorted.dialog.RubikDialogSettings; +import org.distorted.dialog.RubikDialogEffects; import org.distorted.effect.BaseEffect; import org.distorted.library.main.DistortedLibrary; @@ -91,10 +91,17 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList RubikStatePlay play = (RubikStatePlay)RubikState.PLAY.getStateClass(); int object = play.getObject(); int size = play.getSize(); - RubikObjectList obj = RubikObjectList.getObject(object); - int objectSize = obj.getSizes()[size]; - view.getRenderer().createObject( obj, objectSize ); + if( object>=0 && object=0 && size=0 && id< RubikObjectList.getTotal() ) + switch(v.getId()) { - int object = RubikObjectList.unpackObject(id); - int size= RubikObjectList.unpackSize(id); + case RubikStateAbstract.BUTTON_ID_OBJECT: RubikStatePlay play = (RubikStatePlay)RubikState.PLAY.getStateClass(); + play.bringUpPopup(this,v); + break; + case RubikStateAbstract.BUTTON_ID_BACK: RubikState.goBack(this); + break; + } + } - RubikObjectList obj = RubikObjectList.getObject(object); - int objectSize = obj.getSizes()[size]; +/////////////////////////////////////////////////////////////////////////////////////////////////// - RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); - boolean success = view.getRenderer().createObject(obj,objectSize); + public void changeObject(int object, int size) + { + RubikObjectList obj = RubikObjectList.getObject(object); + int objectSize = obj.getSizes()[size]; - if( success ) - { - RubikStatePlay play = (RubikStatePlay)RubikState.PLAY.getStateClass(); - play.markButton(this,object,size); - } - } + RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); + view.getRenderer().createObject(obj,objectSize); + } - if( id == RubikStateAbstract.BUTTON_ID_BACK ) - { - RubikState.goBack(this); - } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public boolean isVertical() + { + RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); + return view.isVertical(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -196,7 +206,7 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList public void Settings(View v) { - RubikDialogSettings settings = new RubikDialogSettings(); + RubikDialogEffects settings = new RubikDialogEffects(); settings.show(getSupportFragmentManager(), null); } diff --git a/src/main/java/org/distorted/magic/RubikSurfaceView.java b/src/main/java/org/distorted/magic/RubikSurfaceView.java index 81b03669..421ca84b 100644 --- a/src/main/java/org/distorted/magic/RubikSurfaceView.java +++ b/src/main/java/org/distorted/magic/RubikSurfaceView.java @@ -82,6 +82,13 @@ public class RubikSurfaceView extends GLSurfaceView mScreenMin = Math.min(width, height); } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + boolean isVertical() + { + return mScreenHeight>mScreenWidth; + } + /////////////////////////////////////////////////////////////////////////////////////////////////// RubikRenderer getRenderer() diff --git a/src/main/java/org/distorted/object/RubikObjectList.java b/src/main/java/org/distorted/object/RubikObjectList.java index 006f09f1..452926ed 100644 --- a/src/main/java/org/distorted/object/RubikObjectList.java +++ b/src/main/java/org/distorted/object/RubikObjectList.java @@ -29,10 +29,24 @@ import org.distorted.magic.R; public enum RubikObjectList { - CUBE ( new int[][] { {2,R.drawable.cube2} , {3,R.drawable.cube3} , {4,R.drawable.cube4} }, - new RubikCubeMovement() ), - PYRAMINX ( new int[][] { {3,R.drawable.pyra3} , {4,R.drawable.pyra4} }, - new RubikPyraminxMovement() ), + CUBE ( + new int[][] { + {2 , R.drawable.cube2} , + {3 , R.drawable.cube3} , + {4 , R.drawable.cube4} , + {5 , R.drawable.cube5} + }, + new RubikCubeMovement() + ), + + PYRA ( + new int[][] { + {3 , R.drawable.pyra3} , + {4 , R.drawable.pyra4} , + {5 , R.drawable.pyra5} + }, + new RubikPyraminxMovement() + ), ; public static final int NUM_OBJECTS = values().length; diff --git a/src/main/java/org/distorted/scores/RubikScores.java b/src/main/java/org/distorted/scores/RubikScores.java index a178a02f..5141a59e 100644 --- a/src/main/java/org/distorted/scores/RubikScores.java +++ b/src/main/java/org/distorted/scores/RubikScores.java @@ -228,24 +228,26 @@ public class RubikScores submStr = subStr.substring(comma+1); object = RubikObjectList.getOrdinal(nameStr); - size = RubikObjectList.getSize(object,Integer.parseInt(sizeStr)); - time = Long.parseLong(timeStr); - subm = Integer.parseInt(submStr); - if( object>=0 && object< NUM_OBJECTS && size>=0 && size=0 && subm<=1 ) + if( object>=0 && object< NUM_OBJECTS ) { - mRecords [object][size][scramble] = time; - mSubmitted[object][size][scramble] = subm; -/* - if( time=0 && size=0 && subm<=1 ) + { + mRecords [object][size][scramble] = time; + mSubmitted[object][size][scramble] = subm; + } + else { - android.util.Log.e("solv", "Set record for: object="+object+" size="+size+" scramble="+scramble+" time: "+time+" submitted: "+subm); + android.util.Log.e("solv", "error: size="+size+" subm="+subm); } -*/ } else { - android.util.Log.e("solv", "error: object="+object+" size="+size); + android.util.Log.e("solv", "error: object="+object); } } } @@ -270,7 +272,8 @@ public class RubikScores { if( mRecords[object][size][scramble-1]> timeTaken ) { - mRecords[object][size][scramble-1] = timeTaken; + mRecords [object][size][scramble-1] = timeTaken; + mSubmitted[object][size][scramble-1] = 0; return true; } } @@ -421,10 +424,12 @@ public class RubikScores for(int size=0; size + android:text="@string/effects" />