commit 9c39179ef788b8526dbcf30623e355dc7818fc71 Author: Leszek Koltunski Date: Mon Jan 24 21:37:14 2022 +0100 Downloading updates: dialog progress. diff --git a/src/main/java/org/distorted/dialogs/RubikDialogUpdateView.java b/src/main/java/org/distorted/dialogs/RubikDialogUpdateView.java new file mode 100644 index 00000000..a9b0a62c --- /dev/null +++ b/src/main/java/org/distorted/dialogs/RubikDialogUpdateView.java @@ -0,0 +1,73 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// 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.Activity; +import android.view.View; +import android.widget.Button; +import android.widget.TextView; + +import org.distorted.main.R; +import org.distorted.network.RubikUpdates; +import org.distorted.objectlib.json.JsonWriter; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class RubikDialogUpdateView + { + private View mView; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public RubikDialogUpdateView() + { + + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public View createView(Activity act, RubikUpdates.UpdateInfo info, boolean isNew) + { + int layoutID = R.layout.dialog_updates_pane; + mView = act.getLayoutInflater().inflate(layoutID, null); + Button install = mView.findViewById(R.id.updates_pane_button); + + install.setOnClickListener( new View.OnClickListener() + { + @Override + public void onClick(View v) + { + android.util.Log.e("D", "INSTALL pressed"); + } + }); + + TextView title = mView.findViewById(R.id.updates_pane_title); + title.setText(info.mObjectLongName); + TextView version = mView.findViewById(R.id.updates_pane_version); + String strVersion = info.mUpdateObject + ? JsonWriter.VERSION_OBJECT_MAJOR+"."+info.mObjectMinorVersion + : JsonWriter.VERSION_EXTRAS_MAJOR+"."+info.mExtrasMinorVersion; + version.setText(strVersion); + TextView description = mView.findViewById(R.id.updates_pane_description); + description.setText(info.mDescription); + + return mView; + } + } diff --git a/src/main/java/org/distorted/dialogs/RubikDialogUpdates.java b/src/main/java/org/distorted/dialogs/RubikDialogUpdates.java index a73cc6fc..5545dcba 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogUpdates.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogUpdates.java @@ -20,6 +20,7 @@ package org.distorted.dialogs; import android.app.Dialog; +import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.util.DisplayMetrics; @@ -27,7 +28,10 @@ import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.Window; +import android.view.WindowManager; import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.ScrollView; import android.widget.TextView; import androidx.annotation.NonNull; @@ -44,13 +48,21 @@ import org.distorted.network.RubikUpdates; public class RubikDialogUpdates extends AppCompatDialogFragment implements RubikNetwork.Updatee { - private View createView(LayoutInflater inflater) + private TextView mText; + private ScrollView mScroll; + private LinearLayout mLayout; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private View createView(FragmentActivity act, LayoutInflater inflater, float size) { final View view = inflater.inflate(R.layout.dialog_updates, null); - TextView text = view.findViewById(R.id.about_version); - text.setTextSize(TypedValue.COMPLEX_UNIT_PX, 50); - text.setText("ggggg ruyujk j k"); + mLayout= view.findViewById(R.id.updates_main_layout); + mScroll= view.findViewById(R.id.updates_scroll); + mText = view.findViewById(R.id.updates_message); + mText.setTextSize(TypedValue.COMPLEX_UNIT_PX, size); + mText.setText( act.getString(R.string.downloading) ); return view; } @@ -70,10 +82,10 @@ public class RubikDialogUpdates extends AppCompatDialogFragment implements Rubik 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.updates); - builder.setCustomTitle(tv); + TextView title = (TextView) inflater.inflate(R.layout.dialog_title, null); + title.setTextSize(TypedValue.COMPLEX_UNIT_PX, titleSize); + title.setText(R.string.updates); + builder.setCustomTitle(title); builder.setCancelable(true); builder.setPositiveButton( R.string.ok, new DialogInterface.OnClickListener() @@ -85,7 +97,7 @@ public class RubikDialogUpdates extends AppCompatDialogFragment implements Rubik } }); - View view = createView(inflater); + View view = createView(act,inflater,okSize); builder.setView(view); Dialog dialog = builder.create(); @@ -107,24 +119,85 @@ public class RubikDialogUpdates extends AppCompatDialogFragment implements Rubik } }); + return dialog; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + @Override + public void onResume() + { + super.onResume(); + RubikNetwork network = RubikNetwork.getInstance(); network.signUpForUpdates(this); - return dialog; + Window window = getDialog().getWindow(); + Context context = getContext(); + + if( window!=null && context!=null ) + { + DisplayMetrics metrics = context.getResources().getDisplayMetrics(); + final float height= metrics.heightPixels; + + WindowManager.LayoutParams params = window.getAttributes(); + params.width = WindowManager.LayoutParams.WRAP_CONTENT; + params.height = (int)(0.75f*height); + window.setAttributes(params); + + int textHeight = (int)(0.8f*params.height); + mText.setHeight(textHeight); + } } /////////////////////////////////////////////////////////////////////////////////////////////////// public void receiveUpdate(RubikUpdates updates) { + FragmentActivity act = getActivity(); + int numN = updates.getNewNumber(); + int numU = updates.getUpdNumber(); + int num = numN+numU; + if( num<=0 ) + { + mScroll.setVerticalScrollBarEnabled(false); + mText.setText(act.getString(R.string.no_updates)); + } + else + { + mText.setVisibility(View.GONE); + + if( mLayout!=null ) + { + for(int i=0; i0 ) { String shownNum = String.valueOf(num); mBubbleUpdates.setText(shownNum); mBubbleUpdates.setVisibility(View.VISIBLE); + int height = (int)(0.05f*mScreenWidth); + mBubbleUpdates.setTextSize(TypedValue.COMPLEX_UNIT_PX,height); } else { diff --git a/src/main/res/layout/dialog_updates.xml b/src/main/res/layout/dialog_updates.xml index 99ae851b..d08a18bc 100644 --- a/src/main/res/layout/dialog_updates.xml +++ b/src/main/res/layout/dialog_updates.xml @@ -1,29 +1,25 @@ + android:layout_height="wrap_content" + android:paddingLeft="10dp" + android:paddingRight="10dp"> - + android:layout_height="match_parent" + android:gravity="center"/> diff --git a/src/main/res/layout/dialog_updates_pane.xml b/src/main/res/layout/dialog_updates_pane.xml new file mode 100644 index 00000000..79ec7802 --- /dev/null +++ b/src/main/res/layout/dialog_updates_pane.xml @@ -0,0 +1,43 @@ + + + + + + + + + + +