commit 5f3801d3dba71a6061e09342f8d87336f7060c31 Author: Leszek Koltunski Date: Sat Jan 22 00:30:02 2022 +0100 Progress downloading updates: dialog. diff --git a/src/main/java/org/distorted/dialogs/RubikDialogUpdates.java b/src/main/java/org/distorted/dialogs/RubikDialogUpdates.java new file mode 100644 index 00000000..c5b09945 --- /dev/null +++ b/src/main/java/org/distorted/dialogs/RubikDialogUpdates.java @@ -0,0 +1,114 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2022 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.dialogs; + +import android.app.Dialog; +import android.content.DialogInterface; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.os.Bundle; +import android.text.method.LinkMovementMethod; +import android.text.method.MovementMethod; +import android.util.DisplayMetrics; +import android.util.TypedValue; +import android.view.LayoutInflater; +import android.view.View; +import android.view.Window; +import android.widget.Button; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatDialogFragment; +import androidx.fragment.app.FragmentActivity; + +import org.distorted.main.R; +import org.distorted.main.RubikActivity; +import org.distorted.network.RubikNetwork; +import org.distorted.network.RubikUpdates; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikDialogUpdates extends AppCompatDialogFragment + { + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) + { + FragmentActivity act = getActivity(); + LayoutInflater inflater = act.getLayoutInflater(); + AlertDialog.Builder builder = new AlertDialog.Builder(act); + + DisplayMetrics displaymetrics = new DisplayMetrics(); + act.getWindowManager().getDefaultDisplay().getMetrics(displaymetrics); + final float titleSize= displaymetrics.widthPixels * RubikActivity.MENU_BIG_TEXT_SIZE; + final float okSize = displaymetrics.widthPixels * RubikActivity.DIALOG_BUTTON_SIZE; + + TextView tv = (TextView) inflater.inflate(R.layout.dialog_title, null); + tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, titleSize); + tv.setText(R.string.about); + builder.setCustomTitle(tv); + + builder.setCancelable(true); + builder.setPositiveButton( R.string.ok, new DialogInterface.OnClickListener() + { + @Override + public void onClick(DialogInterface dialog, int which) + { + + } + }); + + Dialog dialog = builder.create(); + dialog.setCanceledOnTouchOutside(false); + Window window = dialog.getWindow(); + + if( window!=null ) + { + window.getDecorView().setSystemUiVisibility(RubikActivity.FLAGS); + } + + dialog.setOnShowListener(new DialogInterface.OnShowListener() + { + @Override + public void onShow(DialogInterface dialog) + { + Button btnPositive = ((AlertDialog)dialog).getButton(Dialog.BUTTON_POSITIVE); + btnPositive.setTextSize(TypedValue.COMPLEX_UNIT_PX, okSize); + } + }); + + return dialog; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void setUpdates(RubikUpdates updates) + { + + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public static String getDialogTag() + { + return "DialogUpdates"; + } + } diff --git a/src/main/java/org/distorted/screens/RubikScreenPlay.java b/src/main/java/org/distorted/screens/RubikScreenPlay.java index b906427d..f1615648 100644 --- a/src/main/java/org/distorted/screens/RubikScreenPlay.java +++ b/src/main/java/org/distorted/screens/RubikScreenPlay.java @@ -37,6 +37,7 @@ import android.widget.PopupWindow; import android.widget.RelativeLayout; import android.widget.TextView; +import org.distorted.dialogs.RubikDialogUpdates; import org.distorted.network.RubikNetwork; import org.distorted.network.RubikUpdates; import org.distorted.objectlib.main.ObjectControl; @@ -77,6 +78,7 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd private PopupWindow mObjectPopup, mMenuPopup, mPlayPopup; private LinearLayout mPlayLayout; private TextView mBubbleUpdates; + private RubikUpdates mUpdates; private int mObjectSize, mMenuLayoutWidth, mMenuLayoutHeight, mPlayLayoutWidth; private int mLevelValue; private float mButtonSize, mMenuItemSize, mMenuTextSize; @@ -347,7 +349,10 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd @Override public void onClick(View v) { - android.util.Log.e("D", "Download!!"); + if( mObjectPopup!=null ) mObjectPopup.dismiss(); + RubikDialogUpdates uDiag = new RubikDialogUpdates(); + uDiag.setUpdates(mUpdates); + uDiag.show( act.getSupportFragmentManager(), RubikDialogUpdates.getDialogTag() ); } }); @@ -701,7 +706,8 @@ public class RubikScreenPlay extends RubikScreenBase implements RubikNetwork.Upd public void receiveUpdate(RubikUpdates updates) { - int num = updates.getNumberOfUpdates(); + mUpdates = updates; + int num = mUpdates.getNumberOfUpdates(); if( num>0 ) {