/ - Diff - Magic Cube - Distorted Android

     import android.widget.Button;
     import android.widget.ImageView;
     import android.widget.LinearLayout;
     import android.widget.ProgressBar;
     import android.widget.TextView;
     import org.distorted.main.R;
     import org.distorted.network.RubikUpdates;
     import org.distorted.objectlib.json.JsonWriter;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     public class RubikDialogUpdateView
+      {
       private View mView;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public RubikDialogUpdateView()
+        {
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public View createView(Activity act, RubikUpdates.UpdateInfo info, int fontSize, int padding, boolean isNew,
       public View createView(Activity act, RubikUpdates.UpdateInfo info, int fontSize, int padding,
                              LinearLayout.LayoutParams pImage, LinearLayout.LayoutParams pView,
                              LinearLayout.LayoutParams pText, LinearLayout.LayoutParams pButt )
+        {
         int layoutID = R.layout.dialog_updates_pane;
         mView = act.getLayoutInflater().inflate(layoutID, null);
         boolean isCompleted = info.mPercent>=100;
         int layoutID = isCompleted
                        ? R.layout.dialog_updates_completed
                        : R.layout.dialog_updates_started;
         Button button = mView.findViewById(R.id.updates_pane_button);
         button.setOnClickListener( new View.OnClickListener()
+          {
           @Override
           public void onClick(View v)
+            {
             android.util.Log.e("D", "INSTALL pressed");
+            }
           });
         View view = act.getLayoutInflater().inflate(layoutID, null);
         TextView title = mView.findViewById(R.id.updates_pane_title);
         TextView title = view.findViewById(R.id.updates_pane_title);
         title.setText(info.mObjectLongName);
         TextView description = mView.findViewById(R.id.updates_pane_description);
         TextView description = view.findViewById(R.id.updates_pane_description);
         description.setText(info.mDescription);
         ImageView image = mView.findViewById(R.id.updates_pane_image);
         ImageView image = view.findViewById(R.id.updates_pane_image);
         image.setBackgroundResource(R.drawable.unknown_icon);
         image.setLayoutParams(pImage);
         mView.setLayoutParams(pView);
         view.setLayoutParams(pView);
         title.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize);
         description.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize);
         button.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize);
         title.setLayoutParams(pText);
         description.setLayoutParams(pText);
         button.setLayoutParams(pButt);
         mView.setPadding(padding,padding,padding,padding);
         view.setPadding(padding,padding,padding,padding);
         if( isCompleted )
+          {
           Button button = view.findViewById(R.id.updates_pane_button);
           button.setOnClickListener( new View.OnClickListener()
+            {
             @Override
             public void onClick(View v)
+              {
               android.util.Log.e("D", "INSTALL pressed");
+              }
             });
           button.setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize);
           button.setLayoutParams(pButt);
+          }
         else
+          {
           ProgressBar bar = view.findViewById(R.id.updates_pane_bar);
           bar.setLayoutParams(pButt);
           bar.setProgress(info.mPercent);
+          }
         return mView;
         return view;
+        }
+      }

       private void receiveUpdate(RubikUpdates updates, FragmentActivity act)
+        {
         int numN = updates.getNewNumber();
         int numU = updates.getUpdNumber();
         int num = numN+numU;
         int numC = updates.getCompletedNumber();
         if( num<=0 )
         if( numC<=0 )
+          {
           mText.setText(act.getString(R.string.no_updates));
+          }
         else
-...
           //mText.setText("Downloading...");
           int imagH = (int)(mSize*1.00f);
           int textH = (int)(mSize*0.23f);
           int buttH = (int)(mSize*0.49f);
           int textH = (int)(mSize*0.27f);
           int buttH = (int)(mSize*0.35f);
           LinearLayout.LayoutParams pI = new LinearLayout.LayoutParams( imagH,imagH );
           LinearLayout.LayoutParams pV = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, mSize );
-...
           if( mLayout!=null )
+            {
             for(int i=0; i<numN; i++)
             for(int i=0; i<numC; i++)
+              {
               RubikUpdates.UpdateInfo info = updates.getNewUpdate(i);
               RubikUpdates.UpdateInfo info = updates.getCompletedUpdate(i);
               RubikDialogUpdateView rubikView = new RubikDialogUpdateView();
               View pane = rubikView.createView(act,info,mFontSize,mPadding,true,pI,pV,pT,pB);
               View pane = rubikView.createView(act,info,mFontSize,mPadding,pI,pV,pT,pB);
               mLayout.addView(pane);
+              }
             for(int i=0; i<numU; i++)
             int numS = updates.getStartedNumber();
             for(int i=0; i<numS; i++)
+              {
               RubikUpdates.UpdateInfo info = updates.getUpdUpdate(i);
               RubikUpdates.UpdateInfo info = updates.getStartedUpdate(i);
               RubikDialogUpdateView rubikView = new RubikDialogUpdateView();
               View pane = rubikView.createView(act,info,mFontSize,mPadding,false,pI,pV,pT,pB);
               View pane = rubikView.createView(act,info,mFontSize,mPadding,pI,pV,pT,pB);
               mLayout.addView(pane);
+              }
+            }

src/main/java/org/distorted/network/RubikUpdates.java
34	34	public final String mDescription;
35	35	public final int mObjectMinorVersion;
36	36	public final int mExtrasMinorVersion;
	37	public final int mPercent;
37	38	public final boolean mUpdateObject;
38	39	public final boolean mUpdateExtras;
39	40
40		public UpdateInfo(String shortName, String longName, String description, int objectMinor, int extrasMinor, boolean updateO, boolean updateE)
	41	public UpdateInfo(String shortName, String longName, String description, int objectMinor,
	42	int extrasMinor, int percent, boolean updateO, boolean updateE)
41	43	{
42	44	mObjectShortName = shortName;
43	45	mObjectLongName = longName;
44	46	mDescription = description;
45	47	mObjectMinorVersion = objectMinor;
46	48	mExtrasMinorVersion = extrasMinor;
	49	mPercent = percent;
47	50	mUpdateObject = updateO;
48	51	mUpdateExtras = updateE;
49	52	}
50	53	}
51	54
52	55	private String mUrl;
53		private final ArrayList<UpdateInfo> mNew, mUpd;
	56	private final ArrayList<UpdateInfo> mCompleted, mStarted;
54	57
55	58	///////////////////////////////////////////////////////////////////////////////////////////////////
56	59
57	60	public RubikUpdates()
58	61	{
59		mNew = new ArrayList<>();
60		mUpd = new ArrayList<>();
	62	mCompleted = new ArrayList<>();
	63	mStarted = new ArrayList<>();
61	64	}
62	65
63	66	///////////////////////////////////////////////////////////////////////////////////////////////////
...	...
79	82
80	83	private void parseLine(String[] elements)
81	84	{
82		String shortName = elements[0];
83		String objMinor = elements[1];
84		String extMinor = elements[2];
85		String longName = elements[3];
86		String description = elements[4];
87		int oMinor, eMinor;
	85	String shortName = elements[0].trim();
	86	String objMinor = elements[1].trim();
	87	String extMinor = elements[2].trim();
	88	String percent = elements[3].trim();
	89	String longName = elements[4];
	90	String description = elements[5];
	91	int oMinor, eMinor, oPercent;
88	92
89	93	try { oMinor = Integer.parseInt(objMinor); }
90	94	catch (NumberFormatException ex) { oMinor = -1; }
91	95	try { eMinor = Integer.parseInt(extMinor); }
92	96	catch (NumberFormatException ex) { eMinor = -1; }
	97	try { oPercent = Integer.parseInt(percent); }
	98	catch (NumberFormatException ex) { oPercent = -1; }
93	99
94		if( oMinor>=0 && eMinor>=0 )
	100	if( oMinor>=0 && eMinor>=0 && oPercent>=0 )
95	101	{
96	102	int objOrdinal = RubikObjectList.getOrdinal(shortName.toUpperCase());
	103	boolean updateO=true, updateE=true;
97	104
98	105	if( objOrdinal>=0 )
99	106	{
100	107	int localObjectMinor = RubikObjectList.getLocalObjectMinor(objOrdinal);
101	108	int localExtrasMinor = RubikObjectList.getLocalExtrasMinor(objOrdinal);
102		boolean updateO = localObjectMinor<oMinor;
103		boolean updateE = localExtrasMinor<eMinor;
104
105		if( updateO \|\| updateE )
106		{
107		UpdateInfo info = new UpdateInfo(shortName,longName,description,oMinor,eMinor,updateO,updateE);
108		mUpd.add(info);
109		}
	109	updateO = localObjectMinor<oMinor;
	110	updateE = localExtrasMinor<eMinor;
110	111	}
111		else
	112	if( updateO \|\| updateE )
112	113	{
113		UpdateInfo info = new UpdateInfo(shortName,longName,description,oMinor,eMinor,true,true);
114		mNew.add(info);
	114	UpdateInfo info = new UpdateInfo(shortName,longName,description,oMinor,eMinor,oPercent,updateO,updateE);
	115	if(oPercent>=100) mCompleted.add(info);
	116	else mStarted.add(info);
115	117	}
116	118	}
117	119	}
...	...
122	124	{
123	125	android.util.Log.e("D", updates);
124	126
125		mNew.clear();
126		mUpd.clear();
	127	mCompleted.clear();
	128	mStarted.clear();
127	129
128	130	String[] lines = updates.split("\n");
129	131	int numLines = lines.length;
...	...
134	136	for(int line=1; line<numLines; line++)
135	137	{
136	138	String[] elements = lines[line].split(",");
137		if( elements.length>=3 ) parseLine(elements);
	139	if( elements.length>=6 ) parseLine(elements);
138	140	}
139	141	}
140	142	}
...	...
143	145
144	146	public void updateDone(String shortName)
145	147	{
146		for( UpdateInfo info : mNew)
	148	for( UpdateInfo info : mCompleted)
147	149	{
148	150	if( info.mObjectShortName.equals(shortName) )
149	151	{
150		mNew.remove(info);
151		return;
152		}
153		}
154
155		for( UpdateInfo info : mUpd)
156		{
157		if( info.mObjectShortName.equals(shortName) )
158		{
159		mUpd.remove(info);
	152	mCompleted.remove(info);
160	153	return;
161	154	}
162	155	}
...	...
164	157
165	158	///////////////////////////////////////////////////////////////////////////////////////////////////
166	159
167		public UpdateInfo getNewUpdate(int ordinal)
	160	public UpdateInfo getCompletedUpdate(int ordinal)
168	161	{
169		return mNew.get(ordinal);
	162	return mCompleted.get(ordinal);
170	163	}
171	164
172	165	///////////////////////////////////////////////////////////////////////////////////////////////////
173	166
174		public UpdateInfo getUpdUpdate(int ordinal)
	167	public UpdateInfo getStartedUpdate(int ordinal)
175	168	{
176		return mUpd.get(ordinal);
	169	return mStarted.get(ordinal);
177	170	}
178	171
179	172	///////////////////////////////////////////////////////////////////////////////////////////////////
180	173
181		public int getNewNumber()
	174	public int getCompletedNumber()
182	175	{
183		return mNew.size();
	176	return mCompleted.size();
184	177	}
185	178
186	179	///////////////////////////////////////////////////////////////////////////////////////////////////
187	180
188		public int getUpdNumber()
	181	public int getStartedNumber()
189	182	{
190		return mUpd.size();
	183	return mStarted.size();
191	184	}
192	185
193	186	///////////////////////////////////////////////////////////////////////////////////////////////////
...	...
195	188	public void showDebug()
196	189	{
197	190	android.util.Log.e("D", "url: "+mUrl);
198		android.util.Log.e("D", "new objects: "+debug(mNew));
199		android.util.Log.e("D", "upd objects: "+debug(mUpd));
	191	android.util.Log.e("D", "ready objects: "+debug(mCompleted));
	192	android.util.Log.e("D", "next objects: "+debug(mStarted));
200	193	}
201	194	}

src/main/java/org/distorted/screens/RubikScreenPlay.java
721	721	@Override
722	722	public void run()
723	723	{
724		int numN = updates.getNewNumber();
725		int numU = updates.getUpdNumber();
726		int num = numN+numU;
	724	int num = updates.getCompletedNumber();
727	725
728	726	if( num>0 )
729	727	{

     <?xml version="1.0" encoding="utf-8"?>
     <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
         <item android:id="@android:id/background">
             <shape>
                 <solid android:color="@android:color/white" />
             </shape>
         </item>
         <item android:id="@android:id/progress">
             <clip>
                 <shape>
                     <solid android:color="@android:color/black" />
                 </shape>
             </clip>
         </item>
     </layer-list>

     <?xml version="1.0" encoding="utf-8"?>
     <LinearLayout
     	xmlns:android="http://schemas.android.com/apk/res/android"
     	android:layout_width="match_parent"
     	android:layout_height="wrap_content"
     	android:background="@color/medium_grey"
     	android:padding="8dp"
     	android:orientation="horizontal">
        	<ImageView
        	    android:id="@+id/updates_pane_image"
        	    android:scaleType="fitCenter"
        		android:layout_width="wrap_content"
        		android:layout_height="wrap_content"/>
        	<LinearLayout
        		android:layout_width="match_parent"
      		android:layout_height="match_parent"
      		android:orientation="vertical"
      		android:layout_marginStart="8dp">
     		<TextView
         		android:id="@+id/updates_pane_title"
         		android:gravity="top|start"
         		android:layout_width="match_parent"
         		android:layout_height="wrap_content"
         		android:singleLine="true"
                 android:textStyle="bold"/>
             <TextView
         		android:id="@+id/updates_pane_description"
         		android:gravity="top|start"
         		android:layout_width="match_parent"
         		android:layout_height="wrap_content"
         		android:singleLine="true"/>
         	<Button
                  android:id="@+id/updates_pane_button"
                  android:layout_width="match_parent"
                  android:layout_height="wrap_content"
                  android:backgroundTint="@color/black"
                  android:minHeight="0dp"
                  android:minWidth="0dp"
                  android:insetTop="0dp"
                  android:insetBottom="0dp"
                  android:text="@string/install"/>
      	</LinearLayout>
     </LinearLayout>

     <?xml version="1.0" encoding="utf-8"?>
     <LinearLayout
     	xmlns:android="http://schemas.android.com/apk/res/android"
     	android:layout_width="match_parent"
     	android:layout_height="wrap_content"
     	android:background="@color/grey"
     	android:padding="8dp"
     	android:orientation="horizontal">
        	<ImageView
        	    android:id="@+id/updates_pane_image"
        	    android:scaleType="fitCenter"
        		android:layout_width="wrap_content"
        		android:layout_height="wrap_content"/>
        	<LinearLayout
        		android:layout_width="match_parent"
      		android:layout_height="match_parent"
      		android:orientation="vertical"
      		android:layout_marginStart="8dp"
      		android:layout_gravity="center_vertical">
     		<TextView
         		android:id="@+id/updates_pane_title"
         		android:gravity="center_vertical"
         		android:layout_width="match_parent"
         		android:layout_height="wrap_content"
         		android:singleLine="true"
         		android:textStyle="bold"/>
             <TextView
         		android:id="@+id/updates_pane_description"
         		android:gravity="center_vertical"
         		android:layout_width="wrap_content"
         		android:layout_height="wrap_content"
         		android:singleLine="true"/>
         	<Button
                  android:id="@+id/updates_pane_button"
                  android:layout_width="match_parent"
                  android:layout_height="wrap_content"
                  android:backgroundTint="@color/black"
                  android:text="@string/install"
                  android:gravity="center"/>
      	</LinearLayout>
     </LinearLayout>

     <?xml version="1.0" encoding="utf-8"?>
     <LinearLayout
     	xmlns:android="http://schemas.android.com/apk/res/android"
     	android:layout_width="match_parent"
     	android:layout_height="wrap_content"
     	android:background="@color/medium_grey"
     	android:padding="8dp"
     	android:orientation="horizontal">
        	<ImageView
        	    android:id="@+id/updates_pane_image"
        	    android:scaleType="fitCenter"
        		android:layout_width="wrap_content"
        		android:layout_height="wrap_content"/>
        	<LinearLayout
        		android:layout_width="match_parent"
      		android:layout_height="match_parent"
      		android:orientation="vertical"
      		android:layout_marginStart="8dp">
     		<TextView
         		android:id="@+id/updates_pane_title"
         		android:gravity="top|start"
         		android:layout_width="match_parent"
         		android:layout_height="wrap_content"
         		android:singleLine="true"
         		android:textStyle="bold"/>
             <TextView
         		android:id="@+id/updates_pane_description"
         		android:gravity="top|start"
         		android:layout_width="wrap_content"
         		android:layout_height="wrap_content"
         		android:singleLine="true"/>
         	<ProgressBar
                  android:id="@+id/updates_pane_bar"
                  android:layout_width="match_parent"
                  android:layout_height="wrap_content"
                  style="@android:style/Widget.ProgressBar.Horizontal"
                  android:progressDrawable="@drawable/black_progress"
                  android:max="100"/>
      	</LinearLayout>
     </LinearLayout>

src/main/res/values/colors.xml
7	7	<color name="dark_grey">#ff222222</color>
8	8	<color name="grey">#ff333333</color>
9	9	<color name="light_grey">#ff555555</color>
	10	<color name="medium_grey">#ff444444</color>
10	11	<color name="black">#ff010101</color>
11	12	<color name="white">#ffffffff</color>
12	13	</resources>

Project

General

Profile

Magic Cube

Revision 2c9ab085

Added by Leszek Koltunski almost 3 years ago