/ - Diff - Magic Cube - Distorted Android

         final View view = inflater.inflate(R.layout.dialog_about, null);
         TextView text = view.findViewById(R.id.about_version);
         text.setText(R.string.app_version);
         String appName = getString(R.string.app_name);
         String appVers = getString(R.string.app_version);
         text.setText(getString(R.string.ap_placeholder,appName, appVers));
         builder.setView(view);
         return builder.create();

src/main/java/org/distorted/dialog/RubikDialogScoresPagerAdapter.java
162	162	if( allCreated )
163	163	{
164	164	RubikScoresDownloader downloader = new RubikScoresDownloader();
165		downloader.download(this, "distorted", 1); // TODO
	165	downloader.download(this, "distorted", "1.0.0", 1); // TODO
166	166	}
167	167
168	168	return mViews[position];

     import java.net.URL;
     import java.net.UnknownHostException;
     import org.distorted.magic.R;
     import static org.distorted.object.RubikObject.LENGTH;
     import static org.distorted.uistate.RubikStatePlay.MAX_SCRAMBLE;
-...
       private static boolean mRunning = false;
       private static int mMode = IDLE;
       private static Receiver mReceiver;
       private static String mUserName;
       private static String mUserName, mVersion;
       private static int mNumRuns;
       private static String mScores = "";
-...
       private static String[][][] mName    = new String[LENGTH][MAX_SCRAMBLE][MAX_PLACES];
       private static String[][][] mTime    = new String[LENGTH][MAX_SCRAMBLE][MAX_PLACES];
       private static int[][] mPlaces = new int[LENGTH][MAX_SCRAMBLE];
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void fillValues()
+        {
         int begin=-1 ,end, len = mScores.length();
         for(int i=0; i<LENGTH; i++)
           for(int j=0; j<MAX_SCRAMBLE; j++)
+            {
             mPlaces[i][j] = 0;
+            }
         while( begin<len )
+          {
           end = mScores.indexOf('\n', begin+1);
-...
             if(level>=0 && level<MAX_SCRAMBLE && place>=0 && place<MAX_PLACES)
+              {
               int p = mPlaces[size][level];
               mPlaces[size][level]++;
               if( p!=place ) android.util.Log.e("downloader", "size="+size+" level="+level+" p="+p+" place="+place);
               mCountry[size][level][place] = country;
               mName   [size][level][place] = name;
               mTime   [size][level][place] = realTime;
-...
       private boolean doDownload()
+        {
         String version = R.string.app_version+"d";
         String message=URL+"/download.cgi?n="+URLencode(mUserName)+"&r="+mNumRuns+"&e="+version;
         String message=URL+"/download.cgi?n="+URLencode(mUserName)+"&r="+mNumRuns+"&e="+mVersion+"d";
         try
+          {
-...
           return false;
+          }
         if( mScores.length()==0 )
+          {
           mReceiver.exception("Failed to download scores");
           return false;
+          }
         return true;
+        }
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void download(Receiver receiver, String userName, int numRuns)
       public void download(Receiver receiver, String userName, String version, int numRuns)
+        {
         mReceiver = receiver;
         mMode     = DOWNLOAD;
         mUserName = userName;
         mVersion  = version;
         mNumRuns  = numRuns;
         Thread networkThrd = new Thread(this);

src/main/java/org/distorted/uistate/RubikStateAbstract.java
28	28	{
29	29	public static final int BUTTON_ID_BACK= 1023;
30	30
31		public abstract void enterState(RubikActivity act);
32		public abstract void leaveState(RubikActivity act);
	31	abstract void enterState(RubikActivity act);
	32	abstract void leaveState(RubikActivity act);
33	33	public abstract void savePreferences(SharedPreferences.Editor editor);
34	34	public abstract void restorePreferences(SharedPreferences preferences);
35	35	}

src/main/java/org/distorted/uistate/RubikStateMain.java
37	37
38	38	public class RubikStateMain extends RubikStateAbstract
39	39	{
40		public void leaveState(RubikActivity act)
	40	void leaveState(RubikActivity act)
41	41	{
42	42	FragmentManager mana = act.getSupportFragmentManager();
43	43	RubikDialogMain diag = (RubikDialogMain) mana.findFragmentByTag(RubikDialogMain.getDialogTag());
...	...
54	54
55	55	///////////////////////////////////////////////////////////////////////////////////////////////////
56	56
57		public void enterState(RubikActivity act)
	57	void enterState(RubikActivity act)
58	58	{
59	59	FragmentManager mana = act.getSupportFragmentManager();
60	60	RubikDialogMain diag = (RubikDialogMain) mana.findFragmentByTag(RubikDialogMain.getDialogTag());

src/main/java/org/distorted/uistate/RubikStatePlay.java
51	51
52	52	///////////////////////////////////////////////////////////////////////////////////////////////////
53	53
54		public void leaveState(RubikActivity act)
	54	void leaveState(RubikActivity act)
55	55	{
56	56	mPickerValue = mPicker.getValue();
57	57	}
58	58
59	59	///////////////////////////////////////////////////////////////////////////////////////////////////
60	60
61		public void enterState(RubikActivity act)
	61	void enterState(RubikActivity act)
62	62	{
63	63	LayoutInflater inflater = act.getLayoutInflater();
64	64

     import java.util.TimerTask;
     import static android.view.View.INVISIBLE;
     import static org.distorted.object.RubikObject.LENGTH;
     import static org.distorted.uistate.RubikStatePlay.MAX_SCRAMBLE;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     public class RubikStateSolving extends RubikStateAbstract
+      {
       private static final int NO_RECORD = Integer.MAX_VALUE;
       private TextView mTime;
       private Timer mTimer;
       private long mStartTime;
       private boolean mRunning;
       private long[][] mRecords;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void leaveState(RubikActivity act)
       RubikStateSolving()
+        {
         mRecords = new long[LENGTH][MAX_SCRAMBLE];
         for(int i=0; i<LENGTH; i++)
           for(int j=0; j<MAX_SCRAMBLE; j++)
+            {
             mRecords[i][j] = NO_RECORD;
+            }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       void leaveState(RubikActivity act)
+        {
         stopCounting();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void enterState(RubikActivity act)
       void enterState(RubikActivity act)
+        {
         LayoutInflater inflater = act.getLayoutInflater();
-...
       public void savePreferences(SharedPreferences.Editor editor)
+        {
         for(int i=0; i<LENGTH; i++)
           for(int j=0; j<MAX_SCRAMBLE; j++)
+            {
             if( mRecords[i][j]!=NO_RECORD)
+              {
               editor.putLong("record_"+i+"_"+j, mRecords[i][j]);
+              }
+            }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void restorePreferences(SharedPreferences preferences)
+        {
         for(int i=0; i<LENGTH; i++)
           for(int j=0; j<MAX_SCRAMBLE; j++)
+            {
             mRecords[i][j] = preferences.getInt("record_"+i+"_"+j, NO_RECORD );
+            }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
+            }
           mRunning = false;
           return System.currentTimeMillis()-mStartTime;
           long timeTaken = System.currentTimeMillis()-mStartTime;
           RubikStatePlay play = (RubikStatePlay)RubikState.PLAY.getStateClass();
           int object  = play.getButton();
           int scramble= play.getPicker();
           if( object>=0 && object<LENGTH && scramble>=0 && scramble<MAX_SCRAMBLE )
+            {
             if( mRecords[object][scramble]> timeTaken )
+              {
               mRecords[object][scramble] = timeTaken;
               android.util.Log.e("solv","new record!");
+              }
+            }
           return timeTaken;
+          }
         return 0;

     <resources>
         <string name="app_name">Magic Cube</string>
         <string name="app_version">Magic Cube v1.0.0</string>
         <string name="app_version">1.0.0</string>
         <string name="distorted">DISTORTED</string>
         <string name="scramble">Scramble</string>
         <string name="solve">Solve</string>
-...
         <string name="ms_placeholder">%1$d ms</string>
         <string name="sc_placeholder">Scramble %1$d</string>
         <string name="tm_placeholder">%1$02d:%2$02d</string>
         <string name="ap_placeholder">%1$s %2$s</string>
     </resources>

Project

General

Profile

Magic Cube

Revision 329c0aeb

Added by Leszek Koltunski almost 5 years ago