Browse Source

Switch to gradle!!!

master
Anthony Restaino 9 years ago
parent
commit
ce3923d336
  1. 8
      .gitignore
  2. 19
      Lightning-Browser-AS.iml
  3. 19
      Lightning-Browser.iml
  4. 2
      ant.properties
  5. 100
      app/app.iml
  6. 30
      app/build.gradle
  7. 0
      app/libs/jsoup-1.8.1.jar
  8. 98
      app/lightningBrowserPlus.iml
  9. 7
      app/lint.xml
  10. 0
      app/proguard-project.txt
  11. 0
      app/src/main/AndroidManifest.xml
  12. 0
      app/src/main/assets/ask.png
  13. 0
      app/src/main/assets/baidu.png
  14. 0
      app/src/main/assets/bing.png
  15. 0
      app/src/main/assets/duckduckgo.png
  16. 0
      app/src/main/assets/google.png
  17. 0
      app/src/main/assets/hosts.txt
  18. 0
      app/src/main/assets/lightning.png
  19. 0
      app/src/main/assets/startpage.png
  20. 0
      app/src/main/assets/yahoo.png
  21. 0
      app/src/main/assets/yandex.png
  22. 0
      app/src/main/java/acr/browser/lightning/AboutSettingsActivity.java
  23. 0
      app/src/main/java/acr/browser/lightning/AdBlock.java
  24. 0
      app/src/main/java/acr/browser/lightning/AdvancedSettingsActivity.java
  25. 0
      app/src/main/java/acr/browser/lightning/AnimatedProgressBar.java
  26. 0
      app/src/main/java/acr/browser/lightning/BookmarkActivity.java
  27. 0
      app/src/main/java/acr/browser/lightning/BookmarkManager.java
  28. 0
      app/src/main/java/acr/browser/lightning/BookmarkPage.java
  29. 66
      app/src/main/java/acr/browser/lightning/BrowserActivity.java
  30. 0
      app/src/main/java/acr/browser/lightning/BrowserApp.java
  31. 0
      app/src/main/java/acr/browser/lightning/BrowserController.java
  32. 0
      app/src/main/java/acr/browser/lightning/ClickHandler.java
  33. 0
      app/src/main/java/acr/browser/lightning/Constants.java
  34. 0
      app/src/main/java/acr/browser/lightning/DisplaySettingsActivity.java
  35. 0
      app/src/main/java/acr/browser/lightning/DownloadHandler.java
  36. 0
      app/src/main/java/acr/browser/lightning/DrawerArrowDrawable.java
  37. 0
      app/src/main/java/acr/browser/lightning/FetchUrlMimeType.java
  38. 0
      app/src/main/java/acr/browser/lightning/GeneralSettingsActivity.java
  39. 0
      app/src/main/java/acr/browser/lightning/HistoryDatabase.java
  40. 0
      app/src/main/java/acr/browser/lightning/HistoryItem.java
  41. 0
      app/src/main/java/acr/browser/lightning/HistoryPage.java
  42. 0
      app/src/main/java/acr/browser/lightning/HomepageVariables.java
  43. 0
      app/src/main/java/acr/browser/lightning/IncognitoActivity.java
  44. 0
      app/src/main/java/acr/browser/lightning/IntentUtils.java
  45. 0
      app/src/main/java/acr/browser/lightning/LicenseActivity.java
  46. 0
      app/src/main/java/acr/browser/lightning/LightningDownloadListener.java
  47. 0
      app/src/main/java/acr/browser/lightning/LightningView.java
  48. 0
      app/src/main/java/acr/browser/lightning/MainActivity.java
  49. 0
      app/src/main/java/acr/browser/lightning/PreferenceManager.java
  50. 0
      app/src/main/java/acr/browser/lightning/PrivacySettingsActivity.java
  51. 0
      app/src/main/java/acr/browser/lightning/ReadingActivity.java
  52. 0
      app/src/main/java/acr/browser/lightning/ReplacingInputStream.java
  53. 0
      app/src/main/java/acr/browser/lightning/SearchAdapter.java
  54. 0
      app/src/main/java/acr/browser/lightning/SettingsActivity.java
  55. 0
      app/src/main/java/acr/browser/lightning/ThemableActivity.java
  56. 0
      app/src/main/java/acr/browser/lightning/ThemableSettingsActivity.java
  57. 0
      app/src/main/java/acr/browser/lightning/Utils.java
  58. 0
      app/src/main/java/acr/browser/lightning/WebAddress.java
  59. 0
      app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java
  60. 0
      app/src/main/java/acr/browser/lightning/reading/Converter.java
  61. 0
      app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java
  62. 0
      app/src/main/java/acr/browser/lightning/reading/ImageResult.java
  63. 0
      app/src/main/java/acr/browser/lightning/reading/JResult.java
  64. 0
      app/src/main/java/acr/browser/lightning/reading/MapEntry.java
  65. 0
      app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java
  66. 0
      app/src/main/java/acr/browser/lightning/reading/SCache.java
  67. 0
      app/src/main/java/acr/browser/lightning/reading/SHelper.java
  68. 0
      app/src/main/res/anim/slide_down.xml
  69. 0
      app/src/main/res/anim/slide_up.xml
  70. 0
      app/src/main/res/drawable-hdpi/drawer_left_shadow.9.png
  71. 0
      app/src/main/res/drawable-hdpi/drawer_right_shadow.9.png
  72. 0
      app/src/main/res/drawable-hdpi/ic_action_back.png
  73. 0
      app/src/main/res/drawable-hdpi/ic_action_back_dark.png
  74. 0
      app/src/main/res/drawable-hdpi/ic_action_collapse.png
  75. 0
      app/src/main/res/drawable-hdpi/ic_action_copy.png
  76. 0
      app/src/main/res/drawable-hdpi/ic_action_delete.png
  77. 0
      app/src/main/res/drawable-hdpi/ic_action_delete_dark.png
  78. 0
      app/src/main/res/drawable-hdpi/ic_action_expand.png
  79. 0
      app/src/main/res/drawable-hdpi/ic_action_forward.png
  80. 0
      app/src/main/res/drawable-hdpi/ic_action_forward_dark.png
  81. 0
      app/src/main/res/drawable-hdpi/ic_action_invert_dark.png
  82. 0
      app/src/main/res/drawable-hdpi/ic_action_invert_light.png
  83. 0
      app/src/main/res/drawable-hdpi/ic_action_menu.png
  84. 0
      app/src/main/res/drawable-hdpi/ic_action_plus.png
  85. 0
      app/src/main/res/drawable-hdpi/ic_action_plus_dark.png
  86. 0
      app/src/main/res/drawable-hdpi/ic_action_refresh.png
  87. 0
      app/src/main/res/drawable-hdpi/ic_action_star.png
  88. 0
      app/src/main/res/drawable-hdpi/ic_action_star_dark.png
  89. 0
      app/src/main/res/drawable-hdpi/ic_action_tabs_dark.png
  90. 0
      app/src/main/res/drawable-hdpi/ic_action_tabs_light.png
  91. 0
      app/src/main/res/drawable-hdpi/ic_action_text_size_dark.png
  92. 0
      app/src/main/res/drawable-hdpi/ic_action_text_size_light.png
  93. 0
      app/src/main/res/drawable-hdpi/ic_bookmark.png
  94. 0
      app/src/main/res/drawable-hdpi/ic_bookmark_dark.png
  95. 0
      app/src/main/res/drawable-hdpi/ic_drawer.png
  96. 0
      app/src/main/res/drawable-hdpi/ic_history.png
  97. 0
      app/src/main/res/drawable-hdpi/ic_history_dark.png
  98. 0
      app/src/main/res/drawable-hdpi/ic_search.png
  99. 0
      app/src/main/res/drawable-hdpi/ic_search_dark.png
  100. 0
      app/src/main/res/drawable-hdpi/ic_webpage.png
  101. Some files were not shown because too many files have changed in this diff Show More

8
.gitignore vendored

@ -1,3 +1,11 @@ @@ -1,3 +1,11 @@
# Android Studio
.gradle
/local.properties
/.idea/workspace.xml
/.idea/libraries
.DS_Store
/build
#################
## Eclipse
#################

19
Lightning-Browser-AS.iml

@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="Lightning-Browser" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

19
Lightning-Browser.iml

@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="Lightning-Browser" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

2
ant.properties

@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
java.source=1.7
java.target=1.7

100
app/app.iml

@ -0,0 +1,100 @@ @@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Lightning-Browser" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/palette-v7/22.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
<orderEntry type="library" exported="" name="palette-v7-22.1.1" level="project" />
<orderEntry type="library" exported="" name="core-1.51.0.0" level="project" />
<orderEntry type="library" exported="" name="jsoup-1.8.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
<orderEntry type="module" module-name="libnetcipher" exported="" />
</component>
</module>

30
app/build.gradle

@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
defaultConfig {
applicationId "acr.browser.lightning"
minSdkVersion 14
targetSdkVersion 22
}
buildTypes {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
}
debug {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
}
}
}
dependencies {
compile project(':libnetcipher')
compile 'com.android.support:palette-v7:22.1.1'
compile 'com.android.support:appcompat-v7:22.1.1'
compile files('libs/jsoup-1.8.1.jar')
}

0
libs/jsoup-1.8.1.jar → app/libs/jsoup-1.8.1.jar

98
app/lightningBrowserPlus.iml

@ -0,0 +1,98 @@ @@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Lightning-Browser" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/palette-v7/22.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
<orderEntry type="library" exported="" name="palette-v7-22.1.1" level="project" />
<orderEntry type="library" exported="" name="jsoup-1.8.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
<orderEntry type="module" module-name="libnetcipher" exported="" />
</component>
</module>

7
app/lint.xml

@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<lint>
<issue id="all">
<ignore path="external/**" />
</issue>
<issue id="NewApi" severity="ignore" />
</lint>

0
proguard-project.txt → app/proguard-project.txt

0
AndroidManifest.xml → app/src/main/AndroidManifest.xml

0
assets/ask.png → app/src/main/assets/ask.png

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 89 KiB

0
assets/baidu.png → app/src/main/assets/baidu.png

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
assets/bing.png → app/src/main/assets/bing.png

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
assets/duckduckgo.png → app/src/main/assets/duckduckgo.png

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
assets/google.png → app/src/main/assets/google.png

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
assets/hosts.txt → app/src/main/assets/hosts.txt

0
assets/lightning.png → app/src/main/assets/lightning.png

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

0
assets/startpage.png → app/src/main/assets/startpage.png

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
assets/yahoo.png → app/src/main/assets/yahoo.png

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

0
assets/yandex.png → app/src/main/assets/yandex.png

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
src/acr/browser/lightning/AboutSettingsActivity.java → app/src/main/java/acr/browser/lightning/AboutSettingsActivity.java

0
src/acr/browser/lightning/AdBlock.java → app/src/main/java/acr/browser/lightning/AdBlock.java

0
src/acr/browser/lightning/AdvancedSettingsActivity.java → app/src/main/java/acr/browser/lightning/AdvancedSettingsActivity.java

0
src/acr/browser/lightning/AnimatedProgressBar.java → app/src/main/java/acr/browser/lightning/AnimatedProgressBar.java

0
src/acr/browser/lightning/BookmarkActivity.java → app/src/main/java/acr/browser/lightning/BookmarkActivity.java

0
src/acr/browser/lightning/BookmarkManager.java → app/src/main/java/acr/browser/lightning/BookmarkManager.java

0
src/acr/browser/lightning/BookmarkPage.java → app/src/main/java/acr/browser/lightning/BookmarkPage.java

66
src/acr/browser/lightning/BrowserActivity.java → app/src/main/java/acr/browser/lightning/BrowserActivity.java

@ -18,6 +18,7 @@ import android.database.sqlite.SQLiteException; @@ -18,6 +18,7 @@ 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;
@ -627,7 +628,6 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll @@ -627,7 +628,6 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll
mFullScreen = mPreferences.getFullScreenEnabled();
mColorMode = mPreferences.getColorModeEnabled();
mColorMode &= !mDarkTheme;
if (!isIncognito() && !mColorMode && !mDarkTheme && mWebpageBitmap != null) {
changeToolbarBackground(mWebpageBitmap);
} else if (!isIncognito() && mCurrentView != null && !mDarkTheme
@ -1533,44 +1533,44 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll @@ -1533,44 +1533,44 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll
}
private void changeToolbarBackground(Bitmap favicon) {
android.support.v7.graphics.Palette.generateAsync(favicon,
new android.support.v7.graphics.Palette.PaletteAsyncListener() {
Palette.from(favicon).generate(new Palette.PaletteAsyncListener() {
@Override
public void onGenerated(Palette palette) {
// OR with opaque black to remove transparency glitches
int color = 0xff000000 | palette.getVibrantColor(mActivity.getResources()
.getColor(R.color.primary_color));
int finalColor; // Lighten up the dark color if it is
// too dark
if (isColorTooDark(color)) {
finalColor = mixTwoColors(
mActivity.getResources().getColor(R.color.primary_color),
color, 0.25f);
} else {
finalColor = color;
}
@Override
public void onGenerated(Palette palette) {
// OR with opaque black to remove transparency glitches
int color = 0xff000000 | palette.getVibrantColor(mActivity.getResources()
.getColor(R.color.primary_color));
int finalColor; // Lighten up the dark color if it is
// too dark
if (isColorTooDark(color)) {
finalColor = mixTwoColors(
mActivity.getResources().getColor(R.color.primary_color),
color, 0.25f);
} else {
finalColor = color;
}
ValueAnimator anim = ValueAnimator.ofObject(new ArgbEvaluator(),
mBackground.getColor(), finalColor);
ValueAnimator anim = ValueAnimator.ofObject(new ArgbEvaluator(),
mBackground.getColor(), finalColor);
anim.addUpdateListener(new AnimatorUpdateListener() {
anim.addUpdateListener(new AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
int color = (Integer) animation.getAnimatedValue();
mBackground.setColor(color);
getWindow().setBackgroundDrawable(mBackground);
mToolbarLayout.setBackgroundColor(color);
}
@Override
public void onAnimationUpdate(ValueAnimator animation) {
int color = (Integer) animation.getAnimatedValue();
mBackground.setColor(color);
getWindow().setBackgroundDrawable(mBackground);
mToolbarLayout.setBackgroundColor(color);
}
});
});
anim.setDuration(300);
anim.start();
anim.setDuration(300);
anim.start();
}
});
}
});
}
public static boolean isColorTooDark(int color) {

0
src/acr/browser/lightning/BrowserApp.java → app/src/main/java/acr/browser/lightning/BrowserApp.java

0
src/acr/browser/lightning/BrowserController.java → app/src/main/java/acr/browser/lightning/BrowserController.java

0
src/acr/browser/lightning/ClickHandler.java → app/src/main/java/acr/browser/lightning/ClickHandler.java

0
src/acr/browser/lightning/Constants.java → app/src/main/java/acr/browser/lightning/Constants.java

0
src/acr/browser/lightning/DisplaySettingsActivity.java → app/src/main/java/acr/browser/lightning/DisplaySettingsActivity.java

0
src/acr/browser/lightning/DownloadHandler.java → app/src/main/java/acr/browser/lightning/DownloadHandler.java

0
src/acr/browser/lightning/DrawerArrowDrawable.java → app/src/main/java/acr/browser/lightning/DrawerArrowDrawable.java

0
src/acr/browser/lightning/FetchUrlMimeType.java → app/src/main/java/acr/browser/lightning/FetchUrlMimeType.java

0
src/acr/browser/lightning/GeneralSettingsActivity.java → app/src/main/java/acr/browser/lightning/GeneralSettingsActivity.java

0
src/acr/browser/lightning/HistoryDatabase.java → app/src/main/java/acr/browser/lightning/HistoryDatabase.java

0
src/acr/browser/lightning/HistoryItem.java → app/src/main/java/acr/browser/lightning/HistoryItem.java

0
src/acr/browser/lightning/HistoryPage.java → app/src/main/java/acr/browser/lightning/HistoryPage.java

0
src/acr/browser/lightning/HomepageVariables.java → app/src/main/java/acr/browser/lightning/HomepageVariables.java

0
src/acr/browser/lightning/IncognitoActivity.java → app/src/main/java/acr/browser/lightning/IncognitoActivity.java

0
src/acr/browser/lightning/IntentUtils.java → app/src/main/java/acr/browser/lightning/IntentUtils.java

0
src/acr/browser/lightning/LicenseActivity.java → app/src/main/java/acr/browser/lightning/LicenseActivity.java

0
src/acr/browser/lightning/LightningDownloadListener.java → app/src/main/java/acr/browser/lightning/LightningDownloadListener.java

0
src/acr/browser/lightning/LightningView.java → app/src/main/java/acr/browser/lightning/LightningView.java

0
src/acr/browser/lightning/MainActivity.java → app/src/main/java/acr/browser/lightning/MainActivity.java

0
src/acr/browser/lightning/PreferenceManager.java → app/src/main/java/acr/browser/lightning/PreferenceManager.java

0
src/acr/browser/lightning/PrivacySettingsActivity.java → app/src/main/java/acr/browser/lightning/PrivacySettingsActivity.java

0
src/acr/browser/lightning/ReadingActivity.java → app/src/main/java/acr/browser/lightning/ReadingActivity.java

0
src/acr/browser/lightning/ReplacingInputStream.java → app/src/main/java/acr/browser/lightning/ReplacingInputStream.java

0
src/acr/browser/lightning/SearchAdapter.java → app/src/main/java/acr/browser/lightning/SearchAdapter.java

0
src/acr/browser/lightning/SettingsActivity.java → app/src/main/java/acr/browser/lightning/SettingsActivity.java

0
src/acr/browser/lightning/ThemableActivity.java → app/src/main/java/acr/browser/lightning/ThemableActivity.java

0
src/acr/browser/lightning/ThemableSettingsActivity.java → app/src/main/java/acr/browser/lightning/ThemableSettingsActivity.java

0
src/acr/browser/lightning/Utils.java → app/src/main/java/acr/browser/lightning/Utils.java

0
src/acr/browser/lightning/WebAddress.java → app/src/main/java/acr/browser/lightning/WebAddress.java

0
src/acr/browser/lightning/Reading/ArticleTextExtractor.java → app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java

0
src/acr/browser/lightning/Reading/Converter.java → app/src/main/java/acr/browser/lightning/reading/Converter.java

0
src/acr/browser/lightning/Reading/HtmlFetcher.java → app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java

0
src/acr/browser/lightning/Reading/ImageResult.java → app/src/main/java/acr/browser/lightning/reading/ImageResult.java

0
src/acr/browser/lightning/Reading/JResult.java → app/src/main/java/acr/browser/lightning/reading/JResult.java

0
src/acr/browser/lightning/Reading/MapEntry.java → app/src/main/java/acr/browser/lightning/reading/MapEntry.java

0
src/acr/browser/lightning/Reading/OutputFormatter.java → app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java

0
src/acr/browser/lightning/Reading/SCache.java → app/src/main/java/acr/browser/lightning/reading/SCache.java

0
src/acr/browser/lightning/Reading/SHelper.java → app/src/main/java/acr/browser/lightning/reading/SHelper.java

0
res/anim/slide_down.xml → app/src/main/res/anim/slide_down.xml

0
res/anim/slide_up.xml → app/src/main/res/anim/slide_up.xml

0
res/drawable-hdpi/drawer_left_shadow.9.png → app/src/main/res/drawable-hdpi/drawer_left_shadow.9.png

Before

Width:  |  Height:  |  Size: 171 B

After

Width:  |  Height:  |  Size: 171 B

0
res/drawable-hdpi/drawer_right_shadow.9.png → app/src/main/res/drawable-hdpi/drawer_right_shadow.9.png

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 226 B

0
res/drawable-hdpi/ic_action_back.png → app/src/main/res/drawable-hdpi/ic_action_back.png

Before

Width:  |  Height:  |  Size: 297 B

After

Width:  |  Height:  |  Size: 297 B

0
res/drawable-hdpi/ic_action_back_dark.png → app/src/main/res/drawable-hdpi/ic_action_back_dark.png

Before

Width:  |  Height:  |  Size: 262 B

After

Width:  |  Height:  |  Size: 262 B

0
res/drawable-hdpi/ic_action_collapse.png → app/src/main/res/drawable-hdpi/ic_action_collapse.png

Before

Width:  |  Height:  |  Size: 509 B

After

Width:  |  Height:  |  Size: 509 B

0
res/drawable-hdpi/ic_action_copy.png → app/src/main/res/drawable-hdpi/ic_action_copy.png

Before

Width:  |  Height:  |  Size: 353 B

After

Width:  |  Height:  |  Size: 353 B

0
res/drawable-hdpi/ic_action_delete.png → app/src/main/res/drawable-hdpi/ic_action_delete.png

Before

Width:  |  Height:  |  Size: 371 B

After

Width:  |  Height:  |  Size: 371 B

0
res/drawable-hdpi/ic_action_delete_dark.png → app/src/main/res/drawable-hdpi/ic_action_delete_dark.png

Before

Width:  |  Height:  |  Size: 355 B

After

Width:  |  Height:  |  Size: 355 B

0
res/drawable-hdpi/ic_action_expand.png → app/src/main/res/drawable-hdpi/ic_action_expand.png

Before

Width:  |  Height:  |  Size: 546 B

After

Width:  |  Height:  |  Size: 546 B

0
res/drawable-hdpi/ic_action_forward.png → app/src/main/res/drawable-hdpi/ic_action_forward.png

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

0
res/drawable-hdpi/ic_action_forward_dark.png → app/src/main/res/drawable-hdpi/ic_action_forward_dark.png

Before

Width:  |  Height:  |  Size: 268 B

After

Width:  |  Height:  |  Size: 268 B

0
res/drawable-hdpi/ic_action_invert_dark.png → app/src/main/res/drawable-hdpi/ic_action_invert_dark.png

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 304 B

0
res/drawable-hdpi/ic_action_invert_light.png → app/src/main/res/drawable-hdpi/ic_action_invert_light.png

Before

Width:  |  Height:  |  Size: 332 B

After

Width:  |  Height:  |  Size: 332 B

0
res/drawable-hdpi/ic_action_menu.png → app/src/main/res/drawable-hdpi/ic_action_menu.png

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

0
res/drawable-hdpi/ic_action_plus.png → app/src/main/res/drawable-hdpi/ic_action_plus.png

Before

Width:  |  Height:  |  Size: 181 B

After

Width:  |  Height:  |  Size: 181 B

0
res/drawable-hdpi/ic_action_plus_dark.png → app/src/main/res/drawable-hdpi/ic_action_plus_dark.png

Before

Width:  |  Height:  |  Size: 166 B

After

Width:  |  Height:  |  Size: 166 B

0
res/drawable-hdpi/ic_action_refresh.png → app/src/main/res/drawable-hdpi/ic_action_refresh.png

Before

Width:  |  Height:  |  Size: 753 B

After

Width:  |  Height:  |  Size: 753 B

0
res/drawable-hdpi/ic_action_star.png → app/src/main/res/drawable-hdpi/ic_action_star.png

Before

Width:  |  Height:  |  Size: 820 B

After

Width:  |  Height:  |  Size: 820 B

0
res/drawable-hdpi/ic_action_star_dark.png → app/src/main/res/drawable-hdpi/ic_action_star_dark.png

Before

Width:  |  Height:  |  Size: 652 B

After

Width:  |  Height:  |  Size: 652 B

0
res/drawable-hdpi/ic_action_tabs_dark.png → app/src/main/res/drawable-hdpi/ic_action_tabs_dark.png

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 165 B

0
res/drawable-hdpi/ic_action_tabs_light.png → app/src/main/res/drawable-hdpi/ic_action_tabs_light.png

Before

Width:  |  Height:  |  Size: 178 B

After

Width:  |  Height:  |  Size: 178 B

0
res/drawable-hdpi/ic_action_text_size_dark.png → app/src/main/res/drawable-hdpi/ic_action_text_size_dark.png

Before

Width:  |  Height:  |  Size: 210 B

After

Width:  |  Height:  |  Size: 210 B

0
res/drawable-hdpi/ic_action_text_size_light.png → app/src/main/res/drawable-hdpi/ic_action_text_size_light.png

Before

Width:  |  Height:  |  Size: 237 B

After

Width:  |  Height:  |  Size: 237 B

0
res/drawable-hdpi/ic_bookmark.png → app/src/main/res/drawable-hdpi/ic_bookmark.png

Before

Width:  |  Height:  |  Size: 617 B

After

Width:  |  Height:  |  Size: 617 B

0
res/drawable-hdpi/ic_bookmark_dark.png → app/src/main/res/drawable-hdpi/ic_bookmark_dark.png

Before

Width:  |  Height:  |  Size: 516 B

After

Width:  |  Height:  |  Size: 516 B

0
res/drawable-hdpi/ic_drawer.png → app/src/main/res/drawable-hdpi/ic_drawer.png

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
res/drawable-hdpi/ic_history.png → app/src/main/res/drawable-hdpi/ic_history.png

Before

Width:  |  Height:  |  Size: 756 B

After

Width:  |  Height:  |  Size: 756 B

0
res/drawable-hdpi/ic_history_dark.png → app/src/main/res/drawable-hdpi/ic_history_dark.png

Before

Width:  |  Height:  |  Size: 696 B

After

Width:  |  Height:  |  Size: 696 B

0
res/drawable-hdpi/ic_search.png → app/src/main/res/drawable-hdpi/ic_search.png

Before

Width:  |  Height:  |  Size: 748 B

After

Width:  |  Height:  |  Size: 748 B

0
res/drawable-hdpi/ic_search_dark.png → app/src/main/res/drawable-hdpi/ic_search_dark.png

Before

Width:  |  Height:  |  Size: 640 B

After

Width:  |  Height:  |  Size: 640 B

0
res/drawable-hdpi/ic_webpage.png → app/src/main/res/drawable-hdpi/ic_webpage.png

Before

Width:  |  Height:  |  Size: 805 B

After

Width:  |  Height:  |  Size: 805 B

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save