commit 6222afefe9a3542778da9e3cfcaaf60f216b50f9 Author: Leszek Koltunski Date: Fri Nov 14 00:05:54 2025 +0100 progress with remembering solves. diff --git a/src/main/java/org/distorted/helpers/RubikRememberedSolves.java b/src/main/java/org/distorted/helpers/RubikRememberedSolves.java index 226e1266..7e116bc5 100644 --- a/src/main/java/org/distorted/helpers/RubikRememberedSolves.java +++ b/src/main/java/org/distorted/helpers/RubikRememberedSolves.java @@ -18,9 +18,12 @@ import org.json.JSONException; import org.json.JSONObject; import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -66,10 +69,12 @@ public class RubikRememberedSolves /////////////////////////////////////////////////////////////////////////////////////////////////// - public JSONArray readFile(Activity act, String filename) + public JSONArray readFile(Activity act, String objname) { RubikFiles files = RubikFiles.getInstance(); - InputStream file = files.openFile(act, filename); + InputStream file = files.openFile(act,objname.toLowerCase()+"_solves.json"); + + if( file==null ) return null; try { @@ -97,6 +102,30 @@ public class RubikRememberedSolves return contents.toString(); } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + public void rememberSolve(Activity act, String objname, int level, long time, Static4D rot, int[] quats) + { + String filename = objname.toLowerCase()+"_solves.json"; + RubikFiles files = RubikFiles.getInstance(); + InputStream file = files.openFile(act,filename); + RubikRememberedSolves solves = RubikRememberedSolves.getInstance(); + String contents = solves.addInfo(file,level,time,rot,quats); + + try + { + FileOutputStream fos = new FileOutputStream(filename); + OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8); + BufferedWriter bw = new BufferedWriter(osw); + bw.write(contents); + bw.flush(); + } + catch(IOException ex) + { + android.util.Log.e("D", "failed to save file "+filename); + } + } + /////////////////////////////////////////////////////////////////////////////////////////////////// private void debug(int level, long time, Static4D rot, int[] quats) diff --git a/src/main/java/org/distorted/main/MainObjectPopup.java b/src/main/java/org/distorted/main/MainObjectPopup.java index 6197fec3..63dcb320 100644 --- a/src/main/java/org/distorted/main/MainObjectPopup.java +++ b/src/main/java/org/distorted/main/MainObjectPopup.java @@ -283,7 +283,7 @@ public class MainObjectPopup if( numSolves>0 ) { - MainSolvesPopup popup = new MainSolvesPopup(act,object,json,width,height,darkC); + MainSolvesPopup popup = new MainSolvesPopup(act,object,json,width,height); popup.show(v); } else act.switchToPlay(object,mObjectOrdinal,scrambles,ll); diff --git a/src/main/java/org/distorted/main/MainSolvesPopup.java b/src/main/java/org/distorted/main/MainSolvesPopup.java index a6b2ea5b..80c68e10 100644 --- a/src/main/java/org/distorted/main/MainSolvesPopup.java +++ b/src/main/java/org/distorted/main/MainSolvesPopup.java @@ -12,35 +12,33 @@ package org.distorted.main; import android.content.Context; import android.content.res.Resources; import android.graphics.drawable.ColorDrawable; +import android.util.TypedValue; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; +import android.widget.Button; import android.widget.LinearLayout; import android.widget.PopupWindow; +import android.widget.TextView; import org.distorted.objects.RubikObject; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import java.lang.ref.WeakReference; - /////////////////////////////////////////////////////////////////////////////////////////////////// public class MainSolvesPopup { private final int mWidth, mHeight; private final PopupWindow mPopup; - private final WeakReference mAct; private final LinearLayout mLayout; - private int mMargin, mSize, mFontSize, mPadding; + private final int mMargin, mSize, mFontSize, mPadding; /////////////////////////////////////////////////////////////////////////////////////////////////// - MainSolvesPopup(MainActivity act, RubikObject object, JSONArray array, int popupWidth, int popupHeight, int darkC) + MainSolvesPopup(MainActivity act, RubikObject object, JSONArray array, int popupWidth, int popupHeight) { - mAct = new WeakReference<>(act); - mWidth = popupWidth; mHeight= popupHeight; @@ -61,12 +59,12 @@ public class MainSolvesPopup mLayout= layout.findViewById(R.id.dialog_scrollable_main_layout); - fillLayout(array); + fillLayout(act,array); } /////////////////////////////////////////////////////////////////////////////////////////////////// - private void fillLayout(JSONArray array) + private void fillLayout(MainActivity act, JSONArray array) { int textH = (int)(mSize*0.27f); int buttH = (int)(mSize*0.35f); @@ -86,7 +84,7 @@ public class MainSolvesPopup { JSONObject object = array.getJSONObject(s); long time = object.getLong("time"); - View pane = createPane(time, pL, pT, pB); + View pane = createOldPane(act, time, pL, pT, pB); mLayout.addView(pane); } } @@ -95,22 +93,86 @@ public class MainSolvesPopup android.util.Log.e("D", "fillLayout: JSON error: "+jex.getMessage()); } - View pane = createNewPane(pL,pT,pB); + View pane = createNewPane(act, pL,pT,pB); mLayout.addView(pane); } /////////////////////////////////////////////////////////////////////////////////////////////////// - private View createPane(long time, LinearLayout.LayoutParams pView, LinearLayout.LayoutParams pText, LinearLayout.LayoutParams pButt) + private View createOldPane(MainActivity act, long time, LinearLayout.LayoutParams pView, LinearLayout.LayoutParams pText, LinearLayout.LayoutParams pButt) { + View view = act.getLayoutInflater().inflate(R.layout.dialog_solve_old_pane, null); + TextView title = view.findViewById(R.id.solves_pane_title); + TextView tm = view.findViewById(R.id.solves_pane_time); + tm.setText(Long.toString(time)); + + view.setLayoutParams(pView); + view.setPadding(mPadding,mPadding,mPadding,mPadding); + + title.setTextSize(TypedValue.COMPLEX_UNIT_PX, mFontSize); + tm.setTextSize(TypedValue.COMPLEX_UNIT_PX, mFontSize); + title.setLayoutParams(pText); + tm.setLayoutParams(pText); + + Button but1 = view.findViewById(R.id.solves_pane_delete); + + but1.setOnClickListener( new View.OnClickListener() + { + @Override + public void onClick(View v) + { + android.util.Log.e("D", "DELETE"); + } + }); + + but1.setTextSize(TypedValue.COMPLEX_UNIT_PX, mFontSize); + but1.setLayoutParams(pButt); + + Button but2 = view.findViewById(R.id.solves_pane_resume); + but2.setOnClickListener( new View.OnClickListener() + { + @Override + public void onClick(View v) + { + android.util.Log.e("D", "RESUME"); + } + }); + + but2.setTextSize(TypedValue.COMPLEX_UNIT_PX, mFontSize); + but2.setLayoutParams(pButt); + + return view; } /////////////////////////////////////////////////////////////////////////////////////////////////// - private View createNewPane(LinearLayout.LayoutParams pView, LinearLayout.LayoutParams pText, LinearLayout.LayoutParams pButt) + private View createNewPane(MainActivity act, LinearLayout.LayoutParams pView, LinearLayout.LayoutParams pText, LinearLayout.LayoutParams pButt) { + View view = act.getLayoutInflater().inflate(R.layout.dialog_solve_new_pane, null); + TextView title = view.findViewById(R.id.solves_pane_title); + + view.setLayoutParams(pView); + view.setPadding(mPadding,mPadding,mPadding,mPadding); + + title.setTextSize(TypedValue.COMPLEX_UNIT_PX, mFontSize); + title.setLayoutParams(pText); + + Button but = view.findViewById(R.id.solves_pane_play); + + but.setOnClickListener( new View.OnClickListener() + { + @Override + public void onClick(View v) + { + android.util.Log.e("D", "PLAY"); + } + }); + + but.setTextSize(TypedValue.COMPLEX_UNIT_PX, mFontSize); + but.setLayoutParams(pButt); + return view; } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/play/PlayActivity.java b/src/main/java/org/distorted/play/PlayActivity.java index b3fb135f..ae0abb60 100644 --- a/src/main/java/org/distorted/play/PlayActivity.java +++ b/src/main/java/org/distorted/play/PlayActivity.java @@ -9,13 +9,9 @@ package org.distorted.play; -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.IOException; import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.nio.charset.StandardCharsets; +import android.app.Activity; import android.content.SharedPreferences; import android.os.Build; import android.os.Bundle; @@ -304,30 +300,6 @@ public class PlayActivity extends BaseActivity implements DialogScores.ScoresInv return mObjectOrdinal; } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void rememberSolveThread(String name, int level, long time, Static4D rot, int[] quats) - { - String filename = name+"_solves.json"; - RubikFiles files = RubikFiles.getInstance(); - InputStream file = files.openFile(this, filename); - RubikRememberedSolves solves = RubikRememberedSolves.getInstance(); - String contents = solves.addInfo(file,level,time,rot,quats); - - try - { - FileOutputStream fos = new FileOutputStream(filename); - OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8); - BufferedWriter bw = new BufferedWriter(osw); - bw.write(contents); - bw.flush(); - } - catch(IOException ex) - { - android.util.Log.e("D", "failed to save file "+filename); - } - } - /////////////////////////////////////////////////////////////////////////////////////////////////// public void rememberSolve() @@ -342,12 +314,14 @@ public class PlayActivity extends BaseActivity implements DialogScores.ScoresInv int[] quats = new int[numCubits]; for(int c=0; c + + + + + + + + + + +