commit 1cbcc6bfcc1772b5d748c90383a3475c62e06c75 Author: Leszek Koltunski Date: Fri May 10 15:16:05 2019 +0100 Progress with Credits and Settings. diff --git a/src/main/java/org/distorted/magic/RubikActivity.java b/src/main/java/org/distorted/magic/RubikActivity.java index 0fbcc8d9..ff612916 100644 --- a/src/main/java/org/distorted/magic/RubikActivity.java +++ b/src/main/java/org/distorted/magic/RubikActivity.java @@ -41,10 +41,10 @@ public class RubikActivity extends AppCompatActivity implements RubikSettings.On private static final int SMALLEST_SIZE = 2; private static final int[] button_ids = {R.id.rubikSize2, R.id.rubikSize3, R.id.rubikSize4}; - private static final int DEFAULT_APPEAR_POS = 10; - private static final int DEFAULT_DISAPPEAR_POS = 10; - private static final int DEFAULT_APPEAR_TYPE = 1; - private static final int DEFAULT_DISAPPEAR_TYPE = 1; + public static final int DEFAULT_APPEAR_POS = 10; + public static final int DEFAULT_DISAPPEAR_POS = 10; + public static final int DEFAULT_APPEAR_TYPE = 1; + public static final int DEFAULT_DISAPPEAR_TYPE = 1; private static int mSize = DEFAULT_SIZE; @@ -58,7 +58,7 @@ public class RubikActivity extends AppCompatActivity implements RubikSettings.On { super.onCreate(savedState); setTheme(R.style.CustomActivityThemeNoActionBar); - setContentView(R.layout.layout); + setContentView(R.layout.main); markButton(mSize); restorePreferences(); @@ -103,14 +103,6 @@ public class RubikActivity extends AppCompatActivity implements RubikSettings.On return mSize; } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void Scramble(View v) - { - RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); - view.getRenderer().scrambleCube(); - } - /////////////////////////////////////////////////////////////////////////////////////////////////// public void Settings(View v) @@ -127,6 +119,29 @@ public class RubikActivity extends AppCompatActivity implements RubikSettings.On settings.show(getSupportFragmentManager(), null); } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void Credits(View v) + { + RubikCredits credits = new RubikCredits(); + credits.show(getSupportFragmentManager(), null); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void Scramble(View v) + { + RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); + view.getRenderer().scrambleCube(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void Solve(View v) + { + + } + /////////////////////////////////////////////////////////////////////////////////////////////////// public void onComplete(int aP, int dP, int aT, int dT) @@ -216,9 +231,16 @@ public class RubikActivity extends AppCompatActivity implements RubikSettings.On RubikSurfaceView view = findViewById(R.id.rubikSurfaceView); RubikRenderer renderer = view.getRenderer(); - renderer.setAppearDuration(mAppearPos*100 +1); - renderer.setDisappearDuration(mDisappearPos*100 +1); + renderer.setAppearDuration(translateDuration(mAppearPos)+1); + renderer.setDisappearDuration(translateDuration(mDisappearPos) +1); renderer.setAppearType(AppearEffect.getType(mAppearType)); renderer.setDisappearType(DisappearEffect.getType(mDisappearType)); } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static int translateDuration(int pos) + { + return (pos/2)*100; + } } diff --git a/src/main/java/org/distorted/magic/RubikCredits.java b/src/main/java/org/distorted/magic/RubikCredits.java new file mode 100644 index 00000000..64ecd857 --- /dev/null +++ b/src/main/java/org/distorted/magic/RubikCredits.java @@ -0,0 +1,61 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2019 Leszek Koltunski // +// // +// This file is part of Distorted. // +// // +// Distorted 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. // +// // +// Distorted 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 Distorted. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +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; +import android.support.v7.app.AlertDialog; +import android.support.v7.app.AppCompatDialogFragment; +import android.view.LayoutInflater; +import android.view.View; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikCredits extends AppCompatDialogFragment + { + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) + { + FragmentActivity act = getActivity(); + AlertDialog.Builder builder = new AlertDialog.Builder(act); + + builder.setTitle(R.string.app_name); + builder.setIcon(R.drawable.logo); + 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.credits, null); + builder.setView(view); + + return builder.create(); + } + } diff --git a/src/main/java/org/distorted/magic/RubikSettings.java b/src/main/java/org/distorted/magic/RubikSettings.java index de4afd27..1f7c7c26 100644 --- a/src/main/java/org/distorted/magic/RubikSettings.java +++ b/src/main/java/org/distorted/magic/RubikSettings.java @@ -34,6 +34,7 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.SeekBar; import android.widget.Spinner; +import android.widget.TextView; import org.distorted.effect.AppearEffect; import org.distorted.effect.DisappearEffect; @@ -52,6 +53,8 @@ public class RubikSettings extends AppCompatDialogFragment implements SeekBar.On private int mAppearPos, mDisappearPos; private int mAppearType, mDisappearType; + private TextView mAppearDuration, mDisappearDuration; + /////////////////////////////////////////////////////////////////////////////////////////////////// @Override @@ -87,10 +90,10 @@ public class RubikSettings extends AppCompatDialogFragment implements SeekBar.On } catch(NullPointerException ex) { - mAppearPos = 10; - mDisappearPos = 10; - mAppearType = 1; - mDisappearType = 1; + mAppearPos = RubikActivity.DEFAULT_APPEAR_POS; + mDisappearPos = RubikActivity.DEFAULT_DISAPPEAR_POS; + mAppearType = RubikActivity.DEFAULT_APPEAR_TYPE; + mDisappearType = RubikActivity.DEFAULT_DISAPPEAR_TYPE; } } @@ -117,6 +120,9 @@ public class RubikSettings extends AppCompatDialogFragment implements SeekBar.On final View view = inflater.inflate(R.layout.settings, null); builder.setView(view); + mAppearDuration = view.findViewById(R.id.appearDurationText); + mDisappearDuration = view.findViewById(R.id.disappearDurationText); + Spinner appearTypeSpinner = view.findViewById(R.id.appearType); if( appearTypeSpinner!=null ) @@ -224,8 +230,12 @@ public class RubikSettings extends AppCompatDialogFragment implements SeekBar.On { switch (bar.getId()) { - case R.id.appearDuration : mAppearPos = progress; break; - case R.id.disappearDuration: mDisappearPos= progress; break; + case R.id.appearDuration : mAppearPos = progress; + mAppearDuration.setText(RubikActivity.translateDuration(mAppearPos)+" ms"); + break; + case R.id.disappearDuration: mDisappearPos= progress; + mDisappearDuration.setText(RubikActivity.translateDuration(mDisappearPos)+" ms"); + break; } } diff --git a/src/main/res/drawable/logo.png b/src/main/res/drawable/logo.png new file mode 100644 index 00000000..8a0c2637 Binary files /dev/null and b/src/main/res/drawable/logo.png differ diff --git a/src/main/res/layout/credits.xml b/src/main/res/layout/credits.xml new file mode 100644 index 00000000..6cf7c843 --- /dev/null +++ b/src/main/res/layout/credits.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/layout.xml b/src/main/res/layout/layout.xml deleted file mode 100644 index d416c5fd..00000000 --- a/src/main/res/layout/layout.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - -