Dev commit.

qk168899 · Oct 22, 2011 · 6426bb6 · 6426bb6
2 parents 5fbb6ea + 63c9d4d
commit 6426bb6
Show file tree

Hide file tree

Showing 40 changed files with 2,069 additions and 1,164 deletions.
diff --git a/.classpath b/.classpath
@@ -6,5 +6,7 @@
 	<classpathentry kind="src" path="beta"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="lib" path="lib/FlurryAgent.jar"/>
+	<classpathentry kind="lib" path="lib/signpost-commonshttp4-1.2.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/signpost-core-1.2.1.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,48 +1,53 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.androidquery"
-      android:versionCode="20"
-      android:versionName="0.14.10">
-
-
-	<uses-permission android:name="android.permission.INTERNET" /> 
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-	<uses-permission android:name="android.permission.READ_PHONE_STATE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-
-	<uses-permission android:name="android.permission.GET_ACCOUNTS" />	
-	<uses-permission android:name="android.permission.USE_CREDENTIALS" />
-
-	<!--  
-	<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />		
-	-->
-
-
-	<uses-sdk android:minSdkVersion="4"/>
-
-    <application android:icon="@drawable/launch" android:label="@string/app_name" >
-
-		<activity android:name=".test.IntentListActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-		<activity android:name=".test.AdhocActivity" android:theme="@style/android:Theme.Light"></activity>				
-		<activity android:name=".test.async.AjaxLoadingActivity" android:theme="@style/android:Theme.Light"></activity>		
-		<activity android:name=".test.image.ImageLoadingActivity" android:theme="@style/android:Theme.Light"></activity>
-		<activity android:name=".test.image.ImageLoadingListActivity" android:theme="@style/android:Theme.Light"></activity>
-		<activity android:name=".test.image.ImageLoadingList2Activity" android:theme="@style/android:Theme.Light"></activity>
-		<activity android:name=".test.image.ImageLoadingList3Activity" android:theme="@style/android:Theme.Light"></activity>
-		<activity android:name=".test.image.ImageLoadingList4Activity" android:theme="@style/android:Theme.Light"></activity>
-		<activity android:name=".test.image.ImageLoadingListOptionsActivity" android:theme="@style/android:Theme.Light"></activity>
-		<activity android:name=".test.image.ImageLoadingGridActivity" android:theme="@style/android:Theme.Light"></activity>
-		<activity android:name=".test.image.ImageLoadingAspectRatioActivity" android:theme="@style/android:Theme.Light"></activity>
-		<activity android:name=".test.async.AjaxAuthActivity" android:theme="@style/android:Theme.Light"></activity>	
-		<activity android:name=".test.async.XmlActivity" android:theme="@style/android:Theme.Light"></activity>
-		<activity android:name=".test.async.ServiceActivity" android:theme="@style/android:Theme.Light"></activity>
-    </application>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.androidquery"
+      android:versionCode="23"
+      android:versionName="0.15.3">
+
+
+	<uses-permission android:name="android.permission.INTERNET" /> 
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+	<uses-permission android:name="android.permission.READ_PHONE_STATE" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+	<uses-permission android:name="android.permission.GET_ACCOUNTS" />	
+	<uses-permission android:name="android.permission.USE_CREDENTIALS" />
+
+	<!--  
+	<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />		
+	-->
+
+
+	<uses-sdk android:minSdkVersion="7"/>
+
+
+	<application android:icon="@drawable/launch" android:label="@string/app_name">
+
+	<!--  
+    <application android:icon="@drawable/launch" android:label="@string/app_name" android:hardwareAccelerated="true">
+	-->
+		<activity android:name=".test.IntentListActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+		<activity android:name=".test.AdhocActivity" android:theme="@style/android:Theme.Light"></activity>	
+		<activity android:name=".test.AdhocActivity2" android:theme="@style/android:Theme.Light"></activity>			
+		<activity android:name=".test.async.AjaxLoadingActivity" android:theme="@style/android:Theme.Light"></activity>		
+		<activity android:name=".test.image.ImageLoadingActivity" android:theme="@style/android:Theme.Light"></activity>
+		<activity android:name=".test.image.ImageLoadingListActivity" android:theme="@style/android:Theme.Light"></activity>
+		<activity android:name=".test.image.ImageLoadingList2Activity" android:theme="@style/android:Theme.Light"></activity>
+		<activity android:name=".test.image.ImageLoadingList3Activity" android:theme="@style/android:Theme.Light"></activity>
+		<activity android:name=".test.image.ImageLoadingList4Activity" android:theme="@style/android:Theme.Light"></activity>
+		<activity android:name=".test.image.ImageLoadingListOptionsActivity" android:theme="@style/android:Theme.Light"></activity>
+		<activity android:name=".test.image.ImageLoadingGridActivity" android:theme="@style/android:Theme.Light"></activity>
+		<activity android:name=".test.image.ImageLoadingAspectRatioActivity" android:theme="@style/android:Theme.Light"></activity>
+		<activity android:name=".test.async.AjaxAuthActivity" android:theme="@style/android:Theme.Light"></activity>	
+		<activity android:name=".test.async.XmlActivity" android:theme="@style/android:Theme.Light"></activity>
+		<activity android:name=".test.async.ServiceActivity"></activity>
+    </application>
 </manifest>
diff --git a/beta/com/androidquery/TQuery.java b/beta/com/androidquery/TQuery.java
@@ -1,30 +1,7 @@
 package com.androidquery;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.ref.WeakReference;
-
 import android.app.Activity;
-import android.app.Dialog;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Environment;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.AbsListView;
-import android.widget.BaseAdapter;
-import android.widget.AbsListView.OnScrollListener;
-import android.widget.ListAdapter;
-
-import com.androidquery.AQuery;
-import com.androidquery.AbstractAQuery;
-import com.androidquery.callback.BitmapAjaxCallback;
-import com.androidquery.util.AQUtility;
-import com.androidquery.util.Common;
 
 public class TQuery extends AbstractAQuery<TQuery>{
 
@@ -36,46 +13,7 @@ public TQuery(View view) {
 		super(view);
 	}
 
-	private static WeakReference<Dialog> diaRef;
-
-	public void showDialog(Dialog dialog){
-
-		dismissDialogs();
-
-		diaRef = new WeakReference<Dialog>(dialog);
-		dialog.show();
-	}
-
-
-
-	public void dismissDialogs(){
-
-		if(diaRef != null){
-			Dialog d = diaRef.get();
-			if(d != null && d.isShowing()){
-				d.dismiss();
-			}
-			diaRef = null;
-		}
-
-
-		/*
-		Window win = act.getWindow();
-		
-		AQUtility.debug("window", act.getWindow());
-		WindowManager wm = act.getWindowManager();
-		
-		
-		View view = win.findViewById(android.R.id.message);
-		AQUtility.debug("dia view", view);
-		
-		View code = win.findViewById(R.id.code);
-		AQUtility.debug("code view", code);
-		
-		View code2 = id(R.id.code).getView();
-		AQUtility.debug("code2 view", code2);
-		*/
-	}
+
 
 
 }
diff --git a/beta/com/androidquery/WebDialog.java b/beta/com/androidquery/WebDialog.java
@@ -0,0 +1,65 @@
+
+package com.androidquery;
+
+import android.R;
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.FrameLayout;
+
+public class WebDialog extends Dialog {
+
+	private String url;
+	private WebViewClient client;
+
+    public WebDialog(Context context, String url, WebViewClient client) {
+        super(context, R.style.Theme);
+        this.url = url;
+        this.client = client;
+
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+    	super.onCreate(savedInstanceState);
+
+        WebView wv = setUpWebView();
+
+        FrameLayout.LayoutParams FILL = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT);
+        addContentView(wv, FILL);
+
+    }
+
+
+    private WebView setUpWebView() {
+
+    	WebView mWebView = new WebView(getContext());
+        mWebView.setVerticalScrollBarEnabled(false);
+        mWebView.setHorizontalScrollBarEnabled(false);
+
+        WebViewClient wvc = client;
+        if(wvc == null) wvc = new WebViewClient();
+
+        mWebView.setWebViewClient(wvc);
+
+        mWebView.getSettings().setJavaScriptEnabled(true);
+        mWebView.loadUrl(url);
+
+        return mWebView;
+    }
+
+    @Override
+    public void dismiss(){
+
+    	try{
+    		super.dismiss();
+    	}catch(Exception e){    		
+    	}
+
+    }
+
+}