r4sas
/
lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity
Browse Source

Move java files to sub-packages for better organization

master
Anthony Restaino 10 years ago
parent
db734dfa7d
commit
f8c2d0096d
43 changed files with 391 additions and 367 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .idea/misc.xml
  2. 2
      app/proguard-project.txt
  3. 438
      app/src/main/AndroidManifest.xml
  4. 101
      app/src/main/java/acr/browser/lightning/ReplacingInputStream.java
  5. 4
      app/src/main/java/acr/browser/lightning/activity/AboutSettingsActivity.java
  6. 5
      app/src/main/java/acr/browser/lightning/activity/AdvancedSettingsActivity.java
  7. 6
      app/src/main/java/acr/browser/lightning/activity/BookmarkActivity.java
  8. 19
      app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
  9. 2
      app/src/main/java/acr/browser/lightning/activity/BrowserApp.java
  10. 5
      app/src/main/java/acr/browser/lightning/activity/DisplaySettingsActivity.java
  11. 7
      app/src/main/java/acr/browser/lightning/activity/GeneralSettingsActivity.java
  12. 5
      app/src/main/java/acr/browser/lightning/activity/IncognitoActivity.java
  13. 4
      app/src/main/java/acr/browser/lightning/activity/LicenseActivity.java
  14. 5
      app/src/main/java/acr/browser/lightning/activity/MainActivity.java
  15. 7
      app/src/main/java/acr/browser/lightning/activity/PrivacySettingsActivity.java
  16. 6
      app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java
  17. 7
      app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java
  18. 5
      app/src/main/java/acr/browser/lightning/activity/ThemableActivity.java
  19. 5
      app/src/main/java/acr/browser/lightning/activity/ThemableSettingsActivity.java
  20. 5
      app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java
  21. 2
      app/src/main/java/acr/browser/lightning/constant/Constants.java
  22. 7
      app/src/main/java/acr/browser/lightning/constant/HistoryPage.java
  23. 7
      app/src/main/java/acr/browser/lightning/constant/StartPage.java
  24. 2
      app/src/main/java/acr/browser/lightning/controller/BrowserController.java
  25. 7
      app/src/main/java/acr/browser/lightning/database/BookmarkManager.java
  26. 4
      app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java
  27. 2
      app/src/main/java/acr/browser/lightning/database/HistoryItem.java
  28. 5
      app/src/main/java/acr/browser/lightning/download/DownloadHandler.java
  29. 4
      app/src/main/java/acr/browser/lightning/download/FetchUrlMimeType.java
  30. 8
      app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java
  31. 2
      app/src/main/java/acr/browser/lightning/download/WebAddress.java
  32. 4
      app/src/main/java/acr/browser/lightning/object/ClickHandler.java
  33. 6
      app/src/main/java/acr/browser/lightning/object/DrawerArrowDrawable.java
  34. 8
      app/src/main/java/acr/browser/lightning/object/SearchAdapter.java
  35. 5
      app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java
  36. 2
      app/src/main/java/acr/browser/lightning/reading/Converter.java
  37. 2
      app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java
  38. 5
      app/src/main/java/acr/browser/lightning/utils/AdBlock.java
  39. 4
      app/src/main/java/acr/browser/lightning/utils/IntentUtils.java
  40. 7
      app/src/main/java/acr/browser/lightning/utils/Utils.java
  41. 4
      app/src/main/java/acr/browser/lightning/view/AnimatedProgressBar.java
  42. 18
      app/src/main/java/acr/browser/lightning/view/LightningView.java
  43. 2
      app/src/main/res/layout/toolbar.xml

3
.idea/misc.xml
Unescape View File

@ -1,4 +1,7 @@ @@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK" />
</project>

2
app/proguard-project.txt
Unescape View File

@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
}
# Without this rule, openFileChooser does not get called on KitKat
-keep class acr.browser.lightning.LightningView$LightningChromeClient {
-keep class acr.browser.lightning.view.LightningView$LightningChromeClient {
void openFileChooser(android.webkit.ValueCallback);
void openFileChooser(android.webkit.ValueCallback, java.lang.String);
void openFileChooser(android.webkit.ValueCallback, java.lang.String, java.lang.String);

438
app/src/main/AndroidManifest.xml
Unescape View File

@ -1,219 +1,221 @@ @@ -1,219 +1,221 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014 A.C.R. Development -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="acr.browser.lightning"
android:versionCode="77"
android:versionName="4.0.9a" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS" />
<uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-feature
android:name="android.hardware.location.gps"
android:required="false" />
<uses-feature
android:name="android.hardware.location"
android:required="false" />
<uses-feature
android:name="android.hardware.touchscreen"
android:required="false" />
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="22" />
<application
android:name="acr.browser.lightning.BrowserApp"
android:allowBackup="true"
android:hardwareAccelerated="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" >
<activity
android:name="acr.browser.lightning.MainActivity"
android:alwaysRetainTaskState="true"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/app_name"
android:launchMode="singleTask"
android:theme="@style/Theme.LightTheme" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.APP_BROWSER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http" />
<data android:scheme="https" />
<data android:scheme="about" />
<data android:scheme="javascript" />
</intent-filter>
<!--
For these schemes where any of these particular MIME types
have been supplied, we are a good candidate.
-->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="http" />
<data android:scheme="https" />
<data android:scheme="inline" />
<data android:mimeType="text/html" />
<data android:mimeType="text/plain" />
<data android:mimeType="application/xhtml+xml" />
<data android:mimeType="application/vnd.wap.xhtml+xml" />
</intent-filter>
<!-- For viewing saved web archives. -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="http" />
<data android:scheme="https" />
<data android:scheme="file" />
<data android:mimeType="application/x-webarchive-xml" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.WEB_SEARCH" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="" />
<data android:scheme="http" />
<data android:scheme="https" />
</intent-filter>
</activity>
<activity
android:name="acr.browser.lightning.SettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name="acr.browser.lightning.GeneralSettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_general"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.GENERAL_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name="acr.browser.lightning.DisplaySettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_display"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.DISPLAY_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name="acr.browser.lightning.PrivacySettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_privacy"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.PRIVACY_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name="acr.browser.lightning.AdvancedSettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_advanced"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.ADVANCED_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name="acr.browser.lightning.AboutSettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_about"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.ABOUT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name="acr.browser.lightning.IncognitoActivity"
android:alwaysRetainTaskState="true"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/app_name"
android:launchMode="singleTask"
android:theme="@style/Theme.DarkTheme"
android:windowSoftInputMode="stateHidden" >
<intent-filter>
<action android:name="android.intent.action.INCOGNITO" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name="acr.browser.lightning.LicenseActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/licenses"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.LICENSE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name="acr.browser.lightning.BookmarkActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/bookmark_settings"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.BOOKMARK" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name="acr.browser.lightning.ReadingActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/reading_mode"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.READING" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
</application>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014 A.C.R. Development -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="acr.browser.lightning"
android:versionCode="77"
android:versionName="4.0.9a" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS" />
<uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-feature
android:name="android.hardware.location.gps"
android:required="false" />
<uses-feature
android:name="android.hardware.location"
android:required="false" />
<uses-feature
android:name="android.hardware.touchscreen"
android:required="false" />
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="22" />
<application
android:name=".activity.BrowserApp"
android:allowBackup="true"
android:hardwareAccelerated="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" >
<activity
android:name=".activity.MainActivity"
android:alwaysRetainTaskState="true"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/app_name"
android:launchMode="singleTask"
android:theme="@style/Theme.LightTheme" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.APP_BROWSER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http" />
<data android:scheme="https" />
<data android:scheme="about" />
<data android:scheme="javascript" />
</intent-filter>
<!--
For these schemes where any of these particular MIME types
have been supplied, we are a good candidate.
-->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="http" />
<data android:scheme="https" />
<data android:scheme="inline" />
<data android:mimeType="text/html" />
<data android:mimeType="text/plain" />
<data android:mimeType="application/xhtml+xml" />
<data android:mimeType="application/vnd.wap.xhtml+xml" />
</intent-filter>
<!-- For viewing saved web archives. -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="http" />
<data android:scheme="https" />
<data android:scheme="file" />
<data android:mimeType="application/x-webarchive-xml" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.WEB_SEARCH" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="" />
<data android:scheme="http" />
<data android:scheme="https" />
</intent-filter>
</activity>
<activity
android:name=".activity.SettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".activity.GeneralSettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_general"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.GENERAL_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".activity.DisplaySettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_display"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.DISPLAY_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".activity.PrivacySettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_privacy"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.PRIVACY_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".activity.AdvancedSettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_advanced"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.ADVANCED_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".activity.AboutSettingsActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/settings_about"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.ABOUT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".activity.IncognitoActivity"
android:alwaysRetainTaskState="true"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/app_name"
android:launchMode="singleTask"
android:theme="@style/Theme.DarkTheme"
android:windowSoftInputMode="stateHidden" >
<intent-filter>
<action android:name="android.intent.action.INCOGNITO" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".activity.LicenseActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/licenses"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.LICENSE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".activity.BookmarkActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/bookmark_settings"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.BOOKMARK" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".activity.ReadingActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/reading_mode"
android:theme="@style/Theme.SettingsTheme" >
<intent-filter>
<action android:name="android.intent.action.READING" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
</application>
</manifest>

101
app/src/main/java/acr/browser/lightning/ReplacingInputStream.java
Unescape View File

@ -1,101 +0,0 @@ @@ -1,101 +0,0 @@
package acr.browser.lightning;
import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Deque;
import java.util.Iterator;
import java.util.LinkedList;
public class ReplacingInputStream extends FilterInputStream {
Deque<Integer> inQueue = new LinkedList<Integer>();
Deque<Integer> outQueue = new LinkedList<Integer>();
final byte[] search, replacement;
protected ReplacingInputStream(InputStream in, byte[] search, byte[] replacement) {
super(in);
this.search = search;
this.replacement = replacement;
}
private boolean isMatchFound() {
Iterator<Integer> inIter = inQueue.iterator();
for (int i = 0; i < search.length; i++) {
if (!inIter.hasNext() || search[i] != inIter.next()) {
return false;
}
}
return true;
}
private void readAhead() throws IOException {
// Work up some look-ahead.
while (inQueue.size() < search.length) {
int next = super.read();
inQueue.offer(next);
if (next == -1) {
break;
}
}
}
@Override
public int read() throws IOException {
// Next byte already determined.
if (outQueue.isEmpty()) {
readAhead();
if (isMatchFound()) {
for (int i = 0; i < search.length; i++) {
inQueue.remove();
}
for (byte b : replacement) {
outQueue.offer((int) b);
}
} else {
outQueue.add(inQueue.remove());
}
}
return outQueue.remove();
}
/**
* Returns false. REFilterInputStream does not support mark() and reset()
* methods.
*/
@Override
public boolean markSupported() {
return false;
}
/**
* Reads from the stream into the provided array.
*/
@Override
public int read(byte[] b, int off, int len) throws IOException {
int i;
int ok = 0;
while (len-- > 0) {
i = read();
if (i == -1) {
return (ok == 0) ? -1 : ok;
}
b[off++] = (byte) i;
ok++;
}
return ok;
}
@Override
public int read(byte[] buffer) throws IOException {
return read(buffer, 0, buffer.length);
}
}

4
app/src/main/java/acr/browser/lightning/AboutSettingsActivity.java → app/src/main/java/acr/browser/lightning/activity/AboutSettingsActivity.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.activity;
import android.content.Intent;
import android.content.pm.PackageInfo;
@ -15,6 +15,8 @@ import android.view.View.OnClickListener; @@ -15,6 +15,8 @@ import android.view.View.OnClickListener;
import android.widget.RelativeLayout;
import android.widget.TextView;
import acr.browser.lightning.R;
public class AboutSettingsActivity extends ThemableSettingsActivity implements OnClickListener {
private int mEasterEggCounter;

5
app/src/main/java/acr/browser/lightning/AdvancedSettingsActivity.java → app/src/main/java/acr/browser/lightning/activity/AdvancedSettingsActivity.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.activity;
import android.app.AlertDialog;
import android.content.Context;
@ -18,6 +18,9 @@ import android.widget.LinearLayout; @@ -18,6 +18,9 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.R;
public class AdvancedSettingsActivity extends ThemableSettingsActivity {
private CheckBox cbAllowPopups, cbAllowCookies, cbAllowIncognitoCookies, cbRestoreTabs;

6
app/src/main/java/acr/browser/lightning/BookmarkActivity.java → app/src/main/java/acr/browser/lightning/activity/BookmarkActivity.java
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package acr.browser.lightning;
package acr.browser.lightning.activity;
import java.io.File;
import java.util.Arrays;
@ -17,6 +17,10 @@ import android.view.View.OnClickListener; @@ -17,6 +17,10 @@ import android.view.View.OnClickListener;
import android.widget.LinearLayout;
import android.widget.TextView;
import acr.browser.lightning.database.BookmarkManager;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.R;
public class BookmarkActivity extends ThemableSettingsActivity implements OnClickListener {
private BookmarkManager mBookmarkManager;

19
app/src/main/java/acr/browser/lightning/BrowserActivity.java → app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
Unescape View File

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.activity;
import android.animation.ArgbEvaluator;
import android.animation.ValueAnimator;
@ -18,7 +18,6 @@ import android.database.sqlite.SQLiteException; @@ -18,7 +18,6 @@ import android.database.sqlite.SQLiteException;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.ColorMatrix;
import android.graphics.ColorMatrixColorFilter;
import android.graphics.Paint;
@ -62,6 +61,22 @@ import android.support.v7.graphics.Palette; @@ -62,6 +61,22 @@ import android.support.v7.graphics.Palette;
import android.support.v7.widget.Toolbar;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.TextView.OnEditorActionListener;
import acr.browser.lightning.view.AnimatedProgressBar;
import acr.browser.lightning.database.BookmarkManager;
import acr.browser.lightning.constant.BookmarkPage;
import acr.browser.lightning.controller.BrowserController;
import acr.browser.lightning.object.ClickHandler;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.object.DrawerArrowDrawable;
import acr.browser.lightning.database.HistoryDatabase;
import acr.browser.lightning.database.HistoryItem;
import acr.browser.lightning.constant.HistoryPage;
import acr.browser.lightning.view.LightningView;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.R;
import acr.browser.lightning.object.SearchAdapter;
import acr.browser.lightning.utils.Utils;
import info.guardianproject.onionkit.ui.OrbotHelper;
import info.guardianproject.onionkit.web.WebkitProxy;

2
app/src/main/java/acr/browser/lightning/BrowserApp.java → app/src/main/java/acr/browser/lightning/activity/BrowserApp.java
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package acr.browser.lightning;
package acr.browser.lightning.activity;
import android.app.Application;
import android.content.Context;

5
app/src/main/java/acr/browser/lightning/DisplaySettingsActivity.java → app/src/main/java/acr/browser/lightning/activity/DisplaySettingsActivity.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
@ -15,6 +15,9 @@ import android.widget.CompoundButton; @@ -15,6 +15,9 @@ import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.RelativeLayout;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.R;
public class DisplaySettingsActivity extends ThemableSettingsActivity {
// mPreferences variables

7
app/src/main/java/acr/browser/lightning/GeneralSettingsActivity.java → app/src/main/java/acr/browser/lightning/activity/GeneralSettingsActivity.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.activity;
import android.app.Activity;
import android.app.AlertDialog;
@ -23,6 +23,11 @@ import android.widget.LinearLayout; @@ -23,6 +23,11 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.R;
import acr.browser.lightning.utils.Utils;
public class GeneralSettingsActivity extends ThemableSettingsActivity {
// mPreferences variables

5
app/src/main/java/acr/browser/lightning/IncognitoActivity.java → app/src/main/java/acr/browser/lightning/activity/IncognitoActivity.java
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package acr.browser.lightning;
package acr.browser.lightning.activity;
import android.content.Intent;
import android.os.Build;
@ -7,6 +7,9 @@ import android.view.Menu; @@ -7,6 +7,9 @@ import android.view.Menu;
import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.R;
@SuppressWarnings("deprecation")
public class IncognitoActivity extends BrowserActivity {

4
app/src/main/java/acr/browser/lightning/LicenseActivity.java → app/src/main/java/acr/browser/lightning/activity/LicenseActivity.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.activity;
import android.content.Intent;
import android.net.Uri;
@ -10,6 +10,8 @@ import android.support.v7.widget.Toolbar; @@ -10,6 +10,8 @@ import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
import acr.browser.lightning.R;
/*
*NOTE: This activity must not be removed in order to comply with the Mozilla Public License v. 2.0
*under which this code is licensed. Unless you plan on providing other attribution in the app to

5
app/src/main/java/acr/browser/lightning/MainActivity.java → app/src/main/java/acr/browser/lightning/activity/MainActivity.java
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package acr.browser.lightning;
package acr.browser.lightning.activity;
import android.content.Intent;
import android.os.Build;
@ -7,6 +7,9 @@ import android.view.Menu; @@ -7,6 +7,9 @@ import android.view.Menu;
import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.R;
@SuppressWarnings("deprecation")
public class MainActivity extends BrowserActivity {

7
app/src/main/java/acr/browser/lightning/PrivacySettingsActivity.java → app/src/main/java/acr/browser/lightning/activity/PrivacySettingsActivity.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.activity;
import android.app.AlertDialog;
import android.content.Context;
@ -22,6 +22,11 @@ import android.widget.CompoundButton.OnCheckedChangeListener; @@ -22,6 +22,11 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.RelativeLayout;
import android.widget.TextView;
import acr.browser.lightning.database.HistoryDatabase;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.R;
import acr.browser.lightning.utils.Utils;
public class PrivacySettingsActivity extends ThemableSettingsActivity {
// mPreferences variables

6
app/src/main/java/acr/browser/lightning/ReadingActivity.java → app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java
Unescape View File

@ -1,8 +1,12 @@ @@ -1,8 +1,12 @@
package acr.browser.lightning;
package acr.browser.lightning.activity;
import java.util.ArrayList;
import java.util.List;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.R;
import acr.browser.lightning.utils.Utils;
import acr.browser.lightning.reading.HtmlFetcher;
import acr.browser.lightning.reading.JResult;
import android.animation.ObjectAnimator;

7
app/src/main/java/acr/browser/lightning/SettingsActivity.java → app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.activity;
import android.annotation.SuppressLint;
import android.app.Activity;
@ -23,6 +23,11 @@ import android.widget.CompoundButton; @@ -23,6 +23,11 @@ import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.EditText;
import android.widget.RelativeLayout;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.R;
import acr.browser.lightning.utils.Utils;
import info.guardianproject.onionkit.ui.OrbotHelper;
public class SettingsActivity extends ThemableSettingsActivity {

5
app/src/main/java/acr/browser/lightning/ThemableActivity.java → app/src/main/java/acr/browser/lightning/activity/ThemableActivity.java
Unescape View File

@ -1,9 +1,12 @@ @@ -1,9 +1,12 @@
package acr.browser.lightning;
package acr.browser.lightning.activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.R;
public abstract class ThemableActivity extends ActionBarActivity {
private boolean mDark;

5
app/src/main/java/acr/browser/lightning/ThemableSettingsActivity.java → app/src/main/java/acr/browser/lightning/activity/ThemableSettingsActivity.java
Unescape View File

@ -1,9 +1,12 @@ @@ -1,9 +1,12 @@
package acr.browser.lightning;
package acr.browser.lightning.activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.R;
public abstract class ThemableSettingsActivity extends ActionBarActivity {
private boolean mDark;

5
app/src/main/java/acr/browser/lightning/BookmarkPage.java → app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java
Unescape View File

@ -1,7 +1,10 @@ @@ -1,7 +1,10 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.constant;
import acr.browser.lightning.R;
import acr.browser.lightning.activity.BrowserApp;
public class BookmarkPage {

2
app/src/main/java/acr/browser/lightning/Constants.java → app/src/main/java/acr/browser/lightning/constant/Constants.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.constant;
import android.os.Environment;

7
app/src/main/java/acr/browser/lightning/HistoryPage.java → app/src/main/java/acr/browser/lightning/constant/HistoryPage.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.constant;
import java.io.File;
import java.io.FileWriter;
@ -11,6 +11,11 @@ import java.util.List; @@ -11,6 +11,11 @@ import java.util.List;
import android.content.Context;
import acr.browser.lightning.activity.BrowserApp;
import acr.browser.lightning.database.HistoryItem;
import acr.browser.lightning.R;
import acr.browser.lightning.database.HistoryDatabase;
public class HistoryPage {
private static final String FILENAME = "history.html";

7
app/src/main/java/acr/browser/lightning/HomepageVariables.java → app/src/main/java/acr/browser/lightning/constant/StartPage.java
Unescape View File

@ -1,9 +1,12 @@ @@ -1,9 +1,12 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.constant;
public class HomepageVariables {
import acr.browser.lightning.activity.BrowserApp;
import acr.browser.lightning.R;
public class StartPage {
public static final String HEAD = "<!DOCTYPE html><html xmlns=\"http://www.w3.org/1999/xhtml\">"
+ "<head>"

2
app/src/main/java/acr/browser/lightning/BrowserController.java → app/src/main/java/acr/browser/lightning/controller/BrowserController.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.controller;
import android.app.Activity;
import android.graphics.Bitmap;

7
app/src/main/java/acr/browser/lightning/BookmarkManager.java → app/src/main/java/acr/browser/lightning/database/BookmarkManager.java
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package acr.browser.lightning;
package acr.browser.lightning.database;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@ -24,6 +24,11 @@ import android.os.Environment; @@ -24,6 +24,11 @@ import android.os.Environment;
import android.provider.Browser;
import android.widget.Toast;
import acr.browser.lightning.R;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.utils.Utils;
public class BookmarkManager {
private Context mContext;

4
app/src/main/java/acr/browser/lightning/HistoryDatabase.java → app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.database;
import android.content.ContentValues;
import android.content.Context;
@ -11,6 +11,8 @@ import android.database.sqlite.SQLiteOpenHelper; @@ -11,6 +11,8 @@ import android.database.sqlite.SQLiteOpenHelper;
import java.util.ArrayList;
import java.util.List;
import acr.browser.lightning.R;
public class HistoryDatabase extends SQLiteOpenHelper {
// All Static variables

2
app/src/main/java/acr/browser/lightning/HistoryItem.java → app/src/main/java/acr/browser/lightning/database/HistoryItem.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.database;
import android.graphics.Bitmap;

5
app/src/main/java/acr/browser/lightning/DownloadHandler.java → app/src/main/java/acr/browser/lightning/download/DownloadHandler.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.download;
import android.app.Activity;
import android.app.AlertDialog;
@ -20,6 +20,9 @@ import android.webkit.CookieManager; @@ -20,6 +20,9 @@ import android.webkit.CookieManager;
import android.webkit.URLUtil;
import android.widget.Toast;
import acr.browser.lightning.R;
import acr.browser.lightning.preference.PreferenceManager;
/**
* Handle download requests
*/

4
app/src/main/java/acr/browser/lightning/FetchUrlMimeType.java → app/src/main/java/acr/browser/lightning/download/FetchUrlMimeType.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.download;
import android.app.DownloadManager;
import android.content.Context;
@ -14,6 +14,8 @@ import java.io.IOException; @@ -14,6 +14,8 @@ import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
import acr.browser.lightning.R;
/**
* This class is used to pull down the http headers of a given URL so that we
* can analyse the mimetype and make any correction needed before we give the

8
app/src/main/java/acr/browser/lightning/LightningDownloadListener.java → app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.download;
import android.app.Activity;
import android.app.AlertDialog;
@ -10,11 +10,15 @@ import android.util.Log; @@ -10,11 +10,15 @@ import android.util.Log;
import android.webkit.DownloadListener;
import android.webkit.URLUtil;
import acr.browser.lightning.R;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.download.DownloadHandler;
public class LightningDownloadListener implements DownloadListener {
private Activity mActivity;
LightningDownloadListener(Activity activity) {
public LightningDownloadListener(Activity activity) {
mActivity = activity;
}

2
app/src/main/java/acr/browser/lightning/WebAddress.java → app/src/main/java/acr/browser/lightning/download/WebAddress.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.download;
import java.util.Locale;
import java.util.regex.Matcher;

4
app/src/main/java/acr/browser/lightning/ClickHandler.java → app/src/main/java/acr/browser/lightning/object/ClickHandler.java
Unescape View File

@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.object;
import android.content.Context;
import android.os.Handler;
import android.os.Message;
import acr.browser.lightning.controller.BrowserController;
public class ClickHandler extends Handler {
private BrowserController mBrowserController;

6
app/src/main/java/acr/browser/lightning/DrawerArrowDrawable.java → app/src/main/java/acr/browser/lightning/object/DrawerArrowDrawable.java
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package acr.browser.lightning;
package acr.browser.lightning.object;
/*
* Copyright (C) 2014 The Android Open Source Project
@ -30,7 +30,7 @@ import android.support.v7.appcompat.R; @@ -30,7 +30,7 @@ import android.support.v7.appcompat.R;
* A drawable that can draw a "Drawer hamburger" menu or an Arrow and animate
* between them.
*/
class DrawerArrowDrawable extends Drawable {
public class DrawerArrowDrawable extends Drawable {
private final Paint mPaint = new Paint();
// The angle in degress that the arrow head is inclined at.
private static final float ARROW_HEAD_ANGLE = (float) Math.toRadians(45);
@ -60,7 +60,7 @@ class DrawerArrowDrawable extends Drawable { @@ -60,7 +60,7 @@ class DrawerArrowDrawable extends Drawable {
* @param context
* used to get the configuration for the drawable from
*/
DrawerArrowDrawable(Context context) {
public DrawerArrowDrawable(Context context) {
final TypedArray typedArray = context.getTheme().obtainStyledAttributes(null,
R.styleable.DrawerArrowToggle, R.attr.drawerArrowStyle,
R.style.Base_Widget_AppCompat_DrawerArrowToggle);

8
app/src/main/java/acr/browser/lightning/SearchAdapter.java → app/src/main/java/acr/browser/lightning/object/SearchAdapter.java
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package acr.browser.lightning;
package acr.browser.lightning.object;
import java.io.BufferedInputStream;
import java.io.File;
@ -36,6 +36,12 @@ import android.widget.Filterable; @@ -36,6 +36,12 @@ import android.widget.Filterable;
import android.widget.ImageView;
import android.widget.TextView;
import acr.browser.lightning.R;
import acr.browser.lightning.database.BookmarkManager;
import acr.browser.lightning.database.HistoryDatabase;
import acr.browser.lightning.database.HistoryItem;
import acr.browser.lightning.preference.PreferenceManager;
public class SearchAdapter extends BaseAdapter implements Filterable {
private List<HistoryItem> mHistory;

5
app/src/main/java/acr/browser/lightning/PreferenceManager.java → app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java
Unescape View File

@ -1,8 +1,11 @@ @@ -1,8 +1,11 @@
package acr.browser.lightning;
package acr.browser.lightning.preference;
import android.content.SharedPreferences;
import android.os.Environment;
import acr.browser.lightning.activity.BrowserApp;
import acr.browser.lightning.constant.Constants;
public class PreferenceManager {
private static class Name {

2
app/src/main/java/acr/browser/lightning/reading/Converter.java
Unescape View File

@ -20,7 +20,7 @@ import java.net.SocketTimeoutException; @@ -20,7 +20,7 @@ import java.net.SocketTimeoutException;
import java.nio.charset.Charset;
import java.util.Locale;
import acr.browser.lightning.Constants;
import acr.browser.lightning.constant.Constants;
import android.util.Log;
/**

2
app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java
Unescape View File

@ -33,7 +33,7 @@ import java.util.zip.GZIPInputStream; @@ -33,7 +33,7 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
import acr.browser.lightning.Constants;
import acr.browser.lightning.constant.Constants;
import android.util.Log;
/**

5
app/src/main/java/acr/browser/lightning/AdBlock.java → app/src/main/java/acr/browser/lightning/utils/AdBlock.java
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package acr.browser.lightning;
package acr.browser.lightning.utils;
import android.content.Context;
import android.content.res.AssetManager;
@ -13,6 +13,9 @@ import java.util.HashSet; @@ -13,6 +13,9 @@ import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.preference.PreferenceManager;
public class AdBlock {
private static final String TAG = "AdBlock";

4
app/src/main/java/acr/browser/lightning/IntentUtils.java → app/src/main/java/acr/browser/lightning/utils/IntentUtils.java
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package acr.browser.lightning;
package acr.browser.lightning.utils;
import android.app.Activity;
import android.content.ActivityNotFoundException;
@ -15,6 +15,8 @@ import java.util.List; @@ -15,6 +15,8 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import acr.browser.lightning.controller.BrowserController;
public class IntentUtils {
private Activity mActivity;

7
app/src/main/java/acr/browser/lightning/Utils.java → app/src/main/java/acr/browser/lightning/utils/Utils.java
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/*
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.utils;
import android.annotation.SuppressLint;
import android.app.Activity;
@ -28,6 +28,11 @@ import java.util.ArrayList; @@ -28,6 +28,11 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.database.HistoryItem;
import acr.browser.lightning.R;
import acr.browser.lightning.download.DownloadHandler;
public final class Utils {
private Utils() {

4
app/src/main/java/acr/browser/lightning/AnimatedProgressBar.java → app/src/main/java/acr/browser/lightning/view/AnimatedProgressBar.java
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package acr.browser.lightning;
package acr.browser.lightning.view;
import android.animation.ObjectAnimator;
import android.content.Context;
@ -15,6 +15,8 @@ import android.view.animation.DecelerateInterpolator; @@ -15,6 +15,8 @@ import android.view.animation.DecelerateInterpolator;
import android.view.animation.Transformation;
import android.widget.LinearLayout;
import acr.browser.lightning.R;
/**
* Copyright 11/4/2014 Anthony Restaino
* <p/>

18
app/src/main/java/acr/browser/lightning/LightningView.java → app/src/main/java/acr/browser/lightning/view/LightningView.java
Unescape View File

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
* Copyright 2014 A.C.R. Development
*/
package acr.browser.lightning;
package acr.browser.lightning.view;
import java.io.ByteArrayInputStream;
import java.io.File;
@ -52,6 +52,16 @@ import android.webkit.WebViewClient; @@ -52,6 +52,16 @@ import android.webkit.WebViewClient;
import android.widget.EditText;
import android.widget.LinearLayout;
import acr.browser.lightning.controller.BrowserController;
import acr.browser.lightning.constant.Constants;
import acr.browser.lightning.constant.StartPage;
import acr.browser.lightning.download.LightningDownloadListener;
import acr.browser.lightning.preference.PreferenceManager;
import acr.browser.lightning.R;
import acr.browser.lightning.utils.AdBlock;
import acr.browser.lightning.utils.IntentUtils;
import acr.browser.lightning.utils.Utils;
public class LightningView {
private Title mTitle;
@ -142,7 +152,7 @@ public class LightningView { @@ -142,7 +152,7 @@ public class LightningView {
public String getHomepage() {
StringBuilder homepageBuilder = new StringBuilder();
homepageBuilder.append(HomepageVariables.HEAD);
homepageBuilder.append(StartPage.HEAD);
String icon;
String searchUrl;
switch (mPreferences.getSearchChoice()) {
@ -218,9 +228,9 @@ public class LightningView { @@ -218,9 +228,9 @@ public class LightningView {
}
homepageBuilder.append(icon);
homepageBuilder.append(HomepageVariables.MIDDLE);
homepageBuilder.append(StartPage.MIDDLE);
homepageBuilder.append(searchUrl);
homepageBuilder.append(HomepageVariables.END);
homepageBuilder.append(StartPage.END);
File homepage = new File(mActivity.getFilesDir(), "homepage.html");
try {

2
app/src/main/res/layout/toolbar.xml
Unescape View File

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:background="?attr/progressBackgroundColor" >
<acr.browser.lightning.AnimatedProgressBar
<acr.browser.lightning.view.AnimatedProgressBar
android:id="@+id/progress_view"
android:layout_width="match_parent"
android:layout_height="2dp"

Write Preview
Loading…
Cancel
Save