commit c5fca790ad6676bb42c99aa7f4c44fbd913ce800 Author: Leszek Koltunski Date: Fri Jul 1 23:16:24 2022 +0200 Progress with new UI diff --git a/src/main/java/org/distorted/objects/MainEntry.java b/src/main/java/org/distorted/objects/MainEntry.java new file mode 100644 index 00000000..c221ecd3 --- /dev/null +++ b/src/main/java/org/distorted/objects/MainEntry.java @@ -0,0 +1,105 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// 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.objects; + +import android.app.Activity; +import android.graphics.drawable.Drawable; +import android.widget.ImageButton; + +import org.distorted.main.RubikActivity; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class MainEntry +{ + public final static int TYPE_OBJECT = 0; + public final static int TYPE_CREATOR = 1; + + private final RubikObject mObject; + private final int mType; + private final int mIconID; + private Drawable mIconDrawable; + private boolean mPrepared; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + MainEntry(RubikObject object) + { + mType = TYPE_OBJECT; + mIconID = 0; + mIconDrawable = null; + mObject = object; + mPrepared = false; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + MainEntry(int type, int iconID) + { + mType = type; + mIconID = iconID; + mIconDrawable = null; + mObject = null; + mPrepared = false; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void prepare(Activity act) + { + mIconDrawable = act.getDrawable(mIconID); + mPrepared = true; + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// PUBLIC API + + public void setIconTo(RubikActivity act, ImageButton button) + { + if( mType==TYPE_OBJECT ) + { + if( mObject!=null ) mObject.setIconTo(act,button); + else android.util.Log.e("D", "MainListEntry: object null!!"); + } + else if( mType==TYPE_CREATOR ) + { + if( !mPrepared ) prepare(act); + button.setBackground(mIconDrawable); + } + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void onClick(RubikActivity act) + { + if( mType==TYPE_OBJECT ) + { + if( mObject!=null ) + { + android.util.Log.e("D", "clicked on "+ mObject.getLowerName()); + } + else android.util.Log.e("D", "MainListEntry: object null!!"); + } + else if( mType==TYPE_CREATOR ) + { + act.switchToBandagedCreator(); + } + } +} diff --git a/src/main/java/org/distorted/objects/MainEntryList.java b/src/main/java/org/distorted/objects/MainEntryList.java new file mode 100644 index 00000000..904bf2c1 --- /dev/null +++ b/src/main/java/org/distorted/objects/MainEntryList.java @@ -0,0 +1,87 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// 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.objects; + +import java.util.ArrayList; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class MainEntryList +{ + private final ArrayList mList; + private static MainEntryList mThis; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private MainEntryList() + { + mList = new ArrayList<>(); + + int numObjects = RubikObjectList.getNumObjects(); + + for(int i=0; i mWeakAct; @@ -75,14 +75,12 @@ public class RubikScreenPlay extends RubikScreenAbstract implements RubikNetwork { act.switchRenderingOff(); mWeakAct = new WeakReference<>(act); - int numObjects = RubikObjectList.getNumObjects(); mScreenWidth = act.getScreenWidthInPixels(); int screenHeight= act.getScreenHeightInPixels(); int upperBarHeight = act.getHeightUpperBar(); int lowerBarHeight = act.getHeightLowerBar(); - mRowCount = (numObjects + NUM_COLUMNS-1) / NUM_COLUMNS; - mColCount = NUM_COLUMNS; + computeRowAndColCounts(); float titleSize = mScreenWidth*RubikActivity.TITLE_TEXT_SIZE; LayoutInflater inflater = act.getLayoutInflater(); @@ -228,23 +226,21 @@ public class RubikScreenPlay extends RubikScreenAbstract implements RubikNetwork colSpecs[col] = GridLayout.spec(col); } - int numObjects = RubikObjectList.getNumObjects(); + MainEntryList list = MainEntryList.getInstance(); - for(int object=0; object