commit 5560eea91a8ed72dca5eadbfb2e7b123a7dff400 Author: Leszek Koltunski Date: Fri May 10 16:06:38 2019 +0100 Progress with UI. diff --git a/src/main/java/org/distorted/magic/RubikAbout.java b/src/main/java/org/distorted/magic/RubikAbout.java new file mode 100644 index 00000000..3d6032a5 --- /dev/null +++ b/src/main/java/org/distorted/magic/RubikAbout.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 RubikAbout extends AppCompatDialogFragment + { + @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.about, null); + builder.setView(view); + + return builder.create(); + } + } diff --git a/src/main/java/org/distorted/magic/RubikActivity.java b/src/main/java/org/distorted/magic/RubikActivity.java index ff612916..43af0463 100644 --- a/src/main/java/org/distorted/magic/RubikActivity.java +++ b/src/main/java/org/distorted/magic/RubikActivity.java @@ -121,10 +121,10 @@ public class RubikActivity extends AppCompatActivity implements RubikSettings.On /////////////////////////////////////////////////////////////////////////////////////////////////// - public void Credits(View v) + public void About(View v) { - RubikCredits credits = new RubikCredits(); - credits.show(getSupportFragmentManager(), null); + RubikAbout about = new RubikAbout(); + about.show(getSupportFragmentManager(), null); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/magic/RubikCredits.java b/src/main/java/org/distorted/magic/RubikCredits.java deleted file mode 100644 index 64ecd857..00000000 --- a/src/main/java/org/distorted/magic/RubikCredits.java +++ /dev/null @@ -1,61 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// 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 1f7c7c26..dcebeac9 100644 --- a/src/main/java/org/distorted/magic/RubikSettings.java +++ b/src/main/java/org/distorted/magic/RubikSettings.java @@ -231,10 +231,12 @@ public class RubikSettings extends AppCompatDialogFragment implements SeekBar.On switch (bar.getId()) { case R.id.appearDuration : mAppearPos = progress; - mAppearDuration.setText(RubikActivity.translateDuration(mAppearPos)+" ms"); + int appear_ms= RubikActivity.translateDuration(mAppearPos); + mAppearDuration.setText(getString(R.string.ms_placeholder,appear_ms)); break; case R.id.disappearDuration: mDisappearPos= progress; - mDisappearDuration.setText(RubikActivity.translateDuration(mDisappearPos)+" ms"); + int disappear_ms= RubikActivity.translateDuration(mDisappearPos); + mDisappearDuration.setText(getString(R.string.ms_placeholder,disappear_ms)); break; } } diff --git a/src/main/res/layout/about.xml b/src/main/res/layout/about.xml new file mode 100644 index 00000000..720c6cff --- /dev/null +++ b/src/main/res/layout/about.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/credits.xml b/src/main/res/layout/credits.xml deleted file mode 100644 index 6cf7c843..00000000 --- a/src/main/res/layout/credits.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/layout/main.xml b/src/main/res/layout/main.xml index 026e4849..3dee7f07 100644 --- a/src/main/res/layout/main.xml +++ b/src/main/res/layout/main.xml @@ -48,14 +48,14 @@ android:src="@drawable/button4"/>