diff --git a/AndroidManifest.xml b/AndroidManifest.xml index dc8b894..22dbdc6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="30" + android:versionName="2.3.7" > diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png index ad52b95..3b9f85e 100644 Binary files a/res/drawable-hdpi/ic_launcher.png and b/res/drawable-hdpi/ic_launcher.png differ diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png index 60e6737..b68acba 100644 Binary files a/res/drawable-mdpi/ic_launcher.png and b/res/drawable-mdpi/ic_launcher.png differ diff --git a/res/drawable-xhdpi/bg_inactive.9.png b/res/drawable-xhdpi/bg_inactive.9.png index 2138fee..a46cc89 100644 Binary files a/res/drawable-xhdpi/bg_inactive.9.png and b/res/drawable-xhdpi/bg_inactive.9.png differ diff --git a/res/drawable-xhdpi/bg_press.9.png b/res/drawable-xhdpi/bg_press.9.png index cb23568..0458ed7 100644 Binary files a/res/drawable-xhdpi/bg_press.9.png and b/res/drawable-xhdpi/bg_press.9.png differ diff --git a/res/drawable-xhdpi/book.9.png b/res/drawable-xhdpi/book.9.png new file mode 100644 index 0000000..0d12394 Binary files /dev/null and b/res/drawable-xhdpi/book.9.png differ diff --git a/res/drawable-xhdpi/book_press.9.png b/res/drawable-xhdpi/book_press.9.png new file mode 100644 index 0000000..56d31b5 Binary files /dev/null and b/res/drawable-xhdpi/book_press.9.png differ diff --git a/res/drawable/bookmark.xml b/res/drawable/bookmark.xml index a29edb2..6d483c8 100644 --- a/res/drawable/bookmark.xml +++ b/res/drawable/bookmark.xml @@ -1,5 +1,5 @@ - - - + + + \ No newline at end of file diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 140d209..c9cfcb8 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -110,17 +110,22 @@ android:paddingTop="10dp" android:src="@drawable/refresh" /> + diff --git a/res/layout/menu.xml b/res/layout/menu.xml new file mode 100644 index 0000000..d9c513b --- /dev/null +++ b/res/layout/menu.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/menu-de/menu.xml b/res/menu-de/menu.xml new file mode 100644 index 0000000..5c6a7a5 --- /dev/null +++ b/res/menu-de/menu.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/res/menu-zh-rTW/menu.xml b/res/menu-zh-rTW/menu.xml index c0e828c..b3a6137 100644 --- a/res/menu-zh-rTW/menu.xml +++ b/res/menu-zh-rTW/menu.xml @@ -1,12 +1,10 @@ - - - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml new file mode 100644 index 0000000..b72961d --- /dev/null +++ b/res/values-de/strings.xml @@ -0,0 +1,21 @@ + + + + Lightning+ + Google + Browser Einstellungen + Webseiten erlauben auf Standort zu zugreifen + Passworter speichern + Ansicht + Beim Schlie�en Verlauf l�schen + kontaktiere mich + Adobe Flash aktivieren (fals es installiert ist) + Mobile Ansicht + Computer Ansicht + personalisierte Nutzeransicht + Startseite + Einstellungen werden erst g�ltig wenn ein neuer ab ge�ffnet wird + Vollansicht aktivieren + JavaScript aktivieren + + \ No newline at end of file diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 47522df..6f5be6c 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -1,7 +1,7 @@ - Lightning+ + Lightning Google Impostazioni del browser Consenti ai siti di accedere alla tua posizione diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 68083b9..67c0bf6 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -1,7 +1,7 @@ - Lightning + Lightning+ Google 浏览器设置 允许站点访问您地理位置 diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index df01390..9ae223a 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -1,21 +1,19 @@ - - - - Lightning - Google - 浏覽器設置 - 允許站點訪問您地理位置 - 保存密碼 - User Agent - 退出時清空曆史記錄（緩存將被自動清理） - 郵件開發者 - 啓用 Adobe Flash（若已安裝） - 作爲移動設備訪問 - 作爲桌面設備訪問 - 自定義 User Agent - 首頁 - 設置僅將應用于新標簽頁 - 啓用全屏模式 - 啓用 JavaScript - - \ No newline at end of file + + + Lightning+ + Google + 瀏覽器設定 + 允許網頁存取您的位置資訊 + 儲存密碼 + 使用者代理 + 退出時清除歷史記錄（自動清理緩存） + 電郵給開發者 + 啓用 Adobe Flash（若已安裝） + 以手機版檢視 + 以電腦桌面版檢視 + 自定義使用者代理 + 首頁 + 設定僅套用於新的標簽頁 + 啓用全螢幕模式 + 啓用 JavaScript + diff --git a/res/values/colors.xml b/res/values/colors.xml index 88c99fc..0026e66 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -1,8 +1,8 @@ #00000000 - #b40099cc - #330099cc + #b433b5e5 + #3333b5e5 #ff000000 #ff3f3f3f diff --git a/src/acr/browser/barebones/Barebones.java b/src/acr/browser/barebones/Barebones.java index 675234f..444d74d 100644 --- a/src/acr/browser/barebones/Barebones.java +++ b/src/acr/browser/barebones/Barebones.java @@ -17,12 +17,16 @@ import android.app.AlertDialog; import android.app.DownloadManager; import android.content.ClipData; import android.content.ClipboardManager; +import android.content.ContentResolver; +import android.content.ContentUris; +import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; import android.database.Cursor; +import android.database.DatabaseUtils; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; import android.graphics.Bitmap; @@ -39,11 +43,13 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.provider.Browser; +import android.provider.Browser.BookmarkColumns; import android.text.SpannableString; import android.text.Spanned; import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Log; +import android.view.Display; import android.view.Gravity; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -88,6 +94,7 @@ import android.widget.LinearLayout; import android.widget.MultiAutoCompleteTextView.Tokenizer; import android.widget.PopupMenu; import android.widget.PopupMenu.OnMenuItemClickListener; +import android.widget.PopupWindow; import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.ScrollView; @@ -105,7 +112,8 @@ public class Barebones extends Activity implements OnLongClickListener, static final boolean PAID_VERSION = false; // variable declaration - static int crap; + + static Rect edge; static SimpleAdapter adapter; static MultiAutoCompleteTextView getUrl; static TextView[] urlTitle = new TextView[MAX_TABS]; @@ -127,9 +135,12 @@ public class Barebones extends Activity implements OnLongClickListener, static int height, width, pixels, leftPad, rightPad, pixelHeight; static int bookHeight, API; static int mShortAnimationDuration; + static int id, tenPad; + static int hitTest; static int urlColumn, titleColumn; static View mCustomView = null; static CustomViewCallback mCustomViewCallback; + static boolean xPress; static boolean tabsAreDisplayed = true, isPhone = false; static boolean pageIsLoading = false, java; static boolean allowLocation, savePasswords, deleteHistory; @@ -219,11 +230,8 @@ public class Barebones extends Activity implements OnLongClickListener, public void init() { DisplayMetrics metrics = new DisplayMetrics(); getWindowManager().getDefaultDisplay().getMetrics(metrics); - if (isPhone) { - showFullScreen = settings.getBoolean("fullscreen", true); - } else { - showFullScreen = settings.getBoolean("fullscreen", false); - } + + showFullScreen = settings.getBoolean("fullscreen", false); uBar = (RelativeLayout) findViewById(R.id.urlBar); bg = (RelativeLayout) findViewById(R.id.background); slideUp = AnimationUtils.loadAnimation(this, R.anim.slide_up); @@ -349,9 +357,10 @@ public class Barebones extends Activity implements OnLongClickListener, pixelHeight = (int) (36 * scale + 0.5f); bookHeight = (int) (48 * scale + 0.5f); height56 = (int) (56 * scale + 0.5f); - leftPad = (int) (10 * scale + 0.5f); - rightPad = (int) (10 * scale + 0.5f); + leftPad = (int) (17 * scale + 0.5f); + rightPad = (int) (15 * scale + 0.5f); height32 = (int) (32 * scale + 0.5f); + tenPad = (int) (10 * scale + 0.5f); statusBar = (int) (25 * scale + 0.5f); number = 0; loading = getResources().getDrawable(R.drawable.loading); @@ -361,7 +370,7 @@ public class Barebones extends Activity implements OnLongClickListener, webpage.setBounds(0, 0, width * 2 / 3, height * 2 / 3); webpageOther.setBounds(0, 0, width * 1 / 2, height * 1 / 2); exitTab.setBounds(0, 0, width * 2 / 3, height * 2 / 3); - Intent url = getIntent().addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); + Intent url = getIntent(); String URL = null; // that opens the browser // gets the string passed into the browser URL = url.getDataString(); @@ -396,17 +405,17 @@ public class Barebones extends Activity implements OnLongClickListener, } }); - + enterUrl(); updateUI(); if (showFullScreen) { bg.removeView(uBar); background.addView(uBar); } - + } - - public static void updateUI(){ + + public static void updateUI() { clock = System.currentTimeMillis(); Thread uiUpdate = new Thread(new Runnable() { @@ -414,7 +423,8 @@ public class Barebones extends Activity implements OnLongClickListener, public void run() { long clock = System.currentTimeMillis(); while (true) { - while (!(System.currentTimeMillis() - clock > 20 && pageIdIsVisible)); + while (!(System.currentTimeMillis() - clock > 20 && pageIdIsVisible)) + ; main[pageId].postInvalidate(); clock = System.currentTimeMillis(); @@ -425,7 +435,7 @@ public class Barebones extends Activity implements OnLongClickListener, pageIdIsVisible = true; uiUpdate.setDaemon(true); uiUpdate.setPriority(Thread.MIN_PRIORITY); - //uiUpdate.start(); + // uiUpdate.start(); } } @@ -481,90 +491,94 @@ public class Barebones extends Activity implements OnLongClickListener, } } - void enterUrl(){ + void enterUrl() { getUrl = (MultiAutoCompleteTextView) findViewById(R.id.enterUrl); + getUrl.setPadding(tenPad, 0, tenPad, 0); getUrl.setTextColor(getResources().getColor(android.R.color.black)); - + getUrl.setPadding(tenPad, 0, tenPad, 0); + getUrl.setBackgroundResource(R.drawable.book); + getUrl.setPadding(tenPad, 0, tenPad, 0); handler = new Handler() { - @Override - public void handleMessage(Message msg) { - switch (msg.what) { - case 1:{ - adapter = new SimpleAdapter(Barebones.this, list, - R.layout.two_line_autocomplete, - new String[] { "title", "url" }, new int[] { R.id.title, - R.id.url }); - getUrl.setAdapter(adapter); - break;} - case 2:{ - - break; - } - } - } - }; - + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case 1: { + adapter = new SimpleAdapter(Barebones.this, list, + R.layout.two_line_autocomplete, new String[] { + "title", "url" }, new int[] { R.id.title, + R.id.url }); + getUrl.setAdapter(adapter); + + break; + } + case 2: { + + break; + } + } + } + }; + Thread updateAutoComplete = new Thread(new Runnable() { - + @Override public void run() { - - + bookmarks = Browser.BOOKMARKS_URI; + columns = new String[] { Browser.BookmarkColumns.URL, Browser.BookmarkColumns.TITLE }; - Context con = Barebones.this; - try{ - managedCursor = null; - managedCursor = con.getContentResolver().query(bookmarks, // URI of - columns, // Which columns to return - null, // Which rows to return (all rows) - null, // Selection arguments (none) - null); - Log.i("Lightning: ","SQLite success!!!"); - handler.sendEmptyMessage(1); - - } - catch(SQLiteException e){ + + try { + + managedCursor = null; + managedCursor = getContentResolver().query(bookmarks, // URI + // of + columns, // Which columns to return + null, // Which rows to return (all rows) + null, // Selection arguments (none) + null); + Log.i("Barebones: ", "SQLite success!!!"); + handler.sendEmptyMessage(1); + Log.i("Barebones: ", "SQLite success!!!"); + + } catch (SQLiteException e) { handler.sendEmptyMessage(2); - Log.e("Lightning: ","SQLite Error!!! "+e); + Log.e("Barebones: ", "SQLite Error!!! " + e); } - + list = new ArrayList>(); noStockBrowser = true; - if(managedCursor!=null){ + if (managedCursor != null) { noStockBrowser = false; - - if (managedCursor.moveToFirst()) { - - // Variable for holding the retrieved URL - - urlColumn = managedCursor - .getColumnIndex(Browser.BookmarkColumns.URL); - titleColumn = managedCursor - .getColumnIndex(Browser.BookmarkColumns.TITLE); - // Reference to the the column containing the URL - do { - urlA = managedCursor.getString(urlColumn); - title = managedCursor.getString(titleColumn); - map = new HashMap(); - map.put("title", title); - map.put("url", urlA); - list.add(map); - } while (managedCursor.moveToNext()); - } + + if (managedCursor.moveToFirst()) { + + // Variable for holding the retrieved URL + + urlColumn = managedCursor + .getColumnIndex(Browser.BookmarkColumns.URL); + titleColumn = managedCursor + .getColumnIndex(Browser.BookmarkColumns.TITLE); + // Reference to the the column containing the URL + do { + urlA = managedCursor.getString(urlColumn); + title = managedCursor.getString(titleColumn); + map = new HashMap(); + map.put("title", title); + map.put("url", urlA); + list.add(map); + } while (managedCursor.moveToNext()); + } } - - + } - + }); - - - + updateAutoComplete.start(); - + getUrl.setThreshold(2); getUrl.setTokenizer(new SpaceTokenizer()); @@ -573,9 +587,10 @@ public class Barebones extends Activity implements OnLongClickListener, @Override public void onItemClick(AdapterView arg0, View arg1, int arg2, long arg3) { + try{ txt = (TextView) arg1.findViewById(R.id.url); str = txt.getText().toString(); - if(!pageIdIsVisible && isBookmarkShowing){ + if (!pageIdIsVisible && isBookmarkShowing) { scrollBookmarks.startAnimation(fadeOut); background.removeView(scrollBookmarks); background.addView(main[pageId]); @@ -584,9 +599,14 @@ public class Barebones extends Activity implements OnLongClickListener, } main[pageId].loadUrl(str); getUrl.setText(str); + getUrl.setPadding(tenPad, 0, tenPad, 0); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(getUrl.getWindowToken(), 0); - + } + catch(NullPointerException e){ + + Log.e("Barebones Error: ","NullPointerException on item click"); + } } }); @@ -594,7 +614,7 @@ public class Barebones extends Activity implements OnLongClickListener, getUrl.setSelectAllOnFocus(true); // allows edittext to select all when // clicked } - + // new tab method, takes the id of the tab to be created and the url to load void newTab(int theId, String theUrl) { lastVisibleWebView = pageId; @@ -632,7 +652,6 @@ public class Barebones extends Activity implements OnLongClickListener, R.drawable.bg_inactive)); } urlTitle[pageId].setPadding(leftPad, 0, rightPad, 0); - background.addView(main[num]); background.removeView(main[pageId]); @@ -681,6 +700,75 @@ public class Barebones extends Activity implements OnLongClickListener, Drawable[] drawables = title.getCompoundDrawables(); bounds[number] = drawables[2].getBounds(); title.setOnLongClickListener(Barebones.this); + title.setOnClickListener(new OnClickListener() { + + @Override + public void onClick(View arg0) { + id = arg0.getId(); + if (API < 16) { + urlTitle[pageId] + .setBackgroundDrawable(getResources() + .getDrawable(R.drawable.bg_inactive)); + } else if (API > 15) { + urlTitle[pageId].setBackground(getResources() + .getDrawable(R.drawable.bg_inactive)); + } + urlTitle[pageId].setPadding(leftPad, 0, rightPad, 0); + + if (isBookmarkShowing) { + + background.addView(main[id]); + main[id].startAnimation(fadeIn); + scrollBookmarks.startAnimation(fadeOut); + background.removeView(scrollBookmarks); + isBookmarkShowing = false; + uBar.bringToFront(); + } else if (!isBookmarkShowing) { + if (!showFullScreen) { + background.addView(main[id]); + main[id].startAnimation(fadeIn); + main[pageId].startAnimation(fadeOut); + pageIdIsVisible = false; + background.removeView(main[pageId]); + uBar.bringToFront(); + } else if (API >= 12) { + pageIdIsVisible = false; + main[id].setAlpha(0f); + main[id].clearAnimation(); + background.addView(main[id]); + main[id].animate().alpha(1f) + .setDuration(mShortAnimationDuration); + main[pageId].clearAnimation(); + // main[pageId].animate().alpha(0f) + // .setDuration(mShortAnimationDuration); + + // main[pageId].setAlpha(1f); + background.removeView(main[pageId]); + + uBar.bringToFront(); + } else { + pageIdIsVisible = false; + background.removeView(main[pageId]); + background.addView(main[id]); + } + uBar.bringToFront(); + } + pageId = id; + pageIdIsVisible = true; + getUrl.setText(urlToLoad[pageId][0]); + getUrl.setPadding(tenPad, 0, tenPad, 0); + if (API < 16) { + urlTitle[pageId] + .setBackgroundDrawable(getResources() + .getDrawable(R.drawable.bg_press)); + } else if (API > 15) { + urlTitle[pageId].setBackground(getResources() + .getDrawable(R.drawable.bg_press)); + } + urlTitle[pageId].setPadding(leftPad, 0, rightPad, 0); + } + + }); title.setOnTouchListener(Barebones.this); tabLayout.addView(title); urlTitle[number] = title; @@ -697,7 +785,6 @@ public class Barebones extends Activity implements OnLongClickListener, Toast.makeText(Barebones.this, "Maximum number of tabs reached...", Toast.LENGTH_SHORT).show(); } - } @@ -850,16 +937,16 @@ public class Barebones extends Activity implements OnLongClickListener, switch (agentPicker) { case 1: main[pageToView].getSettings().setUserAgentString(mobile); - Log.i("lightning", mobile); + Log.i("barebones", mobile); break; case 2: main[pageToView].getSettings().setUserAgentString(desktop); - Log.i("lightning", desktop); + Log.i("barebones", desktop); break; case 3: userAgent = settings.getString("agent", user); main[pageToView].getSettings().setUserAgentString(userAgent); - Log.i("lightning", userAgent); + Log.i("barebones", userAgent); break; } background.addView(main[pageToView]); @@ -870,23 +957,21 @@ public class Barebones extends Activity implements OnLongClickListener, background.removeView(main[lastVisibleWebView]); } uBar.bringToFront(); - if(Url.contains("about:home")&&!showFullScreen){ + if (Url.contains("about:home") && !showFullScreen) { pageIdIsVisible = false; goBookmarks(); - } - else if (Url.contains("about:home")) { + } else if (Url.contains("about:home")) { pageIdIsVisible = true; main[pageToView].loadUrl("about:blank"); - - } - else if (Url.contains("about:blank")) { + + } else if (Url.contains("about:blank")) { pageIdIsVisible = true; main[pageToView].loadUrl("about:blank"); - + } else { pageIdIsVisible = true; main[pageToView].loadUrl(Url); - + } } @@ -900,16 +985,16 @@ public class Barebones extends Activity implements OnLongClickListener, @Override protected void onDraw(Canvas canvas) { - if(!showFullScreen){ - main[pageId].invalidate(); + if (!showFullScreen) { + main[pageId].invalidate(); } super.onDraw(canvas); } @Override public boolean onTouchEvent(MotionEvent event) { - //final HitTestResult poop; - + // final HitTestResult poop; + switch (event.getAction()) { case MotionEvent.ACTION_DOWN: { move = false; @@ -923,13 +1008,11 @@ public class Barebones extends Activity implements OnLongClickListener, move = true; } case MotionEvent.ACTION_UP: { - try{ - crap = getHitTestResult().getType(); - } - catch(NullPointerException e){ - Log.e("Lightning","Touch was invalid"); - } - if (showFullScreen&&crap!=9) { + try { + hitTest = getHitTestResult().getType(); + } catch (NullPointerException e) { + } + if (showFullScreen && hitTest != 9) { if (System.currentTimeMillis() - timeBetweenDownPress < 500 && !move) { if (!uBarShows) { @@ -964,12 +1047,19 @@ public class Barebones extends Activity implements OnLongClickListener, private class AnthonyWebViewClient extends WebViewClient { + @Override + public void doUpdateVisitedHistory(WebView view, String url, + boolean isReload) { + + return; + } + @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { pageIdIsVisible = true; return super.shouldOverrideUrlLoading(view, url); - + } @Override @@ -983,8 +1073,8 @@ public class Barebones extends Activity implements OnLongClickListener, public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) { - Log.e("Lightning: ","Error: " + description); - + Log.e("Barebones: ", "Error: " + description); + super.onReceivedError(view, errorCode, description, failingUrl); } @@ -1004,25 +1094,13 @@ public class Barebones extends Activity implements OnLongClickListener, } @Override - public void onPageStarted(WebView view, final String url, Bitmap favicon) { + public void onPageStarted(WebView view, String url, Bitmap favicon) { int num = view.getId(); - Thread hist = new Thread(new Runnable() { - - @Override - public void run() { - if(!noStockBrowser){ - Browser.updateVisitedHistory(getContentResolver(), url, - true); - - } - - } - }); - hist.start(); pageIsLoading = true; refresh.startAnimation(anim); getUrl.setText(url); + getUrl.setPadding(tenPad, 0, tenPad, 0); urlToLoad[num][0] = url; urlTitle[num].setCompoundDrawables(webpageOther, null, exitTab, null); @@ -1034,8 +1112,19 @@ public class Barebones extends Activity implements OnLongClickListener, } @Override - public void onPageFinished(WebView view, String url) { + public void onPageFinished(WebView view, final String url) { + if (!noStockBrowser) { + Thread history = new Thread(new Runnable() { + @Override + public void run() { + Browser.updateVisitedHistory(getContentResolver(), url, + true); + // Log.i("Barebones",view.getTitle()+" "+url); + } + }); + history.start(); + } pageIsLoading = false; anim.cancel(); anim.reset(); @@ -1135,7 +1224,7 @@ public class Barebones extends Activity implements OnLongClickListener, if (allowLocation == true) { callback.invoke(origin, true, false); } else { - Log.i("Lightning: ", "onGeolocationPermissionsShowPrompt()"); + Log.i("Barebones: ", "onGeolocationPermissionsShowPrompt()"); final boolean remember = true; AlertDialog.Builder builder = new AlertDialog.Builder( @@ -1176,7 +1265,6 @@ public class Barebones extends Activity implements OnLongClickListener, super.onReceivedTitle(view, title); } - @Override public void onShowCustomView(View view, WebChromeClient.CustomViewCallback callback) { @@ -1259,18 +1347,16 @@ public class Barebones extends Activity implements OnLongClickListener, view.setSaveEnabled(true); webViewSettings.setDomStorageEnabled(true); webViewSettings.setAppCacheEnabled(true); - webViewSettings.setAppCachePath( - getApplicationContext().getFilesDir().getAbsolutePath() - + "/cache"); + webViewSettings.setAppCachePath(getApplicationContext().getFilesDir() + .getAbsolutePath() + "/cache"); webViewSettings.setRenderPriority(RenderPriority.HIGH); webViewSettings.setGeolocationEnabled(true); - webViewSettings.setGeolocationDatabasePath( - getApplicationContext().getFilesDir().getAbsolutePath()); + webViewSettings.setGeolocationDatabasePath(getApplicationContext() + .getFilesDir().getAbsolutePath()); webViewSettings.setDatabaseEnabled(true); - webViewSettings.setDatabasePath( - getApplicationContext().getFilesDir().getAbsolutePath() - + "/databases"); + webViewSettings.setDatabasePath(getApplicationContext().getFilesDir() + .getAbsolutePath() + "/databases"); enableFlash = settings.getInt("enableflash", 0); switch (enableFlash) { case 0: @@ -1297,8 +1383,8 @@ public class Barebones extends Activity implements OnLongClickListener, webViewSettings.setSupportZoom(true); webViewSettings.setUseWideViewPort(true); webViewSettings.setLoadWithOverviewMode(true); // Seems to be causing - // the performance - // to drop + // the performance + // to drop if (API >= 11) { webViewSettings.setDisplayZoomControls(false); webViewSettings.setAllowContentAccess(true); @@ -1323,9 +1409,9 @@ public class Barebones extends Activity implements OnLongClickListener, bookmarkLayout.setOrientation(LinearLayout.VERTICAL); TextView description = new TextView(Barebones.this); description.setHeight(height56); - description.setBackgroundColor(0xff0099cc); + description.setBackgroundColor(0xff33b5e5); description.setTextColor(0xffffffff); - description.setText("Bookmarks (long-press to remove)"); + description.setText("Bookmarks"); description.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL); description.setTextSize(bookHeight / 3); @@ -1354,13 +1440,14 @@ public class Barebones extends Activity implements OnLongClickListener, if (uBar.isShown()) { urlTitle[pageId].setText("Bookmarks"); getUrl.setText("Bookmarks"); + getUrl.setPadding(tenPad, 0, tenPad, 0); } - //main[pageId].startAnimation(fadeOut); + // main[pageId].startAnimation(fadeOut); background.removeView(main[pageId]); if (showFullScreen) { - //uBar.startAnimation(fadeOut); + // uBar.startAnimation(fadeOut); background.removeView(uBar); } scrollBookmarks.addView(bookmarkLayout); @@ -1390,9 +1477,9 @@ public class Barebones extends Activity implements OnLongClickListener, new FileWriter(book)); BufferedWriter urlWriter = new BufferedWriter( new FileWriter(bookUrl)); - Log.i("lightning", "makes to here"); + Log.i("barebones", "makes to here"); while (bUrl[n] != null && n < (MAX_BOOKMARKS - 1)) { - Log.i("lightning", "makes to here " + n); + Log.i("barebones", "makes to here " + n); if (delete != n) { bookWriter.write(bTitle[n]); urlWriter.write(bUrl[n]); @@ -1400,7 +1487,7 @@ public class Barebones extends Activity implements OnLongClickListener, urlWriter.newLine(); } n++; - Log.i("lightning", "makes to here " + n); + Log.i("barebones", "makes to here " + n); } bookWriter.close(); urlWriter.close(); @@ -1484,7 +1571,7 @@ public class Barebones extends Activity implements OnLongClickListener, scrollBookmarks.startAnimation(fadeOut); background.removeView(scrollBookmarks); isBookmarkShowing = false; - + uBar.bringToFront(); main[pageId].loadUrl(bUrl[number]); } @@ -1510,6 +1597,8 @@ public class Barebones extends Activity implements OnLongClickListener, e.printStackTrace(); } catch (IOException e) { + e.printStackTrace(); + } catch (NullPointerException e){ e.printStackTrace(); } } @@ -1567,8 +1656,10 @@ public class Barebones extends Activity implements OnLongClickListener, public void deleteTab(int id) { int leftId = id; pageIdIsVisible = false; + main[id].stopLoading(); + main[id].clearView(); boolean right = false, left = false; - //background.clearDisappearingChildren(); + // background.clearDisappearingChildren(); if (API < 16) { urlTitle[id].setBackgroundDrawable(getResources().getDrawable( R.drawable.bg_press)); @@ -1609,6 +1700,7 @@ public class Barebones extends Activity implements OnLongClickListener, urlTitle[id].setPadding(leftPad, 0, rightPad, 0); pageId = id; getUrl.setText(urlToLoad[pageId][0]); + getUrl.setPadding(tenPad, 0, tenPad, 0); right = true; break; } @@ -1620,7 +1712,7 @@ public class Barebones extends Activity implements OnLongClickListener, if (urlTitle[leftId].isShown()) { background.addView(main[leftId]); main[leftId].setVisibility(View.VISIBLE); - //uBar.bringToFront(); + // uBar.bringToFront(); if (API < 16) { urlTitle[leftId] .setBackgroundDrawable(getResources() @@ -1632,6 +1724,7 @@ public class Barebones extends Activity implements OnLongClickListener, urlTitle[leftId].setPadding(leftPad, 0, rightPad, 0); pageId = leftId; getUrl.setText(urlToLoad[pageId][0]); + getUrl.setPadding(tenPad, 0, tenPad, 0); left = true; break; } @@ -1640,12 +1733,10 @@ public class Barebones extends Activity implements OnLongClickListener, } - - } - else{ + } else { right = left = true; } - + if (right == false && left == false) { finish(); } else { @@ -1794,6 +1885,21 @@ public class Barebones extends Activity implements OnLongClickListener, }); menu.show(); } else if (API < 11) { + /* + LayoutInflater inflater=(LayoutInflater)Barebones.this.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + Display display=getWindowManager().getDefaultDisplay(); + + int width=display.getWidth()/2; + int height=display.getHeight()/2; + + View pop = inflater.inflate(R.layout.menu,null,false); + pop.measure(View.MeasureSpec.UNSPECIFIED,View.MeasureSpec.UNSPECIFIED); + height=pop.getMeasuredHeight(); + width=pop.getMeasuredWidth(); + PopupWindow pu = new PopupWindow(pop,width,height,true); + pu.showAtLocation(findViewById(v.getId()),Gravity.NO_GRAVITY,v.getRight(),v.getBottom()+80); + */ + openOptionsMenu(); } } @@ -1857,20 +1963,19 @@ public class Barebones extends Activity implements OnLongClickListener, String fixedQuery = query.trim(); boolean period = fixedQuery.contains("."); if (isBookmarkShowing) { - Log.i("Lightning", " is executing"); + Log.i("Barebones", " is executing"); scrollBookmarks.startAnimation(fadeOut); background.removeView(scrollBookmarks); + isBookmarkShowing = false; background.addView(main[pageId]); main[pageId].startAnimation(fadeIn); uBar.bringToFront(); - - + } pageIdIsVisible = true; - if(fixedQuery.contains("about:home")){ + if (fixedQuery.contains("about:home")) { goBookmarks(); - } - else if (fixedQuery.contains(" ") || period == false) { + } else if (fixedQuery.contains(" ") || period == false) { fixedQuery.replaceAll(" ", "+"); main[pageId] .loadUrl("http://www.google.com/search?q=" + fixedQuery); @@ -1906,6 +2011,7 @@ public class Barebones extends Activity implements OnLongClickListener, uBar.bringToFront(); urlTitle[pageId].setText(urlToLoad[pageId][1]); getUrl.setText(urlToLoad[pageId][0]); + getUrl.setPadding(tenPad, 0, tenPad, 0); pageIdIsVisible = true; isBookmarkShowing = false; } else { @@ -1966,6 +2072,7 @@ public class Barebones extends Activity implements OnLongClickListener, background.removeView(scrollBookmarks); urlTitle[pageId].setText(urlToLoad[pageId][1]); getUrl.setText(urlToLoad[pageId][0]); + getUrl.setPadding(tenPad, 0, tenPad, 0); pageIdIsVisible = true; isBookmarkShowing = false; uBar.bringToFront(); @@ -1973,6 +2080,7 @@ public class Barebones extends Activity implements OnLongClickListener, main[pageId].goBack(); } else { deleteTab(pageId); + uBar.bringToFront(); } } @@ -1990,6 +2098,7 @@ public class Barebones extends Activity implements OnLongClickListener, @Override public void finish() { pageIdIsVisible = false; + this.onPause(); super.finish(); } @@ -1999,10 +2108,9 @@ public class Barebones extends Activity implements OnLongClickListener, deleteHistory = settings.getBoolean("history", false); if (deleteHistory == true) { - - if(noStockBrowser){ + if (!noStockBrowser) { Browser.clearHistory(getContentResolver()); - } + } } // trimCache(this); } catch (Exception e) { @@ -2041,11 +2149,11 @@ public class Barebones extends Activity implements OnLongClickListener, @Override public boolean onTouch(View v, MotionEvent event) { pageIdIsVisible = false; - final int id = v.getId(); - boolean xPress = false; + id = v.getId(); + xPress = false; x = (int) event.getX(); y = (int) event.getY(); - final Rect edge = new Rect(); + edge = new Rect(); v.getLocalVisibleRect(edge); if (x >= (edge.right - bounds[id].width() - fuzz) @@ -2108,13 +2216,12 @@ public class Barebones extends Activity implements OnLongClickListener, main[id].animate().alpha(1f) .setDuration(mShortAnimationDuration); main[pageId].clearAnimation(); - // main[pageId].animate().alpha(0f) - // .setDuration(mShortAnimationDuration); - - // main[pageId].setAlpha(1f); + // main[pageId].animate().alpha(0f) + // .setDuration(mShortAnimationDuration); + + // main[pageId].setAlpha(1f); background.removeView(main[pageId]); - - + uBar.bringToFront(); } else { pageIdIsVisible = false; @@ -2126,6 +2233,7 @@ public class Barebones extends Activity implements OnLongClickListener, pageId = id; pageIdIsVisible = true; getUrl.setText(urlToLoad[pageId][0]); + getUrl.setPadding(tenPad, 0, tenPad, 0); } } @@ -2144,4 +2252,34 @@ public class Barebones extends Activity implements OnLongClickListener, return true; } + @Override + protected void onPause() { + if (API >= 11) { + main[pageId].onPause(); + } + main[pageId].pauseTimers(); + super.onPause(); + } + + @Override + protected void onResume() { + if (API >= 11) { + main[pageId].onResume(); + } + main[pageId].resumeTimers(); + super.onResume(); + + } + + @Override + protected void onNewIntent(Intent intent) { + + String url = null; + url = intent.getDataString(); + if (url != null) { + newTab(number, url); + } + super.onNewIntent(intent); + } + }