From 0af05ca42a461d7290b965707a3549a768b3567b Mon Sep 17 00:00:00 2001 From: SCratORS Date: Sun, 4 Feb 2024 13:23:24 +0300 Subject: [PATCH] Revert "Reuse and dependency-inject Calendar" --- .../scrat/everchanging/BackgroundScene.java | 6 ++--- java/com/scrat/everchanging/ButterFlie.java | 6 ++--- .../scrat/everchanging/ButterFliesScene.java | 6 ++--- java/com/scrat/everchanging/Dandelion.java | 6 ++--- .../scrat/everchanging/DandelionsScene.java | 6 ++--- .../everchanging/EverchangingRender.java | 23 +++++++++---------- java/com/scrat/everchanging/Eye.java | 6 ++--- java/com/scrat/everchanging/EyesScene.java | 6 ++--- java/com/scrat/everchanging/FireFlie.java | 6 ++--- .../scrat/everchanging/FireFliesScene.java | 6 ++--- java/com/scrat/everchanging/FireWork.java | 6 ++--- .../scrat/everchanging/FireWorksScene.java | 7 ++---- java/com/scrat/everchanging/HeartsScene.java | 6 ++--- java/com/scrat/everchanging/Leave.java | 6 ++--- java/com/scrat/everchanging/LeavesScene.java | 7 ++---- java/com/scrat/everchanging/Rain.java | 6 ++--- java/com/scrat/everchanging/RainsScene.java | 8 +++---- java/com/scrat/everchanging/Snow.java | 5 ++-- java/com/scrat/everchanging/SnowsScene.java | 6 ++--- 19 files changed, 48 insertions(+), 86 deletions(-) diff --git a/java/com/scrat/everchanging/BackgroundScene.java b/java/com/scrat/everchanging/BackgroundScene.java index d845ffb..0e8c72c 100644 --- a/java/com/scrat/everchanging/BackgroundScene.java +++ b/java/com/scrat/everchanging/BackgroundScene.java @@ -5,8 +5,6 @@ public class BackgroundScene extends Scene { - private final Calendar calendar; - private final Background background; private final Foreground foreground; @@ -14,14 +12,14 @@ public class BackgroundScene extends Scene { private int currentForeground; private int currentTimesOfDay; - BackgroundScene (final Context context, final Calendar calendar) { + BackgroundScene (Context context) { super(ShortTypes.BG); - this.calendar = calendar; background = new Background(context); foreground = new Foreground(context); } private void GetDateTime(){ + Calendar calendar = Calendar.getInstance(); int currentMonth = calendar.get(Calendar.MONTH) + 1; int currentDay = calendar.get(Calendar.DAY_OF_MONTH); int currentHour = calendar.get(Calendar.HOUR_OF_DAY); diff --git a/java/com/scrat/everchanging/ButterFlie.java b/java/com/scrat/everchanging/ButterFlie.java index bcf655e..3048d3b 100644 --- a/java/com/scrat/everchanging/ButterFlie.java +++ b/java/com/scrat/everchanging/ButterFlie.java @@ -1008,17 +1008,14 @@ public class ButterFlie extends TextureObject { private final float[] animationStartPosition = {1.0f, 1.0f, 0.0000f, 0.0000f, 3.40f, -3.60f}; - private final Calendar calendar; - ArrayList removeObjects = new ArrayList<>(); boolean init = false; float svgScale = 1.0f; int frameCounter = 0; int maxFrames = 10; int numClips = minObjects; - ButterFlie(Context context, final Calendar calendar) { + ButterFlie(Context context) { super(context, textureList, null); - this.calendar = calendar; } private int ConvertRange( int originalStart, int originalEnd, // original range @@ -1030,6 +1027,7 @@ private int ConvertRange( } private boolean get2401() { svgScale = textureManager.dipToPixels(1); + Calendar calendar = Calendar.getInstance(); int currentMonth = calendar.get(Calendar.MONTH) + 1; int currentDay = calendar.get(Calendar.DAY_OF_MONTH); return (currentMonth==1) && (currentDay==24); diff --git a/java/com/scrat/everchanging/ButterFliesScene.java b/java/com/scrat/everchanging/ButterFliesScene.java index 57aa9c1..c396443 100644 --- a/java/com/scrat/everchanging/ButterFliesScene.java +++ b/java/com/scrat/everchanging/ButterFliesScene.java @@ -2,13 +2,11 @@ import android.content.Context; -import java.util.Calendar; - public class ButterFliesScene extends Scene { private final ButterFlie butterflie; - public ButterFliesScene(final Context context, final Calendar calendar) { + public ButterFliesScene(Context context) { super(ShortTypes.B); - butterflie = new ButterFlie(context, calendar); + butterflie = new ButterFlie(context); } public void update(boolean createObject) { diff --git a/java/com/scrat/everchanging/Dandelion.java b/java/com/scrat/everchanging/Dandelion.java index a2d9fa3..d27eabf 100644 --- a/java/com/scrat/everchanging/Dandelion.java +++ b/java/com/scrat/everchanging/Dandelion.java @@ -234,8 +234,6 @@ public class Dandelion extends TextureObject { }; private final float[] animationStartPosition = {0.15f, 0.15f, 0.0000f, 0.0000f, 38.55f, 24.85f}; - private final Calendar calendar; - ArrayList removeObjects = new ArrayList<>(); int frameCounter = 0; @@ -243,9 +241,8 @@ public class Dandelion extends TextureObject { int numClips = minObjects; boolean init = false; float svgScale = 1.0f; - public Dandelion(Context context, final Calendar calendar) { + public Dandelion(Context context) { super(context, textureList, pivotList); - this.calendar = calendar; } void createObject() { @@ -270,6 +267,7 @@ void createObject() { private boolean get1902() { svgScale = textureManager.dipToPixels(1); + Calendar calendar = Calendar.getInstance(); int currentMonth = calendar.get(Calendar.MONTH) + 1; int currentDay = calendar.get(Calendar.DAY_OF_MONTH); return (currentMonth==2) && (currentDay==19); diff --git a/java/com/scrat/everchanging/DandelionsScene.java b/java/com/scrat/everchanging/DandelionsScene.java index 8808030..341944c 100644 --- a/java/com/scrat/everchanging/DandelionsScene.java +++ b/java/com/scrat/everchanging/DandelionsScene.java @@ -2,15 +2,13 @@ import android.content.Context; -import java.util.Calendar; - public class DandelionsScene extends Scene { private final Dandelion dandelion; - public DandelionsScene(final Context context, final Calendar calendar) { + public DandelionsScene(Context context) { super(ShortTypes.D); - dandelion = new Dandelion(context, calendar); + dandelion = new Dandelion(context); } public void update(boolean createObject) { diff --git a/java/com/scrat/everchanging/EverchangingRender.java b/java/com/scrat/everchanging/EverchangingRender.java index 1606c3d..847888b 100644 --- a/java/com/scrat/everchanging/EverchangingRender.java +++ b/java/com/scrat/everchanging/EverchangingRender.java @@ -112,8 +112,6 @@ public class EverchangingRender implements GLSurfaceView.Renderer { {10, 2, 9, 9, 8, 9, 8, 8, 9, 9, 9, 8, 8, 8, 9, 8, 8, 7, 8, 10, 3, 3, 10, 3, 3, 3, 3, 0, 0, 0, 9} }; - private final Calendar calendar = Calendar.getInstance(); - Context context; private final ArrayList scenes = new ArrayList<>(); @@ -134,19 +132,19 @@ public void onSurfaceCreated(GL10 gl, EGLConfig config) { GLES20.glBlendFunc(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE_MINUS_SRC_ALPHA); - scenes.add(new BackgroundScene(context, calendar)); + scenes.add(new BackgroundScene(context)); scenes.add(new CrystalBlickScene(context)); - scenes.add(new FireFliesScene(context, calendar)); - scenes.add(new DandelionsScene(context, calendar)); - scenes.add(new RainsScene(context, calendar)); + scenes.add(new FireFliesScene(context)); + scenes.add(new DandelionsScene(context)); + scenes.add(new RainsScene(context)); scenes.add(new PetalsScene(context)); - scenes.add(new SnowsScene(context, calendar)); - scenes.add(new LeavesScene(context, calendar)); - scenes.add(new FireWorksScene(context, calendar)); - scenes.add(new EyesScene(context, calendar)); - scenes.add(new ButterFliesScene(context, calendar)); + scenes.add(new SnowsScene(context)); + scenes.add(new LeavesScene(context)); + scenes.add(new FireWorksScene(context)); + scenes.add(new EyesScene(context)); + scenes.add(new ButterFliesScene(context)); scenes.add(new BatsScene(context)); - scenes.add(new HeartsScene(context, calendar)); + scenes.add(new HeartsScene(context)); scenes.add(new ValentinesScene(context)); scenes.add(new FairiesScene(context)); @@ -187,6 +185,7 @@ public void onSurfaceChanged(GL10 gl, int width, int height) { private Scene.ShortTypes getAnim() { + Calendar calendar = Calendar.getInstance(); int currentMonth = calendar.get(Calendar.MONTH); int currentDay = calendar.get(Calendar.DAY_OF_MONTH)-1; int currentHour = calendar.get(Calendar.HOUR_OF_DAY); diff --git a/java/com/scrat/everchanging/Eye.java b/java/com/scrat/everchanging/Eye.java index cc9b305..2eb4de3 100644 --- a/java/com/scrat/everchanging/Eye.java +++ b/java/com/scrat/everchanging/Eye.java @@ -21,16 +21,14 @@ public class Eye extends TextureObject { boolean init = false; static final String[][] textureList = {{"image_1","image_2","image_3","image_4","image_5","image_6","image_7","image_8","image_9","image_10","image_11","image_12"}}; - private final Calendar calendar; - boolean[] positions = {false,false,false,false,false}; ArrayList removeObjects = new ArrayList<>(); - public Eye(final Context context, final Calendar calendar) { + public Eye(Context context) { super(context, textureList, null); - this.calendar = calendar; } private boolean get0601() { + Calendar calendar = Calendar.getInstance(); int currentMonth = calendar.get(Calendar.MONTH) + 1; int currentDay = calendar.get(Calendar.DAY_OF_MONTH); return (currentMonth==1) && (currentDay==6); diff --git a/java/com/scrat/everchanging/EyesScene.java b/java/com/scrat/everchanging/EyesScene.java index 2cae645..ddcddec 100644 --- a/java/com/scrat/everchanging/EyesScene.java +++ b/java/com/scrat/everchanging/EyesScene.java @@ -2,14 +2,12 @@ import android.content.Context; -import java.util.Calendar; - public class EyesScene extends Scene { private final Eye eye; - public EyesScene(final Context context, final Calendar calendar) { + public EyesScene(Context context) { super(ShortTypes.E); - eye = new Eye(context, calendar); + eye = new Eye(context); } public void update(boolean createObject) { diff --git a/java/com/scrat/everchanging/FireFlie.java b/java/com/scrat/everchanging/FireFlie.java index 5395afa..68c7f36 100644 --- a/java/com/scrat/everchanging/FireFlie.java +++ b/java/com/scrat/everchanging/FireFlie.java @@ -145,15 +145,12 @@ public class FireFlie extends TextureObject { int maxFrames = 6; boolean init = false; - private final Calendar calendar; - static final String[][] textureList = {{"image_168","image_170"}}; static final float[][] pivotList = {{7.5f, 7.5f},{7.5f, 7.5f}}; ArrayList removeObjects = new ArrayList<>(); - public FireFlie(final Context context, final Calendar calendar) { + public FireFlie(Context context) { super(context, textureList, pivotList); - this.calendar = calendar; } void createObject() { @@ -201,6 +198,7 @@ void resetObject(Object object) { } private boolean get2501() { + Calendar calendar = Calendar.getInstance(); int currentMonth = calendar.get(Calendar.MONTH) + 1; int currentDay = calendar.get(Calendar.DAY_OF_MONTH); return (currentMonth==1) && (currentDay==25); diff --git a/java/com/scrat/everchanging/FireFliesScene.java b/java/com/scrat/everchanging/FireFliesScene.java index c4b2f32..3359956 100644 --- a/java/com/scrat/everchanging/FireFliesScene.java +++ b/java/com/scrat/everchanging/FireFliesScene.java @@ -2,15 +2,13 @@ import android.content.Context; -import java.util.Calendar; - public class FireFliesScene extends Scene { private final FireFlie fireflie; - public FireFliesScene(final Context context, final Calendar calendar) { + public FireFliesScene(Context context) { super(ShortTypes.FF); - fireflie = new FireFlie(context, calendar); + fireflie = new FireFlie(context); } public void update(boolean createObject) { diff --git a/java/com/scrat/everchanging/FireWork.java b/java/com/scrat/everchanging/FireWork.java index 971e91b..692c398 100644 --- a/java/com/scrat/everchanging/FireWork.java +++ b/java/com/scrat/everchanging/FireWork.java @@ -33,19 +33,17 @@ public class FireWork extends TextureObject{ int maxFrames = 5; ArrayList removeObjects = new ArrayList<>(); - private final Calendar calendar; - private boolean get010104() { svgScale = textureManager.dipToPixels(1); + Calendar calendar = Calendar.getInstance(); int currentMonth = calendar.get(Calendar.MONTH) + 1; int currentDay = calendar.get(Calendar.DAY_OF_MONTH); int currentYear = calendar.get(Calendar.YEAR); return (currentMonth==1) && (currentDay==1) && (currentYear % 4 == 0); } - FireWork(final Context context, final Calendar calendar) { + FireWork(Context context) { super(context, textureList, null); - this.calendar = calendar; } void resetObject(Object object) { diff --git a/java/com/scrat/everchanging/FireWorksScene.java b/java/com/scrat/everchanging/FireWorksScene.java index c3e5faf..d61a806 100644 --- a/java/com/scrat/everchanging/FireWorksScene.java +++ b/java/com/scrat/everchanging/FireWorksScene.java @@ -1,14 +1,11 @@ package com.scrat.everchanging; import android.content.Context; - -import java.util.Calendar; - public class FireWorksScene extends Scene{ private final FireWork firework; - FireWorksScene(final Context context, final Calendar calendar) { + FireWorksScene(Context context) { super(ShortTypes.FW); - firework = new FireWork(context, calendar); + firework = new FireWork(context); } public void setupPosition(int width, int height, float ratio, int displayRotation) { super.createProjectMatrix(width, height, displayRotation); diff --git a/java/com/scrat/everchanging/HeartsScene.java b/java/com/scrat/everchanging/HeartsScene.java index 8e380d9..e6433e2 100644 --- a/java/com/scrat/everchanging/HeartsScene.java +++ b/java/com/scrat/everchanging/HeartsScene.java @@ -2,15 +2,13 @@ import android.content.Context; -import java.util.Calendar; - public class HeartsScene extends Scene implements Rain.FinishCallback { private final Rain rain; private final Ripple ripple; - public HeartsScene(final Context context, final Calendar calendar) { + public HeartsScene(Context context) { super(ShortTypes.H); - rain = new Rain(context, calendar, 1); + rain = new Rain(context, 1); ripple = new Ripple(context, 1); rain.registerCallBack(this); } diff --git a/java/com/scrat/everchanging/Leave.java b/java/com/scrat/everchanging/Leave.java index e79003b..4aa6e70 100644 --- a/java/com/scrat/everchanging/Leave.java +++ b/java/com/scrat/everchanging/Leave.java @@ -380,8 +380,6 @@ public class Leave extends TextureObject { {{128, 128, 128, 256},{199, 168, 39, 0}} }; - private final Calendar calendar; - ArrayList removeObjects = new ArrayList<>(); int frameCounter = 0; int maxFrames = 8; @@ -390,14 +388,14 @@ public class Leave extends TextureObject { boolean init = false; int animCount =1; - public Leave (final Context context, final Calendar calendar) { + public Leave (Context context) { super(context, textureList, null); - this.calendar = calendar; } private boolean get0703() { svgScale = textureManager.dipToPixels(1); animCount = (int)((height / 280.0f) + 0.5f); + Calendar calendar = Calendar.getInstance(); int currentMonth = calendar.get(Calendar.MONTH) + 1; int currentDay = calendar.get(Calendar.DAY_OF_MONTH); return (currentMonth==3) && (currentDay==7); diff --git a/java/com/scrat/everchanging/LeavesScene.java b/java/com/scrat/everchanging/LeavesScene.java index 7f7dd87..283d17d 100644 --- a/java/com/scrat/everchanging/LeavesScene.java +++ b/java/com/scrat/everchanging/LeavesScene.java @@ -1,14 +1,11 @@ package com.scrat.everchanging; import android.content.Context; - -import java.util.Calendar; - public class LeavesScene extends Scene { private final Leave leave; - LeavesScene(final Context context, final Calendar calendar) { + LeavesScene(Context context) { super(ShortTypes.L); - leave = new Leave(context, calendar); + leave = new Leave(context); } public void setupPosition(int width, int height, float ratio, int displayRotation) { diff --git a/java/com/scrat/everchanging/Rain.java b/java/com/scrat/everchanging/Rain.java index 11596f1..37d1848 100644 --- a/java/com/scrat/everchanging/Rain.java +++ b/java/com/scrat/everchanging/Rain.java @@ -27,8 +27,6 @@ interface FinishCallback{ static final String[][] textureList = {{"shape_22"}}; - private final Calendar calendar; - ArrayList removeObjects = new ArrayList<>(); int frameCounter = 0; @@ -41,9 +39,8 @@ interface FinishCallback{ FinishCallback finishCallback; int typesAnim; - Rain(final Context context, final Calendar calendar, final int anim) { + Rain(Context context, int anim) { super(context, textureList, null); - this.calendar = calendar; this.typesAnim = anim; } @@ -76,6 +73,7 @@ void createObject() { private boolean get0403() { frameMoveCount = 1 + (int) (height / speed); + Calendar calendar = Calendar.getInstance(); int currentMonth = calendar.get(Calendar.MONTH) + 1; int currentDay = calendar.get(Calendar.DAY_OF_MONTH); return (currentMonth==3) && (currentDay==4); diff --git a/java/com/scrat/everchanging/RainsScene.java b/java/com/scrat/everchanging/RainsScene.java index b13ce15..3464539 100644 --- a/java/com/scrat/everchanging/RainsScene.java +++ b/java/com/scrat/everchanging/RainsScene.java @@ -2,16 +2,14 @@ import android.content.Context; -import java.util.Calendar; - -public class RainsScene extends Scene implements Rain.FinishCallback { +public class RainsScene extends Scene implements Rain.FinishCallback { private final Rain rain; private final Ripple ripple; - public RainsScene(final Context context, final Calendar calendar) { + public RainsScene(Context context) { super(ShortTypes.R); - rain = new Rain(context, calendar, 0); + rain = new Rain(context, 0); ripple = new Ripple(context, 0); rain.registerCallBack(this); } diff --git a/java/com/scrat/everchanging/Snow.java b/java/com/scrat/everchanging/Snow.java index 704105b..d41ec2e 100644 --- a/java/com/scrat/everchanging/Snow.java +++ b/java/com/scrat/everchanging/Snow.java @@ -140,7 +140,6 @@ public class Snow extends TextureObject{ {{256, 256, 256, 0}, {0, 0, 0, 0}} }; - private final Calendar calendar; ArrayList removeObjects = new ArrayList<>(); int frameCounter = 0; @@ -149,13 +148,13 @@ public class Snow extends TextureObject{ boolean init = false; int heightMax = 0; - public Snow (final Context context, final Calendar calendar) { + public Snow (Context context) { super(context, textureList,null); - this.calendar = calendar; } private boolean get0404() { heightMax = (int) (height * 0.5f) + colorTransform.length + 10; + Calendar calendar = Calendar.getInstance(); int currentMonth = calendar.get(Calendar.MONTH) + 1; int currentDay = calendar.get(Calendar.DAY_OF_MONTH); return (currentMonth==4) && (currentDay==4); diff --git a/java/com/scrat/everchanging/SnowsScene.java b/java/com/scrat/everchanging/SnowsScene.java index 21aa046..935c2c8 100644 --- a/java/com/scrat/everchanging/SnowsScene.java +++ b/java/com/scrat/everchanging/SnowsScene.java @@ -2,15 +2,13 @@ import android.content.Context; -import java.util.Calendar; - public class SnowsScene extends Scene{ private final Snow show; - SnowsScene(final Context context, final Calendar calendar) { + SnowsScene(Context context) { super(ShortTypes.S); - show = new Snow(context, calendar); + show = new Snow(context); } public void setupPosition(int width, int height, float ratio, int displayRotation) {