Browse Source

Remove unused resources, code cleanup

master
Anthony Restaino 10 years ago
parent
commit
e335a2b936
  1. 8
      app/build.gradle
  2. 2
      app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java
  3. 6
      app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java
  4. BIN
      app/src/main/res/drawable-hdpi/ic_action_menu.png
  5. BIN
      app/src/main/res/drawable-xhdpi/ic_action_menu.png
  6. BIN
      app/src/main/res/drawable-xhdpi/progress_bar.9.png
  7. BIN
      app/src/main/res/drawable-xhdpi/progress_bar_bg.9.png
  8. BIN
      app/src/main/res/drawable-xxhdpi/ic_action_menu.png
  9. 18
      app/src/main/res/drawable/progress.xml
  10. 4
      app/src/main/res/values-v21/styles.xml

8
app/build.gradle

@ -8,8 +8,8 @@ android {
applicationId "acr.browser.lightning" applicationId "acr.browser.lightning"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 22 targetSdkVersion 22
versionCode 77 versionCode 78
versionName "4.0.9a" versionName "4.0.10a"
} }
buildTypes { buildTypes {
@ -33,8 +33,8 @@ android {
dependencies { dependencies {
compile(project(':libnetcipher')) { compile(project(':libnetcipher')) {
// Exclude any support-v4 modules because appcompat-v7 will import the latest // Exclude any support-v4 modules because appcompat-v7 will import the latest
exclude module:'support-v4' exclude module: 'support-v4'
exclude module:'android-support-v4' exclude module: 'android-support-v4'
} }
compile 'com.android.support:palette-v7:22.1.1' compile 'com.android.support:palette-v7:22.1.1'
compile 'com.android.support:appcompat-v7:22.1.1' compile 'com.android.support:appcompat-v7:22.1.1'

2
app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java

@ -127,7 +127,7 @@ public class ArticleTextExtractor {
} }
public JResult extractContent(JResult res, Document doc, OutputFormatter formatter) public JResult extractContent(JResult res, Document doc, OutputFormatter formatter)
throws Exception { throws NullPointerException {
if (doc == null) if (doc == null)
throw new NullPointerException("missing document"); throw new NullPointerException("missing document");

6
app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java

@ -298,13 +298,13 @@ public class HtmlFetcher {
return SHelper.useDomainOfFirstArg4Second(url, urlOrPath); return SHelper.useDomainOfFirstArg4Second(url, urlOrPath);
} }
public String fetchAsString(String urlAsString, int timeout) throws MalformedURLException, public String fetchAsString(String urlAsString, int timeout) throws
IOException { IOException {
return fetchAsString(urlAsString, timeout, true); return fetchAsString(urlAsString, timeout, true);
} }
public String fetchAsString(String urlAsString, int timeout, boolean includeSomeGooseOptions) public String fetchAsString(String urlAsString, int timeout, boolean includeSomeGooseOptions)
throws MalformedURLException, IOException { throws IOException {
HttpURLConnection hConn = createUrlConnection(urlAsString, timeout, includeSomeGooseOptions); HttpURLConnection hConn = createUrlConnection(urlAsString, timeout, includeSomeGooseOptions);
hConn.setInstanceFollowRedirects(true); hConn.setInstanceFollowRedirects(true);
String encoding = hConn.getContentEncoding(); String encoding = hConn.getContentEncoding();
@ -401,7 +401,7 @@ public class HtmlFetcher {
} }
protected HttpURLConnection createUrlConnection(String urlAsStr, int timeout, protected HttpURLConnection createUrlConnection(String urlAsStr, int timeout,
boolean includeSomeGooseOptions) throws MalformedURLException, IOException { boolean includeSomeGooseOptions) throws IOException {
URL url = new URL(urlAsStr); URL url = new URL(urlAsStr);
// using proxy may increase latency // using proxy may increase latency
HttpURLConnection hConn = (HttpURLConnection) url.openConnection(Proxy.NO_PROXY); HttpURLConnection hConn = (HttpURLConnection) url.openConnection(Proxy.NO_PROXY);

BIN
app/src/main/res/drawable-hdpi/ic_action_menu.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 B

BIN
app/src/main/res/drawable-xhdpi/ic_action_menu.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 391 B

BIN
app/src/main/res/drawable-xhdpi/progress_bar.9.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 B

BIN
app/src/main/res/drawable-xhdpi/progress_bar_bg.9.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 179 B

BIN
app/src/main/res/drawable-xxhdpi/ic_action_menu.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 722 B

18
app/src/main/res/drawable/progress.xml

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background"
android:drawable="@drawable/progress_bar_bg" />
<item android:id="@android:id/secondaryProgress">
<scale android:scaleWidth="100%"
android:drawable="@drawable/progress_bar" />
</item>
<item android:id="@android:id/progress">
<scale android:scaleWidth="100%"
android:drawable="@drawable/progress_bar" />
</item>
</layer-list>

4
app/src/main/res/values-v21/styles.xml

@ -5,7 +5,7 @@
<!-- customize the color palette --> <!-- customize the color palette -->
<item name="toolbarSettingsBackground">@color/primary_color</item> <item name="toolbarSettingsBackground">@color/primary_color</item>
<item name="listBackground">@drawable/list_bg</item> <item name="listBackground">?attr/listChoiceBackgroundIndicator</item>
<item name="colorPrimary">@color/primary_color</item> <item name="colorPrimary">@color/primary_color</item>
<item name="colorPrimaryDark">@color/secondary_color_settings</item> <item name="colorPrimaryDark">@color/secondary_color_settings</item>
<item name="colorAccent">@color/accent_color</item> <item name="colorAccent">@color/accent_color</item>
@ -21,7 +21,7 @@
<!-- customize the color palette --> <!-- customize the color palette -->
<item name="toolbarSettingsBackground">@color/primary_color_dark</item> <item name="toolbarSettingsBackground">@color/primary_color_dark</item>
<item name="listBackground">@drawable/list_bg</item> <item name="listBackground">?attr/listChoiceBackgroundIndicator</item>
<item name="colorPrimary">@color/primary_color_dark</item> <item name="colorPrimary">@color/primary_color_dark</item>
<item name="colorPrimaryDark">@color/secondary_color_settings_dark</item> <item name="colorPrimaryDark">@color/secondary_color_settings_dark</item>
<item name="colorAccent">@color/accent_color</item> <item name="colorAccent">@color/accent_color</item>

Loading…
Cancel
Save