# HG changeset patch
# User Xeli
# Date 1322138670 -3600
# Node ID 41b0a9955c475591c47c84a35cc9e0c9655addd8
# Parent 162fec525764c13b84b7a23fcfc61083a37c402e
new download manager \o/
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/AndroidManifest.xml
--- a/project_files/Android-build/SDL-android-project/AndroidManifest.xml Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/AndroidManifest.xml Thu Nov 24 13:44:30 2011 +0100
@@ -22,15 +22,15 @@
android:screenOrientation='landscape'>
-
+ android:theme="@android:style/Theme.Dialog">
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:screenOrientation='landscape'>
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/res/drawable-mdpi/arrow.png
Binary file project_files/Android-build/SDL-android-project/res/drawable-mdpi/arrow.png has changed
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/res/drawable-mdpi/box.9.png
Binary file project_files/Android-build/SDL-android-project/res/drawable-mdpi/box.9.png has changed
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/res/drawable-mdpi/box_dark.9.png
Binary file project_files/Android-build/SDL-android-project/res/drawable-mdpi/box_dark.9.png has changed
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/res/layout/download.xml
--- a/project_files/Android-build/SDL-android-project/res/layout/download.xml Thu Nov 24 13:40:17 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/res/layout/download_confirmdialog.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/Android-build/SDL-android-project/res/layout/download_confirmdialog.xml Thu Nov 24 13:44:30 2011 +0100
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/res/layout/download_info.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/Android-build/SDL-android-project/res/layout/download_info.xml Thu Nov 24 13:44:30 2011 +0100
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/res/layout/download_listactivity.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/Android-build/SDL-android-project/res/layout/download_listactivity.xml Thu Nov 24 13:44:30 2011 +0100
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/res/layout/download_progress.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/Android-build/SDL-android-project/res/layout/download_progress.xml Thu Nov 24 13:44:30 2011 +0100
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/res/layout/spinner_textimg_dropdown_entry.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/Android-build/SDL-android-project/res/layout/spinner_textimg_dropdown_entry.xml Thu Nov 24 13:44:30 2011 +0100
@@ -0,0 +1,22 @@
+
+
+
+
+
\ No newline at end of file
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/res/layout/team_creation.xml
--- a/project_files/Android-build/SDL-android-project/res/layout/team_creation.xml Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/res/layout/team_creation.xml Thu Nov 24 13:44:30 2011 +0100
@@ -70,7 +70,7 @@
android:text="@string/grave"/>
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/res/raw/team_one.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/team_one.xml Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/team_one.xml Thu Nov 24 13:44:30 2011 +0100
@@ -1,49 +1,49 @@
Team 1
- cm_cog
- Cake
- coffin
+ hedgewars
+ Lego
+ Bone
Classic
0
Leonidas
- spartan
+ NoHat
0
Pipo
- clown-copper
+ NoHat
0
Sonic
- Sonic
+ NoHat
0
Xin
- StrawHat
+ NoHat
0
Arnold
- cyborg
+ NoHat
0
Jack
- Pumpkin_Hat
+ NoHat
0
Tom
- Samurai
+ NoHat
0
Goldie
- diglett
+ NoHat
0
\ No newline at end of file
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/res/raw/team_two.xml
--- a/project_files/Android-build/SDL-android-project/res/raw/team_two.xml Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/res/raw/team_two.xml Thu Nov 24 13:44:30 2011 +0100
@@ -1,49 +1,49 @@
Team 2
- cm_42
- Plane
- pyramid
- Singer
+ hedgewars
+ Lego
+ Bone
+ Classic
0
Paris
- pinksunhat
- 3
+ NoHat
+ 0
Knut
- sth_Knux
- 3
+ NoHat
+ 0
Ash
- RedCap
- 3
+ NoHat
+ 0
Woad
- Toad
- 3
+ NoHat
+ 0
Bob
- rasta
- 3
+ NoHat
+ 0
Corky
- porkey
- 3
+ NoHat
+ 0
Bea
- crown
- 3
+ NoHat
+ 0
Silvia
- Rambo
- 3
+ NoHat
+ 0
\ No newline at end of file
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/res/values/strings.xml
--- a/project_files/Android-build/SDL-android-project/res/values/strings.xml Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/res/values/strings.xml Thu Nov 24 13:44:30 2011 +0100
@@ -12,7 +12,7 @@
Downloading hedgewars files...
- Success - Download complete
+ Successfully downloaded:
Continue in background
@@ -23,6 +23,12 @@
The download has failed, check the internet connectivity and please try again
Before starting the game we must download some extra files...
+ Are you sure you want to download this package?
+ You\'ve already downloaded this package, are you sure you want to download it again?
+ Download now!
+
+ This download has been queued
+
Style
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadActivity.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadActivity.java Thu Nov 24 13:40:17 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
-/*
- * Hedgewars for Android. An Android port of Hedgewars, a free turn based strategy game
- * Copyright (c) 2011 Richard Deurwaarder
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-
-package org.hedgewars.hedgeroid.Downloader;
-
-import org.hedgewars.hedgeroid.MainActivity;
-import org.hedgewars.hedgeroid.R;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Message;
-import android.os.Messenger;
-import android.os.RemoteException;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-public class DownloadActivity extends Activity{
- private Messenger messageService;
- private boolean boundToService = false;
-
- private TextView progress_sub;
- private ProgressBar progress;
- private Button positive, negative;
-
- public static final int MSG_START = 0;
- public static final int MSG_UPDATE = 1;
- public static final int MSG_DONE = 2;
- public static final int MSG_FAILED = 3;
- private Handler.Callback messageCallback = new Handler.Callback() {
-
- public boolean handleMessage(Message msg) {
- switch(msg.what){
- case MSG_START:
- progress.setMax(msg.arg1);
- progress_sub.setText(String.format("%dkb/%dkb\n%s", 0, msg.arg1, ""));
- positive.setText(R.string.download_background);
- positive.setOnClickListener(backgroundClicker);
- negative.setText(R.string.download_cancel);
- negative.setOnClickListener(cancelClicker);
- break;
- case MSG_UPDATE:
- progress_sub.setText(String.format("%d%% - %dkb/%dkb\n%s",(msg.arg1*100)/msg.arg2, msg.arg1, msg.arg2, msg.obj));
- progress.setProgress(msg.arg1);
- break;
- case MSG_DONE:
- progress.setProgress(progress.getMax());
- progress_sub.setText(R.string.download_done);
-
- positive.setText(R.string.download_back);
- positive.setOnClickListener(doneClicker);
-
- negative.setVisibility(View.INVISIBLE);
- break;
- case MSG_FAILED:
- progress.setProgress(progress.getMax());
- progress_sub.setText(R.string.download_failed);
- positive.setText(R.string.download_back);
- positive.setOnClickListener(doneClicker);
-
- negative.setText(R.string.download_tryagain);
- negative.setOnClickListener(tryAgainClicker);
- break;
- }
- return false;
- }
- };
- private Handler messageHandler = new Handler(messageCallback);
- private Messenger messenger = new Messenger(messageHandler);
-
- public void onCreate(Bundle savedInstanceState){
- super.onCreate(savedInstanceState);
- setContentView(R.layout.download);
-
- progress_sub = (TextView)findViewById(R.id.progressbar_sub);
- progress = (ProgressBar)findViewById(R.id.progressbar);
-
- positive = (Button) findViewById(R.id.background);
- negative = (Button) findViewById(R.id.cancelDownload);
- positive.setOnClickListener(backgroundClicker);
- negative.setOnClickListener(cancelClicker);
-
- }
-
- private OnClickListener backgroundClicker = new OnClickListener(){
- public void onClick(View v){
- finish();
- }
- };
- private OnClickListener cancelClicker = new OnClickListener(){
- public void onClick(View v){
- Intent i = new Intent(getApplicationContext(), DownloadService.class);
- i.putExtra(DownloadService.INTENT_TASKID, DownloadService.TASKID_CANCEL);
- startService(i);
- finish();
- }
- };
- private OnClickListener doneClicker = new OnClickListener(){
- public void onClick(View v){
- finish();
- startActivity(new Intent(getApplicationContext(), MainActivity.class));
- }
- };
-
- private OnClickListener tryAgainClicker = new OnClickListener(){
- public void onClick(View v){
- bindToService(DownloadService.TASKID_ADDTASK);
- }
- };
-
- public void onStart(){
- super.onStart();
- bindToService(DownloadService.TASKID_SETUP);
- }
-
- public void onStop(){
- super.onStop();
- unBindFromService();
- }
-
- private ServiceConnection connection = new ServiceConnection(){
-
- public void onServiceConnected(ComponentName name, IBinder service) {
- messageService = new Messenger(service);
-
- try{
- Message msg = Message.obtain(null, DownloadService.MSG_REGISTER_CLIENT);
- msg.replyTo = messenger;
- messageService.send(msg);
-
- }catch (RemoteException e){}
- }
-
- public void onServiceDisconnected(ComponentName name) {
- messageService = null;
- }
-
- };
-
- private void bindToService(int taskId){
- Intent i = new Intent(getApplicationContext(), DownloadService.class);
- i.putExtra(DownloadService.INTENT_TASKID, taskId);
- startService(i);
- bindService(new Intent(getApplicationContext(), DownloadService.class), connection, Context.BIND_AUTO_CREATE);
- boundToService = true;
- }
-
- private void unBindFromService(){
- if(boundToService){
- boundToService = false;
- unbindService(connection);
- }
- }
-}
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadAssets.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadAssets.java Thu Nov 24 13:44:30 2011 +0100
@@ -0,0 +1,95 @@
+package org.hedgewars.hedgeroid.Downloader;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.hedgewars.hedgeroid.MainActivity;
+import org.hedgewars.hedgeroid.Utils;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.os.AsyncTask;
+import android.util.Log;
+
+public class DownloadAssets extends AsyncTask{
+
+ private MainActivity act;
+ private static byte[] buffer = null;
+
+ public DownloadAssets(MainActivity _act){
+ act = _act;
+ }
+
+
+
+ public static Long copyFileOrDir(Context c, String path) {
+ AssetManager assetManager = c.getAssets();
+ String assets[] = null;
+ try {
+ assets = assetManager.list(path);
+ if (assets.length == 0) {
+ return DownloadAssets.copyFile(c, path);
+ } else {
+ String fullPath = Utils.getCachePath(c) + path;
+ File dir = new File(fullPath);
+ if (!dir.exists())
+ dir.mkdir();
+ for (int i = 0; i < assets.length; ++i) {
+ Long result = DownloadAssets.copyFileOrDir(c, path + "/" + assets[i]);
+ if(result > 0) return 1l;
+ }
+ }
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ Log.e("tag", "I/O Exception", ex);
+ return 1l;
+ }
+ return 0l;
+ }
+
+ private static Long copyFile(Context c, String filename) {
+ AssetManager assetManager = c.getAssets();
+
+ InputStream in = null;
+ OutputStream out = null;
+ try {
+ in = assetManager.open(filename);
+ in = new BufferedInputStream(in, 8192);
+
+ String newFileName = Utils.getCachePath(c) + filename;
+ out = new FileOutputStream(newFileName);
+ out = new BufferedOutputStream(out, 8192);
+
+ int read;
+ while ((read = in.read(buffer)) != -1) {
+ out.write(buffer, 0, read);
+ }
+ in.close();
+ in = null;
+ out.flush();
+ out.close();
+ out = null;
+ } catch (Exception e) {
+ e.printStackTrace();
+ Log.e("tag", e.getMessage());
+ return 1l;
+ }
+ return 0l;
+
+ }
+
+ protected Long doInBackground(Object... params) {
+ buffer = new byte[8192];//allocate the buffer
+ return DownloadAssets.copyFileOrDir(act, "Data");
+ }
+
+ protected void onPostExecute(Long result){
+ act.onAssetsDownloaded(result == 0);
+ buffer = null;
+ }
+}
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadAsyncTask.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadAsyncTask.java Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadAsyncTask.java Thu Nov 24 13:44:30 2011 +0100
@@ -31,6 +31,8 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
+import org.hedgewars.hedgeroid.Downloader.DownloadService.DownloadTask;
+
import android.os.AsyncTask;
/**
* This is an AsyncTask which will download a zip from an URL and unzip it to a specified path
@@ -39,35 +41,35 @@
* @author Xeli
*
*/
-public class DownloadAsyncTask extends AsyncTask {
+public class DownloadAsyncTask extends AsyncTask {
//private final static String URL_WITHOUT_SUFFIX = "http://www.xelification.com/tmp/firebutton.";
private final static String URL_ZIP_SUFFIX = ".zip";
private final static String URL_HASH_SUFFIX = ".hash";
- private DownloadService service;
+ private DownloadTask task;
private long lastUpdateMillis = 0;
- public DownloadAsyncTask(DownloadService _service){
- service = _service;
+ public DownloadAsyncTask(DownloadTask _task){
+ task = _task;
}
/**
*
* @param params - A {@link}DownloadTask which gives information about where to download from and store the files to
*/
- protected Long doInBackground(DownloadTask...tasks) {
- DownloadTask task = tasks[0];//just use one task per execute call for now
+ protected Long doInBackground(DownloadPackage...packages) {
+ DownloadPackage pack = packages[0];//just use one task per execute call for now
HttpURLConnection conn = null;
MessageDigest digester = null;
- String rootZipDest = task.getPathToStore();
+ String rootZipDest = pack.getPathToStore();
File rootDest = new File(rootZipDest);//TODO check for nullpointer, it hints to the absence of an sdcard
rootDest.mkdir();
try {
- URL url = new URL(task.getURL() + URL_ZIP_SUFFIX);
+ URL url = new URL(pack.getURL() + URL_ZIP_SUFFIX);
conn = (HttpURLConnection)url.openConnection();
} catch (IOException e) {
e.printStackTrace();
@@ -83,7 +85,7 @@
int kbytesToProcess = conn.getContentLength()/1024;
byte[] buffer = new byte[1024];
- service.start(kbytesToProcess);
+ task.start(kbytesToProcess);
try {
digester = MessageDigest.getInstance("MD5");
@@ -98,7 +100,7 @@
}catch(IOException e){
e.printStackTrace();
if(conn != null) conn.disconnect();
- return -1l;
+ return -2l;
}
while(entry != null){
@@ -134,11 +136,11 @@
} catch (FileNotFoundException e) {
e.printStackTrace();
if(conn != null) conn.disconnect();
- return -1l;
+ return -3l;
} catch (IOException e) {
e.printStackTrace();
if(conn != null) conn.disconnect();
- return -1l;
+ return -4l;
}finally{
try {
if( output != null) output.close();
@@ -161,20 +163,20 @@
if(conn != null) conn.disconnect();
- if(checkMD5(digester, task))return 0l;
+ if(checkMD5(digester, pack))return 0l;
else return -1l;
}
//TODO proper result handling
protected void onPostExecute(Long result){
- service.done(result > -1l);
+ task.done(result > -1l);
}
protected void onProgressUpdate(Object...objects){
- service.update((Integer)objects[0], (Integer)objects[1], (String)objects[2]);
+ task.update((Integer)objects[0], (Integer)objects[1], (String)objects[2]);
}
- private boolean checkMD5(MessageDigest digester, DownloadTask task){
+ private boolean checkMD5(MessageDigest digester, DownloadPackage task){
if(digester != null) {
byte[] messageDigest = digester.digest();
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadDialogFragment.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadDialogFragment.java Thu Nov 24 13:44:30 2011 +0100
@@ -0,0 +1,69 @@
+package org.hedgewars.hedgeroid.Downloader;
+
+import org.hedgewars.hedgeroid.R;
+
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+
+public class DownloadDialogFragment extends DialogFragment {
+
+ public static final int NUM_ALREADYDOWNLOADED = 0;
+ public static final int NUM_AREYOUSURE = 1;
+
+ private final static String BUNDLE_TASK = "task";
+
+ static DownloadDialogFragment newInstance(DownloadPackage task){
+ DownloadDialogFragment dialog = new DownloadDialogFragment();
+
+ Bundle args = new Bundle();
+ args.putParcelable(DownloadDialogFragment.BUNDLE_TASK, task);
+ dialog.setArguments(args);
+
+ return dialog;
+ }
+
+ public Dialog onCreateDialog(Bundle savedInstanceState){
+ DownloadPackage task = (DownloadPackage)getArguments().getParcelable(DownloadDialogFragment.BUNDLE_TASK);
+
+ Builder builder = new AlertDialog.Builder(getActivity());
+
+ switch(task.getStatus()){
+ case CURRENTVERSION:
+ case NEWERVERSION:
+ builder.setMessage(R.string.download_areyousure);
+ break;
+ case OLDERVERSION:
+ builder.setMessage(R.string.download_alreadydownloaded);
+ break;
+ }
+
+ DownloadClicker clicker = new DownloadClicker(task);
+ builder.setPositiveButton(android.R.string.yes, clicker);
+ builder.setNegativeButton(android.R.string.no, clicker);
+
+ return builder.create();
+ }
+
+ class DownloadClicker implements OnClickListener{
+
+ DownloadPackage task = null;
+
+ public DownloadClicker(DownloadPackage _task){
+ task = _task;
+ }
+
+ public void onClick(DialogInterface dialog, int which) {
+ if(which == Dialog.BUTTON_POSITIVE){
+ Intent i = new Intent(getActivity(), DownloadFragment.class);
+ i.putExtra(DownloadFragment.EXTRA_TASK, task);
+ getActivity().startActivity(i);
+ }
+ }
+ }
+}
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadFragment.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadFragment.java Thu Nov 24 13:44:30 2011 +0100
@@ -0,0 +1,216 @@
+/*
+ * Hedgewars for Android. An Android port of Hedgewars, a free turn based strategy game
+ * Copyright (c) 2011 Richard Deurwaarder
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+
+package org.hedgewars.hedgeroid.Downloader;
+
+import org.hedgewars.hedgeroid.R;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.RemoteException;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+public class DownloadFragment extends Fragment{
+ public static final String EXTRA_TASK = "task";
+
+ public static final int MSG_START = 0;
+ public static final int MSG_UPDATE = 1;
+ public static final int MSG_DONE = 2;
+ public static final int MSG_FAILED = 3;
+
+ private boolean boundToService = false;
+
+ private TextView progress_sub;
+ private ProgressBar progress;
+ private Button positive, negative;
+
+ private DownloadPackage pack;
+
+ private Handler messageHandler;
+ private Messenger messenger, messengerService;
+
+ public static DownloadFragment getInstance(DownloadPackage task){
+ DownloadFragment df = new DownloadFragment();
+ Bundle args = new Bundle();
+ args.putParcelable(DownloadFragment.EXTRA_TASK, task);
+
+ df.setArguments(args);
+
+ return df;
+ }
+
+ public void onActivityCreated(Bundle savedInstanceState){
+ super.onActivityCreated(savedInstanceState);
+
+ messageHandler = new Handler(messageCallback);
+ messenger = new Messenger(messageHandler);
+ Intent i = new Intent(getActivity(), DownloadService.class);
+ getActivity().startService(i);
+ getActivity().bindService(new Intent(getActivity(), DownloadService.class), connection, Context.BIND_AUTO_CREATE);
+ }
+
+ public View onCreateView(LayoutInflater inflater, ViewGroup viewgroup, Bundle savedInstanceState){
+ View v = inflater.inflate(R.layout.download_progress, viewgroup, false);
+ progress_sub = (TextView)v.findViewById(R.id.progressbar_sub);
+ progress = (ProgressBar)v.findViewById(R.id.progressbar);
+
+ positive = (Button) v.findViewById(R.id.background);
+ negative = (Button) v.findViewById(R.id.cancelDownload);
+ positive.setOnClickListener(backgroundClicker);
+ negative.setOnClickListener(cancelClicker);
+
+ pack = getArguments().getParcelable(DownloadFragment.EXTRA_TASK);
+
+ return v;
+ }
+
+ private OnClickListener backgroundClicker = new OnClickListener(){
+ public void onClick(View v){
+ getActivity().finish();
+ }
+ };
+ private OnClickListener cancelClicker = new OnClickListener(){
+ public void onClick(View v){
+ if(messenger != null){
+ Message message = Message.obtain(messageHandler, DownloadService.MSG_CANCEL, pack);
+ try {
+ messengerService.send(message);
+ } catch (RemoteException e) {}
+ }
+ getActivity().finish();
+ }
+ };
+ private OnClickListener doneClicker = new OnClickListener(){
+ public void onClick(View v){
+ getActivity().finish();
+ }
+ };
+
+ private OnClickListener tryAgainClicker = new OnClickListener(){
+ public void onClick(View v){
+ if(messenger != null){
+ Message message = Message.obtain(messageHandler, DownloadService.MSG_ADDTASK, pack);
+ message.replyTo = messenger;
+ try {
+ messengerService.send(message);
+ } catch (RemoteException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ };
+
+ public void onStop(){
+ super.onStop();
+ unBindFromService();
+ }
+
+ private ServiceConnection connection = new ServiceConnection(){
+
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ messengerService = new Messenger(service);
+
+ try{
+ //give the service a task
+ if(messenger != null){
+ Message message = Message.obtain(messageHandler, DownloadService.MSG_ADDTASK, pack);
+ message.replyTo = messenger;
+ messengerService.send(message);
+ }
+
+ }catch (RemoteException e){}
+ }
+
+ public void onServiceDisconnected(ComponentName name) {
+ messengerService = null;
+ }
+
+ };
+
+ private void unBindFromService(){
+ if(boundToService){
+ if(messenger != null){
+ try {
+ Message message = Message.obtain(messageHandler, DownloadService.MSG_UNREGISTER_CLIENT, pack);
+ message.replyTo = messenger;
+ messengerService.send(message);
+ } catch (RemoteException e) {
+ e.printStackTrace();
+ }
+ }
+
+ boundToService = false;
+ getActivity().unbindService(connection);
+ }
+ }
+
+ private Handler.Callback messageCallback = new Handler.Callback() {
+
+ public boolean handleMessage(Message msg) {
+ switch(msg.what){
+ case MSG_START:
+ progress.setMax(msg.arg1);
+ progress_sub.setText(String.format("%dkb/%dkb\n%s", 0, msg.arg1, ""));
+ positive.setText(R.string.download_background);
+ positive.setOnClickListener(backgroundClicker);
+ negative.setText(R.string.download_cancel);
+ negative.setOnClickListener(cancelClicker);
+ break;
+ case MSG_UPDATE:
+ progress_sub.setText(String.format("%d%% - %dkb/%dkb\n%s",(msg.arg1*100)/msg.arg2, msg.arg1, msg.arg2, msg.obj));
+ progress.setProgress(msg.arg1);
+ break;
+ case MSG_DONE:
+ progress.setProgress(progress.getMax());
+ progress_sub.setText(R.string.download_done);
+
+ positive.setText(R.string.download_back);
+ positive.setOnClickListener(doneClicker);
+
+ negative.setVisibility(View.INVISIBLE);
+ break;
+ case MSG_FAILED:
+ progress.setProgress(progress.getMax());
+ progress_sub.setText(R.string.download_failed);
+ positive.setText(R.string.download_back);
+ positive.setOnClickListener(doneClicker);
+
+ negative.setText(R.string.download_tryagain);
+ negative.setOnClickListener(tryAgainClicker);
+ break;
+ }
+ return false;
+ }
+ };
+
+}
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadListActivity.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadListActivity.java Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadListActivity.java Thu Nov 24 13:44:30 2011 +0100
@@ -1,36 +1,114 @@
package org.hedgewars.hedgeroid.Downloader;
-import android.app.ListActivity;
+import org.hedgewars.hedgeroid.R;
+
import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.view.Gravity;
import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+public class DownloadListActivity extends FragmentActivity implements OnItemMovementListener{
-public class DownloadListActivity extends ListActivity implements OnItemClickListener{
+ private FrameLayout layout = null;
+ private LinearLayout downloadQueueContainer = null;
+ private View infoView = null;
+ private ImageView arrow = null;
+ private int halfSize = 0;
+ private DownloadPackage task = null;
-
public void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState);
-
- DownloadTask[] tasks = new DownloadTask[3];
- tasks[0] = new DownloadTask("url1", "/home/path/1", 1, "entry 1");
- tasks[1] = new DownloadTask("url2", "/home/path/2", 1, "entry 2");
- tasks[2] = new DownloadTask("url3", "/home/path/3", 1, "entry 3");
-
- ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_list_item_1, tasks);
- this.setListAdapter(adapter);
- this.getListView().setOnItemClickListener(this);
-
+
+ setContentView(R.layout.download_listactivity);
+ //FragmentManager fm = this.getSupportFragmentManager();
+ //if(fm.findFragmentById(android.R.id.content) == null){
+ // DownloadListFragment listfrag = new DownloadListFragment();
+ // fm.beginTransaction().add(android.R.id.content, listfrag).commit();
+ //}
+
+ layout = (FrameLayout)findViewById(R.id.downloadFrameLayout);
+ downloadQueueContainer = (LinearLayout) findViewById(R.id.downloadQueueContainer);
+ }
+
+ public void onNewItemSelected(DownloadPackage _task, int x, int minX, int maxX, int size) {
+ if(layout != null){
+ if(!_task.equals(task)){//if it's a new task refresh the whole thing
+ task = _task;
+ layout.removeView(infoView);
+ infoView = null;
+ }
+
+ if(infoView == null){//build iv if it hasn't been created yet
+ infoView = this.getLayoutInflater().inflate(R.layout.download_info, layout, false);
+ FrameLayout.LayoutParams params = (android.widget.FrameLayout.LayoutParams) infoView.getLayoutParams();
+ params.gravity = Gravity.NO_GRAVITY;
+ params.height = size;
+ arrow = (ImageView)infoView.findViewById(R.id.arrow);
+ arrow.setVisibility(View.INVISIBLE);
+ halfSize = size/2;
+
+ Button yes = (Button)infoView.findViewById(R.id.download);
+ Button no = (Button)infoView.findViewById(R.id.cancel);
+ yes.setOnClickListener(yesClicker);
+ no.setOnClickListener(noClicker);
+
+ layout.addView(infoView, params);
+ }
+ }
+ }
+
+ public void onViewMoved(int x, int minX, int maxX) {
+ if(halfSize == -1){
+ if(infoView.getHeight() != 0){
+ halfSize = infoView.getHeight()/2;
+ }
+ }
+ if(layout != null && infoView != null){
+ FrameLayout.LayoutParams params = ((FrameLayout.LayoutParams)infoView.getLayoutParams());
+ if(x - halfSize < minX){
+ params.topMargin = 0;
+ arrow.setVisibility(View.INVISIBLE);
+ params.gravity = Gravity.TOP;
+ }else if (x + halfSize >= maxX){
+ params.topMargin = 0;
+ arrow.setVisibility(View.INVISIBLE);
+ params.gravity = Gravity.BOTTOM;
+ }else{
+ params.topMargin = x - halfSize;
+ params.gravity = Gravity.NO_GRAVITY;
+ arrow.setVisibility(View.VISIBLE);
+ }
+
+ infoView.requestLayout();
+
+ }
}
- public void onItemClick(AdapterView arg0, View arg1, int position, long arg3) {
- DownloadTask task = (DownloadTask)arg0.getAdapter().getItem(position);
- }
+ private OnClickListener yesClicker = new OnClickListener(){
+ public void onClick(View v){
+ FragmentManager fm = getSupportFragmentManager();
+ FragmentTransaction ft= fm.beginTransaction();
+ DownloadFragment df = DownloadFragment.getInstance(task);
+
+ ft.add(R.id.downloadQueueContainer, df).commit();
+ //ft.show(new DownloadFragment());
+
+ task = null;
+ layout.removeView(infoView);
+ }
+ };
-// public static class Dialog extends DialogFragment{
-
-// }
-
+ private OnClickListener noClicker = new OnClickListener(){
+ public void onClick(View v){
+ task = null;
+ layout.removeView(infoView);
+ }
+ };
}
-
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadListFragment.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadListFragment.java Thu Nov 24 13:44:30 2011 +0100
@@ -0,0 +1,188 @@
+package org.hedgewars.hedgeroid.Downloader;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.app.ListFragment;
+import android.util.Log;
+import android.view.View;
+import android.widget.AbsListView;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+
+public class DownloadListFragment extends ListFragment implements OnItemClickListener, OnScrollListener, Runnable{
+
+ private View targetView = null;
+ private ArrayList listeners = new ArrayList();
+
+ public void onActivityCreated(Bundle savedInstanceState){
+ super.onActivityCreated(savedInstanceState);
+
+ ArrayList tasks = new ArrayList();
+
+ ArrayAdapter adapter = new ArrayAdapter(getActivity().getApplicationContext(), android.R.layout.simple_list_item_1, tasks);
+ setListAdapter(adapter);
+ getListView().setOnItemClickListener(this);
+ getListView().setOnScrollListener(this);
+
+ if(getActivity() instanceof OnItemMovementListener){
+ listeners.add((OnItemMovementListener)getActivity());
+ }
+
+ getListView().setCacheColorHint(Color.TRANSPARENT);//To prevent a blackish background while scrolling
+
+
+ Thread t = new Thread(this, "DownloadListParser");
+ t.start();
+ }
+
+ public void run(){
+ XmlPullParserFactory xmlPullFactory;
+ try {
+ xmlPullFactory = XmlPullParserFactory.newInstance();
+ XmlPullParser xmlPuller = xmlPullFactory.newPullParser();
+
+ URL url = new URL("http://www.xelification.com/tmp/downloads.xml");
+ HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+
+ BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()), 1024);
+ xmlPuller.setInput(br);
+
+ final ArrayAdapter adapter = (ArrayAdapter) getListAdapter();
+
+ int eventType = xmlPuller.getEventType();
+ while(eventType != XmlPullParser.END_DOCUMENT){
+
+ if(eventType == XmlPullParser.START_TAG){
+ if(xmlPuller.getName().toLowerCase().equals("task")){
+ final DownloadPackage task = DownloadPackage.getTaskFromXML(getActivity(), xmlPuller);
+
+ getActivity().runOnUiThread(new Runnable(){
+ public void run() {
+ adapter.add(task);
+ }
+ });
+ }
+ }
+ eventType = xmlPuller.nextTag();
+ }
+
+
+ } catch (XmlPullParserException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+
+ }
+
+ public void onItemClick(AdapterView arg0, View arg1, int position, long arg3) {
+ FragmentTransaction ft = getFragmentManager().beginTransaction();
+ Fragment prev = getFragmentManager().findFragmentByTag("dialog");
+
+ //remove any old dialogs
+ if(prev != null) ft.remove(prev);
+ ft.addToBackStack(null);
+
+ //create a new dialog based on this task
+ DownloadPackage task = (DownloadPackage)arg0.getAdapter().getItem(position);
+ DialogFragment newFragment = DownloadDialogFragment.newInstance(task);
+
+ //show it
+ //newFragment.show(ft, "dialog");
+
+ targetView = arg1;
+
+ //determine state
+ int min = arg0.getTop();
+ int max = arg0.getBottom();
+ int top = targetView.getTop();
+
+ previousXCoord = top;
+ for(OnItemMovementListener listener : listeners){
+ listener.onNewItemSelected(task, top, min, max, targetView.getHeight()*2);
+ }
+ }
+
+ private int previousXCoord = 0;
+
+ /*
+ * (non-Javadoc)
+ * @see android.widget.AbsListView.OnScrollListener#onScroll(android.widget.AbsListView, int, int, int)
+ *
+ * Android renews the Items used in the view, so when a user scroll down the list,
+ * as soon as the item has dissapeard from the list it gets reused at the bottom.
+ *
+ * For this reason we cannot just keep sending the targetView.getTop() but we must
+ * remember if the view is supposed to be at the top or bottom of the list. We
+ * remember this with int state,
+ * - 0 means we've got accurate reading from getTop()
+ * - -1 means it's somewhere at the top of the list
+ * - 1 means it's at the bottom somewhere
+ */
+ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+ if(targetView != null){
+ int top = targetView.getTop() + (targetView.getHeight()/2);
+ int min = view.getTop();
+ int max = view.getBottom();
+
+ if(Math.abs(previousXCoord - top) > targetView.getHeight()*2 ){
+ top = previousXCoord;
+ }
+
+ for(OnItemMovementListener listener : listeners){
+ listener.onViewMoved(top, min, max);
+ }
+
+ previousXCoord = top;
+ }
+ }
+
+ public void onScrollStateChanged(AbsListView view, int scrollState) {
+ switch(scrollState){
+ case OnScrollListener.SCROLL_STATE_FLING: Log.d("tag", "fling"); break;
+ case OnScrollListener.SCROLL_STATE_IDLE:Log.d("tag", "idle"); break;
+ case OnScrollListener.SCROLL_STATE_TOUCH_SCROLL:Log.d("tag", "scroll"); break;
+
+ }
+
+ }
+}
+
+interface OnItemMovementListener{
+ /**
+ * When I new item has been selected this method will be called
+ * @param task The task which goes with this item
+ * @param x The middle of this item
+ * @param minX The top of the parent of this item
+ * @param maxX The bottom of the parent of this item
+ */
+ void onNewItemSelected(DownloadPackage task, int x, int minX, int maxX, int size);
+
+ /**
+ * When the item has been moved this method is called
+ * @param x The middle of this item
+ * @param minX The top of the parent of this item
+ * @param maxX The bottom of the parent of this item
+ */
+ void onViewMoved(int x, int minX, int maxX);
+}
+
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadPackage.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadPackage.java Thu Nov 24 13:44:30 2011 +0100
@@ -0,0 +1,186 @@
+/*
+ * Hedgewars for Android. An Android port of Hedgewars, a free turn based strategy game
+ * Copyright (c) 2011 Richard Deurwaarder
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+package org.hedgewars.hedgeroid.Downloader;
+
+import java.io.IOException;
+
+import org.hedgewars.hedgeroid.Utils;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+public class DownloadPackage implements Parcelable{
+ private String url_without_suffix;
+ private String pathToStore;
+ private String representation;
+ private String description;
+ private int versionNumber;
+ private final Status status;
+ private int uniqueId;
+
+
+ public DownloadPackage(Parcel src){
+ url_without_suffix = src.readString();
+ pathToStore = src.readString();
+ representation = src.readString();
+ versionNumber = src.readInt();
+ status = Status.values()[src.readInt()];
+ description = src.readString();
+ uniqueId = src.readInt();
+ }
+
+ public DownloadPackage(Context c, String _url_without_suffix, String path, int version, String _representation, String _description, int _uniqueId){
+ url_without_suffix = _url_without_suffix;
+ pathToStore = path;
+ representation = _representation;
+ versionNumber = version;
+ description = _description;
+ uniqueId = _uniqueId;
+
+
+ //determine if the user has already downloaded this version
+ SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(c);
+ int currentVersion = sharedPref.getInt(representation, -1);
+ if(currentVersion == versionNumber) status = Status.CURRENTVERSION;
+ else if (currentVersion < versionNumber) status = Status.NEWERVERSION;
+ else status = Status.OLDERVERSION;
+ }
+
+ public Status getStatus(){
+ return status;
+ }
+
+ public String getURL(){
+ return url_without_suffix;
+ }
+
+ public String getPathToStore(){
+ return pathToStore;
+ }
+
+ public String toString(){
+ return representation;
+ }
+
+ public int describeContents() {
+ return 0;
+ }
+ public int getId(){
+ return uniqueId;
+ }
+
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeString(url_without_suffix);
+ dest.writeString(pathToStore);
+ dest.writeString(representation);
+ dest.writeInt(versionNumber);
+ dest.writeInt(status.ordinal());
+ dest.writeString(description);
+ }
+
+ public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+ public DownloadPackage createFromParcel(Parcel source) {
+ return new DownloadPackage(source);
+ }
+ public DownloadPackage[] newArray(int size) {
+ return new DownloadPackage[size];
+ }
+ };
+
+ /*
+ * We enter with a XmlPullParser.Start_tag with name "task"
+ */
+ public static DownloadPackage getTaskFromXML(Context c, XmlPullParser xmlPuller) throws XmlPullParserException, IOException{
+ String url = null;
+ String path = null;
+ String representation = null;
+ String description = null;
+ int uniqueId = -1;
+ int version = -1;
+
+ int eventType = DownloadPackage.getEventType(xmlPuller);//get the next token, should be a start tag
+ while(eventType != XmlPullParser.END_DOCUMENT){
+ switch(eventType){
+ case XmlPullParser.START_TAG:
+ String name = xmlPuller.getName().toLowerCase();
+ if(DownloadPackage.getEventType(xmlPuller) == XmlPullParser.TEXT){
+ String text = xmlPuller.getText().trim();
+ if(name.equals("url")){
+ url = text;
+ }else if(name.equals("version")){
+ try{
+ version = Integer.parseInt(text);
+ }catch (NumberFormatException e){
+ e.printStackTrace();
+ version = -1;
+ }
+ }else if(name.equals("path")){
+ path = Utils.getDataPath(c) + text;
+ }else if(name.equals("representation")){
+ representation = text;
+ }else if(name.equals("description")){
+ description = text;
+ }else if(name.equals("uniqueid")){
+ try{
+ uniqueId = Integer.parseInt(text);
+ }catch (NumberFormatException e){
+ e.printStackTrace();
+ version = -1;
+ }
+ }
+ }
+ DownloadPackage.getEventType(xmlPuller);//endtag
+ break;
+ case XmlPullParser.END_TAG:
+ if(xmlPuller.getName().toLowerCase().equals("task") && url != null && path != null && version != -1 && representation != null){
+ return new DownloadPackage(c, url, path, version, representation, description, uniqueId);
+ }else{
+ throw new XmlPullParserException("XML download parsing: missing tags");
+ }
+ case XmlPullParser.TEXT:
+ throw new XmlPullParserException("Wrong tag recieved got TEXT : " + xmlPuller.getText());
+ default:
+ throw new XmlPullParserException("Wrong tag recieved got: " + eventType);
+ }
+ eventType = DownloadPackage.getEventType(xmlPuller);
+ }
+ throw new XmlPullParserException("Xml: unexpected endofdocument tag");
+ }
+
+ /**
+ * Skips whitespaces..
+ */
+ private static int getEventType(XmlPullParser xmlPuller)throws XmlPullParserException, IOException{
+ int eventType = xmlPuller.next();
+ while(eventType == XmlPullParser.TEXT && xmlPuller.isWhitespace()){
+ eventType = xmlPuller.next();
+ }
+ return eventType;
+ }
+}
+
+enum Status{
+ CURRENTVERSION, NEWERVERSION, OLDERVERSION;
+}
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadService.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadService.java Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadService.java Thu Nov 24 13:44:30 2011 +0100
@@ -20,11 +20,12 @@
package org.hedgewars.hedgeroid.Downloader;
import java.util.ArrayList;
+import java.util.Deque;
import java.util.LinkedList;
+import java.util.List;
import org.hedgewars.hedgeroid.MainActivity;
import org.hedgewars.hedgeroid.R;
-import org.hedgewars.hedgeroid.Utils;
import android.app.Notification;
import android.app.NotificationManager;
@@ -37,104 +38,83 @@
import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
-import android.preference.PreferenceManager;
-import android.util.Log;
import android.widget.RemoteViews;
public class DownloadService extends Service {
-
- public final static int TASKID_SETUP = 0;
- public final static int TASKID_CANCEL = 1;
- public final static int TASKID_ADDTASK = 2;
-
public final static String INTENT_TASKID = "taskId";
public final static String INTENT_TASK = "task";
public static final String PREF_DOWNLOADED = "downloaded";
public static final int MSG_CANCEL = 0;
- public static final int MSG_REGISTER_CLIENT = 1;
public static final int MSG_UNREGISTER_CLIENT = 2;
+ public final static int MSG_ADDTASK = 4;
public static final int NOTIFICATION_PROCESSING = 0;
public static final int NOTIFICATION_DONE = 1;
private DownloadAsyncTask asyncExecutor;
- private final Messenger messenger = new Messenger(new DownloadHandler());
+
+ private DownloadHandler handler = new DownloadHandler();
+ private final Messenger messenger = new Messenger(handler);
+
private NotificationManager nM;
private RemoteViews contentView;
- private Notification notification;
- private LinkedList downloadTasks = new LinkedList();
- private ArrayList clientList = new ArrayList();
- private Message onRegisterMessage = null;
+ private Deque downloadTasks = new LinkedList();
-
- class DownloadHandler extends Handler{
+ public class DownloadHandler extends Handler{
public void handleMessage(Message msg){
- switch(msg.what){
- case MSG_CANCEL:
- asyncExecutor.cancel(false);
- break;
- case MSG_REGISTER_CLIENT:
- clientList.add(msg.replyTo);
- if(onRegisterMessage != null){
- try {
- msg.replyTo.send(Message.obtain(onRegisterMessage));
- } catch (RemoteException e) {
- e.printStackTrace();
+ if(msg.obj != null){
+ DownloadPackage pack = (DownloadPackage) msg.obj;
+ DownloadTask task = null;
+ Messenger replyToMessenger = msg.replyTo;
+ for(DownloadTask _task : downloadTasks){
+ if(_task.getPackage().equals(pack)){
+ task = _task;
+ break;
}
}
- break;
- case MSG_UNREGISTER_CLIENT:
- clientList.remove(msg.replyTo);
- break;
+
+ switch(msg.what){
+ case MSG_ADDTASK:
+ if(task == null){
+ task = new DownloadTask(pack);
+ downloadTasks.add(task);
+ }
+
+ task.addClient(replyToMessenger);
+ runNextTask();
+ return;
+ case MSG_CANCEL:
+ if(task != null && task.getPackage().equals(pack) && task.getStatus() == TASK_STATE.RUNNING){
+ asyncExecutor.cancel(false);
+ }
+ return;
+ case MSG_UNREGISTER_CLIENT:
+ if(task != null){
+ task.removeClient(replyToMessenger);
+ }
+ return;
+ }
}
}
}
+
+ public void onCreate(){
+ super.onCreate();
+ nM = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+ }
public IBinder onBind(Intent intent) {
return messenger.getBinder();
}
- /**
- * This is the main method which controls how DownloadService and DownloadAsyncTask are running
- */
- public int onStartCommand(Intent intent, int flags, int startId){
- switch(intent.getIntExtra("taskID", TASKID_SETUP)){
- case TASKID_SETUP:
- nM = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-
- notification = new Notification(R.drawable.statusbar, getString(R.string.notification_title), System.currentTimeMillis());
- notification.flags |= Notification.FLAG_ONGOING_EVENT;
-
- contentView = new RemoteViews(getPackageName(), R.layout.notification);
- contentView.setProgressBar(R.id.notification_progress, 100, 34, false);
- notification.contentView = contentView;
-
- PendingIntent contentIntent = PendingIntent.getActivity(this, 0, new Intent(this, DownloadActivity.class), Intent.FLAG_ACTIVITY_NEW_TASK);
- notification.contentIntent = contentIntent;
-
- asyncExecutor = new DownloadAsyncTask(this);
- break;
- case TASKID_ADDTASK:
- //Add downloadtask to the queue
- DownloadTask task = intent.getParcelableExtra(DownloadService.INTENT_TASK);
- downloadTasks.offer(task);
- runNextTask();
- break;
- case TASKID_CANCEL:
- asyncExecutor.cancel(false);
- break;
- }
- return 0;
- }
-
- private synchronized void runNextTask(){
- if(!asyncExecutor.getStatus().equals(AsyncTask.Status.RUNNING)){//if the task isnt running right now...
- DownloadTask task = downloadTasks.poll();
- if(task == null){
- startForeground(NOTIFICATION_PROCESSING, notification);
- asyncExecutor.execute(task);
+ private void runNextTask(){
+ if(asyncExecutor == null){//if (task isnt running right now) ...
+ DownloadTask task = downloadTasks.pollFirst();
+ if(task != null){
+ asyncExecutor = new DownloadAsyncTask(task);
+ asyncExecutor.execute(task.getPackage());
}
}
}
@@ -144,59 +124,101 @@
asyncExecutor.cancel(false);
}
- /*
- * Callbacks called from the async tasks
- */
+ class DownloadTask {
+ private final DownloadPackage pack;
+ private TASK_STATE status = TASK_STATE.PENDING;
+ private Notification progressNotification, doneNotification;
+
+ //I expect little to no removeClient calls that's why we go for a list rather than a map
+ private final List clients;
+
+ public DownloadTask(DownloadPackage _pack){
+ pack = _pack;
+ clients = new LinkedList();
+ }
+
+ public void addClient(Messenger messenger){
+ clients.add(messenger);
+ }
+ public void removeClient(Messenger messenger){
+ clients.remove(messenger);
+ }
+
+ public DownloadPackage getPackage(){
+ return pack;
+ }
+
+ public TASK_STATE getStatus(){
+ return status;
+ }
+
+ public void sendMessageToClients(Message msg){
+ for(Messenger messenger : clients){
+ try {
+ messenger.send(msg);
+ } catch (RemoteException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /*
+ * Callbacks called from the async tasks
+ */
- //Thread safe method to let clients know the processing is starting and will process int max kbytes
- public void start(int max){
- onRegisterMessage = Message.obtain(null, DownloadActivity.MSG_START, max, -1);
- sendMessageToClients(onRegisterMessage);
- }
+ //Thread safe method to let clients know the processing is starting and will process int max kbytes
+ public void start(int max){
+ progressNotification = new Notification(R.drawable.statusbar, getString(R.string.notification_title), System.currentTimeMillis());
+ progressNotification.flags |= Notification.FLAG_ONGOING_EVENT;
+
+ contentView = new RemoteViews(getPackageName(), R.layout.notification);
+ contentView.setProgressBar(R.id.notification_progress, 100, 34, false);
+ progressNotification.contentView = contentView;
+
+ PendingIntent contentIntent = PendingIntent.getActivity(DownloadService.this, 0, new Intent(DownloadService.this, DownloadFragment.class), Intent.FLAG_ACTIVITY_NEW_TASK);
+ progressNotification.contentIntent = contentIntent;
+
+ startForeground(NOTIFICATION_PROCESSING, progressNotification);//TODO werkt het?
+
+ Message msg = Message.obtain(null, DownloadFragment.MSG_START, max, 0);
+ sendMessageToClients(msg);
+ }
+
+ //periodically gets called by the ASyncTask, we can't tell for sure when it's called
+ public void update(int progress, int max, String fileName){
+ progress = (progress/1024);
- //periodically gets called by the ASyncTask, we can't tell for sure when it's called
- public void update(int progress, int max, String fileName){
- progress = (progress/1024);
- updateNotification(progress, max, fileName);
+ contentView.setProgressBar(R.id.notification_progress, max, progress, false);
+ contentView.setTextViewText(R.id.progressbar_sub, String.format("%dkb/%dkb (Compressed sizes)", progress, max));
+ nM.notify(NOTIFICATION_PROCESSING, progressNotification);
+
+ sendMessageToClients(Message.obtain(handler, DownloadFragment.MSG_UPDATE, progress, max, fileName));
+ }
- sendMessageToClients(Message.obtain(null, DownloadActivity.MSG_UPDATE, progress, max, fileName));
+ //Call back from the ASync task when the task has either run into an error or finished otherwise
+ public void done(boolean succesful){
+ if(succesful){
+ sendMessageToClients(Message.obtain(handler, DownloadFragment.MSG_DONE));
+ }else sendMessageToClients(Message.obtain(handler, DownloadFragment.MSG_FAILED));
+ stopForeground(true);
+ nM.cancel(NOTIFICATION_PROCESSING);
+
+ String title = getString(R.string.notification_title);
+
+ doneNotification = new Notification(R.drawable.icon, title, System.currentTimeMillis());
+ doneNotification.flags |= Notification.FLAG_AUTO_CANCEL;
+ PendingIntent contentIntent = PendingIntent.getActivity(DownloadService.this, 0, new Intent(DownloadService.this, DownloadListActivity.class), Intent.FLAG_ACTIVITY_NEW_TASK);
+ doneNotification.setLatestEventInfo(DownloadService.this, title, getString(R.string.notification_done) + pack, contentIntent);
+ nM.notify(pack.getId(), doneNotification);
+
+ asyncExecutor = null;
+ runNextTask();//see if there are more tasks
+ }
+
}
- //Call back from the ASync task when the task has either run into an error or finished otherwise
- public void done(boolean succesful){
- if(succesful){
- sendMessageToClients(Message.obtain(null, DownloadActivity.MSG_DONE));
- }else sendMessageToClients(Message.obtain(null, DownloadActivity.MSG_FAILED));
- nM.cancel(NOTIFICATION_PROCESSING);
- stopForeground(true);
- showDoneNotification();
- runNextTask();//see if there are more tasks
- }
-
-
- private void updateNotification(int progress, int max, String fileName){
-
- contentView.setProgressBar(R.id.notification_progress, max, progress, false);
- contentView.setTextViewText(R.id.progressbar_sub, String.format("%dkb/%dkb (Compressed sizes)", progress, max));
- nM.notify(NOTIFICATION_PROCESSING, notification);
- }
-
- private void showDoneNotification(){
- String title = getString(R.string.notification_title);
-
- notification = new Notification(R.drawable.icon, title, System.currentTimeMillis());
- notification.flags |= Notification.FLAG_AUTO_CANCEL;
- PendingIntent contentIntent = PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), Intent.FLAG_ACTIVITY_NEW_TASK);
- notification.setLatestEventInfo(this, title, getString(R.string.notification_done), contentIntent);
- nM.notify(NOTIFICATION_DONE, notification);
- }
-
- private void sendMessageToClients(Message msg){
- for(Messenger m : clientList){
- try {
- m.send(Message.obtain(msg));
- } catch (RemoteException e) {}//TODO should we catch this properly?
- }
+ enum TASK_STATE{
+ RUNNING, FINISHED, PENDING;
}
}
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadTask.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Downloader/DownloadTask.java Thu Nov 24 13:40:17 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-/*
- * Hedgewars for Android. An Android port of Hedgewars, a free turn based strategy game
- * Copyright (c) 2011 Richard Deurwaarder
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-package org.hedgewars.hedgeroid.Downloader;
-
-import java.io.IOException;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-public class DownloadTask implements Parcelable{
-
- private String url_without_suffix;
- private String pathToStore;
- private String representation;
- private int attempts;
- private int versionNumber;
-
-
- public DownloadTask(Parcel in){
- readFromParcel(in);
- }
-
- public DownloadTask(String _url_without_suffix, String path, int version, String _representation){
- url_without_suffix = _url_without_suffix;
- pathToStore = path;
- representation = _representation;
- versionNumber = version;
- attempts = 0;
- }
-
- public int getAttempts(){
- return attempts;
- }
-
- public String getURL(){
- return url_without_suffix;
- }
-
- public String getPathToStore(){
- return pathToStore;
- }
-
- public void incrementAttempts(){
- attempts++;
- }
-
- public String toString(){
- return representation;
- }
-
- public int describeContents() {
- return 0;
- }
-
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeString(url_without_suffix);
- dest.writeString(pathToStore);
- dest.writeString(representation);
- dest.writeInt(versionNumber);
- dest.writeInt(attempts);
- }
-
- private void readFromParcel(Parcel src){
- url_without_suffix = src.readString();
- pathToStore = src.readString();
- representation = src.readString();
- versionNumber = src.readInt();
- attempts = src.readInt();
- }
-
- public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
- public DownloadTask createFromParcel(Parcel source) {
- return new DownloadTask(source);
- }
- public DownloadTask[] newArray(int size) {
- return new DownloadTask[size];
- }
- };
-
- /*
- * We enter with a XmlPullParser.Start_tag with name "task"
- */
- public static DownloadTask getTaskFromXML(XmlPullParser xmlPuller) throws XmlPullParserException, IOException{
- String url = null;
- String path = null;
- String representation = null;
- int version = -1;
-
- int eventType = xmlPuller.getEventType();//get the next token, should be a start tag
- while(eventType != XmlPullParser.END_DOCUMENT){
- switch(eventType){
- case XmlPullParser.START_TAG:
- String name = xmlPuller.getName().toLowerCase();
- if(name.equals("url")){
- if(xmlPuller.getEventType() == XmlPullParser.TEXT){
- url = xmlPuller.getText();
- }
- }else if(name.equals("version")){
- if(xmlPuller.getEventType() == XmlPullParser.TEXT){
- version = Integer.parseInt(xmlPuller.getText());
- }
- }else if(name.equals("path")){
- if(xmlPuller.getEventType() == XmlPullParser.TEXT){
- path = xmlPuller.getText();
- }
- }else if(name.equals("representation")){
- if(xmlPuller.getEventType() == XmlPullParser.TEXT){
- representation = xmlPuller.getText();
- }
- }
-
- xmlPuller.getEventType();//endtag
- break;
- case XmlPullParser.END_TAG:
- if(xmlPuller.getName().toLowerCase().equals("task") && url != null && path != null && version != -1 && representation != null){
- return new DownloadTask(url, path, version, representation);
- }else{
- throw new XmlPullParserException(null);
- }
- default:
- throw new XmlPullParserException(null);
- }
- eventType = getEventType(xmlPuller);
- }
-
- throw new XmlPullParserException(null);
- }
-
- /**
- * Skips whitespaces..
- */
- private static int getEventType(XmlPullParser xmlPuller)throws XmlPullParserException, IOException{
- int eventType = xmlPuller.next();
- while(eventType == XmlPullParser.TEXT && xmlPuller.isWhitespace()){
- eventType = xmlPuller.next();
- }
- return eventType;
- }
-}
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/FrontendDataUtils.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/FrontendDataUtils.java Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/FrontendDataUtils.java Thu Nov 24 13:44:30 2011 +0100
@@ -85,8 +85,8 @@
}
public static ArrayList> getGraves(Context c){
- String pathPrefix = Utils.getDownloadPath(c) + "Graphics/Graves/";
- ArrayList names = Utils.getFilesFromDirWithSuffix(c, "Graphics/Graves", ".png", true);
+ String pathPrefix = Utils.getDataPath(c) + "Graphics/Graves/";
+ ArrayList names = Utils.getFilesFromDirWithSuffix(c,"Graphics/Graves", ".png", true);
ArrayList> data = new ArrayList>(names.size());
for(String s : names){
@@ -106,7 +106,7 @@
}
public static ArrayList> getFlags(Context c){
- String pathPrefix = Utils.getDownloadPath(c) + "Graphics/Flags/";
+ String pathPrefix = Utils.getDataPath(c) + "Graphics/Flags/";
ArrayList names = Utils.getFilesFromDirWithSuffix(c, "Graphics/Flags", ".png", true);
ArrayList> data = new ArrayList>(names.size());
@@ -131,7 +131,7 @@
}
public static ArrayList getForts(Context c){
- return Utils.getFilesFromDirWithSuffix(c, "Forts", "L.png", true);
+ return Utils.getFilesFromDirWithSuffix(c,"Forts", "L.png", true);
}
public static ArrayList> getTypes(Context c){
ArrayList> data = new ArrayList>(6);
@@ -149,8 +149,8 @@
}
public static ArrayList> getHats(Context c){
- ArrayList files = Utils.getFilesFromDirWithSuffix(c, "Graphics/Hats", ".png", true);
- String pathPrefix = Utils.getDownloadPath(c) + "Graphics/Hats/";
+ ArrayList files = Utils.getFilesFromDirWithSuffix(c,"Graphics/Hats", ".png", true);
+ String pathPrefix = Utils.getDataPath(c) + "Graphics/Hats/";
int size = files.size();
ArrayList> data = new ArrayList>(size);
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/MainActivity.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/MainActivity.java Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/MainActivity.java Thu Nov 24 13:44:30 2011 +0100
@@ -18,36 +18,54 @@
package org.hedgewars.hedgeroid;
-import org.hedgewars.hedgeroid.Downloader.DownloadActivity;
+import org.hedgewars.hedgeroid.Downloader.DownloadAssets;
+import org.hedgewars.hedgeroid.Downloader.DownloadFragment;
import org.hedgewars.hedgeroid.Downloader.DownloadListActivity;
import org.hedgewars.hedgeroid.Downloader.DownloadService;
-import android.app.Activity;
+import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Bundle;
import android.preference.PreferenceManager;
+import android.support.v4.app.FragmentActivity;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.Toast;
-public class MainActivity extends Activity {
+public class MainActivity extends FragmentActivity {
- Button downloader, startGame;
-
+ private Button downloader, startGame;
+ private ProgressDialog assetsDialog;
+
public void onCreate(Bundle sis){
super.onCreate(sis);
setContentView(R.layout.main);
-
+
downloader = (Button)findViewById(R.id.downloader);
startGame = (Button)findViewById(R.id.startGame);
-
+
downloader.setOnClickListener(downloadClicker);
startGame.setOnClickListener(startGameClicker);
+
+ boolean assetsCopied = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("assetscopied", false);
+
+ if(!assetsCopied){
+ DownloadAssets assetsAsyncTask = new DownloadAssets(this);
+ assetsDialog = ProgressDialog.show(this, "Please wait a moment", "Moving assets...");
+ assetsAsyncTask.execute((Object[])null);
+ }
}
-
-
-
+
+ public void onAssetsDownloaded(boolean result){
+ if(result){
+ PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean("assetscopied", true).commit();
+ }else{
+ Toast.makeText(this, R.string.download_failed, Toast.LENGTH_LONG);
+ }
+ assetsDialog.dismiss();
+ }
+
private OnClickListener downloadClicker = new OnClickListener(){
public void onClick(View v){
//startActivityForResult(new Intent(getApplicationContext(), DownloadActivity.class), 0);
@@ -57,13 +75,7 @@
private OnClickListener startGameClicker = new OnClickListener(){
public void onClick(View v){
- if(PreferenceManager.getDefaultSharedPreferences(MainActivity.this).getBoolean(DownloadService.PREF_DOWNLOADED, false))
- startActivity(new Intent(getApplicationContext(), StartGameActivity.class));
- else {
- Toast.makeText(MainActivity.this, R.string.download_userexplain, Toast.LENGTH_LONG).show();
- startActivityForResult(new Intent(getApplicationContext(), DownloadActivity.class), 0);
- }
+ startActivity(new Intent(getApplicationContext(), StartGameActivity.class));
}
};
-
}
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java Thu Nov 24 13:44:30 2011 +0100
@@ -277,7 +277,7 @@
//Set up the IPC socket server to communicate with the engine
EngineProtocolNetwork ipc = new EngineProtocolNetwork(config);
- String path = Utils.getDownloadPath(SDLActivity.mSingleton);//This represents the data directory
+ String path = Utils.getDataPath(SDLActivity.mSingleton);//This represents the data directory
path = path.substring(0, path.length()-1);//remove the trailing '/'
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/StartGameActivity.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/StartGameActivity.java Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/StartGameActivity.java Thu Nov 24 13:44:30 2011 +0100
@@ -142,7 +142,7 @@
public void onItemSelected(AdapterView arg0, View view, int position, long rowId) {
String themeName = (String) arg0.getAdapter().getItem(position);
- Drawable themeIconDrawable = Drawable.createFromPath(Utils.getDownloadPath(StartGameActivity.this) + "Themes/" + themeName + "/icon@2X.png");
+ Drawable themeIconDrawable = Drawable.createFromPath(Utils.getDataPath(StartGameActivity.this) + "Themes/" + themeName + "/icon@2X.png");
themeIcon.setImageDrawable(themeIconDrawable);
config.theme = themeName;
}
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TeamCreatorActivity.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TeamCreatorActivity.java Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TeamCreatorActivity.java Thu Nov 24 13:44:30 2011 +0100
@@ -99,12 +99,11 @@
hogName.add((EditText) team_creation_entry
.findViewById(R.id.txtTeam1));
}
- ArrayList> gravesData = FrontendDataUtils
- .getGraves(this);
+ ArrayList> gravesData = FrontendDataUtils.getGraves(this);
SimpleAdapter sa = new SimpleAdapter(this, gravesData,
R.layout.spinner_textimg_entry, new String[] { "txt", "img" },
new int[] { R.id.spinner_txt, R.id.spinner_img });
-
+ sa.setDropDownViewResource(R.layout.spinner_textimg_dropdown_entry);
sa.setViewBinder(viewBinder);
grave.setAdapter(sa);
grave.setOnFocusChangeListener(focusser);
@@ -114,6 +113,7 @@
sa = new SimpleAdapter(this, flagsData, R.layout.spinner_textimg_entry,
new String[] { "txt", "img" }, new int[] { R.id.spinner_txt,
R.id.spinner_img });
+ sa.setDropDownViewResource(R.layout.spinner_textimg_dropdown_entry);
sa.setViewBinder(viewBinder);
flag.setAdapter(sa);
flag.setOnFocusChangeListener(focusser);
@@ -123,6 +123,7 @@
sa = new SimpleAdapter(this, typesData, R.layout.spinner_textimg_entry,
new String[] { "txt", "img" }, new int[] { R.id.spinner_txt,
R.id.spinner_img });
+ sa.setDropDownViewResource(R.layout.spinner_textimg_dropdown_entry);
difficulty.setAdapter(sa);
difficulty.setOnFocusChangeListener(focusser);
@@ -131,6 +132,7 @@
sa = new SimpleAdapter(this, hatsData, R.layout.spinner_textimg_entry,
new String[] { "txt", "img" }, new int[] { R.id.spinner_txt,
R.id.spinner_img });
+ sa.setDropDownViewResource(R.layout.spinner_textimg_dropdown_entry);
sa.setViewBinder(viewBinder);
for (Spinner spin : hogHat) {
spin.setAdapter(sa);
@@ -138,12 +140,14 @@
ArrayAdapter adapter = new ArrayAdapter(this,
R.layout.listview_item, FrontendDataUtils.getVoices(this));
+ adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
voice.setAdapter(adapter);
voice.setOnFocusChangeListener(focusser);
voiceButton.setOnClickListener(voiceClicker);
adapter = new ArrayAdapter(this, R.layout.listview_item,
FrontendDataUtils.getForts(this));
+ adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
fort.setAdapter(adapter);
fort.setOnItemSelectedListener(fortSelector);
fort.setOnFocusChangeListener(focusser);
@@ -294,7 +298,7 @@
settingsChanged = true;
String fortName = (String) arg0.getAdapter().getItem(position);
Drawable fortIconDrawable = Drawable.createFromPath(Utils
- .getDownloadPath(TeamCreatorActivity.this)
+ .getDataPath(TeamCreatorActivity.this)
+ "Forts/"
+ fortName + "L.png");
imgFort.setImageDrawable(fortIconDrawable);
@@ -314,7 +318,7 @@
public void onClick(View v) {
try {
File dir = new File(String.format("%sSounds/voices/%s",
- Utils.getDownloadPath(TeamCreatorActivity.this),
+ Utils.getDataPath(TeamCreatorActivity.this),
voice.getSelectedItem()));
String file = "";
File[] dirs = dir.listFiles();
diff -r 162fec525764 -r 41b0a9955c47 project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Utils.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Utils.java Thu Nov 24 13:40:17 2011 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/Utils.java Thu Nov 24 13:44:30 2011 +0100
@@ -30,29 +30,35 @@
import android.content.res.TypedArray;
import android.os.Build;
import android.os.Environment;
+import android.util.Log;
import android.widget.Toast;
public class Utils {
+ private static final String ROOT_DIR = "Data/";
/**
* get the path to which we should download all the data files
* @param c context
* @return absolute path
*/
- public static String getDownloadPath(Context c){
+ public static String getCachePath(Context c){
if(Build.VERSION.SDK_INT < 8){//8 == Build.VERSION_CODES.FROYO
- return PreFroyoSDCardDir.getDownloadPath(c);
+ return PreFroyoSDCardDir.getDownloadPath(c) + '/';
}else{
- return FroyoSDCardDir.getDownloadPath(c);
+ return FroyoSDCardDir.getDownloadPath(c) + '/';
}
}
+ public static String getDataPath(Context c){
+ return getCachePath(c) + ROOT_DIR;
+ }
+
static class FroyoSDCardDir{
public static String getDownloadPath(Context c){
File f = c.getExternalCacheDir();
if(f != null){
- return f.getAbsolutePath() + "/Data/";
+ return f.getAbsolutePath();
}else{
Toast.makeText(c, R.string.sdcard_not_mounted, Toast.LENGTH_LONG).show();
return null;
@@ -78,11 +84,15 @@
* @return string of files
*/
public static String[] getFileNamesFromRelativeDir(Context c, String dirName){
- String prefix = getDownloadPath(c);
+ String prefix = getDataPath(c);
File f = new File(prefix + dirName);
if(f.exists() && f.isDirectory()) return f.list();
- else throw new IllegalArgumentException("File not a directory or doesn't exist dirName = " + f.getAbsolutePath());
+ else{
+
+ Log.e("Utils::", "Couldn't find dir: " + dirName);
+ return new String[0];
+ }
}
/**
@@ -92,11 +102,14 @@
* @return
*/
public static File[] getFilesFromRelativeDir(Context c, String dirName){
- String prefix = getDownloadPath(c);
+ String prefix = getDataPath(c);
File f = new File(prefix + dirName);
if(f.exists() && f.isDirectory()) return f.listFiles();
- else throw new IllegalArgumentException("File not a directory or doesn't exist dirName = " + f.getAbsolutePath());
+ else {
+ Log.e("Utils::", "Dir not found: " + dirName);
+ return new File[0];
+ }
}
/**