Browse Source

4.2.3

- Fixed favicons and urls switching randomly
- Enlarged exit button touch area for tabs
- Slide animation when new tab is opened
- Other stuff I cannot remember... I think I skipped a couple versions
before updating the code. Sorry bout that.
master
Anthony Restaino 12 years ago
parent
commit
103b4e40e1
  1. 4
      AndroidManifest.xml
  2. BIN
      res/drawable-xhdpi/bar.9.png
  3. BIN
      res/drawable-xhdpi/clearbg.9.png
  4. 2
      res/layout/activity_main.xml
  5. 397
      res/layout/settings.xml
  6. 2
      src/acr/browser/barebones/AnthonyWebView.java
  7. 3276
      src/acr/browser/barebones/Barebones.java
  8. 4
      src/acr/browser/barebones/DatabaseHandler.java
  9. 18
      src/acr/browser/barebones/FinalVars.java
  10. 2
      src/acr/browser/barebones/Settings.java

4
AndroidManifest.xml

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="acr.browser.barebones" package="acr.browser.barebones"
android:versionCode="37" android:versionCode="42"
android:versionName="2.4" > android:versionName="2.4.3" >
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"

BIN
res/drawable-xhdpi/bar.9.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 B

After

Width:  |  Height:  |  Size: 243 B

BIN
res/drawable-xhdpi/clearbg.9.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 180 B

After

Width:  |  Height:  |  Size: 165 B

2
res/layout/activity_main.xml

@ -130,7 +130,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_toLeftOf="@+id/options" android:layout_toLeftOf="@+id/options"
android:layout_toRightOf="@+id/refreshLayout" android:layout_toRightOf="@+id/refreshLayout"
android:background="@drawable/bookmark" android:background="@drawable/book"
android:ems="10" android:ems="10"
android:hint="@string/google" android:hint="@string/google"
android:imeOptions="actionGo" android:imeOptions="actionGo"

397
res/layout/settings.xml

@ -1,246 +1,161 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent" android:layout_height="match_parent">
android:layout_height="match_parent" >
<RelativeLayout android:id="@+id/relativeLayout1"
<RelativeLayout android:layout_width="match_parent" android:layout_height="48dp"
android:id="@+id/relativeLayout1" android:layout_alignParentLeft="true" android:layout_alignParentRight="true"
android:layout_width="wrap_content" android:layout_alignParentTop="true" android:background="@drawable/bar">
android:layout_height="48dp"
android:layout_alignParentLeft="true" <TextView android:id="@+id/textView1" android:layout_width="wrap_content"
android:layout_alignParentRight="true" android:layout_height="wrap_content" android:layout_centerHorizontal="true"
android:layout_alignParentTop="true" android:layout_centerVertical="true" android:text="@string/settings"
android:background="@drawable/bar" > android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <ImageView android:id="@+id/back" android:layout_width="48dp"
android:id="@+id/textView1" android:layout_height="48dp" android:layout_alignParentLeft="true"
android:layout_width="wrap_content" android:layout_alignParentTop="true" android:paddingBottom="5dp"
android:layout_height="wrap_content" android:paddingLeft="5dp" android:paddingRight="5dp"
android:layout_centerHorizontal="true" android:paddingTop="5dp" android:src="@drawable/back" />
android:layout_centerVertical="true" </RelativeLayout>
android:text="@string/settings"
android:textAppearance="?android:attr/textAppearanceMedium" /> <ScrollView android:id="@+id/scrollView1"
android:layout_width="match_parent" android:layout_height="match_parent"
<ImageView android:layout_below="@+id/relativeLayout1">
android:id="@+id/back"
android:layout_width="48dp" <RelativeLayout android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="wrap_content">
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" <TextView android:id="@+id/textView4" android:layout_width="match_parent"
android:paddingBottom="5dp" android:layout_height="56dp" android:layout_below="@+id/relativeLayout1"
android:paddingLeft="5dp" android:layout_centerHorizontal="true" android:background="#ff0099cc"
android:paddingRight="5dp" android:gravity="center_vertical|center_horizontal" android:text="@string/settingshelp"
android:paddingTop="5dp" android:textAppearance="?android:attr/textAppearanceLarge"
android:src="@drawable/back" /> android:textColor="#ffffffff" />
</RelativeLayout>
<CheckBox android:id="@+id/password" android:layout_width="match_parent"
<ScrollView android:layout_marginRight="20dp"
android:id="@+id/scrollView1" android:layout_height="56dp" android:layout_below="@+id/saveTabs"
android:layout_width="match_parent" android:text="@string/password"
android:layout_height="match_parent" android:layout_marginLeft="20dp"
android:layout_below="@+id/relativeLayout1" > />
<RelativeLayout <EditText android:id="@+id/agent" android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="56dp" android:layout_alignParentRight="true"
android:layout_height="wrap_content" > android:layout_marginRight="20dp"
android:layout_alignTop="@+id/textView2" android:layout_toRightOf="@+id/textView2"
<TextView android:ems="10" android:inputType="textUri" android:background="@drawable/book"
android:id="@+id/textView4" android:paddingLeft="10dp" android:paddingRight="10dp"
android:layout_width="match_parent" android:singleLine="true" />
android:layout_height="56dp"
android:layout_below="@+id/relativeLayout1"
android:layout_centerHorizontal="true" <CheckBox android:id="@+id/flash" android:layout_width="match_parent"
android:background="#ff0099cc" android:layout_marginRight="20dp"
android:gravity="center_vertical|center_horizontal" android:layout_height="56dp" android:layout_below="@+id/password"
android:text="@string/settingshelp" android:text="@string/flash"
android:textAppearance="?android:attr/textAppearanceLarge" android:layout_marginLeft="20dp"
android:textColor="#ffffffff" /> />
<CheckBox <CheckBox android:id="@+id/historyClear"
android:id="@+id/password" android:layout_marginRight="20dp"
android:layout_width="wrap_content" android:layout_width="match_parent" android:layout_height="56dp"
android:layout_height="56dp" android:layout_below="@+id/flash"
android:layout_alignLeft="@+id/flash" android:text="@string/history"
android:layout_alignParentRight="true" android:layout_marginLeft="20dp"
android:layout_below="@+id/saveTabs" />
android:layout_marginRight="20dp"
android:background="@drawable/blueback" <RadioButton android:id="@+id/radioDesktop"
android:paddingRight="20dp" android:layout_width="match_parent" android:layout_height="56dp"
android:text="@string/password" /> android:layout_marginRight="20dp"
android:layout_below="@+id/radioMobile"
<EditText android:onClick="radioAgent" android:text="@string/desk"
android:id="@+id/agent" android:layout_marginLeft="20dp"
android:layout_width="wrap_content" />
android:layout_height="56dp"
android:layout_alignParentRight="true" <RadioButton android:id="@+id/radioCustom"
android:layout_alignTop="@+id/textView2" android:layout_width="match_parent" android:layout_height="56dp"
android:layout_toRightOf="@+id/textView2" android:layout_below="@+id/radioDesktop"
android:ems="10" android:onClick="radioAgent" android:text="@string/custom"
android:inputType="textUri" android:layout_marginRight="20dp"
android:layout_marginLeft="20dp"
android:background="@drawable/bookmark" />
android:layout_marginRight="20dp"
android:paddingLeft="10dp" <TextView android:id="@+id/textView2" android:layout_width="wrap_content"
android:paddingRight="10dp" android:layout_height="56dp" android:layout_alignParentLeft="true"
android:singleLine="true" > android:layout_below="@+id/radioCustom" android:gravity="center_vertical|center_horizontal"
</EditText> android:paddingLeft="10dp" android:paddingRight="5dp" android:text="@string/agent"
android:layout_marginLeft="20dp"/>
<CheckBox
android:id="@+id/flash" <TextView
android:layout_width="wrap_content" android:id="@+id/textView3"
android:layout_height="56dp" android:layout_width="wrap_content"
android:layout_alignParentLeft="true" android:layout_height="56dp"
android:layout_alignParentRight="true" android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp" android:layout_below="@+id/textView2"
android:layout_marginRight="20dp" android:gravity="center_vertical|center_horizontal"
android:background="@drawable/blueback" android:paddingLeft="10dp"
android:layout_below="@+id/password" android:paddingRight="5dp"
android:paddingRight="20dp" android:text="@string/home"
android:text="@string/flash" /> android:layout_marginLeft="20dp"/>
<CheckBox <CheckBox android:id="@+id/fullScreen" android:layout_width="match_parent"
android:id="@+id/historyClear" android:layout_marginRight="20dp"
android:layout_width="wrap_content" android:layout_height="56dp" android:layout_below="@+id/historyClear"
android:layout_height="56dp" android:text="@string/fullscreen"
android:layout_alignParentLeft="true" android:layout_marginLeft="20dp"
android:layout_alignParentRight="true" />
android:layout_below="@+id/flash"
android:layout_marginLeft="20dp" <CheckBox android:id="@+id/java" android:layout_width="match_parent"
android:layout_marginRight="20dp" android:layout_height="56dp" android:layout_below="@+id/fullScreen"
android:layout_toLeftOf="@+id/flash" android:layout_marginRight="20dp"
android:paddingRight="20dp" android:text="@string/java"
android:background="@drawable/blueback" android:layout_marginLeft="20dp"
android:text="@string/history" /> />
<RadioButton
android:id="@+id/radioDesktop"
android:layout_width="match_parent" <RadioButton android:id="@+id/radioMobile"
android:layout_height="56dp" android:layout_width="match_parent" android:layout_height="56dp"
android:layout_alignLeft="@+id/radioMobile" android:layout_marginRight="20dp"
android:layout_below="@+id/radioMobile" android:layout_below="@+id/java"
android:layout_marginRight="20dp" android:marqueeRepeatLimit="20" android:onClick="radioAgent"
android:onClick="radioAgent" android:text="@string/mobile"
android:paddingRight="20dp" android:layout_marginLeft="20dp"
android:background="@drawable/blueback" />
android:text="@string/desk" />
<CheckBox android:id="@+id/saveTabs" android:layout_width="match_parent"
<RadioButton android:layout_height="56dp" android:layout_below="@+id/location"
android:id="@+id/radioCustom" android:layout_marginRight="20dp"
android:layout_width="match_parent" android:text="@string/saveTab"
android:layout_height="56dp" android:layout_marginLeft="20dp"
android:layout_alignLeft="@+id/radioDesktop" />
android:layout_below="@+id/radioDesktop"
android:background="@drawable/blueback" <EditText android:id="@+id/homePage" android:layout_width="wrap_content"
android:layout_marginRight="20dp" android:layout_height="56dp" android:layout_alignBaseline="@+id/textView3"
android:onClick="radioAgent" android:layout_alignBottom="@+id/textView3"
android:paddingRight="20dp" android:layout_alignLeft="@+id/agent"
android:text="@string/custom" /> android:layout_alignParentRight="true" android:background="@drawable/book"
android:ems="10" android:inputType="textUri" android:paddingLeft="10dp"
<TextView android:layout_marginRight="20dp"
android:id="@+id/textView2" android:paddingRight="10dp">
android:layout_width="wrap_content"
android:layout_height="56dp"
android:layout_alignParentLeft="true" </EditText>
android:layout_below="@+id/radioCustom"
android:gravity="center_vertical|center_horizontal" <CheckBox
android:paddingLeft="10dp" android:id="@+id/location"
android:paddingRight="5dp" android:layout_marginLeft="20dp"
android:layout_marginLeft="20dp"
android:layout_width="match_parent"
android:text="@string/agent" /> android:layout_height="56dp"
android:layout_below="@+id/textView4"
<TextView
android:id="@+id/textView3" android:layout_marginRight="20dp"
android:layout_width="wrap_content" android:text="@string/location"/>
android:layout_height="56dp"
android:layout_alignParentLeft="true" </RelativeLayout>
android:layout_below="@+id/textView2"
android:gravity="center_vertical" </ScrollView>
android:paddingLeft="10dp"
android:layout_marginLeft="20dp"
android:paddingRight="5dp"
android:text="@string/home" />
<EditText
android:id="@+id/homePage"
android:layout_width="wrap_content"
android:layout_height="56dp"
android:layout_alignLeft="@+id/agent"
android:layout_alignRight="@+id/agent"
android:background="@drawable/bookmark"
android:layout_below="@+id/agent"
android:ems="10"
android:inputType="textUri"
android:paddingLeft="10dp"
android:paddingRight="10dp"/>
<CheckBox
android:id="@+id/fullScreen"
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_alignLeft="@+id/historyClear"
android:layout_alignParentRight="true"
android:layout_below="@+id/historyClear"
android:layout_marginRight="20dp"
android:paddingRight="20dp"
android:background="@drawable/blueback"
android:text="@string/fullscreen" />
<CheckBox
android:id="@+id/java"
android:layout_width="wrap_content"
android:layout_height="56dp"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_below="@+id/fullScreen"
android:layout_toLeftOf="@+id/flash"
android:paddingRight="20dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/blueback"
android:text="@string/java" />
<CheckBox
android:id="@+id/location"
android:layout_width="wrap_content"
android:layout_height="56dp"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_below="@+id/textView4"
android:paddingRight="20dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/blueback"
android:text="@string/location" />
<RadioButton
android:id="@+id/radioMobile"
android:layout_width="wrap_content"
android:layout_height="56dp"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_below="@+id/java"
android:marqueeRepeatLimit="20"
android:onClick="radioAgent"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/blueback"
android:text="@string/mobile" />
<CheckBox
android:id="@+id/saveTabs"
android:layout_width="wrap_content"
android:layout_height="56dp"
android:layout_alignLeft="@+id/password"
android:layout_alignRight="@+id/password"
android:layout_below="@+id/location"
android:background="@drawable/blueback"
android:text="@string/saveTab" />
</RelativeLayout>
</ScrollView>

2
src/acr/browser/barebones/AnthonyWebView.java

@ -9,7 +9,7 @@ import android.webkit.WebView;
public final class AnthonyWebView extends WebView { public final class AnthonyWebView extends WebView {
boolean move; boolean move;
int API = Barebones.API; int API = FinalVars.API;
int hitTest; int hitTest;
boolean showFullScreen = Barebones.showFullScreen; boolean showFullScreen = Barebones.showFullScreen;
View uBar = Barebones.uBar; View uBar = Barebones.uBar;

3276
src/acr/browser/barebones/Barebones.java

File diff suppressed because it is too large Load Diff

4
src/acr/browser/barebones/DatabaseHandler.java

@ -33,10 +33,10 @@ public class DatabaseHandler extends SQLiteOpenHelper {
// Creating Tables // Creating Tables
@Override @Override
public void onCreate(SQLiteDatabase db) { public void onCreate(SQLiteDatabase db) {
String CREATE_CONTACTS_TABLE = "CREATE TABLE " + TABLE_HISTORY + "(" String CREATE_HISTORY_TABLE = "CREATE TABLE " + TABLE_HISTORY + "("
+ KEY_ID + " INTEGER PRIMARY KEY," + KEY_URL + " TEXT," + KEY_ID + " INTEGER PRIMARY KEY," + KEY_URL + " TEXT,"
+ KEY_TITLE + " TEXT" +")"; + KEY_TITLE + " TEXT" +")";
db.execSQL(CREATE_CONTACTS_TABLE); db.execSQL(CREATE_HISTORY_TABLE);
} }
// Upgrading database // Upgrading database

18
src/acr/browser/barebones/FinalVars.java

@ -0,0 +1,18 @@
package acr.browser.barebones;
public class FinalVars {
public static final int MAX_TABS = 5;
public static final int MAX_BOOKMARKS = 5;
public static final boolean PAID_VERSION = false;
public static final int API = Integer.valueOf(android.os.Build.VERSION.SDK_INT);
public static final String YAHOO_SEARCH = "https://search.yahoo.com/search?p=";
public static final String GOOGLE_SEARCH = "https://www.google.com/search?q=";
public static final String BING_SEARCH = "https://www.bing.com/search?q=";
public static final String HOMEPAGE = "https://www.google.com/";
public static final String SETTINGS_INTENT = "android.intent.action.BAREBONESSETTINGS";
}

2
src/acr/browser/barebones/Settings.java

@ -59,7 +59,7 @@ public class Settings extends Activity {
agentPicker = settings.getInt("agentchoose", 1); agentPicker = settings.getInt("agentchoose", 1);
userAgent = settings.getString("agent", user); userAgent = settings.getString("agent", user);
java = settings.getBoolean("java", true); java = settings.getBoolean("java", true);
homepage = settings.getString("home", "http://www.google.com"); homepage = settings.getString("home", FinalVars.HOMEPAGE);
agent.setText(userAgent); agent.setText(userAgent);
edit = settings.edit(); edit = settings.edit();

Loading…
Cancel
Save