/ - Diff - Magic Cube - Distorted Android

src/main/java/org/distorted/dialog/RubikDialogScoresPagerAdapter.java
45	45
46	46	///////////////////////////////////////////////////////////////////////////////////////////////////
47	47
48		public void receive(final String[][][] country, final String[][][] name, final String[][][] time)
	48	public void receive(final String[][][] country, final String[][][] name, final float[][][] time)
49	49	{
50	50	prepareView();
51	51
52	52	int c = mViewPager.getCurrentItem();
53	53
54		addPage(mViews[c],country[c],name[c],time[c]);
	54	addPage(c, mViews[c],country[c],name[c],time[c]);
55	55
56	56	for(int i=0; i<mNumTabs; i++)
57	57	{
58	58	if( i==c ) continue;
59	59
60		addPage(mViews[i],country[i],name[i],time[i]);
	60	addPage(i, mViews[i],country[i],name[i],time[i]);
61	61	}
62	62	}
63	63
...	...
88	88
89	89	///////////////////////////////////////////////////////////////////////////////////////////////////
90	90
91		private void addPage(final RubikDialogScoresView view, final String[][] country, final String[][] name, final String[][] time)
	91	private void addPage(int tab, final RubikDialogScoresView view, final String[][] country, final String[][] name, final float[][] time)
92	92	{
93	93	for(int i=0; i<MAX_SCRAMBLE; i++)
94	94	{
95		final LinearLayout section = view.createSection(mAct, i, country[i], name[i], time[i]);
	95	final LinearLayout section = view.createSection(mAct, tab, i, country[i], name[i], time[i]);
96	96
97	97	mAct.runOnUiThread(new Runnable()
98	98	{

     import android.widget.TextView;
     import org.distorted.magic.R;
     import org.distorted.object.RubikObjectList;
     import org.distorted.scores.RubikScores;
     import static org.distorted.scores.RubikScoresDownloader.MAX_PLACES;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       LinearLayout createSection(FragmentActivity act, int scramble, final String[] country, final String[] name, final String[] time)
       LinearLayout createSection(FragmentActivity act, int tab, int scramble, final String[] country, final String[] name, final float[] time)
+        {
         LinearLayout level = (LinearLayout)inflate(act, R.layout.dialog_scores_scramble_title, null);
         TextView text = level.findViewById(R.id.scoresScrambleTitle);
-...
         Resources res = act.getResources();
         String packageName = act.getPackageName();
         for(int j=0; j<MAX_PLACES; j++)
+          {
           if( name[j] != null )
+            {
             View row = inflate(act, R.layout.dialog_scores_scramble_row, null);
             ImageView imgCoun = row.findViewById(R.id.scoresScrambleRowCountry);
             TextView textName = row.findViewById(R.id.scoresScrambleRowName);
             TextView textTime = row.findViewById(R.id.scoresScrambleRowTime);
         int object = RubikObjectList.unpackObject(tab);
         int size   = RubikObjectList.unpackSize(tab);
         RubikScores scores = RubikScores.getInstance();
             int resID = res.getIdentifier( country[j], "drawable", packageName);
         boolean inserted = false;
         long myRecordInSeconds = scores.getRecord(object, size, scramble);
         String myName = scores.getName();
         int myCountryID = scores.getCountryID();
         String myRecord = ( myRecordInSeconds<RubikScores.NO_RECORD ) ? Float.toString((myRecordInSeconds/100)/10.0f) : "??";
         String theirTime;
         int theirCountryID;
             imgCoun.setImageResource(resID!=0 ? resID : R.drawable.unk);
             textName.setText(name[j]);
             textTime.setText(time[j]);
         int white = res.getColor(R.color.white);
         int red   = res.getColor(R.color.red);
         for(int j=0; j<MAX_PLACES-1; j++)
+          {
           if( name[j] != null )
+            {
             if( myRecordInSeconds<time[j] && !inserted )
+              {
               inserted = true;
               View row = createRow(act, myCountryID, myName, myRecord, red);
               level.addView(row);
+              }
             theirCountryID = res.getIdentifier( country[j], "drawable", packageName);
             theirTime = Float.toString(time[j]);
             View row = createRow(act, theirCountryID, name[j], theirTime, white);
             level.addView(row);
+            }
+          }
         if( !inserted )
+          {
           View row = createRow(act, myCountryID, myName, myRecord, red);
           level.addView(row);
+          }
         return level;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private View createRow(FragmentActivity act, int countryID, String name, String time, int color)
+        {
         View row = inflate(act, R.layout.dialog_scores_scramble_row, null);
         ImageView imgCoun = row.findViewById(R.id.scoresScrambleRowCountry);
         TextView textName = row.findViewById(R.id.scoresScrambleRowName);
         TextView textTime = row.findViewById(R.id.scoresScrambleRowTime);
         imgCoun.setImageResource(countryID!=0 ? countryID : R.drawable.unk);
         textName.setText(name);
         textTime.setText(time);
         textName.setTextColor(color);
         textTime.setTextColor(color);
         return row;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // needs to run on UI thread

src/main/java/org/distorted/scores/RubikScores.java
20	20	package org.distorted.scores;
21	21
22	22	import android.content.SharedPreferences;
	23
	24	import org.distorted.magic.R;
23	25	import org.distorted.object.RubikObjectList;
24	26
25	27	import static org.distorted.object.RubikObjectList.MAX_SIZE;
...	...
31	33
32	34	public class RubikScores
33	35	{
34		private static final long NO_RECORD = Integer.MAX_VALUE;
	36	public static final long NO_RECORD = Long.MAX_VALUE;
35	37	private static RubikScores mThis;
36	38
37	39	private long[][][] mRecords;
...	...
39	41	private boolean mNameIsVerified;
40	42	private int mNumRuns;
41	43	private int mNumPlays;
	44	private int mCountryID;
42	45
43	46	///////////////////////////////////////////////////////////////////////////////////////////////////
44	47
...	...
53	56	mRecords[i][j][k] = NO_RECORD;
54	57	}
55	58
56		mName = "";
	59	mName = "YOU";
57	60	mNameIsVerified = false;
58	61	mNumPlays= -1;
59	62	mNumRuns = -1;
	63	mCountryID = R.drawable.unk;
60	64	}
61	65
62	66	///////////////////////////////////////////////////////////////////////////////////////////////////
...	...
116	120	{
117	121	String recordStr, subStr, nameStr, sizeStr, timeStr;
118	122	int start, end, equals, underscore;
119		int object, size, time;
	123	int object, size;
	124	long time;
120	125
121	126	for(int scramble=0; scramble<MAX_SCRAMBLE; scramble++)
122	127	{
...	...
143	148
144	149	object = RubikObjectList.getOrdinal(nameStr);
145	150	size = RubikObjectList.getSize(object,Integer.parseInt(sizeStr));
146		time = Integer.parseInt(timeStr);
	151	time = Long.parseLong(timeStr);
147	152
148	153	if( object>=0 && object< NUM_OBJECTS && size>=0 && size<MAX_SIZE )
149	154	{
150	155	mRecords[object][size][scramble] = time;
151	156
152		if( time<Integer.MAX_VALUE )
	157	if( time<NO_RECORD )
153	158	{
154	159	android.util.Log.e("solv", "Set record for: object="+object+" size="+size+" scramble="+scramble+" time: "+time);
155	160	}
...	...
162	167	}
163	168	}
164	169
165		mName = preferences.getString("scores_name" , "");
	170	mName = preferences.getString("scores_name" , "YOU" );
166	171	mNameIsVerified = preferences.getBoolean("scores_isVerified", false);
167	172	mNumPlays = preferences.getInt("scores_numPlays", 0);
168	173	mNumRuns = preferences.getInt("scores_numRuns" , 0);
...	...
199	204	}
200	205
201	206	///////////////////////////////////////////////////////////////////////////////////////////////////
	207	// TODO
202	208
203	209	public void setName(String newName)
204	210	{
...	...
206	212	}
207	213
208	214	///////////////////////////////////////////////////////////////////////////////////////////////////
	215	// TODO
209	216
210	217	public void verifyName()
211	218	{
212	219	mNameIsVerified = true;
213	220	}
214	221
	222	///////////////////////////////////////////////////////////////////////////////////////////////////
	223	// TODO
	224
	225	public void setCountry(int country)
	226	{
	227	mCountryID = country;
	228	}
	229
215	230	///////////////////////////////////////////////////////////////////////////////////////////////////
216	231
217	232	public long getRecord(int object, int size, int scramble)
218	233	{
219	234	int maxsize = RubikObjectList.getObject(object).getSizes().length;
220	235
221		if( object>=0 && object<NUM_OBJECTS && size>=0 && size<maxsize && scramble>=1 && scramble<=MAX_SCRAMBLE )
	236	if( object>=0 && object<NUM_OBJECTS && size>=0 && size<maxsize && scramble>=0 && scramble<MAX_SCRAMBLE )
222	237	{
223	238	return mRecords[object][size][scramble];
224	239	}
...	...
227	242	}
228	243
229	244	///////////////////////////////////////////////////////////////////////////////////////////////////
	245	// TODO
	246
	247	public boolean isVerified()
	248	{
	249	return mNameIsVerified;
	250	}
	251
	252	///////////////////////////////////////////////////////////////////////////////////////////////////
	253	// TODO
230	254
231	255	public int getNumPlays()
232	256	{
...	...
249	273
250	274	///////////////////////////////////////////////////////////////////////////////////////////////////
251	275
252		public boolean isVerified()
	276	public int getCountryID()
253	277	{
254		return mNameIsVerified;
	278	return mCountryID;
255	279	}
256	280	}

src/main/java/org/distorted/scores/RubikScoresDownloader.java
34	34	{
35	35	public interface Receiver
36	36	{
37		void receive(String[][][] country, String[][][] name, String[][][] time);
	37	void receive(String[][][] country, String[][][] name, float[][][] time);
38	38	void exception(String exception);
39	39	}
40	40
...	...
91	91	private static String mScores = "";
92	92	private static String[][][] mCountry = new String[mTotal][MAX_SCRAMBLE][MAX_PLACES];
93	93	private static String[][][] mName = new String[mTotal][MAX_SCRAMBLE][MAX_PLACES];
94		private static String[][][] mTime = new String[mTotal][MAX_SCRAMBLE][MAX_PLACES];
	94	private static float[][][] mTime = new float[mTotal][MAX_SCRAMBLE][MAX_PLACES];
95	95
96	96	private static int[][] mPlaces = new int[mTotal][MAX_SCRAMBLE];
97	97
...	...
138	138	String name = row.substring(s3+1, s4);
139	139	int time = Integer.parseInt( row.substring(s4+1,s5) );
140	140	String country = row.substring(s5+1, s6);
141		String realTime= String.valueOf(time/10.0f);
142	141
143	142	if(level>=0 && level<MAX_SCRAMBLE && place>=0 && place<MAX_PLACES)
144	143	{
...	...
149	148
150	149	mCountry[size][level][place] = country;
151	150	mName [size][level][place] = name;
152		mTime [size][level][place] = realTime;
	151	mTime [size][level][place] = ((float)time)/10.0f;
153	152	}
154	153	}
155	154	}

             android:layout_height="match_parent"
             android:layout_weight="1.5"
             android:textSize="20sp"
             android:gravity="left"
             android:gravity="start"
             android:background="@color/black"
             android:paddingLeft="0dp"/>
             android:paddingStart="0dp"/>
         <TextView
             android:id="@+id/scoresScrambleRowName"
-...
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:textSize="20sp"
             android:gravity="left"
             android:gravity="start"
             android:background="@color/black"
             />
-...
             android:layout_height="match_parent"
             android:layout_weight="1.5"
             android:textSize="20sp"
             android:gravity="right"
             android:gravity="end"
             android:background="@color/black"
             android:paddingRight="5dp"
             android:paddingEnd="5dp"
             />
     </LinearLayout>

src/main/res/values/colors.xml
6	6	<color name="red">#ffff0000</color>
7	7	<color name="grey">#ff333333</color>
8	8	<color name="black">#ff010101</color>
	9	<color name="white">#ffffffff</color>
9	10	</resources>

Project

General

Profile

Magic Cube

Revision 1c90c64a

Added by Leszek Koltunski almost 5 years ago