From ce3923d336f82d8b97b8058bae37b9847904323d Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 2 May 2015 12:40:40 -0400 Subject: [PATCH 01/22] Switch to gradle!!! --- .gitignore | 8 + Lightning-Browser-AS.iml | 19 ++ Lightning-Browser.iml | 19 ++ ant.properties | 2 - app/app.iml | 100 +++++++++++ app/build.gradle | 30 ++++ {libs => app/libs}/jsoup-1.8.1.jar | Bin app/lightningBrowserPlus.iml | 98 +++++++++++ app/lint.xml | 7 + .../proguard-project.txt | 0 .../src/main/AndroidManifest.xml | 0 {assets => app/src/main/assets}/ask.png | Bin {assets => app/src/main/assets}/baidu.png | Bin {assets => app/src/main/assets}/bing.png | Bin .../src/main/assets}/duckduckgo.png | Bin {assets => app/src/main/assets}/google.png | Bin {assets => app/src/main/assets}/hosts.txt | 0 {assets => app/src/main/assets}/lightning.png | Bin {assets => app/src/main/assets}/startpage.png | Bin {assets => app/src/main/assets}/yahoo.png | Bin {assets => app/src/main/assets}/yandex.png | Bin .../lightning/AboutSettingsActivity.java | 0 .../java}/acr/browser/lightning/AdBlock.java | 0 .../lightning/AdvancedSettingsActivity.java | 0 .../lightning/AnimatedProgressBar.java | 0 .../browser/lightning/BookmarkActivity.java | 0 .../browser/lightning/BookmarkManager.java | 0 .../acr/browser/lightning/BookmarkPage.java | 0 .../browser/lightning/BrowserActivity.java | 66 +++---- .../acr/browser/lightning/BrowserApp.java | 0 .../browser/lightning/BrowserController.java | 0 .../acr/browser/lightning/ClickHandler.java | 0 .../acr/browser/lightning/Constants.java | 0 .../lightning/DisplaySettingsActivity.java | 0 .../browser/lightning/DownloadHandler.java | 0 .../lightning/DrawerArrowDrawable.java | 0 .../browser/lightning/FetchUrlMimeType.java | 0 .../lightning/GeneralSettingsActivity.java | 0 .../browser/lightning/HistoryDatabase.java | 0 .../acr/browser/lightning/HistoryItem.java | 0 .../acr/browser/lightning/HistoryPage.java | 0 .../browser/lightning/HomepageVariables.java | 0 .../browser/lightning/IncognitoActivity.java | 0 .../acr/browser/lightning/IntentUtils.java | 0 .../browser/lightning/LicenseActivity.java | 0 .../lightning/LightningDownloadListener.java | 0 .../acr/browser/lightning/LightningView.java | 0 .../acr/browser/lightning/MainActivity.java | 0 .../browser/lightning/PreferenceManager.java | 0 .../lightning/PrivacySettingsActivity.java | 0 .../browser/lightning/ReadingActivity.java | 0 .../lightning/ReplacingInputStream.java | 0 .../acr/browser/lightning/SearchAdapter.java | 0 .../browser/lightning/SettingsActivity.java | 0 .../browser/lightning/ThemableActivity.java | 0 .../lightning/ThemableSettingsActivity.java | 0 .../java}/acr/browser/lightning/Utils.java | 0 .../acr/browser/lightning/WebAddress.java | 0 .../reading}/ArticleTextExtractor.java | 0 .../browser/lightning/reading}/Converter.java | 0 .../lightning/reading}/HtmlFetcher.java | 0 .../lightning/reading}/ImageResult.java | 0 .../browser/lightning/reading}/JResult.java | 0 .../browser/lightning/reading}/MapEntry.java | 0 .../lightning/reading}/OutputFormatter.java | 0 .../browser/lightning/reading}/SCache.java | 0 .../browser/lightning/reading}/SHelper.java | 0 {res => app/src/main/res}/anim/slide_down.xml | 0 {res => app/src/main/res}/anim/slide_up.xml | 0 .../drawable-hdpi/drawer_left_shadow.9.png | Bin .../drawable-hdpi/drawer_right_shadow.9.png | Bin .../res}/drawable-hdpi/ic_action_back.png | Bin .../drawable-hdpi/ic_action_back_dark.png | Bin .../res}/drawable-hdpi/ic_action_collapse.png | Bin .../res}/drawable-hdpi/ic_action_copy.png | Bin .../res}/drawable-hdpi/ic_action_delete.png | Bin .../drawable-hdpi/ic_action_delete_dark.png | Bin .../res}/drawable-hdpi/ic_action_expand.png | Bin .../res}/drawable-hdpi/ic_action_forward.png | Bin .../drawable-hdpi/ic_action_forward_dark.png | Bin .../drawable-hdpi/ic_action_invert_dark.png | Bin .../drawable-hdpi/ic_action_invert_light.png | Bin .../res}/drawable-hdpi/ic_action_menu.png | Bin .../res}/drawable-hdpi/ic_action_plus.png | Bin .../drawable-hdpi/ic_action_plus_dark.png | Bin .../res}/drawable-hdpi/ic_action_refresh.png | Bin .../res}/drawable-hdpi/ic_action_star.png | Bin .../drawable-hdpi/ic_action_star_dark.png | Bin .../drawable-hdpi/ic_action_tabs_dark.png | Bin .../drawable-hdpi/ic_action_tabs_light.png | Bin .../ic_action_text_size_dark.png | Bin .../ic_action_text_size_light.png | Bin .../main/res}/drawable-hdpi/ic_bookmark.png | Bin .../res}/drawable-hdpi/ic_bookmark_dark.png | Bin .../src/main/res}/drawable-hdpi/ic_drawer.png | Bin .../main/res}/drawable-hdpi/ic_history.png | Bin .../res}/drawable-hdpi/ic_history_dark.png | Bin .../src/main/res}/drawable-hdpi/ic_search.png | Bin .../res}/drawable-hdpi/ic_search_dark.png | Bin .../main/res}/drawable-hdpi/ic_webpage.png | Bin .../res}/drawable-hdpi/ic_webpage_dark.png | Bin .../drawable-mdpi/drawer_left_shadow.9.png | Bin .../drawable-mdpi/drawer_right_shadow.9.png | Bin .../drawable-xhdpi/drawer_left_shadow.9.png | Bin .../drawable-xhdpi/drawer_right_shadow.9.png | Bin .../res}/drawable-xhdpi/ic_action_back.png | Bin .../drawable-xhdpi/ic_action_back_dark.png | Bin .../drawable-xhdpi/ic_action_collapse.png | Bin .../res}/drawable-xhdpi/ic_action_copy.png | Bin .../res}/drawable-xhdpi/ic_action_delete.png | Bin .../drawable-xhdpi/ic_action_delete_dark.png | Bin .../res}/drawable-xhdpi/ic_action_expand.png | Bin .../res}/drawable-xhdpi/ic_action_forward.png | Bin .../drawable-xhdpi/ic_action_forward_dark.png | Bin .../drawable-xhdpi/ic_action_invert_dark.png | Bin .../drawable-xhdpi/ic_action_invert_light.png | Bin .../res}/drawable-xhdpi/ic_action_menu.png | Bin .../res}/drawable-xhdpi/ic_action_plus.png | Bin .../drawable-xhdpi/ic_action_plus_dark.png | Bin .../res}/drawable-xhdpi/ic_action_refresh.png | Bin .../res}/drawable-xhdpi/ic_action_star.png | Bin .../drawable-xhdpi/ic_action_star_dark.png | Bin .../drawable-xhdpi/ic_action_tabs_dark.png | Bin .../drawable-xhdpi/ic_action_tabs_light.png | Bin .../ic_action_text_size_dark.png | Bin .../ic_action_text_size_light.png | Bin .../main/res}/drawable-xhdpi/ic_bookmark.png | Bin .../res}/drawable-xhdpi/ic_bookmark_dark.png | Bin .../main/res}/drawable-xhdpi/ic_drawer.png | Bin .../main/res}/drawable-xhdpi/ic_history.png | Bin .../res}/drawable-xhdpi/ic_history_dark.png | Bin .../main/res}/drawable-xhdpi/ic_search.png | Bin .../res}/drawable-xhdpi/ic_search_dark.png | Bin .../main/res}/drawable-xhdpi/ic_webpage.png | Bin .../res}/drawable-xhdpi/ic_webpage_dark.png | Bin .../res}/drawable-xhdpi/progress_bar.9.png | Bin .../res}/drawable-xhdpi/progress_bar_bg.9.png | Bin .../res}/drawable-xxhdpi/ic_action_back.png | Bin .../drawable-xxhdpi/ic_action_back_dark.png | Bin .../drawable-xxhdpi/ic_action_collapse.png | Bin .../res}/drawable-xxhdpi/ic_action_copy.png | Bin .../res}/drawable-xxhdpi/ic_action_delete.png | Bin .../drawable-xxhdpi/ic_action_delete_dark.png | Bin .../res}/drawable-xxhdpi/ic_action_expand.png | Bin .../drawable-xxhdpi/ic_action_forward.png | Bin .../ic_action_forward_dark.png | Bin .../drawable-xxhdpi/ic_action_invert_dark.png | Bin .../ic_action_invert_light.png | Bin .../res}/drawable-xxhdpi/ic_action_menu.png | Bin .../res}/drawable-xxhdpi/ic_action_plus.png | Bin .../drawable-xxhdpi/ic_action_plus_dark.png | Bin .../drawable-xxhdpi/ic_action_refresh.png | Bin .../res}/drawable-xxhdpi/ic_action_star.png | Bin .../drawable-xxhdpi/ic_action_star_dark.png | Bin .../drawable-xxhdpi/ic_action_tabs_dark.png | Bin .../drawable-xxhdpi/ic_action_tabs_light.png | Bin .../ic_action_text_size_dark.png | Bin .../ic_action_text_size_light.png | Bin .../main/res}/drawable-xxhdpi/ic_bookmark.png | Bin .../res}/drawable-xxhdpi/ic_bookmark_dark.png | Bin .../main/res}/drawable-xxhdpi/ic_history.png | Bin .../res}/drawable-xxhdpi/ic_history_dark.png | Bin .../main/res}/drawable-xxhdpi/ic_search.png | Bin .../res}/drawable-xxhdpi/ic_search_dark.png | Bin .../main/res}/drawable-xxhdpi/ic_webpage.png | Bin .../res}/drawable-xxhdpi/ic_webpage_dark.png | Bin .../src/main/res}/drawable/card_bg.xml | 0 .../main/res}/drawable/card_bg_elevate.xml | 0 .../src/main/res}/drawable/list_bg.xml | 0 .../src/main/res}/drawable/list_bg_dark.xml | 0 .../src/main/res}/drawable/list_bg_light.xml | 0 .../src/main/res}/drawable/progress.xml | 0 .../main/res}/drawable/toolbar_elevate.xml | 0 .../res}/drawable/toolbar_elevate_dark.xml | 0 .../src/main/res}/layout/about_settings.xml | 0 .../src/main/res}/layout/activity_main.xml | 7 +- .../main/res}/layout/advanced_settings.xml | 0 .../res}/layout/animated_progress_bar.xml | 0 .../src/main/res}/layout/bookmark_drawer.xml | 0 .../main/res}/layout/bookmark_list_item.xml | 0 .../main/res}/layout/bookmark_settings.xml | 0 .../src/main/res}/layout/browser_content.xml | 0 .../src/main/res}/layout/display_settings.xml | 0 .../src/main/res}/layout/general_settings.xml | 0 .../src/main/res}/layout/license_activity.xml | 0 .../src/main/res}/layout/privacy_settings.xml | 0 .../src/main/res}/layout/reading_view.xml | 0 {res => app/src/main/res}/layout/search.xml | 0 .../src/main/res}/layout/search_interface.xml | 0 .../src/main/res}/layout/seek_layout.xml | 0 {res => app/src/main/res}/layout/settings.xml | 0 .../src/main/res}/layout/tab_drawer.xml | 2 +- .../src/main/res}/layout/tab_list_item.xml | 0 {res => app/src/main/res}/layout/toolbar.xml | 0 .../src/main/res}/layout/toolbar_content.xml | 0 .../src/main/res}/layout/toolbar_settings.xml | 0 .../res}/layout/two_line_autocomplete.xml | 0 .../res}/layout/video_loading_progress.xml | 0 .../src/main/res}/menu-large/incognito.xml | 3 + {res => app/src/main/res}/menu-large/main.xml | 0 .../src/main/res}/menu-xlarge/incognito.xml | 3 + .../src/main/res}/menu-xlarge/main.xml | 0 {res => app/src/main/res}/menu/incognito.xml | 0 {res => app/src/main/res}/menu/main.xml | 0 {res => app/src/main/res}/menu/reading.xml | 0 .../src/main/res}/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res}/mipmap-mdpi/ic_launcher.png | Bin .../main/res}/mipmap-xhdpi/ic_launcher.png | Bin .../main/res}/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res}/mipmap-xxxhdpi/ic_launcher.png | Bin .../src/main/res}/values-ar/strings.xml | 2 +- .../src/main/res}/values-de/strings.xml | 2 +- .../src/main/res}/values-es/strings.xml | 0 .../src/main/res}/values-fr/strings.xml | 0 .../src/main/res}/values-gr/strings.xml | 0 .../src/main/res}/values-hu/strings.xml | 0 .../src/main/res}/values-it/strings.xml | 0 .../src/main/res}/values-iw/strings.xml | 0 .../src/main/res}/values-ja/strings.xml | 0 .../src/main/res}/values-pl/strings.xml | 0 .../src/main/res}/values-pt/strings.xml | 0 .../src/main/res}/values-ru/strings.xml | 0 .../src/main/res}/values-sr/strings.xml | 0 .../src/main/res}/values-tr/strings.xml | 2 +- .../src/main/res}/values-v21/styles.xml | 24 ++- .../src/main/res}/values-zh-rCN/strings.xml | 0 .../src/main/res}/values-zh-rTW/strings.xml | 0 {res => app/src/main/res}/values/arrays.xml | 0 {res => app/src/main/res}/values/attr.xml | 0 {res => app/src/main/res}/values/colors.xml | 18 +- {res => app/src/main/res}/values/dimens.xml | 0 {res => app/src/main/res}/values/strings.xml | 0 {res => app/src/main/res}/values/styles.xml | 8 +- build.gradle | 15 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 49896 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 164 ++++++++++++++++++ gradlew.bat | 90 ++++++++++ project.properties | 17 -- settings.gradle | 4 + setup-ant.bat | 26 --- setup-ant.sh | 21 --- 242 files changed, 638 insertions(+), 125 deletions(-) create mode 100644 Lightning-Browser-AS.iml create mode 100644 Lightning-Browser.iml delete mode 100644 ant.properties create mode 100644 app/app.iml create mode 100644 app/build.gradle rename {libs => app/libs}/jsoup-1.8.1.jar (100%) create mode 100644 app/lightningBrowserPlus.iml create mode 100644 app/lint.xml rename proguard-project.txt => app/proguard-project.txt (100%) rename AndroidManifest.xml => app/src/main/AndroidManifest.xml (100%) rename {assets => app/src/main/assets}/ask.png (100%) rename {assets => app/src/main/assets}/baidu.png (100%) rename {assets => app/src/main/assets}/bing.png (100%) rename {assets => app/src/main/assets}/duckduckgo.png (100%) rename {assets => app/src/main/assets}/google.png (100%) rename {assets => app/src/main/assets}/hosts.txt (100%) rename {assets => app/src/main/assets}/lightning.png (100%) rename {assets => app/src/main/assets}/startpage.png (100%) rename {assets => app/src/main/assets}/yahoo.png (100%) rename {assets => app/src/main/assets}/yandex.png (100%) rename {src => app/src/main/java}/acr/browser/lightning/AboutSettingsActivity.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/AdBlock.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/AdvancedSettingsActivity.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/AnimatedProgressBar.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/BookmarkActivity.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/BookmarkManager.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/BookmarkPage.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/BrowserActivity.java (98%) rename {src => app/src/main/java}/acr/browser/lightning/BrowserApp.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/BrowserController.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/ClickHandler.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/Constants.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/DisplaySettingsActivity.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/DownloadHandler.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/DrawerArrowDrawable.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/FetchUrlMimeType.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/GeneralSettingsActivity.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/HistoryDatabase.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/HistoryItem.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/HistoryPage.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/HomepageVariables.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/IncognitoActivity.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/IntentUtils.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/LicenseActivity.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/LightningDownloadListener.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/LightningView.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/MainActivity.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/PreferenceManager.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/PrivacySettingsActivity.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/ReadingActivity.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/ReplacingInputStream.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/SearchAdapter.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/SettingsActivity.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/ThemableActivity.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/ThemableSettingsActivity.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/Utils.java (100%) rename {src => app/src/main/java}/acr/browser/lightning/WebAddress.java (100%) rename {src/acr/browser/lightning/Reading => app/src/main/java/acr/browser/lightning/reading}/ArticleTextExtractor.java (100%) rename {src/acr/browser/lightning/Reading => app/src/main/java/acr/browser/lightning/reading}/Converter.java (100%) rename {src/acr/browser/lightning/Reading => app/src/main/java/acr/browser/lightning/reading}/HtmlFetcher.java (100%) rename {src/acr/browser/lightning/Reading => app/src/main/java/acr/browser/lightning/reading}/ImageResult.java (100%) rename {src/acr/browser/lightning/Reading => app/src/main/java/acr/browser/lightning/reading}/JResult.java (100%) rename {src/acr/browser/lightning/Reading => app/src/main/java/acr/browser/lightning/reading}/MapEntry.java (100%) rename {src/acr/browser/lightning/Reading => app/src/main/java/acr/browser/lightning/reading}/OutputFormatter.java (100%) rename {src/acr/browser/lightning/Reading => app/src/main/java/acr/browser/lightning/reading}/SCache.java (100%) rename {src/acr/browser/lightning/Reading => app/src/main/java/acr/browser/lightning/reading}/SHelper.java (100%) rename {res => app/src/main/res}/anim/slide_down.xml (100%) rename {res => app/src/main/res}/anim/slide_up.xml (100%) rename {res => app/src/main/res}/drawable-hdpi/drawer_left_shadow.9.png (100%) rename {res => app/src/main/res}/drawable-hdpi/drawer_right_shadow.9.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_back.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_back_dark.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_collapse.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_copy.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_delete.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_delete_dark.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_expand.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_forward.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_forward_dark.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_invert_dark.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_invert_light.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_menu.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_plus.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_plus_dark.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_refresh.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_star.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_star_dark.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_tabs_dark.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_tabs_light.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_text_size_dark.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_action_text_size_light.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_bookmark.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_bookmark_dark.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_drawer.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_history.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_history_dark.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_search.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_search_dark.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_webpage.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ic_webpage_dark.png (100%) rename {res => app/src/main/res}/drawable-mdpi/drawer_left_shadow.9.png (100%) rename {res => app/src/main/res}/drawable-mdpi/drawer_right_shadow.9.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/drawer_left_shadow.9.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/drawer_right_shadow.9.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_back.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_back_dark.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_collapse.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_copy.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_delete.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_delete_dark.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_expand.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_forward.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_forward_dark.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_invert_dark.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_invert_light.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_menu.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_plus.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_plus_dark.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_refresh.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_star.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_star_dark.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_tabs_dark.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_tabs_light.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_text_size_dark.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_action_text_size_light.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_bookmark.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_bookmark_dark.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_drawer.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_history.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_history_dark.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_search.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_search_dark.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_webpage.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/ic_webpage_dark.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/progress_bar.9.png (100%) rename {res => app/src/main/res}/drawable-xhdpi/progress_bar_bg.9.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_back.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_back_dark.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_collapse.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_copy.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_delete.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_delete_dark.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_expand.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_forward.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_forward_dark.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_invert_dark.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_invert_light.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_menu.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_plus.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_plus_dark.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_refresh.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_star.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_star_dark.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_tabs_dark.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_tabs_light.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_text_size_dark.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_action_text_size_light.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_bookmark.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_bookmark_dark.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_history.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_history_dark.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_search.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_search_dark.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_webpage.png (100%) rename {res => app/src/main/res}/drawable-xxhdpi/ic_webpage_dark.png (100%) rename {res => app/src/main/res}/drawable/card_bg.xml (100%) rename {res => app/src/main/res}/drawable/card_bg_elevate.xml (100%) rename {res => app/src/main/res}/drawable/list_bg.xml (100%) rename {res => app/src/main/res}/drawable/list_bg_dark.xml (100%) rename {res => app/src/main/res}/drawable/list_bg_light.xml (100%) rename {res => app/src/main/res}/drawable/progress.xml (100%) rename {res => app/src/main/res}/drawable/toolbar_elevate.xml (100%) rename {res => app/src/main/res}/drawable/toolbar_elevate_dark.xml (100%) rename {res => app/src/main/res}/layout/about_settings.xml (100%) rename {res => app/src/main/res}/layout/activity_main.xml (82%) rename {res => app/src/main/res}/layout/advanced_settings.xml (100%) rename {res => app/src/main/res}/layout/animated_progress_bar.xml (100%) rename {res => app/src/main/res}/layout/bookmark_drawer.xml (100%) rename {res => app/src/main/res}/layout/bookmark_list_item.xml (100%) rename {res => app/src/main/res}/layout/bookmark_settings.xml (100%) rename {res => app/src/main/res}/layout/browser_content.xml (100%) rename {res => app/src/main/res}/layout/display_settings.xml (100%) rename {res => app/src/main/res}/layout/general_settings.xml (100%) rename {res => app/src/main/res}/layout/license_activity.xml (100%) rename {res => app/src/main/res}/layout/privacy_settings.xml (100%) rename {res => app/src/main/res}/layout/reading_view.xml (100%) rename {res => app/src/main/res}/layout/search.xml (100%) rename {res => app/src/main/res}/layout/search_interface.xml (100%) rename {res => app/src/main/res}/layout/seek_layout.xml (100%) rename {res => app/src/main/res}/layout/settings.xml (100%) rename {res => app/src/main/res}/layout/tab_drawer.xml (98%) rename {res => app/src/main/res}/layout/tab_list_item.xml (100%) rename {res => app/src/main/res}/layout/toolbar.xml (100%) rename {res => app/src/main/res}/layout/toolbar_content.xml (100%) rename {res => app/src/main/res}/layout/toolbar_settings.xml (100%) rename {res => app/src/main/res}/layout/two_line_autocomplete.xml (100%) rename {res => app/src/main/res}/layout/video_loading_progress.xml (100%) rename {res => app/src/main/res}/menu-large/incognito.xml (91%) rename {res => app/src/main/res}/menu-large/main.xml (100%) rename {res => app/src/main/res}/menu-xlarge/incognito.xml (91%) rename {res => app/src/main/res}/menu-xlarge/main.xml (100%) rename {res => app/src/main/res}/menu/incognito.xml (100%) rename {res => app/src/main/res}/menu/main.xml (100%) rename {res => app/src/main/res}/menu/reading.xml (100%) rename {res => app/src/main/res}/mipmap-hdpi/ic_launcher.png (100%) rename {res => app/src/main/res}/mipmap-mdpi/ic_launcher.png (100%) rename {res => app/src/main/res}/mipmap-xhdpi/ic_launcher.png (100%) rename {res => app/src/main/res}/mipmap-xxhdpi/ic_launcher.png (100%) rename {res => app/src/main/res}/mipmap-xxxhdpi/ic_launcher.png (100%) rename {res => app/src/main/res}/values-ar/strings.xml (99%) rename {res => app/src/main/res}/values-de/strings.xml (99%) rename {res => app/src/main/res}/values-es/strings.xml (100%) rename {res => app/src/main/res}/values-fr/strings.xml (100%) rename {res => app/src/main/res}/values-gr/strings.xml (100%) rename {res => app/src/main/res}/values-hu/strings.xml (100%) rename {res => app/src/main/res}/values-it/strings.xml (100%) rename {res => app/src/main/res}/values-iw/strings.xml (100%) rename {res => app/src/main/res}/values-ja/strings.xml (100%) rename {res => app/src/main/res}/values-pl/strings.xml (100%) rename {res => app/src/main/res}/values-pt/strings.xml (100%) rename {res => app/src/main/res}/values-ru/strings.xml (100%) rename {res => app/src/main/res}/values-sr/strings.xml (100%) rename {res => app/src/main/res}/values-tr/strings.xml (99%) rename {res => app/src/main/res}/values-v21/styles.xml (81%) rename {res => app/src/main/res}/values-zh-rCN/strings.xml (100%) rename {res => app/src/main/res}/values-zh-rTW/strings.xml (100%) rename {res => app/src/main/res}/values/arrays.xml (100%) rename {res => app/src/main/res}/values/attr.xml (100%) rename {res => app/src/main/res}/values/colors.xml (94%) rename {res => app/src/main/res}/values/dimens.xml (100%) rename {res => app/src/main/res}/values/strings.xml (100%) rename {res => app/src/main/res}/values/styles.xml (95%) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat delete mode 100644 project.properties create mode 100644 settings.gradle delete mode 100644 setup-ant.bat delete mode 100755 setup-ant.sh diff --git a/.gitignore b/.gitignore index 468c405..2e4147a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,11 @@ +# Android Studio +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build + ################# ## Eclipse ################# diff --git a/Lightning-Browser-AS.iml b/Lightning-Browser-AS.iml new file mode 100644 index 0000000..77ef0be --- /dev/null +++ b/Lightning-Browser-AS.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Lightning-Browser.iml b/Lightning-Browser.iml new file mode 100644 index 0000000..77ef0be --- /dev/null +++ b/Lightning-Browser.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ant.properties b/ant.properties deleted file mode 100644 index 6b22946..0000000 --- a/ant.properties +++ /dev/null @@ -1,2 +0,0 @@ -java.source=1.7 -java.target=1.7 diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 0000000..6c59c00 --- /dev/null +++ b/app/app.iml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..a875445 --- /dev/null +++ b/app/build.gradle @@ -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') +} diff --git a/libs/jsoup-1.8.1.jar b/app/libs/jsoup-1.8.1.jar similarity index 100% rename from libs/jsoup-1.8.1.jar rename to app/libs/jsoup-1.8.1.jar diff --git a/app/lightningBrowserPlus.iml b/app/lightningBrowserPlus.iml new file mode 100644 index 0000000..759baa1 --- /dev/null +++ b/app/lightningBrowserPlus.iml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/lint.xml b/app/lint.xml new file mode 100644 index 0000000..0da7f20 --- /dev/null +++ b/app/lint.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/proguard-project.txt b/app/proguard-project.txt similarity index 100% rename from proguard-project.txt rename to app/proguard-project.txt diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/assets/ask.png b/app/src/main/assets/ask.png similarity index 100% rename from assets/ask.png rename to app/src/main/assets/ask.png diff --git a/assets/baidu.png b/app/src/main/assets/baidu.png similarity index 100% rename from assets/baidu.png rename to app/src/main/assets/baidu.png diff --git a/assets/bing.png b/app/src/main/assets/bing.png similarity index 100% rename from assets/bing.png rename to app/src/main/assets/bing.png diff --git a/assets/duckduckgo.png b/app/src/main/assets/duckduckgo.png similarity index 100% rename from assets/duckduckgo.png rename to app/src/main/assets/duckduckgo.png diff --git a/assets/google.png b/app/src/main/assets/google.png similarity index 100% rename from assets/google.png rename to app/src/main/assets/google.png diff --git a/assets/hosts.txt b/app/src/main/assets/hosts.txt similarity index 100% rename from assets/hosts.txt rename to app/src/main/assets/hosts.txt diff --git a/assets/lightning.png b/app/src/main/assets/lightning.png similarity index 100% rename from assets/lightning.png rename to app/src/main/assets/lightning.png diff --git a/assets/startpage.png b/app/src/main/assets/startpage.png similarity index 100% rename from assets/startpage.png rename to app/src/main/assets/startpage.png diff --git a/assets/yahoo.png b/app/src/main/assets/yahoo.png similarity index 100% rename from assets/yahoo.png rename to app/src/main/assets/yahoo.png diff --git a/assets/yandex.png b/app/src/main/assets/yandex.png similarity index 100% rename from assets/yandex.png rename to app/src/main/assets/yandex.png diff --git a/src/acr/browser/lightning/AboutSettingsActivity.java b/app/src/main/java/acr/browser/lightning/AboutSettingsActivity.java similarity index 100% rename from src/acr/browser/lightning/AboutSettingsActivity.java rename to app/src/main/java/acr/browser/lightning/AboutSettingsActivity.java diff --git a/src/acr/browser/lightning/AdBlock.java b/app/src/main/java/acr/browser/lightning/AdBlock.java similarity index 100% rename from src/acr/browser/lightning/AdBlock.java rename to app/src/main/java/acr/browser/lightning/AdBlock.java diff --git a/src/acr/browser/lightning/AdvancedSettingsActivity.java b/app/src/main/java/acr/browser/lightning/AdvancedSettingsActivity.java similarity index 100% rename from src/acr/browser/lightning/AdvancedSettingsActivity.java rename to app/src/main/java/acr/browser/lightning/AdvancedSettingsActivity.java diff --git a/src/acr/browser/lightning/AnimatedProgressBar.java b/app/src/main/java/acr/browser/lightning/AnimatedProgressBar.java similarity index 100% rename from src/acr/browser/lightning/AnimatedProgressBar.java rename to app/src/main/java/acr/browser/lightning/AnimatedProgressBar.java diff --git a/src/acr/browser/lightning/BookmarkActivity.java b/app/src/main/java/acr/browser/lightning/BookmarkActivity.java similarity index 100% rename from src/acr/browser/lightning/BookmarkActivity.java rename to app/src/main/java/acr/browser/lightning/BookmarkActivity.java diff --git a/src/acr/browser/lightning/BookmarkManager.java b/app/src/main/java/acr/browser/lightning/BookmarkManager.java similarity index 100% rename from src/acr/browser/lightning/BookmarkManager.java rename to app/src/main/java/acr/browser/lightning/BookmarkManager.java diff --git a/src/acr/browser/lightning/BookmarkPage.java b/app/src/main/java/acr/browser/lightning/BookmarkPage.java similarity index 100% rename from src/acr/browser/lightning/BookmarkPage.java rename to app/src/main/java/acr/browser/lightning/BookmarkPage.java diff --git a/src/acr/browser/lightning/BrowserActivity.java b/app/src/main/java/acr/browser/lightning/BrowserActivity.java similarity index 98% rename from src/acr/browser/lightning/BrowserActivity.java rename to app/src/main/java/acr/browser/lightning/BrowserActivity.java index df0d04a..24a316f 100644 --- a/src/acr/browser/lightning/BrowserActivity.java +++ b/app/src/main/java/acr/browser/lightning/BrowserActivity.java @@ -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 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 } 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) { diff --git a/src/acr/browser/lightning/BrowserApp.java b/app/src/main/java/acr/browser/lightning/BrowserApp.java similarity index 100% rename from src/acr/browser/lightning/BrowserApp.java rename to app/src/main/java/acr/browser/lightning/BrowserApp.java diff --git a/src/acr/browser/lightning/BrowserController.java b/app/src/main/java/acr/browser/lightning/BrowserController.java similarity index 100% rename from src/acr/browser/lightning/BrowserController.java rename to app/src/main/java/acr/browser/lightning/BrowserController.java diff --git a/src/acr/browser/lightning/ClickHandler.java b/app/src/main/java/acr/browser/lightning/ClickHandler.java similarity index 100% rename from src/acr/browser/lightning/ClickHandler.java rename to app/src/main/java/acr/browser/lightning/ClickHandler.java diff --git a/src/acr/browser/lightning/Constants.java b/app/src/main/java/acr/browser/lightning/Constants.java similarity index 100% rename from src/acr/browser/lightning/Constants.java rename to app/src/main/java/acr/browser/lightning/Constants.java diff --git a/src/acr/browser/lightning/DisplaySettingsActivity.java b/app/src/main/java/acr/browser/lightning/DisplaySettingsActivity.java similarity index 100% rename from src/acr/browser/lightning/DisplaySettingsActivity.java rename to app/src/main/java/acr/browser/lightning/DisplaySettingsActivity.java diff --git a/src/acr/browser/lightning/DownloadHandler.java b/app/src/main/java/acr/browser/lightning/DownloadHandler.java similarity index 100% rename from src/acr/browser/lightning/DownloadHandler.java rename to app/src/main/java/acr/browser/lightning/DownloadHandler.java diff --git a/src/acr/browser/lightning/DrawerArrowDrawable.java b/app/src/main/java/acr/browser/lightning/DrawerArrowDrawable.java similarity index 100% rename from src/acr/browser/lightning/DrawerArrowDrawable.java rename to app/src/main/java/acr/browser/lightning/DrawerArrowDrawable.java diff --git a/src/acr/browser/lightning/FetchUrlMimeType.java b/app/src/main/java/acr/browser/lightning/FetchUrlMimeType.java similarity index 100% rename from src/acr/browser/lightning/FetchUrlMimeType.java rename to app/src/main/java/acr/browser/lightning/FetchUrlMimeType.java diff --git a/src/acr/browser/lightning/GeneralSettingsActivity.java b/app/src/main/java/acr/browser/lightning/GeneralSettingsActivity.java similarity index 100% rename from src/acr/browser/lightning/GeneralSettingsActivity.java rename to app/src/main/java/acr/browser/lightning/GeneralSettingsActivity.java diff --git a/src/acr/browser/lightning/HistoryDatabase.java b/app/src/main/java/acr/browser/lightning/HistoryDatabase.java similarity index 100% rename from src/acr/browser/lightning/HistoryDatabase.java rename to app/src/main/java/acr/browser/lightning/HistoryDatabase.java diff --git a/src/acr/browser/lightning/HistoryItem.java b/app/src/main/java/acr/browser/lightning/HistoryItem.java similarity index 100% rename from src/acr/browser/lightning/HistoryItem.java rename to app/src/main/java/acr/browser/lightning/HistoryItem.java diff --git a/src/acr/browser/lightning/HistoryPage.java b/app/src/main/java/acr/browser/lightning/HistoryPage.java similarity index 100% rename from src/acr/browser/lightning/HistoryPage.java rename to app/src/main/java/acr/browser/lightning/HistoryPage.java diff --git a/src/acr/browser/lightning/HomepageVariables.java b/app/src/main/java/acr/browser/lightning/HomepageVariables.java similarity index 100% rename from src/acr/browser/lightning/HomepageVariables.java rename to app/src/main/java/acr/browser/lightning/HomepageVariables.java diff --git a/src/acr/browser/lightning/IncognitoActivity.java b/app/src/main/java/acr/browser/lightning/IncognitoActivity.java similarity index 100% rename from src/acr/browser/lightning/IncognitoActivity.java rename to app/src/main/java/acr/browser/lightning/IncognitoActivity.java diff --git a/src/acr/browser/lightning/IntentUtils.java b/app/src/main/java/acr/browser/lightning/IntentUtils.java similarity index 100% rename from src/acr/browser/lightning/IntentUtils.java rename to app/src/main/java/acr/browser/lightning/IntentUtils.java diff --git a/src/acr/browser/lightning/LicenseActivity.java b/app/src/main/java/acr/browser/lightning/LicenseActivity.java similarity index 100% rename from src/acr/browser/lightning/LicenseActivity.java rename to app/src/main/java/acr/browser/lightning/LicenseActivity.java diff --git a/src/acr/browser/lightning/LightningDownloadListener.java b/app/src/main/java/acr/browser/lightning/LightningDownloadListener.java similarity index 100% rename from src/acr/browser/lightning/LightningDownloadListener.java rename to app/src/main/java/acr/browser/lightning/LightningDownloadListener.java diff --git a/src/acr/browser/lightning/LightningView.java b/app/src/main/java/acr/browser/lightning/LightningView.java similarity index 100% rename from src/acr/browser/lightning/LightningView.java rename to app/src/main/java/acr/browser/lightning/LightningView.java diff --git a/src/acr/browser/lightning/MainActivity.java b/app/src/main/java/acr/browser/lightning/MainActivity.java similarity index 100% rename from src/acr/browser/lightning/MainActivity.java rename to app/src/main/java/acr/browser/lightning/MainActivity.java diff --git a/src/acr/browser/lightning/PreferenceManager.java b/app/src/main/java/acr/browser/lightning/PreferenceManager.java similarity index 100% rename from src/acr/browser/lightning/PreferenceManager.java rename to app/src/main/java/acr/browser/lightning/PreferenceManager.java diff --git a/src/acr/browser/lightning/PrivacySettingsActivity.java b/app/src/main/java/acr/browser/lightning/PrivacySettingsActivity.java similarity index 100% rename from src/acr/browser/lightning/PrivacySettingsActivity.java rename to app/src/main/java/acr/browser/lightning/PrivacySettingsActivity.java diff --git a/src/acr/browser/lightning/ReadingActivity.java b/app/src/main/java/acr/browser/lightning/ReadingActivity.java similarity index 100% rename from src/acr/browser/lightning/ReadingActivity.java rename to app/src/main/java/acr/browser/lightning/ReadingActivity.java diff --git a/src/acr/browser/lightning/ReplacingInputStream.java b/app/src/main/java/acr/browser/lightning/ReplacingInputStream.java similarity index 100% rename from src/acr/browser/lightning/ReplacingInputStream.java rename to app/src/main/java/acr/browser/lightning/ReplacingInputStream.java diff --git a/src/acr/browser/lightning/SearchAdapter.java b/app/src/main/java/acr/browser/lightning/SearchAdapter.java similarity index 100% rename from src/acr/browser/lightning/SearchAdapter.java rename to app/src/main/java/acr/browser/lightning/SearchAdapter.java diff --git a/src/acr/browser/lightning/SettingsActivity.java b/app/src/main/java/acr/browser/lightning/SettingsActivity.java similarity index 100% rename from src/acr/browser/lightning/SettingsActivity.java rename to app/src/main/java/acr/browser/lightning/SettingsActivity.java diff --git a/src/acr/browser/lightning/ThemableActivity.java b/app/src/main/java/acr/browser/lightning/ThemableActivity.java similarity index 100% rename from src/acr/browser/lightning/ThemableActivity.java rename to app/src/main/java/acr/browser/lightning/ThemableActivity.java diff --git a/src/acr/browser/lightning/ThemableSettingsActivity.java b/app/src/main/java/acr/browser/lightning/ThemableSettingsActivity.java similarity index 100% rename from src/acr/browser/lightning/ThemableSettingsActivity.java rename to app/src/main/java/acr/browser/lightning/ThemableSettingsActivity.java diff --git a/src/acr/browser/lightning/Utils.java b/app/src/main/java/acr/browser/lightning/Utils.java similarity index 100% rename from src/acr/browser/lightning/Utils.java rename to app/src/main/java/acr/browser/lightning/Utils.java diff --git a/src/acr/browser/lightning/WebAddress.java b/app/src/main/java/acr/browser/lightning/WebAddress.java similarity index 100% rename from src/acr/browser/lightning/WebAddress.java rename to app/src/main/java/acr/browser/lightning/WebAddress.java diff --git a/src/acr/browser/lightning/Reading/ArticleTextExtractor.java b/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java similarity index 100% rename from src/acr/browser/lightning/Reading/ArticleTextExtractor.java rename to app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java diff --git a/src/acr/browser/lightning/Reading/Converter.java b/app/src/main/java/acr/browser/lightning/reading/Converter.java similarity index 100% rename from src/acr/browser/lightning/Reading/Converter.java rename to app/src/main/java/acr/browser/lightning/reading/Converter.java diff --git a/src/acr/browser/lightning/Reading/HtmlFetcher.java b/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java similarity index 100% rename from src/acr/browser/lightning/Reading/HtmlFetcher.java rename to app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java diff --git a/src/acr/browser/lightning/Reading/ImageResult.java b/app/src/main/java/acr/browser/lightning/reading/ImageResult.java similarity index 100% rename from src/acr/browser/lightning/Reading/ImageResult.java rename to app/src/main/java/acr/browser/lightning/reading/ImageResult.java diff --git a/src/acr/browser/lightning/Reading/JResult.java b/app/src/main/java/acr/browser/lightning/reading/JResult.java similarity index 100% rename from src/acr/browser/lightning/Reading/JResult.java rename to app/src/main/java/acr/browser/lightning/reading/JResult.java diff --git a/src/acr/browser/lightning/Reading/MapEntry.java b/app/src/main/java/acr/browser/lightning/reading/MapEntry.java similarity index 100% rename from src/acr/browser/lightning/Reading/MapEntry.java rename to app/src/main/java/acr/browser/lightning/reading/MapEntry.java diff --git a/src/acr/browser/lightning/Reading/OutputFormatter.java b/app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java similarity index 100% rename from src/acr/browser/lightning/Reading/OutputFormatter.java rename to app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java diff --git a/src/acr/browser/lightning/Reading/SCache.java b/app/src/main/java/acr/browser/lightning/reading/SCache.java similarity index 100% rename from src/acr/browser/lightning/Reading/SCache.java rename to app/src/main/java/acr/browser/lightning/reading/SCache.java diff --git a/src/acr/browser/lightning/Reading/SHelper.java b/app/src/main/java/acr/browser/lightning/reading/SHelper.java similarity index 100% rename from src/acr/browser/lightning/Reading/SHelper.java rename to app/src/main/java/acr/browser/lightning/reading/SHelper.java diff --git a/res/anim/slide_down.xml b/app/src/main/res/anim/slide_down.xml similarity index 100% rename from res/anim/slide_down.xml rename to app/src/main/res/anim/slide_down.xml diff --git a/res/anim/slide_up.xml b/app/src/main/res/anim/slide_up.xml similarity index 100% rename from res/anim/slide_up.xml rename to app/src/main/res/anim/slide_up.xml diff --git a/res/drawable-hdpi/drawer_left_shadow.9.png b/app/src/main/res/drawable-hdpi/drawer_left_shadow.9.png similarity index 100% rename from res/drawable-hdpi/drawer_left_shadow.9.png rename to app/src/main/res/drawable-hdpi/drawer_left_shadow.9.png diff --git a/res/drawable-hdpi/drawer_right_shadow.9.png b/app/src/main/res/drawable-hdpi/drawer_right_shadow.9.png similarity index 100% rename from res/drawable-hdpi/drawer_right_shadow.9.png rename to app/src/main/res/drawable-hdpi/drawer_right_shadow.9.png diff --git a/res/drawable-hdpi/ic_action_back.png b/app/src/main/res/drawable-hdpi/ic_action_back.png similarity index 100% rename from res/drawable-hdpi/ic_action_back.png rename to app/src/main/res/drawable-hdpi/ic_action_back.png diff --git a/res/drawable-hdpi/ic_action_back_dark.png b/app/src/main/res/drawable-hdpi/ic_action_back_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_back_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_back_dark.png diff --git a/res/drawable-hdpi/ic_action_collapse.png b/app/src/main/res/drawable-hdpi/ic_action_collapse.png similarity index 100% rename from res/drawable-hdpi/ic_action_collapse.png rename to app/src/main/res/drawable-hdpi/ic_action_collapse.png diff --git a/res/drawable-hdpi/ic_action_copy.png b/app/src/main/res/drawable-hdpi/ic_action_copy.png similarity index 100% rename from res/drawable-hdpi/ic_action_copy.png rename to app/src/main/res/drawable-hdpi/ic_action_copy.png diff --git a/res/drawable-hdpi/ic_action_delete.png b/app/src/main/res/drawable-hdpi/ic_action_delete.png similarity index 100% rename from res/drawable-hdpi/ic_action_delete.png rename to app/src/main/res/drawable-hdpi/ic_action_delete.png diff --git a/res/drawable-hdpi/ic_action_delete_dark.png b/app/src/main/res/drawable-hdpi/ic_action_delete_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_delete_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_delete_dark.png diff --git a/res/drawable-hdpi/ic_action_expand.png b/app/src/main/res/drawable-hdpi/ic_action_expand.png similarity index 100% rename from res/drawable-hdpi/ic_action_expand.png rename to app/src/main/res/drawable-hdpi/ic_action_expand.png diff --git a/res/drawable-hdpi/ic_action_forward.png b/app/src/main/res/drawable-hdpi/ic_action_forward.png similarity index 100% rename from res/drawable-hdpi/ic_action_forward.png rename to app/src/main/res/drawable-hdpi/ic_action_forward.png diff --git a/res/drawable-hdpi/ic_action_forward_dark.png b/app/src/main/res/drawable-hdpi/ic_action_forward_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_forward_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_forward_dark.png diff --git a/res/drawable-hdpi/ic_action_invert_dark.png b/app/src/main/res/drawable-hdpi/ic_action_invert_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_invert_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_invert_dark.png diff --git a/res/drawable-hdpi/ic_action_invert_light.png b/app/src/main/res/drawable-hdpi/ic_action_invert_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_invert_light.png rename to app/src/main/res/drawable-hdpi/ic_action_invert_light.png diff --git a/res/drawable-hdpi/ic_action_menu.png b/app/src/main/res/drawable-hdpi/ic_action_menu.png similarity index 100% rename from res/drawable-hdpi/ic_action_menu.png rename to app/src/main/res/drawable-hdpi/ic_action_menu.png diff --git a/res/drawable-hdpi/ic_action_plus.png b/app/src/main/res/drawable-hdpi/ic_action_plus.png similarity index 100% rename from res/drawable-hdpi/ic_action_plus.png rename to app/src/main/res/drawable-hdpi/ic_action_plus.png diff --git a/res/drawable-hdpi/ic_action_plus_dark.png b/app/src/main/res/drawable-hdpi/ic_action_plus_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_plus_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_plus_dark.png diff --git a/res/drawable-hdpi/ic_action_refresh.png b/app/src/main/res/drawable-hdpi/ic_action_refresh.png similarity index 100% rename from res/drawable-hdpi/ic_action_refresh.png rename to app/src/main/res/drawable-hdpi/ic_action_refresh.png diff --git a/res/drawable-hdpi/ic_action_star.png b/app/src/main/res/drawable-hdpi/ic_action_star.png similarity index 100% rename from res/drawable-hdpi/ic_action_star.png rename to app/src/main/res/drawable-hdpi/ic_action_star.png diff --git a/res/drawable-hdpi/ic_action_star_dark.png b/app/src/main/res/drawable-hdpi/ic_action_star_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_star_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_star_dark.png diff --git a/res/drawable-hdpi/ic_action_tabs_dark.png b/app/src/main/res/drawable-hdpi/ic_action_tabs_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_tabs_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_tabs_dark.png diff --git a/res/drawable-hdpi/ic_action_tabs_light.png b/app/src/main/res/drawable-hdpi/ic_action_tabs_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_tabs_light.png rename to app/src/main/res/drawable-hdpi/ic_action_tabs_light.png diff --git a/res/drawable-hdpi/ic_action_text_size_dark.png b/app/src/main/res/drawable-hdpi/ic_action_text_size_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_text_size_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_text_size_dark.png diff --git a/res/drawable-hdpi/ic_action_text_size_light.png b/app/src/main/res/drawable-hdpi/ic_action_text_size_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_text_size_light.png rename to app/src/main/res/drawable-hdpi/ic_action_text_size_light.png diff --git a/res/drawable-hdpi/ic_bookmark.png b/app/src/main/res/drawable-hdpi/ic_bookmark.png similarity index 100% rename from res/drawable-hdpi/ic_bookmark.png rename to app/src/main/res/drawable-hdpi/ic_bookmark.png diff --git a/res/drawable-hdpi/ic_bookmark_dark.png b/app/src/main/res/drawable-hdpi/ic_bookmark_dark.png similarity index 100% rename from res/drawable-hdpi/ic_bookmark_dark.png rename to app/src/main/res/drawable-hdpi/ic_bookmark_dark.png diff --git a/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png similarity index 100% rename from res/drawable-hdpi/ic_drawer.png rename to app/src/main/res/drawable-hdpi/ic_drawer.png diff --git a/res/drawable-hdpi/ic_history.png b/app/src/main/res/drawable-hdpi/ic_history.png similarity index 100% rename from res/drawable-hdpi/ic_history.png rename to app/src/main/res/drawable-hdpi/ic_history.png diff --git a/res/drawable-hdpi/ic_history_dark.png b/app/src/main/res/drawable-hdpi/ic_history_dark.png similarity index 100% rename from res/drawable-hdpi/ic_history_dark.png rename to app/src/main/res/drawable-hdpi/ic_history_dark.png diff --git a/res/drawable-hdpi/ic_search.png b/app/src/main/res/drawable-hdpi/ic_search.png similarity index 100% rename from res/drawable-hdpi/ic_search.png rename to app/src/main/res/drawable-hdpi/ic_search.png diff --git a/res/drawable-hdpi/ic_search_dark.png b/app/src/main/res/drawable-hdpi/ic_search_dark.png similarity index 100% rename from res/drawable-hdpi/ic_search_dark.png rename to app/src/main/res/drawable-hdpi/ic_search_dark.png diff --git a/res/drawable-hdpi/ic_webpage.png b/app/src/main/res/drawable-hdpi/ic_webpage.png similarity index 100% rename from res/drawable-hdpi/ic_webpage.png rename to app/src/main/res/drawable-hdpi/ic_webpage.png diff --git a/res/drawable-hdpi/ic_webpage_dark.png b/app/src/main/res/drawable-hdpi/ic_webpage_dark.png similarity index 100% rename from res/drawable-hdpi/ic_webpage_dark.png rename to app/src/main/res/drawable-hdpi/ic_webpage_dark.png diff --git a/res/drawable-mdpi/drawer_left_shadow.9.png b/app/src/main/res/drawable-mdpi/drawer_left_shadow.9.png similarity index 100% rename from res/drawable-mdpi/drawer_left_shadow.9.png rename to app/src/main/res/drawable-mdpi/drawer_left_shadow.9.png diff --git a/res/drawable-mdpi/drawer_right_shadow.9.png b/app/src/main/res/drawable-mdpi/drawer_right_shadow.9.png similarity index 100% rename from res/drawable-mdpi/drawer_right_shadow.9.png rename to app/src/main/res/drawable-mdpi/drawer_right_shadow.9.png diff --git a/res/drawable-xhdpi/drawer_left_shadow.9.png b/app/src/main/res/drawable-xhdpi/drawer_left_shadow.9.png similarity index 100% rename from res/drawable-xhdpi/drawer_left_shadow.9.png rename to app/src/main/res/drawable-xhdpi/drawer_left_shadow.9.png diff --git a/res/drawable-xhdpi/drawer_right_shadow.9.png b/app/src/main/res/drawable-xhdpi/drawer_right_shadow.9.png similarity index 100% rename from res/drawable-xhdpi/drawer_right_shadow.9.png rename to app/src/main/res/drawable-xhdpi/drawer_right_shadow.9.png diff --git a/res/drawable-xhdpi/ic_action_back.png b/app/src/main/res/drawable-xhdpi/ic_action_back.png similarity index 100% rename from res/drawable-xhdpi/ic_action_back.png rename to app/src/main/res/drawable-xhdpi/ic_action_back.png diff --git a/res/drawable-xhdpi/ic_action_back_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_back_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_back_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_back_dark.png diff --git a/res/drawable-xhdpi/ic_action_collapse.png b/app/src/main/res/drawable-xhdpi/ic_action_collapse.png similarity index 100% rename from res/drawable-xhdpi/ic_action_collapse.png rename to app/src/main/res/drawable-xhdpi/ic_action_collapse.png diff --git a/res/drawable-xhdpi/ic_action_copy.png b/app/src/main/res/drawable-xhdpi/ic_action_copy.png similarity index 100% rename from res/drawable-xhdpi/ic_action_copy.png rename to app/src/main/res/drawable-xhdpi/ic_action_copy.png diff --git a/res/drawable-xhdpi/ic_action_delete.png b/app/src/main/res/drawable-xhdpi/ic_action_delete.png similarity index 100% rename from res/drawable-xhdpi/ic_action_delete.png rename to app/src/main/res/drawable-xhdpi/ic_action_delete.png diff --git a/res/drawable-xhdpi/ic_action_delete_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_delete_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_delete_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_delete_dark.png diff --git a/res/drawable-xhdpi/ic_action_expand.png b/app/src/main/res/drawable-xhdpi/ic_action_expand.png similarity index 100% rename from res/drawable-xhdpi/ic_action_expand.png rename to app/src/main/res/drawable-xhdpi/ic_action_expand.png diff --git a/res/drawable-xhdpi/ic_action_forward.png b/app/src/main/res/drawable-xhdpi/ic_action_forward.png similarity index 100% rename from res/drawable-xhdpi/ic_action_forward.png rename to app/src/main/res/drawable-xhdpi/ic_action_forward.png diff --git a/res/drawable-xhdpi/ic_action_forward_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_forward_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_forward_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_forward_dark.png diff --git a/res/drawable-xhdpi/ic_action_invert_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_invert_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_invert_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_invert_dark.png diff --git a/res/drawable-xhdpi/ic_action_invert_light.png b/app/src/main/res/drawable-xhdpi/ic_action_invert_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_invert_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_invert_light.png diff --git a/res/drawable-xhdpi/ic_action_menu.png b/app/src/main/res/drawable-xhdpi/ic_action_menu.png similarity index 100% rename from res/drawable-xhdpi/ic_action_menu.png rename to app/src/main/res/drawable-xhdpi/ic_action_menu.png diff --git a/res/drawable-xhdpi/ic_action_plus.png b/app/src/main/res/drawable-xhdpi/ic_action_plus.png similarity index 100% rename from res/drawable-xhdpi/ic_action_plus.png rename to app/src/main/res/drawable-xhdpi/ic_action_plus.png diff --git a/res/drawable-xhdpi/ic_action_plus_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_plus_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_plus_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_plus_dark.png diff --git a/res/drawable-xhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh.png similarity index 100% rename from res/drawable-xhdpi/ic_action_refresh.png rename to app/src/main/res/drawable-xhdpi/ic_action_refresh.png diff --git a/res/drawable-xhdpi/ic_action_star.png b/app/src/main/res/drawable-xhdpi/ic_action_star.png similarity index 100% rename from res/drawable-xhdpi/ic_action_star.png rename to app/src/main/res/drawable-xhdpi/ic_action_star.png diff --git a/res/drawable-xhdpi/ic_action_star_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_star_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_star_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_star_dark.png diff --git a/res/drawable-xhdpi/ic_action_tabs_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_tabs_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_tabs_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_tabs_dark.png diff --git a/res/drawable-xhdpi/ic_action_tabs_light.png b/app/src/main/res/drawable-xhdpi/ic_action_tabs_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_tabs_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_tabs_light.png diff --git a/res/drawable-xhdpi/ic_action_text_size_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_text_size_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_text_size_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_text_size_dark.png diff --git a/res/drawable-xhdpi/ic_action_text_size_light.png b/app/src/main/res/drawable-xhdpi/ic_action_text_size_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_text_size_light.png rename to app/src/main/res/drawable-xhdpi/ic_action_text_size_light.png diff --git a/res/drawable-xhdpi/ic_bookmark.png b/app/src/main/res/drawable-xhdpi/ic_bookmark.png similarity index 100% rename from res/drawable-xhdpi/ic_bookmark.png rename to app/src/main/res/drawable-xhdpi/ic_bookmark.png diff --git a/res/drawable-xhdpi/ic_bookmark_dark.png b/app/src/main/res/drawable-xhdpi/ic_bookmark_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_bookmark_dark.png rename to app/src/main/res/drawable-xhdpi/ic_bookmark_dark.png diff --git a/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png similarity index 100% rename from res/drawable-xhdpi/ic_drawer.png rename to app/src/main/res/drawable-xhdpi/ic_drawer.png diff --git a/res/drawable-xhdpi/ic_history.png b/app/src/main/res/drawable-xhdpi/ic_history.png similarity index 100% rename from res/drawable-xhdpi/ic_history.png rename to app/src/main/res/drawable-xhdpi/ic_history.png diff --git a/res/drawable-xhdpi/ic_history_dark.png b/app/src/main/res/drawable-xhdpi/ic_history_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_history_dark.png rename to app/src/main/res/drawable-xhdpi/ic_history_dark.png diff --git a/res/drawable-xhdpi/ic_search.png b/app/src/main/res/drawable-xhdpi/ic_search.png similarity index 100% rename from res/drawable-xhdpi/ic_search.png rename to app/src/main/res/drawable-xhdpi/ic_search.png diff --git a/res/drawable-xhdpi/ic_search_dark.png b/app/src/main/res/drawable-xhdpi/ic_search_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_search_dark.png rename to app/src/main/res/drawable-xhdpi/ic_search_dark.png diff --git a/res/drawable-xhdpi/ic_webpage.png b/app/src/main/res/drawable-xhdpi/ic_webpage.png similarity index 100% rename from res/drawable-xhdpi/ic_webpage.png rename to app/src/main/res/drawable-xhdpi/ic_webpage.png diff --git a/res/drawable-xhdpi/ic_webpage_dark.png b/app/src/main/res/drawable-xhdpi/ic_webpage_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_webpage_dark.png rename to app/src/main/res/drawable-xhdpi/ic_webpage_dark.png diff --git a/res/drawable-xhdpi/progress_bar.9.png b/app/src/main/res/drawable-xhdpi/progress_bar.9.png similarity index 100% rename from res/drawable-xhdpi/progress_bar.9.png rename to app/src/main/res/drawable-xhdpi/progress_bar.9.png diff --git a/res/drawable-xhdpi/progress_bar_bg.9.png b/app/src/main/res/drawable-xhdpi/progress_bar_bg.9.png similarity index 100% rename from res/drawable-xhdpi/progress_bar_bg.9.png rename to app/src/main/res/drawable-xhdpi/progress_bar_bg.9.png diff --git a/res/drawable-xxhdpi/ic_action_back.png b/app/src/main/res/drawable-xxhdpi/ic_action_back.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_back.png rename to app/src/main/res/drawable-xxhdpi/ic_action_back.png diff --git a/res/drawable-xxhdpi/ic_action_back_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_back_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_back_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_back_dark.png diff --git a/res/drawable-xxhdpi/ic_action_collapse.png b/app/src/main/res/drawable-xxhdpi/ic_action_collapse.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_collapse.png rename to app/src/main/res/drawable-xxhdpi/ic_action_collapse.png diff --git a/res/drawable-xxhdpi/ic_action_copy.png b/app/src/main/res/drawable-xxhdpi/ic_action_copy.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_copy.png rename to app/src/main/res/drawable-xxhdpi/ic_action_copy.png diff --git a/res/drawable-xxhdpi/ic_action_delete.png b/app/src/main/res/drawable-xxhdpi/ic_action_delete.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_delete.png rename to app/src/main/res/drawable-xxhdpi/ic_action_delete.png diff --git a/res/drawable-xxhdpi/ic_action_delete_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_delete_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_delete_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_delete_dark.png diff --git a/res/drawable-xxhdpi/ic_action_expand.png b/app/src/main/res/drawable-xxhdpi/ic_action_expand.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_expand.png rename to app/src/main/res/drawable-xxhdpi/ic_action_expand.png diff --git a/res/drawable-xxhdpi/ic_action_forward.png b/app/src/main/res/drawable-xxhdpi/ic_action_forward.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_forward.png rename to app/src/main/res/drawable-xxhdpi/ic_action_forward.png diff --git a/res/drawable-xxhdpi/ic_action_forward_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_forward_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_forward_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_forward_dark.png diff --git a/res/drawable-xxhdpi/ic_action_invert_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_invert_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_invert_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_invert_dark.png diff --git a/res/drawable-xxhdpi/ic_action_invert_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_invert_light.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_invert_light.png rename to app/src/main/res/drawable-xxhdpi/ic_action_invert_light.png diff --git a/res/drawable-xxhdpi/ic_action_menu.png b/app/src/main/res/drawable-xxhdpi/ic_action_menu.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_menu.png rename to app/src/main/res/drawable-xxhdpi/ic_action_menu.png diff --git a/res/drawable-xxhdpi/ic_action_plus.png b/app/src/main/res/drawable-xxhdpi/ic_action_plus.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_plus.png rename to app/src/main/res/drawable-xxhdpi/ic_action_plus.png diff --git a/res/drawable-xxhdpi/ic_action_plus_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_plus_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_plus_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_plus_dark.png diff --git a/res/drawable-xxhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_refresh.png rename to app/src/main/res/drawable-xxhdpi/ic_action_refresh.png diff --git a/res/drawable-xxhdpi/ic_action_star.png b/app/src/main/res/drawable-xxhdpi/ic_action_star.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_star.png rename to app/src/main/res/drawable-xxhdpi/ic_action_star.png diff --git a/res/drawable-xxhdpi/ic_action_star_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_star_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_star_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_star_dark.png diff --git a/res/drawable-xxhdpi/ic_action_tabs_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_tabs_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_tabs_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_tabs_dark.png diff --git a/res/drawable-xxhdpi/ic_action_tabs_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_tabs_light.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_tabs_light.png rename to app/src/main/res/drawable-xxhdpi/ic_action_tabs_light.png diff --git a/res/drawable-xxhdpi/ic_action_text_size_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_text_size_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_text_size_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_text_size_dark.png diff --git a/res/drawable-xxhdpi/ic_action_text_size_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_text_size_light.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_text_size_light.png rename to app/src/main/res/drawable-xxhdpi/ic_action_text_size_light.png diff --git a/res/drawable-xxhdpi/ic_bookmark.png b/app/src/main/res/drawable-xxhdpi/ic_bookmark.png similarity index 100% rename from res/drawable-xxhdpi/ic_bookmark.png rename to app/src/main/res/drawable-xxhdpi/ic_bookmark.png diff --git a/res/drawable-xxhdpi/ic_bookmark_dark.png b/app/src/main/res/drawable-xxhdpi/ic_bookmark_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_bookmark_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_bookmark_dark.png diff --git a/res/drawable-xxhdpi/ic_history.png b/app/src/main/res/drawable-xxhdpi/ic_history.png similarity index 100% rename from res/drawable-xxhdpi/ic_history.png rename to app/src/main/res/drawable-xxhdpi/ic_history.png diff --git a/res/drawable-xxhdpi/ic_history_dark.png b/app/src/main/res/drawable-xxhdpi/ic_history_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_history_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_history_dark.png diff --git a/res/drawable-xxhdpi/ic_search.png b/app/src/main/res/drawable-xxhdpi/ic_search.png similarity index 100% rename from res/drawable-xxhdpi/ic_search.png rename to app/src/main/res/drawable-xxhdpi/ic_search.png diff --git a/res/drawable-xxhdpi/ic_search_dark.png b/app/src/main/res/drawable-xxhdpi/ic_search_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_search_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_search_dark.png diff --git a/res/drawable-xxhdpi/ic_webpage.png b/app/src/main/res/drawable-xxhdpi/ic_webpage.png similarity index 100% rename from res/drawable-xxhdpi/ic_webpage.png rename to app/src/main/res/drawable-xxhdpi/ic_webpage.png diff --git a/res/drawable-xxhdpi/ic_webpage_dark.png b/app/src/main/res/drawable-xxhdpi/ic_webpage_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_webpage_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_webpage_dark.png diff --git a/res/drawable/card_bg.xml b/app/src/main/res/drawable/card_bg.xml similarity index 100% rename from res/drawable/card_bg.xml rename to app/src/main/res/drawable/card_bg.xml diff --git a/res/drawable/card_bg_elevate.xml b/app/src/main/res/drawable/card_bg_elevate.xml similarity index 100% rename from res/drawable/card_bg_elevate.xml rename to app/src/main/res/drawable/card_bg_elevate.xml diff --git a/res/drawable/list_bg.xml b/app/src/main/res/drawable/list_bg.xml similarity index 100% rename from res/drawable/list_bg.xml rename to app/src/main/res/drawable/list_bg.xml diff --git a/res/drawable/list_bg_dark.xml b/app/src/main/res/drawable/list_bg_dark.xml similarity index 100% rename from res/drawable/list_bg_dark.xml rename to app/src/main/res/drawable/list_bg_dark.xml diff --git a/res/drawable/list_bg_light.xml b/app/src/main/res/drawable/list_bg_light.xml similarity index 100% rename from res/drawable/list_bg_light.xml rename to app/src/main/res/drawable/list_bg_light.xml diff --git a/res/drawable/progress.xml b/app/src/main/res/drawable/progress.xml similarity index 100% rename from res/drawable/progress.xml rename to app/src/main/res/drawable/progress.xml diff --git a/res/drawable/toolbar_elevate.xml b/app/src/main/res/drawable/toolbar_elevate.xml similarity index 100% rename from res/drawable/toolbar_elevate.xml rename to app/src/main/res/drawable/toolbar_elevate.xml diff --git a/res/drawable/toolbar_elevate_dark.xml b/app/src/main/res/drawable/toolbar_elevate_dark.xml similarity index 100% rename from res/drawable/toolbar_elevate_dark.xml rename to app/src/main/res/drawable/toolbar_elevate_dark.xml diff --git a/res/layout/about_settings.xml b/app/src/main/res/layout/about_settings.xml similarity index 100% rename from res/layout/about_settings.xml rename to app/src/main/res/layout/about_settings.xml diff --git a/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml similarity index 82% rename from res/layout/activity_main.xml rename to app/src/main/res/layout/activity_main.xml index 336ead4..db9476a 100644 --- a/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,23 +1,22 @@ + android:orientation="vertical"> + android:fitsSystemWindows="true"> + android:orientation="vertical"> diff --git a/res/layout/advanced_settings.xml b/app/src/main/res/layout/advanced_settings.xml similarity index 100% rename from res/layout/advanced_settings.xml rename to app/src/main/res/layout/advanced_settings.xml diff --git a/res/layout/animated_progress_bar.xml b/app/src/main/res/layout/animated_progress_bar.xml similarity index 100% rename from res/layout/animated_progress_bar.xml rename to app/src/main/res/layout/animated_progress_bar.xml diff --git a/res/layout/bookmark_drawer.xml b/app/src/main/res/layout/bookmark_drawer.xml similarity index 100% rename from res/layout/bookmark_drawer.xml rename to app/src/main/res/layout/bookmark_drawer.xml diff --git a/res/layout/bookmark_list_item.xml b/app/src/main/res/layout/bookmark_list_item.xml similarity index 100% rename from res/layout/bookmark_list_item.xml rename to app/src/main/res/layout/bookmark_list_item.xml diff --git a/res/layout/bookmark_settings.xml b/app/src/main/res/layout/bookmark_settings.xml similarity index 100% rename from res/layout/bookmark_settings.xml rename to app/src/main/res/layout/bookmark_settings.xml diff --git a/res/layout/browser_content.xml b/app/src/main/res/layout/browser_content.xml similarity index 100% rename from res/layout/browser_content.xml rename to app/src/main/res/layout/browser_content.xml diff --git a/res/layout/display_settings.xml b/app/src/main/res/layout/display_settings.xml similarity index 100% rename from res/layout/display_settings.xml rename to app/src/main/res/layout/display_settings.xml diff --git a/res/layout/general_settings.xml b/app/src/main/res/layout/general_settings.xml similarity index 100% rename from res/layout/general_settings.xml rename to app/src/main/res/layout/general_settings.xml diff --git a/res/layout/license_activity.xml b/app/src/main/res/layout/license_activity.xml similarity index 100% rename from res/layout/license_activity.xml rename to app/src/main/res/layout/license_activity.xml diff --git a/res/layout/privacy_settings.xml b/app/src/main/res/layout/privacy_settings.xml similarity index 100% rename from res/layout/privacy_settings.xml rename to app/src/main/res/layout/privacy_settings.xml diff --git a/res/layout/reading_view.xml b/app/src/main/res/layout/reading_view.xml similarity index 100% rename from res/layout/reading_view.xml rename to app/src/main/res/layout/reading_view.xml diff --git a/res/layout/search.xml b/app/src/main/res/layout/search.xml similarity index 100% rename from res/layout/search.xml rename to app/src/main/res/layout/search.xml diff --git a/res/layout/search_interface.xml b/app/src/main/res/layout/search_interface.xml similarity index 100% rename from res/layout/search_interface.xml rename to app/src/main/res/layout/search_interface.xml diff --git a/res/layout/seek_layout.xml b/app/src/main/res/layout/seek_layout.xml similarity index 100% rename from res/layout/seek_layout.xml rename to app/src/main/res/layout/seek_layout.xml diff --git a/res/layout/settings.xml b/app/src/main/res/layout/settings.xml similarity index 100% rename from res/layout/settings.xml rename to app/src/main/res/layout/settings.xml diff --git a/res/layout/tab_drawer.xml b/app/src/main/res/layout/tab_drawer.xml similarity index 98% rename from res/layout/tab_drawer.xml rename to app/src/main/res/layout/tab_drawer.xml index 63a469c..648a8c6 100644 --- a/res/layout/tab_drawer.xml +++ b/app/src/main/res/layout/tab_drawer.xml @@ -4,7 +4,7 @@ android:layout_width="@dimen/navigation_width" android:layout_height="match_parent" android:layout_gravity="start" - android:background="?drawerBackground" + android:background="?attr/drawerBackground" android:clickable="true" android:fitsSystemWindows="true" android:orientation="vertical" > diff --git a/res/layout/tab_list_item.xml b/app/src/main/res/layout/tab_list_item.xml similarity index 100% rename from res/layout/tab_list_item.xml rename to app/src/main/res/layout/tab_list_item.xml diff --git a/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml similarity index 100% rename from res/layout/toolbar.xml rename to app/src/main/res/layout/toolbar.xml diff --git a/res/layout/toolbar_content.xml b/app/src/main/res/layout/toolbar_content.xml similarity index 100% rename from res/layout/toolbar_content.xml rename to app/src/main/res/layout/toolbar_content.xml diff --git a/res/layout/toolbar_settings.xml b/app/src/main/res/layout/toolbar_settings.xml similarity index 100% rename from res/layout/toolbar_settings.xml rename to app/src/main/res/layout/toolbar_settings.xml diff --git a/res/layout/two_line_autocomplete.xml b/app/src/main/res/layout/two_line_autocomplete.xml similarity index 100% rename from res/layout/two_line_autocomplete.xml rename to app/src/main/res/layout/two_line_autocomplete.xml diff --git a/res/layout/video_loading_progress.xml b/app/src/main/res/layout/video_loading_progress.xml similarity index 100% rename from res/layout/video_loading_progress.xml rename to app/src/main/res/layout/video_loading_progress.xml diff --git a/res/menu-large/incognito.xml b/app/src/main/res/menu-large/incognito.xml similarity index 91% rename from res/menu-large/incognito.xml rename to app/src/main/res/menu-large/incognito.xml index 21af914..80bd08e 100644 --- a/res/menu-large/incognito.xml +++ b/app/src/main/res/menu-large/incognito.xml @@ -33,5 +33,8 @@ + \ No newline at end of file diff --git a/res/menu-large/main.xml b/app/src/main/res/menu-large/main.xml similarity index 100% rename from res/menu-large/main.xml rename to app/src/main/res/menu-large/main.xml diff --git a/res/menu-xlarge/incognito.xml b/app/src/main/res/menu-xlarge/incognito.xml similarity index 91% rename from res/menu-xlarge/incognito.xml rename to app/src/main/res/menu-xlarge/incognito.xml index 21af914..80bd08e 100644 --- a/res/menu-xlarge/incognito.xml +++ b/app/src/main/res/menu-xlarge/incognito.xml @@ -33,5 +33,8 @@ + \ No newline at end of file diff --git a/res/menu-xlarge/main.xml b/app/src/main/res/menu-xlarge/main.xml similarity index 100% rename from res/menu-xlarge/main.xml rename to app/src/main/res/menu-xlarge/main.xml diff --git a/res/menu/incognito.xml b/app/src/main/res/menu/incognito.xml similarity index 100% rename from res/menu/incognito.xml rename to app/src/main/res/menu/incognito.xml diff --git a/res/menu/main.xml b/app/src/main/res/menu/main.xml similarity index 100% rename from res/menu/main.xml rename to app/src/main/res/menu/main.xml diff --git a/res/menu/reading.xml b/app/src/main/res/menu/reading.xml similarity index 100% rename from res/menu/reading.xml rename to app/src/main/res/menu/reading.xml diff --git a/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from res/mipmap-hdpi/ic_launcher.png rename to app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from res/mipmap-mdpi/ic_launcher.png rename to app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from res/mipmap-xhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from res/mipmap-xxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from res/mipmap-xxxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml similarity index 99% rename from res/values-ar/strings.xml rename to app/src/main/res/values-ar/strings.xml index e0d980a..0c32338 100644 --- a/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1,4 +1,4 @@ - + Lightning جوجل diff --git a/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 99% rename from res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml index 1bb3c93..50f6d2c 100644 --- a/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from res/values-zh-rCN/strings.xml rename to app/src/main/res/values-zh-rCN/strings.xml diff --git a/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from res/values-zh-rTW/strings.xml rename to app/src/main/res/values-zh-rTW/strings.xml diff --git a/res/values/arrays.xml b/app/src/main/res/values/arrays.xml similarity index 100% rename from res/values/arrays.xml rename to app/src/main/res/values/arrays.xml diff --git a/res/values/attr.xml b/app/src/main/res/values/attr.xml similarity index 100% rename from res/values/attr.xml rename to app/src/main/res/values/attr.xml diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 94% rename from res/values/colors.xml rename to app/src/main/res/values/colors.xml index 5358ddc..3fca9ae 100644 --- a/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,22 +14,24 @@ #E0E0E0 #4D000000 #0073EF - + #ffffff #424242 - + #9C9C9C #2E2E2E - + #BDBDBD - + #424242 - + #1EFFFFFF #1E000000 - - + + #0FFFFFFF #0F000000 - + + #00000000 + \ No newline at end of file diff --git a/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 95% rename from res/values/styles.xml rename to app/src/main/res/values/styles.xml index 2be4b6b..2273120 100644 --- a/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -9,7 +9,7 @@ @color/primary_color @color/secondary_color_settings @color/accent_color - true + true false @null @drawable/ic_action_invert_light @@ -25,7 +25,7 @@ @color/primary_color_dark @color/secondary_color_settings_dark @color/accent_color - true + true false @null @drawable/ic_action_invert_dark @@ -40,7 +40,7 @@ @color/primary_color @color/secondary_color @color/accent_color - true + true false @color/secondary_color @drawable/list_bg @@ -68,7 +68,7 @@ @color/primary_color_dark @color/secondary_color @color/accent_color - true + true false @color/secondary_color @drawable/list_bg diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..01de6ef --- /dev/null +++ b/build.gradle @@ -0,0 +1,15 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.2.2' + } +} + +allprojects { + repositories { + jcenter() + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..8c0fb64a8698b08ecc4158d828ca593c4928e9dd GIT binary patch literal 49896 zcmagFb986H(k`5d^NVfUwr$(C?M#x1ZQHiZiEVpg+jrjgoQrerx!>1o_ul)D>ebz~ zs=Mmxr&>W81QY-S1PKWQ%N-;H^tS;2*XwVA`dej1RRn1z<;3VgfE4~kaG`A%QSPsR z#ovnZe+tS9%1MfeDyz`RirvdjPRK~p(#^q2(^5@O&NM19EHdvN-A&StN>0g6QA^VN z0Gx%Gq#PD$QMRFzmK+utjS^Y1F0e8&u&^=w5K<;4Rz|i3A=o|IKLY+g`iK6vfr9?+ z-`>gmU&i?FGSL5&F?TXFu`&Js6h;15QFkXp2M1H9|Eq~bpov-GU(uz%mH0n55wUl- zv#~ccAz`F5wlQ>e_KlJS3@{)B?^v*EQM=IxLa&76^y51a((wq|2-`qON>+4dLc{Oo z51}}o^Zen(oAjxDK7b++9_Yg`67p$bPo3~BCpGM7uAWmvIhWc5Gi+gQZ|Pwa-Gll@<1xmcPy z|NZmu6m)g5Ftu~BG&Xdxclw7Cij{xbBMBn-LMII#Slp`AElb&2^Hw+w>(3crLH!;I zN+Vk$D+wP1#^!MDCiad@vM>H#6+`Ct#~6VHL4lzmy;lSdk>`z6)=>Wh15Q2)dQtGqvn0vJU@+(B5{MUc*qs4!T+V=q=wy)<6$~ z!G>e_4dN@lGeF_$q9`Ju6Ncb*x?O7=l{anm7Eahuj_6lA{*#Gv*TaJclevPVbbVYu z(NY?5q+xxbO6%g1xF0r@Ix8fJ~u)VRUp`S%&rN$&e!Od`~s+64J z5*)*WSi*i{k%JjMSIN#X;jC{HG$-^iX+5f5BGOIHWAl*%15Z#!xntpk($-EGKCzKa zT7{siZ9;4TICsWQ$pu&wKZQTCvpI$Xvzwxoi+XkkpeE&&kFb!B?h2hi%^YlXt|-@5 zHJ~%AN!g_^tmn1?HSm^|gCE#!GRtK2(L{9pL#hp0xh zME}|DB>(5)`iE7CM)&_+S}-Bslc#@B5W4_+k4Cp$l>iVyg$KP>CN?SVGZ(&02>iZK zB<^HP$g$Lq*L$BWd?2(F?-MUbNWTJVQdW7$#8a|k_30#vHAD1Z{c#p;bETk0VnU5A zBgLe2HFJ3032$G<`m*OB!KM$*sdM20jm)It5OSru@tXpK5LT>#8)N!*skNu1$TpIw zufjjdp#lyH5bZ%|Iuo|iu9vG1HrIVWLH>278xo>aVBkPN3V$~!=KnlXQ4eDqS7%E% zQ!z^$Q$b^6Q)g#cLpwur(|<0gWHo6A6jc;n`t(V9T;LzTAU{IAu*uEQ%Ort1k+Kn+f_N`9|bxYC+~Z1 zCC1UCWv*Orx$_@ydv9mIe(liLfOr7mhbV@tKw{6)q^1DH1nmvZ0cj215R<~&I<4S| zgnr;9Cdjqpz#o8i0CQjtl`}{c*P)aSdH|abxGdrR)-3z+02-eX(k*B)Uqv6~^nh** z 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/project.properties b/project.properties deleted file mode 100644 index 1fbb689..0000000 --- a/project.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-22 -android.library.reference.1=external/appcompat -android.library.reference.2=external/palette -android.library.reference.3=external/netcipher/libnetcipher diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..09a8a5d --- /dev/null +++ b/settings.gradle @@ -0,0 +1,4 @@ +include ':app' +include ':libnetcipher' + +project(':libnetcipher').projectDir = new File(rootProject.projectDir, 'external/netcipher/libnetcipher') diff --git a/setup-ant.bat b/setup-ant.bat deleted file mode 100644 index 2c443b4..0000000 --- a/setup-ant.bat +++ /dev/null @@ -1,26 +0,0 @@ -@ECHO OFF -SETLOCAL enabledelayedexpansion - -SET "target=android-21" - -RMDIR external\appcompat /s /q -XCOPY "%ANDROID_HOME%\extras\android\support\v7\appcompat" "external\appcompat\*" /s /e /y /q - -REM This library is already included by netcipher, but SHA1 of JARs differ -DEL /f /q external\appcompat\libs\android-support-v4.jar - -RMDIR external\palette /s /q -XCOPY "%ANDROID_HOME%\extras\android\support\v7\palette" "external\palette\*" /s /e /y /q -MKDIR external\palette\src - -REM Update ant setup in project and all sub-projects -SET "pattern=project.properties" -FOR /R "./external/" %%# in (*.properties) DO ( - ECHO %%~nx# | FIND "%pattern%" 1>NUL && ( - SET current_dir=%~d0%%~p# - SET current_dir=!current_dir:\=/! - ECHO Updating ant setup in "!current_dir!" - CALL android update lib-project -t %target% -p "!current_dir!" - ) -) -CALL android update project -p . --subprojects -t %target% --name Lightning diff --git a/setup-ant.sh b/setup-ant.sh deleted file mode 100755 index e385400..0000000 --- a/setup-ant.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -target="android-21" - -rm -rf external/appcompat -cp -r "${ANDROID_HOME}/extras/android/support/v7/appcompat" external/ - -# This library is already included by netcipher, but SHA1 of JARs differ -rm external/appcompat/libs/android-support-v4.jar - -rm -rf external/palette -cp -r "${ANDROID_HOME}/extras/android/support/v7/palette" external/ -mkdir external/palette/src - -# Update ant setup in project and all sub-projects -for f in `find external/ -name project.properties`; do - projectdir=`dirname $f` - echo "Updating ant setup in $projectdir:" - android update lib-project -p $projectdir -t $target -done -android update project -p . --subprojects -t $target --name Lightning From 8e326683053df815f83d50a37fe579c0cce702ce Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 2 May 2015 12:42:27 -0400 Subject: [PATCH 02/22] Remove old iml file --- app/lightningBrowserPlus.iml | 98 ------------------------------------ 1 file changed, 98 deletions(-) delete mode 100644 app/lightningBrowserPlus.iml diff --git a/app/lightningBrowserPlus.iml b/app/lightningBrowserPlus.iml deleted file mode 100644 index 759baa1..0000000 --- a/app/lightningBrowserPlus.iml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From d39bf65880903134fc499745cd6f629023bc9a79 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 2 May 2015 12:44:09 -0400 Subject: [PATCH 03/22] Remove unnecessary iml file --- Lightning-Browser-AS.iml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 Lightning-Browser-AS.iml diff --git a/Lightning-Browser-AS.iml b/Lightning-Browser-AS.iml deleted file mode 100644 index 77ef0be..0000000 --- a/Lightning-Browser-AS.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file From 27513bd94e50897cad526fe2b076e34cff017f88 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 2 May 2015 12:47:06 -0400 Subject: [PATCH 04/22] Add in appropriate .idea files --- .idea/compiler.xml | 22 +++++++++++++++++++ .idea/copyright/profiles_settings.xml | 3 +++ .idea/encodings.xml | 6 +++++ .idea/gradle.xml | 20 +++++++++++++++++ .idea/inspectionProfiles/Project_Default.xml | 11 ++++++++++ .../inspectionProfiles/profiles_settings.xml | 7 ++++++ .idea/misc.xml | 4 ++++ .idea/modules.xml | 10 +++++++++ .idea/vcs.xml | 8 +++++++ 9 files changed, 91 insertions(+) create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..02069c6 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..99b1a92 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..3b31283 --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..231e88d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..00ab69e --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..00cd10a --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From e65e06265208757cfe222cd8bffc85c4d568daa7 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 2 May 2015 12:51:14 -0400 Subject: [PATCH 05/22] Fixing travis --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8cde23..5481cfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,5 @@ android: before_install: - git submodule update --init --recursive install: - - ./setup-ant.sh + - ./gradlew script: - - ant debug && lint -w --exitcode --disable MissingTranslation . From fa77fe228a19570ab9704b0f18466b1f10c189eb Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 2 May 2015 12:56:23 -0400 Subject: [PATCH 06/22] Dummy change to gradleq --- gradlew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradlew b/gradlew index 91a7e26..70b9d09 100644 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env bashs ############################################################################## ## From 4868cf0cc6dc3b17b219e66f1f4371766be1acba Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 2 May 2015 12:56:53 -0400 Subject: [PATCH 07/22] Try to fix line end bug --- gradlew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradlew b/gradlew index 70b9d09..91a7e26 100644 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bashs +#!/usr/bin/env bash ############################################################################## ## From b02f726a325c9861cdc506f410b5e11dd41da87d Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 2 May 2015 13:00:17 -0400 Subject: [PATCH 08/22] Fix travis yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5481cfb..8dd5f02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ android: - 'android-sdk-license-.+' - '.*intel.+' before_install: + - chmod +x gradlew - git submodule update --init --recursive install: - ./gradlew From 8738af72f047c7caf9be3965edaec6a6d8f4b7f2 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 2 May 2015 13:05:32 -0400 Subject: [PATCH 09/22] Update to latest sdk --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8dd5f02..06e1ab5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: android android: components: - - build-tools-21.1.1 - - android-21 + - build-tools-22.0.1 + - android-22 - extra-android-support licenses: - 'android-sdk-license-.+' From e7188c5985ff6234be90e0e1a8a57d4835dbaaa4 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 2 May 2015 13:12:16 -0400 Subject: [PATCH 10/22] Update build to search for latest support repos --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 06e1ab5..2f63e76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,8 @@ android: - '.*intel.+' before_install: - chmod +x gradlew + - android update sdk --filter extra-android-support --no-ui --force > /dev/null + - android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null - git submodule update --init --recursive install: - ./gradlew From e40f1d44a5d1d6ab7c838db1abdb46360f1d11a9 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 2 May 2015 13:25:27 -0400 Subject: [PATCH 11/22] add m2repository --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f63e76..17527aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,12 @@ android: - build-tools-22.0.1 - android-22 - extra-android-support + - extra-android-m2repository licenses: - 'android-sdk-license-.+' - '.*intel.+' before_install: - chmod +x gradlew - - android update sdk --filter extra-android-support --no-ui --force > /dev/null - - android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null - git submodule update --init --recursive install: - ./gradlew From db734dfa7d193d03fbd70dd03ccfe1e5ae483fe2 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 2 May 2015 14:57:12 -0400 Subject: [PATCH 12/22] Exclude support jars from netcipher build --- app/build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a875445..2e51b88 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,11 @@ android { } dependencies { - compile project(':libnetcipher') + compile(project(':libnetcipher')) { + // Exclude any support-v4 modules because appcompat-v7 will import the latest + exclude module:'support-v4' + exclude module:'android-support-v4' + } 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') From f8c2d0096dfb15bc29bd056420a51da98430f4ee Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sat, 2 May 2015 16:37:22 -0400 Subject: [PATCH 13/22] Move java files to sub-packages for better organization --- .idea/misc.xml | 3 + app/proguard-project.txt | 2 +- app/src/main/AndroidManifest.xml | 438 +++++++++--------- .../lightning/ReplacingInputStream.java | 101 ---- .../{ => activity}/AboutSettingsActivity.java | 4 +- .../AdvancedSettingsActivity.java | 5 +- .../{ => activity}/BookmarkActivity.java | 6 +- .../{ => activity}/BrowserActivity.java | 19 +- .../lightning/{ => activity}/BrowserApp.java | 2 +- .../DisplaySettingsActivity.java | 5 +- .../GeneralSettingsActivity.java | 7 +- .../{ => activity}/IncognitoActivity.java | 5 +- .../{ => activity}/LicenseActivity.java | 4 +- .../{ => activity}/MainActivity.java | 5 +- .../PrivacySettingsActivity.java | 7 +- .../{ => activity}/ReadingActivity.java | 6 +- .../{ => activity}/SettingsActivity.java | 7 +- .../{ => activity}/ThemableActivity.java | 5 +- .../ThemableSettingsActivity.java | 5 +- .../{ => constant}/BookmarkPage.java | 5 +- .../lightning/{ => constant}/Constants.java | 2 +- .../lightning/{ => constant}/HistoryPage.java | 7 +- .../StartPage.java} | 7 +- .../{ => controller}/BrowserController.java | 2 +- .../{ => database}/BookmarkManager.java | 7 +- .../{ => database}/HistoryDatabase.java | 4 +- .../lightning/{ => database}/HistoryItem.java | 2 +- .../{ => download}/DownloadHandler.java | 5 +- .../{ => download}/FetchUrlMimeType.java | 4 +- .../LightningDownloadListener.java | 8 +- .../lightning/{ => download}/WebAddress.java | 2 +- .../lightning/{ => object}/ClickHandler.java | 4 +- .../{ => object}/DrawerArrowDrawable.java | 6 +- .../lightning/{ => object}/SearchAdapter.java | 8 +- .../{ => preference}/PreferenceManager.java | 5 +- .../browser/lightning/reading/Converter.java | 2 +- .../lightning/reading/HtmlFetcher.java | 2 +- .../lightning/{ => utils}/AdBlock.java | 5 +- .../lightning/{ => utils}/IntentUtils.java | 4 +- .../browser/lightning/{ => utils}/Utils.java | 7 +- .../{ => view}/AnimatedProgressBar.java | 4 +- .../lightning/{ => view}/LightningView.java | 18 +- app/src/main/res/layout/toolbar.xml | 2 +- 43 files changed, 391 insertions(+), 367 deletions(-) delete mode 100644 app/src/main/java/acr/browser/lightning/ReplacingInputStream.java rename app/src/main/java/acr/browser/lightning/{ => activity}/AboutSettingsActivity.java (97%) rename app/src/main/java/acr/browser/lightning/{ => activity}/AdvancedSettingsActivity.java (98%) rename app/src/main/java/acr/browser/lightning/{ => activity}/BookmarkActivity.java (95%) rename app/src/main/java/acr/browser/lightning/{ => activity}/BrowserActivity.java (98%) rename app/src/main/java/acr/browser/lightning/{ => activity}/BrowserApp.java (88%) rename app/src/main/java/acr/browser/lightning/{ => activity}/DisplaySettingsActivity.java (97%) rename app/src/main/java/acr/browser/lightning/{ => activity}/GeneralSettingsActivity.java (98%) rename app/src/main/java/acr/browser/lightning/{ => activity}/IncognitoActivity.java (92%) rename app/src/main/java/acr/browser/lightning/{ => activity}/LicenseActivity.java (96%) rename app/src/main/java/acr/browser/lightning/{ => activity}/MainActivity.java (92%) rename app/src/main/java/acr/browser/lightning/{ => activity}/PrivacySettingsActivity.java (98%) rename app/src/main/java/acr/browser/lightning/{ => activity}/ReadingActivity.java (96%) rename app/src/main/java/acr/browser/lightning/{ => activity}/SettingsActivity.java (98%) rename app/src/main/java/acr/browser/lightning/{ => activity}/ThemableActivity.java (86%) rename app/src/main/java/acr/browser/lightning/{ => activity}/ThemableSettingsActivity.java (86%) rename app/src/main/java/acr/browser/lightning/{ => constant}/BookmarkPage.java (93%) rename app/src/main/java/acr/browser/lightning/{ => constant}/Constants.java (98%) rename app/src/main/java/acr/browser/lightning/{ => constant}/HistoryPage.java (93%) rename app/src/main/java/acr/browser/lightning/{HomepageVariables.java => constant/StartPage.java} (94%) rename app/src/main/java/acr/browser/lightning/{ => controller}/BrowserController.java (96%) rename app/src/main/java/acr/browser/lightning/{ => database}/BookmarkManager.java (98%) rename app/src/main/java/acr/browser/lightning/{ => database}/HistoryDatabase.java (98%) rename app/src/main/java/acr/browser/lightning/{ => database}/HistoryItem.java (98%) rename app/src/main/java/acr/browser/lightning/{ => download}/DownloadHandler.java (98%) rename app/src/main/java/acr/browser/lightning/{ => download}/FetchUrlMimeType.java (97%) rename app/src/main/java/acr/browser/lightning/{ => download}/LightningDownloadListener.java (86%) rename app/src/main/java/acr/browser/lightning/{ => download}/WebAddress.java (98%) rename app/src/main/java/acr/browser/lightning/{ => object}/ClickHandler.java (86%) rename app/src/main/java/acr/browser/lightning/{ => object}/DrawerArrowDrawable.java (97%) rename app/src/main/java/acr/browser/lightning/{ => object}/SearchAdapter.java (97%) rename app/src/main/java/acr/browser/lightning/{ => preference}/PreferenceManager.java (98%) rename app/src/main/java/acr/browser/lightning/{ => utils}/AdBlock.java (94%) rename app/src/main/java/acr/browser/lightning/{ => utils}/IntentUtils.java (96%) rename app/src/main/java/acr/browser/lightning/{ => utils}/Utils.java (96%) rename app/src/main/java/acr/browser/lightning/{ => view}/AnimatedProgressBar.java (99%) rename app/src/main/java/acr/browser/lightning/{ => view}/LightningView.java (98%) diff --git a/.idea/misc.xml b/.idea/misc.xml index 231e88d..3f1af1d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,7 @@ + + + \ No newline at end of file diff --git a/app/proguard-project.txt b/app/proguard-project.txt index e1acdcd..2cb04a6 100644 --- a/app/proguard-project.txt +++ b/app/proguard-project.txt @@ -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); diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b022a3d..4782b4c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,219 +1,221 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/acr/browser/lightning/ReplacingInputStream.java b/app/src/main/java/acr/browser/lightning/ReplacingInputStream.java deleted file mode 100644 index 9cd201d..0000000 --- a/app/src/main/java/acr/browser/lightning/ReplacingInputStream.java +++ /dev/null @@ -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 inQueue = new LinkedList(); - - Deque outQueue = new LinkedList(); - - final byte[] search, replacement; - - protected ReplacingInputStream(InputStream in, byte[] search, byte[] replacement) { - super(in); - this.search = search; - this.replacement = replacement; - } - - private boolean isMatchFound() { - Iterator 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); - } -} diff --git a/app/src/main/java/acr/browser/lightning/AboutSettingsActivity.java b/app/src/main/java/acr/browser/lightning/activity/AboutSettingsActivity.java similarity index 97% rename from app/src/main/java/acr/browser/lightning/AboutSettingsActivity.java rename to app/src/main/java/acr/browser/lightning/activity/AboutSettingsActivity.java index 551f944..dd7e19d 100644 --- a/app/src/main/java/acr/browser/lightning/AboutSettingsActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/AboutSettingsActivity.java @@ -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; import android.widget.RelativeLayout; import android.widget.TextView; +import acr.browser.lightning.R; + public class AboutSettingsActivity extends ThemableSettingsActivity implements OnClickListener { private int mEasterEggCounter; diff --git a/app/src/main/java/acr/browser/lightning/AdvancedSettingsActivity.java b/app/src/main/java/acr/browser/lightning/activity/AdvancedSettingsActivity.java similarity index 98% rename from app/src/main/java/acr/browser/lightning/AdvancedSettingsActivity.java rename to app/src/main/java/acr/browser/lightning/activity/AdvancedSettingsActivity.java index 258d3a1..7433b63 100644 --- a/app/src/main/java/acr/browser/lightning/AdvancedSettingsActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/AdvancedSettingsActivity.java @@ -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; 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; diff --git a/app/src/main/java/acr/browser/lightning/BookmarkActivity.java b/app/src/main/java/acr/browser/lightning/activity/BookmarkActivity.java similarity index 95% rename from app/src/main/java/acr/browser/lightning/BookmarkActivity.java rename to app/src/main/java/acr/browser/lightning/activity/BookmarkActivity.java index 35fbe1c..a6aa1af 100644 --- a/app/src/main/java/acr/browser/lightning/BookmarkActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/BookmarkActivity.java @@ -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; 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; diff --git a/app/src/main/java/acr/browser/lightning/BrowserActivity.java b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java similarity index 98% rename from app/src/main/java/acr/browser/lightning/BrowserActivity.java rename to app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java index 24a316f..3b7b0a3 100644 --- a/app/src/main/java/acr/browser/lightning/BrowserActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java @@ -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; 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; 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; diff --git a/app/src/main/java/acr/browser/lightning/BrowserApp.java b/app/src/main/java/acr/browser/lightning/activity/BrowserApp.java similarity index 88% rename from app/src/main/java/acr/browser/lightning/BrowserApp.java rename to app/src/main/java/acr/browser/lightning/activity/BrowserApp.java index 5b49829..98a6850 100644 --- a/app/src/main/java/acr/browser/lightning/BrowserApp.java +++ b/app/src/main/java/acr/browser/lightning/activity/BrowserApp.java @@ -1,4 +1,4 @@ -package acr.browser.lightning; +package acr.browser.lightning.activity; import android.app.Application; import android.content.Context; diff --git a/app/src/main/java/acr/browser/lightning/DisplaySettingsActivity.java b/app/src/main/java/acr/browser/lightning/activity/DisplaySettingsActivity.java similarity index 97% rename from app/src/main/java/acr/browser/lightning/DisplaySettingsActivity.java rename to app/src/main/java/acr/browser/lightning/activity/DisplaySettingsActivity.java index 256e78f..712e8c3 100644 --- a/app/src/main/java/acr/browser/lightning/DisplaySettingsActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/DisplaySettingsActivity.java @@ -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; 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 diff --git a/app/src/main/java/acr/browser/lightning/GeneralSettingsActivity.java b/app/src/main/java/acr/browser/lightning/activity/GeneralSettingsActivity.java similarity index 98% rename from app/src/main/java/acr/browser/lightning/GeneralSettingsActivity.java rename to app/src/main/java/acr/browser/lightning/activity/GeneralSettingsActivity.java index 565e999..ece6f6e 100644 --- a/app/src/main/java/acr/browser/lightning/GeneralSettingsActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/GeneralSettingsActivity.java @@ -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; 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 diff --git a/app/src/main/java/acr/browser/lightning/IncognitoActivity.java b/app/src/main/java/acr/browser/lightning/activity/IncognitoActivity.java similarity index 92% rename from app/src/main/java/acr/browser/lightning/IncognitoActivity.java rename to app/src/main/java/acr/browser/lightning/activity/IncognitoActivity.java index 6d7c804..2595845 100644 --- a/app/src/main/java/acr/browser/lightning/IncognitoActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/IncognitoActivity.java @@ -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; 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 { diff --git a/app/src/main/java/acr/browser/lightning/LicenseActivity.java b/app/src/main/java/acr/browser/lightning/activity/LicenseActivity.java similarity index 96% rename from app/src/main/java/acr/browser/lightning/LicenseActivity.java rename to app/src/main/java/acr/browser/lightning/activity/LicenseActivity.java index 2b19bb4..97aeb4f 100644 --- a/app/src/main/java/acr/browser/lightning/LicenseActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/LicenseActivity.java @@ -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; 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 diff --git a/app/src/main/java/acr/browser/lightning/MainActivity.java b/app/src/main/java/acr/browser/lightning/activity/MainActivity.java similarity index 92% rename from app/src/main/java/acr/browser/lightning/MainActivity.java rename to app/src/main/java/acr/browser/lightning/activity/MainActivity.java index 6cee58a..ab8d744 100644 --- a/app/src/main/java/acr/browser/lightning/MainActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/MainActivity.java @@ -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; 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 { diff --git a/app/src/main/java/acr/browser/lightning/PrivacySettingsActivity.java b/app/src/main/java/acr/browser/lightning/activity/PrivacySettingsActivity.java similarity index 98% rename from app/src/main/java/acr/browser/lightning/PrivacySettingsActivity.java rename to app/src/main/java/acr/browser/lightning/activity/PrivacySettingsActivity.java index 6b9f489..e129d59 100644 --- a/app/src/main/java/acr/browser/lightning/PrivacySettingsActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/PrivacySettingsActivity.java @@ -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; 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 diff --git a/app/src/main/java/acr/browser/lightning/ReadingActivity.java b/app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java similarity index 96% rename from app/src/main/java/acr/browser/lightning/ReadingActivity.java rename to app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java index 573d1a3..a5f024b 100644 --- a/app/src/main/java/acr/browser/lightning/ReadingActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java @@ -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; diff --git a/app/src/main/java/acr/browser/lightning/SettingsActivity.java b/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java similarity index 98% rename from app/src/main/java/acr/browser/lightning/SettingsActivity.java rename to app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java index d286a28..c3ef0bd 100644 --- a/app/src/main/java/acr/browser/lightning/SettingsActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java @@ -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; 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 { diff --git a/app/src/main/java/acr/browser/lightning/ThemableActivity.java b/app/src/main/java/acr/browser/lightning/activity/ThemableActivity.java similarity index 86% rename from app/src/main/java/acr/browser/lightning/ThemableActivity.java rename to app/src/main/java/acr/browser/lightning/activity/ThemableActivity.java index fb112f7..9afd653 100644 --- a/app/src/main/java/acr/browser/lightning/ThemableActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/ThemableActivity.java @@ -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; diff --git a/app/src/main/java/acr/browser/lightning/ThemableSettingsActivity.java b/app/src/main/java/acr/browser/lightning/activity/ThemableSettingsActivity.java similarity index 86% rename from app/src/main/java/acr/browser/lightning/ThemableSettingsActivity.java rename to app/src/main/java/acr/browser/lightning/activity/ThemableSettingsActivity.java index a11632a..86a9468 100644 --- a/app/src/main/java/acr/browser/lightning/ThemableSettingsActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/ThemableSettingsActivity.java @@ -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; diff --git a/app/src/main/java/acr/browser/lightning/BookmarkPage.java b/app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java similarity index 93% rename from app/src/main/java/acr/browser/lightning/BookmarkPage.java rename to app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java index d1d130d..4d6367c 100644 --- a/app/src/main/java/acr/browser/lightning/BookmarkPage.java +++ b/app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java @@ -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 { diff --git a/app/src/main/java/acr/browser/lightning/Constants.java b/app/src/main/java/acr/browser/lightning/constant/Constants.java similarity index 98% rename from app/src/main/java/acr/browser/lightning/Constants.java rename to app/src/main/java/acr/browser/lightning/constant/Constants.java index 5a4aa9f..f87f7ec 100644 --- a/app/src/main/java/acr/browser/lightning/Constants.java +++ b/app/src/main/java/acr/browser/lightning/constant/Constants.java @@ -1,7 +1,7 @@ /* * Copyright 2014 A.C.R. Development */ -package acr.browser.lightning; +package acr.browser.lightning.constant; import android.os.Environment; diff --git a/app/src/main/java/acr/browser/lightning/HistoryPage.java b/app/src/main/java/acr/browser/lightning/constant/HistoryPage.java similarity index 93% rename from app/src/main/java/acr/browser/lightning/HistoryPage.java rename to app/src/main/java/acr/browser/lightning/constant/HistoryPage.java index 2ec79d8..109f026 100644 --- a/app/src/main/java/acr/browser/lightning/HistoryPage.java +++ b/app/src/main/java/acr/browser/lightning/constant/HistoryPage.java @@ -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; 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"; diff --git a/app/src/main/java/acr/browser/lightning/HomepageVariables.java b/app/src/main/java/acr/browser/lightning/constant/StartPage.java similarity index 94% rename from app/src/main/java/acr/browser/lightning/HomepageVariables.java rename to app/src/main/java/acr/browser/lightning/constant/StartPage.java index de59fa1..3a1beb5 100644 --- a/app/src/main/java/acr/browser/lightning/HomepageVariables.java +++ b/app/src/main/java/acr/browser/lightning/constant/StartPage.java @@ -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 = "" + "" diff --git a/app/src/main/java/acr/browser/lightning/BrowserController.java b/app/src/main/java/acr/browser/lightning/controller/BrowserController.java similarity index 96% rename from app/src/main/java/acr/browser/lightning/BrowserController.java rename to app/src/main/java/acr/browser/lightning/controller/BrowserController.java index e320757..5052203 100644 --- a/app/src/main/java/acr/browser/lightning/BrowserController.java +++ b/app/src/main/java/acr/browser/lightning/controller/BrowserController.java @@ -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; diff --git a/app/src/main/java/acr/browser/lightning/BookmarkManager.java b/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java similarity index 98% rename from app/src/main/java/acr/browser/lightning/BookmarkManager.java rename to app/src/main/java/acr/browser/lightning/database/BookmarkManager.java index 4442432..208f5b3 100644 --- a/app/src/main/java/acr/browser/lightning/BookmarkManager.java +++ b/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java @@ -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; 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; diff --git a/app/src/main/java/acr/browser/lightning/HistoryDatabase.java b/app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java similarity index 98% rename from app/src/main/java/acr/browser/lightning/HistoryDatabase.java rename to app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java index 6ece034..6e9736e 100644 --- a/app/src/main/java/acr/browser/lightning/HistoryDatabase.java +++ b/app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java @@ -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; import java.util.ArrayList; import java.util.List; +import acr.browser.lightning.R; + public class HistoryDatabase extends SQLiteOpenHelper { // All Static variables diff --git a/app/src/main/java/acr/browser/lightning/HistoryItem.java b/app/src/main/java/acr/browser/lightning/database/HistoryItem.java similarity index 98% rename from app/src/main/java/acr/browser/lightning/HistoryItem.java rename to app/src/main/java/acr/browser/lightning/database/HistoryItem.java index e106508..3d79010 100644 --- a/app/src/main/java/acr/browser/lightning/HistoryItem.java +++ b/app/src/main/java/acr/browser/lightning/database/HistoryItem.java @@ -1,7 +1,7 @@ /* * Copyright 2014 A.C.R. Development */ -package acr.browser.lightning; +package acr.browser.lightning.database; import android.graphics.Bitmap; diff --git a/app/src/main/java/acr/browser/lightning/DownloadHandler.java b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java similarity index 98% rename from app/src/main/java/acr/browser/lightning/DownloadHandler.java rename to app/src/main/java/acr/browser/lightning/download/DownloadHandler.java index bfd0d40..b4830bc 100644 --- a/app/src/main/java/acr/browser/lightning/DownloadHandler.java +++ b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java @@ -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; import android.webkit.URLUtil; import android.widget.Toast; +import acr.browser.lightning.R; +import acr.browser.lightning.preference.PreferenceManager; + /** * Handle download requests */ diff --git a/app/src/main/java/acr/browser/lightning/FetchUrlMimeType.java b/app/src/main/java/acr/browser/lightning/download/FetchUrlMimeType.java similarity index 97% rename from app/src/main/java/acr/browser/lightning/FetchUrlMimeType.java rename to app/src/main/java/acr/browser/lightning/download/FetchUrlMimeType.java index a9ad666..1cb2165 100644 --- a/app/src/main/java/acr/browser/lightning/FetchUrlMimeType.java +++ b/app/src/main/java/acr/browser/lightning/download/FetchUrlMimeType.java @@ -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; 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 diff --git a/app/src/main/java/acr/browser/lightning/LightningDownloadListener.java b/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java similarity index 86% rename from app/src/main/java/acr/browser/lightning/LightningDownloadListener.java rename to app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java index 1f155be..2439405 100644 --- a/app/src/main/java/acr/browser/lightning/LightningDownloadListener.java +++ b/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java @@ -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; 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; } diff --git a/app/src/main/java/acr/browser/lightning/WebAddress.java b/app/src/main/java/acr/browser/lightning/download/WebAddress.java similarity index 98% rename from app/src/main/java/acr/browser/lightning/WebAddress.java rename to app/src/main/java/acr/browser/lightning/download/WebAddress.java index f2aa0d3..d459e08 100644 --- a/app/src/main/java/acr/browser/lightning/WebAddress.java +++ b/app/src/main/java/acr/browser/lightning/download/WebAddress.java @@ -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; diff --git a/app/src/main/java/acr/browser/lightning/ClickHandler.java b/app/src/main/java/acr/browser/lightning/object/ClickHandler.java similarity index 86% rename from app/src/main/java/acr/browser/lightning/ClickHandler.java rename to app/src/main/java/acr/browser/lightning/object/ClickHandler.java index 4a9f702..f17020b 100644 --- a/app/src/main/java/acr/browser/lightning/ClickHandler.java +++ b/app/src/main/java/acr/browser/lightning/object/ClickHandler.java @@ -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; diff --git a/app/src/main/java/acr/browser/lightning/DrawerArrowDrawable.java b/app/src/main/java/acr/browser/lightning/object/DrawerArrowDrawable.java similarity index 97% rename from app/src/main/java/acr/browser/lightning/DrawerArrowDrawable.java rename to app/src/main/java/acr/browser/lightning/object/DrawerArrowDrawable.java index 8f44787..a8de763 100644 --- a/app/src/main/java/acr/browser/lightning/DrawerArrowDrawable.java +++ b/app/src/main/java/acr/browser/lightning/object/DrawerArrowDrawable.java @@ -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; * 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 { * @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); diff --git a/app/src/main/java/acr/browser/lightning/SearchAdapter.java b/app/src/main/java/acr/browser/lightning/object/SearchAdapter.java similarity index 97% rename from app/src/main/java/acr/browser/lightning/SearchAdapter.java rename to app/src/main/java/acr/browser/lightning/object/SearchAdapter.java index d130cd8..c5b97e3 100644 --- a/app/src/main/java/acr/browser/lightning/SearchAdapter.java +++ b/app/src/main/java/acr/browser/lightning/object/SearchAdapter.java @@ -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; 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 mHistory; diff --git a/app/src/main/java/acr/browser/lightning/PreferenceManager.java b/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java similarity index 98% rename from app/src/main/java/acr/browser/lightning/PreferenceManager.java rename to app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java index 33f82e1..275e93d 100644 --- a/app/src/main/java/acr/browser/lightning/PreferenceManager.java +++ b/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java @@ -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 { diff --git a/app/src/main/java/acr/browser/lightning/reading/Converter.java b/app/src/main/java/acr/browser/lightning/reading/Converter.java index 6178d00..25c5310 100644 --- a/app/src/main/java/acr/browser/lightning/reading/Converter.java +++ b/app/src/main/java/acr/browser/lightning/reading/Converter.java @@ -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; /** diff --git a/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java b/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java index e1032ea..8dc5b6e 100644 --- a/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java +++ b/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java @@ -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; /** diff --git a/app/src/main/java/acr/browser/lightning/AdBlock.java b/app/src/main/java/acr/browser/lightning/utils/AdBlock.java similarity index 94% rename from app/src/main/java/acr/browser/lightning/AdBlock.java rename to app/src/main/java/acr/browser/lightning/utils/AdBlock.java index 0806cfc..4abcbfe 100644 --- a/app/src/main/java/acr/browser/lightning/AdBlock.java +++ b/app/src/main/java/acr/browser/lightning/utils/AdBlock.java @@ -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; 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"; diff --git a/app/src/main/java/acr/browser/lightning/IntentUtils.java b/app/src/main/java/acr/browser/lightning/utils/IntentUtils.java similarity index 96% rename from app/src/main/java/acr/browser/lightning/IntentUtils.java rename to app/src/main/java/acr/browser/lightning/utils/IntentUtils.java index e43f275..60c4a47 100644 --- a/app/src/main/java/acr/browser/lightning/IntentUtils.java +++ b/app/src/main/java/acr/browser/lightning/utils/IntentUtils.java @@ -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; import java.util.regex.Matcher; import java.util.regex.Pattern; +import acr.browser.lightning.controller.BrowserController; + public class IntentUtils { private Activity mActivity; diff --git a/app/src/main/java/acr/browser/lightning/Utils.java b/app/src/main/java/acr/browser/lightning/utils/Utils.java similarity index 96% rename from app/src/main/java/acr/browser/lightning/Utils.java rename to app/src/main/java/acr/browser/lightning/utils/Utils.java index a3caa7c..cfa65c7 100644 --- a/app/src/main/java/acr/browser/lightning/Utils.java +++ b/app/src/main/java/acr/browser/lightning/utils/Utils.java @@ -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; 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() { diff --git a/app/src/main/java/acr/browser/lightning/AnimatedProgressBar.java b/app/src/main/java/acr/browser/lightning/view/AnimatedProgressBar.java similarity index 99% rename from app/src/main/java/acr/browser/lightning/AnimatedProgressBar.java rename to app/src/main/java/acr/browser/lightning/view/AnimatedProgressBar.java index 09a7cfc..5c28908 100644 --- a/app/src/main/java/acr/browser/lightning/AnimatedProgressBar.java +++ b/app/src/main/java/acr/browser/lightning/view/AnimatedProgressBar.java @@ -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; import android.view.animation.Transformation; import android.widget.LinearLayout; +import acr.browser.lightning.R; + /** * Copyright 11/4/2014 Anthony Restaino *

diff --git a/app/src/main/java/acr/browser/lightning/LightningView.java b/app/src/main/java/acr/browser/lightning/view/LightningView.java similarity index 98% rename from app/src/main/java/acr/browser/lightning/LightningView.java rename to app/src/main/java/acr/browser/lightning/view/LightningView.java index 73ad01a..a2e11be 100644 --- a/app/src/main/java/acr/browser/lightning/LightningView.java +++ b/app/src/main/java/acr/browser/lightning/view/LightningView.java @@ -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; 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 { 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 { } 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 { diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml index ed55fae..d54e396 100644 --- a/app/src/main/res/layout/toolbar.xml +++ b/app/src/main/res/layout/toolbar.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:background="?attr/progressBackgroundColor" > - Date: Sat, 2 May 2015 23:11:46 -0400 Subject: [PATCH 14/22] Serbian translation thanks to @pekjam --- app/src/main/res/values-sr/strings.xml | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index f111c7c..650de67 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -1,13 +1,10 @@ - + Lightning Open navigation drawer From cb27bf8afa1e637b01440481c6a0a4c5c7b6f6d5 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 3 May 2015 00:11:46 -0400 Subject: [PATCH 16/22] Fix BrowserApp class not being found by webkitproxy --- .../lightning/activity/BrowserActivity.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java index 3b7b0a3..9cc4fbc 100644 --- a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java @@ -547,7 +547,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll try { String host = mPreferences.getProxyHost(); int port = mPreferences.getProxyPort(); - WebkitProxy.setProxy(this.getPackageName() + ".BrowserApp", getApplicationContext(), + WebkitProxy.setProxy(BrowserApp.class.getName(), getApplicationContext(), host, port); } catch (Exception e) { Log.d(Constants.TAG, "error enabling web proxying", e); @@ -710,7 +710,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll initializeTor(); } else { try { - WebkitProxy.resetProxy(mActivity.getPackageName() + ".BrowserApp", + WebkitProxy.resetProxy(BrowserApp.class.getName(), getApplicationContext()); } catch (Exception e) { e.printStackTrace(); @@ -1010,7 +1010,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll /** * Takes in the id of which bookmark was selected and shows a dialog that * allows the user to rename and change the url of the bookmark - * + * * @param id * which id in the list was chosen */ @@ -1054,7 +1054,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll /** * displays the WebView contained in the LightningView Also handles the * removal of previous views - * + * * @param view * the LightningView to show */ @@ -2196,7 +2196,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll /** * turns on fullscreen mode in the app - * + * * @param enabled * whether to enable fullscreen or not */ @@ -2373,7 +2373,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll @Override /** - * handles a long click on the page, parameter String url + * handles a long click on the page, parameter String url * is the url that should have been obtained from the WebView touch node * thingy, if it is null, this method tries to deal with it and find a workaround */ @@ -2586,7 +2586,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll /** * handle presses on the refresh icon in the search bar, if the page is * loading, stop the page, if it is done loading refresh the page. - * + * * See setIsFinishedLoading and setIsLoading for displaying the correct icon */ public void refreshOrStop() { From f5fcc2e62bdb84af68e6453adf198d25be6fc893 Mon Sep 17 00:00:00 2001 From: DF1E Date: Sun, 3 May 2015 13:56:22 +0200 Subject: [PATCH 17/22] improvements for android studio --- .gitattributes | 22 --- .gitignore | 174 ++---------------- app/.gitignore | 3 + app/build.gradle | 10 +- app/lint.xml | 7 - app/proguard-project.txt | 5 + app/src/main/AndroidManifest.xml | 9 +- .../lightning/activity/ReadingActivity.java | 23 +-- .../lightning/activity/ThemableActivity.java | 6 +- .../activity/ThemableSettingsActivity.java | 6 +- lint.xml | 7 - 11 files changed, 49 insertions(+), 223 deletions(-) delete mode 100644 .gitattributes create mode 100644 app/.gitignore delete mode 100644 app/lint.xml delete mode 100644 lint.xml diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 412eeda..0000000 --- a/.gitattributes +++ /dev/null @@ -1,22 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp -*.sln merge=union -*.csproj merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index 5241091..4620058 100644 --- a/.gitignore +++ b/.gitignore @@ -1,180 +1,34 @@ # Android Studio -.gradle +*.jks +.DS_Store /local.properties /.idea/workspace.xml -/.idea/libraries -.DS_Store /build -# Binary -*.apk - -################# -## Eclipse -################# - -*.pydevproject -.project -.metadata -bin/ -tmp/ -gen/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.classpath -.settings/ -.loadpath -proguard/ - # External tool builders .externalToolBuilders/ -# Locally stored "Eclipse launch configurations" -*.launch - # CDT-specific .cproject # PDT-specific .buildpath - -################# -## Visual Studio -################# - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results -[Dd]ebug/ -[Rr]elease/ -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.vspscc -.builds -*.dotCover - -## TODO: If you have NuGet Package Restore enabled, uncomment this -#packages/ - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf - -# Visual Studio profiler -*.psess -*.vsp - -# ReSharper is a .NET coding add-in -_ReSharper* - -# Installshield output folder -[Ee]xpress - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish - -# Others -[Bb]in -[Oo]bj -sql -TestResults -*.Cache -ClientBin -stylecop.* -~$* -*.dbmdl -Generated_Code #added for RIA/Silverlight projects - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML - - - -############ -## Windows -############ - # Windows image file caches Thumbs.db +ehthumbs.db -# Folder config file -Desktop.ini - - -############# -## Python -############# +# Local configuration file (sdk path, etc) +local.properties +gradle.properties +.directory -*.py[co] +# Intellij project files +*.iml +*.ipr +*.iws +.idea/ -# Packages -*.egg -*.egg-info -dist +# Gradle build -eggs -parts -bin -var -sdist -develop-eggs -.installed.cfg - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -#Translations -*.mo - -#Mr Developer -.mr.developer.cfg - -# Mac crap -.DS_Store - -# Support libraries -/external/appcompat -/external/palette +.gradle \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..3f22d0d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1,3 @@ +/build +app-release.apk +manifest-merger-release-report.txt \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e51b88..dabf7c6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,18 +8,24 @@ android { applicationId "acr.browser.lightning" minSdkVersion 14 targetSdkVersion 22 + versionCode 77 + versionName "4.0.9a" } buildTypes { release { minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt' + proguardFiles 'proguard-project.txt' } debug { minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt' + proguardFiles 'proguard-project.txt' } } + + lintOptions { + abortOnError false + } } dependencies { diff --git a/app/lint.xml b/app/lint.xml deleted file mode 100644 index 0da7f20..0000000 --- a/app/lint.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/app/proguard-project.txt b/app/proguard-project.txt index 2cb04a6..4bab3ea 100644 --- a/app/proguard-project.txt +++ b/app/proguard-project.txt @@ -72,3 +72,8 @@ -keep class * implements android.os.Parcelable { public static final android.os.Parcelable$Creator *; } + +# The support library contains references to newer platform versions. +# Don't warn about those in case this app is linking against an older +# platform version. We know about them, and they are safe. +-dontwarn android.support.** diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4782b4c..a8a20a3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,10 +1,7 @@ - + package="acr.browser.lightning" > @@ -24,10 +21,6 @@ android:name="android.hardware.touchscreen" android:required="false" /> - - - - - - - - From fa1994c8b281d3bdfe5675dbb722d8fbc680a5d6 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 4 May 2015 12:06:51 -0400 Subject: [PATCH 18/22] Lint fixes and code cleanup --- .idea/misc.xml | 24 +++++ app/src/main/AndroidManifest.xml | 4 - .../activity/AdvancedSettingsActivity.java | 4 +- .../lightning/activity/BookmarkActivity.java | 14 ++- .../lightning/activity/BrowserActivity.java | 85 ++++++++--------- .../activity/PrivacySettingsActivity.java | 2 +- .../lightning/activity/ReadingActivity.java | 25 ++--- .../lightning/activity/SettingsActivity.java | 2 +- .../lightning/activity/ThemableActivity.java | 6 +- .../activity/ThemableSettingsActivity.java | 6 +- .../browser/lightning/constant/Constants.java | 1 - .../controller/BrowserController.java | 42 ++++---- .../lightning/database/BookmarkManager.java | 95 ++++++------------- .../lightning/database/HistoryDatabase.java | 7 +- .../lightning/database/HistoryItem.java | 8 +- .../lightning/download/DownloadHandler.java | 4 +- .../lightning/download/FetchUrlMimeType.java | 15 ++- .../download/LightningDownloadListener.java | 2 +- .../lightning/download/WebAddress.java | 2 +- .../lightning/object/SearchAdapter.java | 30 +++--- .../reading/ArticleTextExtractor.java | 11 ++- .../browser/lightning/reading/Converter.java | 13 ++- .../lightning/reading/HtmlFetcher.java | 8 +- .../lightning/reading/ImageResult.java | 14 +-- .../browser/lightning/reading/JResult.java | 2 +- .../lightning/reading/OutputFormatter.java | 2 +- .../browser/lightning/reading/SHelper.java | 10 +- .../acr/browser/lightning/utils/AdBlock.java | 2 +- .../browser/lightning/utils/IntentUtils.java | 2 +- .../acr/browser/lightning/utils/Utils.java | 9 +- .../browser/lightning/view/LightningView.java | 45 +++++---- 31 files changed, 235 insertions(+), 261 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 3f1af1d..8a1bb8c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,29 @@ + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4782b4c..cb63446 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -24,10 +24,6 @@ android:name="android.hardware.touchscreen" android:required="false" /> - - { + private class SortName implements Comparator { @Override public int compare(File a, File b) { @@ -137,7 +135,7 @@ public class BookmarkActivity extends ThemableSettingsActivity implements OnClic } protected Dialog onCreateDialog(int id) { - Dialog dialog = null; + Dialog dialog; final AlertDialog.Builder builder = new Builder(this); switch (id) { diff --git a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java index 9cc4fbc..bde3d06 100644 --- a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java @@ -96,19 +96,16 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll private FullscreenHolder mFullscreenContainer; private ListView mDrawerListLeft, mDrawerListRight; private LinearLayout mDrawerLeft, mDrawerRight, mUiLayout, mToolbarLayout; - private RelativeLayout mNewTab, mSearchBar; + private RelativeLayout mSearchBar; // List - private final List mWebViews = new ArrayList(); + private final List mWebViews = new ArrayList<>(); private List mBookmarkList; private LightningView mCurrentView; - // View - private ActionBar mActionBar; private AnimatedProgressBar mProgressBar; private AutoCompleteTextView mSearch; private ImageView mArrowImage; - private Toolbar mToolbar; private VideoView mVideoView; private View mCustomView, mVideoProgressView; @@ -160,9 +157,9 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll @SuppressWarnings("deprecation") private synchronized void initialize() { setContentView(R.layout.activity_main); - mToolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(mToolbar); - mActionBar = getSupportActionBar(); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + ActionBar actionBar = getSupportActionBar(); mPreferences = PreferenceManager.getInstance(); mDarkTheme = mPreferences.getUseDarkTheme() || isIncognito(); @@ -177,7 +174,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll mUiLayout = (LinearLayout) findViewById(R.id.ui_layout); mProgressBar = (AnimatedProgressBar) findViewById(R.id.progress_view); - mNewTab = (RelativeLayout) findViewById(R.id.new_tab_button); + RelativeLayout newTab = (RelativeLayout) findViewById(R.id.new_tab_button); mDrawerLeft = (LinearLayout) findViewById(R.id.left_drawer); // Drawer stutters otherwise mDrawerLeft.setLayerType(View.LAYER_TYPE_HARDWARE, null); @@ -205,22 +202,22 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll mHistoryDatabase = HistoryDatabase.getInstance(getApplicationContext()); // set display options of the ActionBar - mActionBar.setDisplayShowTitleEnabled(false); - mActionBar.setDisplayShowHomeEnabled(false); - mActionBar.setDisplayShowCustomEnabled(true); - mActionBar.setCustomView(R.layout.toolbar_content); + actionBar.setDisplayShowTitleEnabled(false); + actionBar.setDisplayShowHomeEnabled(false); + actionBar.setDisplayShowCustomEnabled(true); + actionBar.setCustomView(R.layout.toolbar_content); - View v = mActionBar.getCustomView(); + View v = actionBar.getCustomView(); LayoutParams lp = v.getLayoutParams(); lp.width = LayoutParams.MATCH_PARENT; v.setLayoutParams(lp); mArrowDrawable = new DrawerArrowDrawable(this); - mArrowImage = (ImageView) mActionBar.getCustomView().findViewById(R.id.arrow); + mArrowImage = (ImageView) actionBar.getCustomView().findViewById(R.id.arrow); // Use hardware acceleration for the animation mArrowImage.setLayerType(View.LAYER_TYPE_HARDWARE, null); mArrowImage.setImageDrawable(mArrowDrawable); - LinearLayout arrowButton = (LinearLayout) mActionBar.getCustomView().findViewById( + LinearLayout arrowButton = (LinearLayout) actionBar.getCustomView().findViewById( R.id.arrow_button); arrowButton.setOnClickListener(this); @@ -231,8 +228,8 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll forward.setOnClickListener(this); // create the search EditText in the ToolBar - mSearch = (AutoCompleteTextView) mActionBar.getCustomView().findViewById(R.id.search); - mUntitledTitle = (String) getString(R.string.untitled); + mSearch = (AutoCompleteTextView) actionBar.getCustomView().findViewById(R.id.search); + mUntitledTitle = getString(R.string.untitled); mBackgroundColor = getResources().getColor(R.color.primary_color); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { mDeleteIcon = getResources().getDrawable(R.drawable.ic_action_delete); @@ -283,8 +280,8 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll }); initialize.run(); - mNewTab.setOnClickListener(this); - mNewTab.setOnLongClickListener(new OnLongClickListener() { + newTab.setOnClickListener(this); + newTab.setOnLongClickListener(new OnLongClickListener() { @Override public boolean onLongClick(View v) { @@ -500,7 +497,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll * If Orbot/Tor is installed, prompt the user if they want to enable * proxying for this session */ - public boolean checkForTor() { + private boolean checkForTor() { boolean useProxy = mPreferences.getUseProxy(); OrbotHelper oh = new OrbotHelper(this); @@ -538,7 +535,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll /* * Initialize WebKit Proxying for Tor */ - public void initializeTor() { + private void initializeTor() { OrbotHelper oh = new OrbotHelper(this); if (!oh.isOrbotRunning()) { @@ -617,12 +614,12 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll mPreferences.setMemoryUrl(""); String[] array = Utils.getArray(mem); int count = 0; - for (int n = 0; n < array.length; n++) { - if (array[n].length() > 0) { - if (url != null && url.compareTo(array[n]) == 0) { + for (String urlString : array) { + if (urlString.length() > 0) { + if (url != null && url.compareTo(urlString) == 0) { url = null; } - newTab(array[n], true); + newTab(urlString, true); count++; } } @@ -1459,13 +1456,13 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll public class LightningViewAdapter extends ArrayAdapter { - Context context; + final Context context; ColorMatrix colorMatrix; ColorMatrixColorFilter filter; Paint paint; - int layoutResourceId; + final int layoutResourceId; List data = null; - CloseTabListener mExitListener; + final CloseTabListener mExitListener; public LightningViewAdapter(Context context, int layoutResourceId, List data) { super(context, layoutResourceId, data); @@ -1478,7 +1475,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll @Override public View getView(final int position, View convertView, ViewGroup parent) { View row = convertView; - LightningViewHolder holder = null; + LightningViewHolder holder; if (row == null) { LayoutInflater inflater = ((Activity) context).getLayoutInflater(); row = inflater.inflate(layoutResourceId, parent, false); @@ -1591,11 +1588,11 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll public static boolean isColorTooDark(int color) { final byte RED_CHANNEL = 16; final byte GREEN_CHANNEL = 8; - final byte BLUE_CHANNEL = 0; + //final byte BLUE_CHANNEL = 0; int r = ((int) ((float) (color >> RED_CHANNEL & 0xff) * 0.3f)) & 0xff; int g = ((int) ((float) (color >> GREEN_CHANNEL & 0xff) * 0.59)) & 0xff; - int b = ((int) ((float) (color >> BLUE_CHANNEL & 0xff) * 0.11)) & 0xff; + int b = ((int) ((float) (color & 0xff) * 0.11)) & 0xff; int gr = (r + g + b) & 0xff; int gray = gr + (gr << GREEN_CHANNEL) + (gr << RED_CHANNEL); @@ -1606,7 +1603,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll final byte ALPHA_CHANNEL = 24; final byte RED_CHANNEL = 16; final byte GREEN_CHANNEL = 8; - final byte BLUE_CHANNEL = 0; + //final byte BLUE_CHANNEL = 0; final float inverseAmount = 1.0f - amount; @@ -1614,14 +1611,14 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll int g = ((int) (((float) (color1 >> GREEN_CHANNEL & 0xff) * amount) + ((float) (color2 >> GREEN_CHANNEL & 0xff) * inverseAmount))) & 0xff; int b = ((int) (((float) (color1 & 0xff) * amount) + ((float) (color2 & 0xff) * inverseAmount))) & 0xff; - return 0xff << ALPHA_CHANNEL | r << RED_CHANNEL | g << GREEN_CHANNEL | b << BLUE_CHANNEL; + return 0xff << ALPHA_CHANNEL | r << RED_CHANNEL | g << GREEN_CHANNEL | b; } public class BookmarkViewAdapter extends ArrayAdapter { - Context context; + final Context context; List data = null; - int layoutResourceId; + final int layoutResourceId; public BookmarkViewAdapter(Context context, int layoutResourceId, List data) { super(context, layoutResourceId, data); @@ -1633,7 +1630,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll @Override public View getView(int position, View convertView, ViewGroup parent) { View row = convertView; - BookmarkViewHolder holder = null; + BookmarkViewHolder holder; if (row == null) { LayoutInflater inflater = ((Activity) context).getLayoutInflater(); @@ -1670,8 +1667,8 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll private class DownloadImageTask extends AsyncTask { - ImageView bmImage; - HistoryItem mWeb; + final ImageView bmImage; + final HistoryItem mWeb; public DownloadImageTask(ImageView bmImage, HistoryItem web) { this.bmImage = bmImage; @@ -1852,14 +1849,13 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll public boolean getSystemBrowser() { Cursor c = null; String[] columns = new String[] { "url", "title" }; - boolean browserFlag = false; + boolean browserFlag; try { Uri bookmarks = Browser.BOOKMARKS_URI; c = getContentResolver().query(bookmarks, columns, null, null, null); - } catch (SQLiteException ignored) { - } catch (IllegalStateException ignored) { - } catch (NullPointerException ignored) { + } catch (SQLiteException | IllegalStateException | NullPointerException e) { + e.printStackTrace(); } if (c != null) { @@ -1871,7 +1867,6 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll } if (c != null) { c.close(); - c = null; } mPreferences.setSystemBrowserPresent(browserFlag); return browserFlag; @@ -1899,7 +1894,6 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll getUrl.setText(url); } searchTheWeb(url); - url = null; InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(getUrl.getWindowToken(), 0); if (mCurrentView != null) { @@ -2045,7 +2039,6 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll mFilePathCallback.onReceiveValue(results); mFilePathCallback = null; - return; } @Override diff --git a/app/src/main/java/acr/browser/lightning/activity/PrivacySettingsActivity.java b/app/src/main/java/acr/browser/lightning/activity/PrivacySettingsActivity.java index e129d59..68220ef 100644 --- a/app/src/main/java/acr/browser/lightning/activity/PrivacySettingsActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/PrivacySettingsActivity.java @@ -144,7 +144,7 @@ public class PrivacySettingsActivity extends ThemableSettingsActivity { private static class MessageHandler extends Handler { - Context mHandlerContext; + final Context mHandlerContext; public MessageHandler(Context context) { this.mHandlerContext = context; diff --git a/app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java b/app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java index a5f024b..75bb05c 100644 --- a/app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java @@ -1,14 +1,5 @@ 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; import android.app.AlertDialog; import android.app.ProgressDialog; @@ -18,7 +9,7 @@ import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; @@ -28,7 +19,17 @@ import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; -public class ReadingActivity extends ActionBarActivity { +import java.util.ArrayList; +import java.util.List; + +import acr.browser.lightning.R; +import acr.browser.lightning.constant.Constants; +import acr.browser.lightning.preference.PreferenceManager; +import acr.browser.lightning.reading.HtmlFetcher; +import acr.browser.lightning.reading.JResult; +import acr.browser.lightning.utils.Utils; + +public class ReadingActivity extends AppCompatActivity { private TextView mTitle; private TextView mBody; @@ -114,7 +115,7 @@ public class ReadingActivity extends ActionBarActivity { private class PageLoader extends AsyncTask { - private Context mContext; + private final Context mContext; private ProgressDialog mProgressDialog; private String mTitleText; private List mBodyText; diff --git a/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java b/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java index c3ef0bd..c5a8b92 100644 --- a/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/SettingsActivity.java @@ -32,7 +32,7 @@ import info.guardianproject.onionkit.ui.OrbotHelper; public class SettingsActivity extends ThemableSettingsActivity { - private static int API = android.os.Build.VERSION.SDK_INT; + private static final int API = android.os.Build.VERSION.SDK_INT; private PreferenceManager mPreferences; private Context mContext; private Activity mActivity; diff --git a/app/src/main/java/acr/browser/lightning/activity/ThemableActivity.java b/app/src/main/java/acr/browser/lightning/activity/ThemableActivity.java index 9afd653..3b80b75 100644 --- a/app/src/main/java/acr/browser/lightning/activity/ThemableActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/ThemableActivity.java @@ -2,12 +2,12 @@ package acr.browser.lightning.activity; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; -import acr.browser.lightning.preference.PreferenceManager; import acr.browser.lightning.R; +import acr.browser.lightning.preference.PreferenceManager; -public abstract class ThemableActivity extends ActionBarActivity { +public abstract class ThemableActivity extends AppCompatActivity { private boolean mDark; diff --git a/app/src/main/java/acr/browser/lightning/activity/ThemableSettingsActivity.java b/app/src/main/java/acr/browser/lightning/activity/ThemableSettingsActivity.java index 86a9468..1955e59 100644 --- a/app/src/main/java/acr/browser/lightning/activity/ThemableSettingsActivity.java +++ b/app/src/main/java/acr/browser/lightning/activity/ThemableSettingsActivity.java @@ -2,12 +2,12 @@ package acr.browser.lightning.activity; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; -import acr.browser.lightning.preference.PreferenceManager; import acr.browser.lightning.R; +import acr.browser.lightning.preference.PreferenceManager; -public abstract class ThemableSettingsActivity extends ActionBarActivity { +public abstract class ThemableSettingsActivity extends AppCompatActivity { private boolean mDark; diff --git a/app/src/main/java/acr/browser/lightning/constant/Constants.java b/app/src/main/java/acr/browser/lightning/constant/Constants.java index f87f7ec..f8a25ce 100644 --- a/app/src/main/java/acr/browser/lightning/constant/Constants.java +++ b/app/src/main/java/acr/browser/lightning/constant/Constants.java @@ -14,7 +14,6 @@ public final class Constants { public static final String DESKTOP_USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2049.0 Safari/537.36"; public static final String MOBILE_USER_AGENT = "Mozilla/5.0 (Linux; U; Android 4.4; en-us; Nexus 4 Build/JOP24G) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30"; - public static final int API = android.os.Build.VERSION.SDK_INT; public static final String YAHOO_SEARCH = "https://search.yahoo.com/search?p="; public static final String GOOGLE_SEARCH = "https://www.google.com/search?client=lightning&ie=UTF-8&oe=UTF-8&q="; public static final String BING_SEARCH = "https://www.bing.com/search?q="; diff --git a/app/src/main/java/acr/browser/lightning/controller/BrowserController.java b/app/src/main/java/acr/browser/lightning/controller/BrowserController.java index 5052203..8fdbd53 100644 --- a/app/src/main/java/acr/browser/lightning/controller/BrowserController.java +++ b/app/src/main/java/acr/browser/lightning/controller/BrowserController.java @@ -14,45 +14,45 @@ import android.webkit.WebView; public interface BrowserController { - public void updateUrl(String title, boolean shortUrl); + void updateUrl(String title, boolean shortUrl); - public void updateProgress(int n); + void updateProgress(int n); - public void updateHistory(String title, String url); + void updateHistory(String title, String url); - public void openFileChooser(ValueCallback uploadMsg); + void openFileChooser(ValueCallback uploadMsg); - public void update(); + void update(); - public void onLongPress(); + void onLongPress(); - public void onShowCustomView(View view, int requestedOrientation, CustomViewCallback callback); + void onShowCustomView(View view, int requestedOrientation, CustomViewCallback callback); - public void onHideCustomView(); + void onHideCustomView(); - public Bitmap getDefaultVideoPoster(); + Bitmap getDefaultVideoPoster(); - public View getVideoLoadingProgressView(); + View getVideoLoadingProgressView(); - public void onCreateWindow(boolean isUserGesture, Message resultMsg); + void onCreateWindow(boolean isUserGesture, Message resultMsg); - public Activity getActivity(); + Activity getActivity(); - public void hideActionBar(); + void hideActionBar(); - public void showActionBar(); + void showActionBar(); - public void toggleActionBar(); + void toggleActionBar(); - public void longClickPage(String url); + void longClickPage(String url); - public void openBookmarkPage(WebView view); + void openBookmarkPage(WebView view); - public void showFileChooser(ValueCallback filePathCallback); + void showFileChooser(ValueCallback filePathCallback); - public void closeEmptyTab(); + void closeEmptyTab(); - public boolean isIncognito(); + boolean isIncognito(); - public int getMenu(); + int getMenu(); } diff --git a/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java b/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java index 208f5b3..b42ebb6 100644 --- a/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java +++ b/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java @@ -1,9 +1,17 @@ package acr.browser.lightning.database; +import android.content.Context; +import android.database.Cursor; +import android.os.Environment; +import android.provider.Browser; +import android.widget.Toast; + +import org.json.JSONException; +import org.json.JSONObject; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; @@ -15,15 +23,6 @@ import java.util.Locale; import java.util.SortedMap; import java.util.TreeMap; -import org.json.JSONException; -import org.json.JSONObject; - -import android.content.Context; -import android.database.Cursor; -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; @@ -31,13 +30,13 @@ import acr.browser.lightning.utils.Utils; public class BookmarkManager { - private Context mContext; + private final Context mContext; private static final String TITLE = "title"; private static final String URL = "url"; private static final String FOLDER = "folder"; private static final String ORDER = "order"; private static final String FILE_BOOKMARKS = "bookmarks.dat"; - private static SortedMap mBookmarkMap = new TreeMap( + private static SortedMap mBookmarkMap = new TreeMap<>( String.CASE_INSENSITIVE_ORDER); private static BookmarkManager mInstance; @@ -74,9 +73,7 @@ public class BookmarkManager { bookmarkWriter.newLine(); bookmarkWriter.close(); mBookmarkMap.put(item.getUrl(), 1); - } catch (IOException e) { - e.printStackTrace(); - } catch (JSONException e) { + } catch (IOException | JSONException e) { e.printStackTrace(); } return true; @@ -104,9 +101,7 @@ public class BookmarkManager { } } bookmarkWriter.close(); - } catch (IOException e) { - e.printStackTrace(); - } catch (JSONException e) { + } catch (IOException | JSONException e) { e.printStackTrace(); } } @@ -117,7 +112,7 @@ public class BookmarkManager { * @param url */ public synchronized boolean deleteBookmark(String url) { - List list = new ArrayList(); + List list; if (url == null) { return false; } @@ -141,9 +136,7 @@ public class BookmarkManager { } } fileWriter.close(); - } catch (IOException e) { - e.printStackTrace(); - } catch (JSONException e) { + } catch (IOException | JSONException e) { e.printStackTrace(); } return bookmarkDeleted; @@ -182,9 +175,7 @@ public class BookmarkManager { mContext, mContext.getString(R.string.bookmark_export_path) + " " + bookmarksExport.getPath(), Toast.LENGTH_SHORT).show(); - } catch (IOException e) { - e.printStackTrace(); - } catch (JSONException e) { + } catch (IOException | JSONException e) { e.printStackTrace(); } @@ -196,7 +187,7 @@ public class BookmarkManager { * @return */ public synchronized List getBookmarks(boolean sort) { - List bookmarks = new ArrayList(); + List bookmarks = new ArrayList<>(); File bookmarksFile = new File(mContext.getFilesDir(), FILE_BOOKMARKS); try { BufferedReader bookmarksReader = new BufferedReader(new FileReader(bookmarksFile)); @@ -212,11 +203,7 @@ public class BookmarkManager { bookmarks.add(item); } bookmarksReader.close(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } catch (JSONException e) { + } catch (IOException | JSONException e) { e.printStackTrace(); } if (sort) { @@ -232,7 +219,7 @@ public class BookmarkManager { * @return */ public synchronized List getBookmarksFromFolder(String folder) { - List bookmarks = new ArrayList(); + List bookmarks = new ArrayList<>(); File bookmarksFile = new File(mContext.getFilesDir(), FILE_BOOKMARKS); try { BufferedReader bookmarksReader = new BufferedReader(new FileReader(bookmarksFile)); @@ -250,11 +237,7 @@ public class BookmarkManager { } } bookmarksReader.close(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } catch (JSONException e) { + } catch (IOException | JSONException e) { e.printStackTrace(); } return bookmarks; @@ -266,7 +249,7 @@ public class BookmarkManager { * @return */ private synchronized SortedMap getBookmarkUrls() { - SortedMap map = new TreeMap(String.CASE_INSENSITIVE_ORDER); + SortedMap map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); File bookmarksFile = new File(mContext.getFilesDir(), FILE_BOOKMARKS); try { BufferedReader bookmarksReader = new BufferedReader(new FileReader(bookmarksFile)); @@ -276,11 +259,7 @@ public class BookmarkManager { map.put(object.getString(URL), 1); } bookmarksReader.close(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } catch (JSONException e) { + } catch (JSONException | IOException e) { e.printStackTrace(); } return map; @@ -292,8 +271,8 @@ public class BookmarkManager { * @return */ public synchronized List getFolders() { - List folders = new ArrayList(); - SortedMap folderMap = new TreeMap( + List folders = new ArrayList<>(); + SortedMap folderMap = new TreeMap<>( String.CASE_INSENSITIVE_ORDER); File bookmarksFile = new File(mContext.getFilesDir(), FILE_BOOKMARKS); try { @@ -311,11 +290,7 @@ public class BookmarkManager { } } bookmarksReader.close(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } catch (JSONException e) { + } catch (IOException | JSONException e) { e.printStackTrace(); } return folders; @@ -328,7 +303,7 @@ public class BookmarkManager { public synchronized void importBookmarksFromBrowser(Context context) { if (PreferenceManager.getInstance().getSystemBrowserPresent()) { - List bookmarkList = new ArrayList(); + List bookmarkList = new ArrayList<>(); String[] columns = new String[] { Browser.BookmarkColumns.TITLE, Browser.BookmarkColumns.URL }; String selection = Browser.BookmarkColumns.BOOKMARK + " = 1"; @@ -372,7 +347,7 @@ public class BookmarkManager { if (file == null) { return; } - List list = new ArrayList(); + List list = new ArrayList<>(); try { BufferedReader bookmarksReader = new BufferedReader(new FileReader(file)); String line; @@ -391,17 +366,7 @@ public class BookmarkManager { addBookmarkList(list); Utils.showToast(mContext, number + " " + mContext.getResources().getString(R.string.message_import)); - } catch (FileNotFoundException e) { - e.printStackTrace(); - Utils.createInformativeDialog(context, - mContext.getResources().getString(R.string.title_error), mContext - .getResources().getString(R.string.import_bookmark_error)); - } catch (IOException e) { - e.printStackTrace(); - Utils.createInformativeDialog(context, - mContext.getResources().getString(R.string.title_error), mContext - .getResources().getString(R.string.import_bookmark_error)); - } catch (JSONException e) { + } catch (IOException | JSONException e) { e.printStackTrace(); Utils.createInformativeDialog(context, mContext.getResources().getString(R.string.title_error), mContext @@ -430,9 +395,7 @@ public class BookmarkManager { bookmarkWriter.newLine(); } bookmarkWriter.close(); - } catch (IOException e) { - e.printStackTrace(); - } catch (JSONException e) { + } catch (IOException | JSONException e) { e.printStackTrace(); } } diff --git a/app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java b/app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java index 6e9736e..a12e8c4 100644 --- a/app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java +++ b/app/src/main/java/acr/browser/lightning/database/HistoryDatabase.java @@ -92,6 +92,7 @@ public class HistoryDatabase extends SQLiteOpenHelper { } else { addHistoryItem(new HistoryItem(url, title)); } + q.close(); } public synchronized void addHistoryItem(HistoryItem item) { @@ -116,7 +117,7 @@ public class HistoryDatabase extends SQLiteOpenHelper { } public List findItemsContaining(String search) { - List itemList = new ArrayList(); + List itemList = new ArrayList<>(); String selectQuery = "SELECT * FROM " + TABLE_HISTORY + " WHERE " + KEY_TITLE + " LIKE '%" + search + "%' OR " + KEY_URL + " LIKE '%" + search + "%' " + "ORDER BY " + KEY_TIME_VISITED + " DESC LIMIT 5"; @@ -139,7 +140,7 @@ public class HistoryDatabase extends SQLiteOpenHelper { } public List getLastHundredItems() { - List itemList = new ArrayList(); + List itemList = new ArrayList<>(); String selectQuery = "SELECT * FROM " + TABLE_HISTORY + " ORDER BY " + KEY_TIME_VISITED + " DESC"; @@ -161,7 +162,7 @@ public class HistoryDatabase extends SQLiteOpenHelper { } public List getAllHistoryItems() { - List itemList = new ArrayList(); + List itemList = new ArrayList<>(); String selectQuery = "SELECT * FROM " + TABLE_HISTORY + " ORDER BY " + KEY_TIME_VISITED + " DESC"; diff --git a/app/src/main/java/acr/browser/lightning/database/HistoryItem.java b/app/src/main/java/acr/browser/lightning/database/HistoryItem.java index 3d79010..c4741b7 100644 --- a/app/src/main/java/acr/browser/lightning/database/HistoryItem.java +++ b/app/src/main/java/acr/browser/lightning/database/HistoryItem.java @@ -4,6 +4,7 @@ package acr.browser.lightning.database; import android.graphics.Bitmap; +import android.support.annotation.NonNull; public class HistoryItem implements Comparable { @@ -112,7 +113,7 @@ public class HistoryItem implements Comparable { } @Override - public int compareTo(HistoryItem another) { + public int compareTo(@NonNull HistoryItem another) { return mTitle.compareTo(another.mTitle); } @@ -137,10 +138,7 @@ public class HistoryItem implements Comparable { if (mBitmap != null ? !mBitmap.equals(that.mBitmap) : that.mBitmap != null) { return false; } - if (!mTitle.equals(that.mTitle)) { - return false; - } - return mUrl.equals(that.mUrl); + return mTitle.equals(that.mTitle) && mUrl.equals(that.mUrl); } @Override diff --git a/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java index b4830bc..58f56b0 100644 --- a/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java +++ b/app/src/main/java/acr/browser/lightning/download/DownloadHandler.java @@ -131,8 +131,8 @@ public class DownloadHandler { * If the request is coming from a private browsing tab. */ /* package */ - static void onDownloadStartNoStream(Activity activity, String url, String userAgent, - String contentDisposition, String mimetype, boolean privateBrowsing) { + private static void onDownloadStartNoStream(Activity activity, String url, String userAgent, + String contentDisposition, String mimetype, boolean privateBrowsing) { String filename = URLUtil.guessFileName(url, contentDisposition, mimetype); diff --git a/app/src/main/java/acr/browser/lightning/download/FetchUrlMimeType.java b/app/src/main/java/acr/browser/lightning/download/FetchUrlMimeType.java index 1cb2165..329387b 100644 --- a/app/src/main/java/acr/browser/lightning/download/FetchUrlMimeType.java +++ b/app/src/main/java/acr/browser/lightning/download/FetchUrlMimeType.java @@ -26,15 +26,15 @@ import acr.browser.lightning.R; */ public class FetchUrlMimeType extends Thread { - private Context mContext; + private final Context mContext; - private DownloadManager.Request mRequest; + private final DownloadManager.Request mRequest; - private String mUri; + private final String mUri; - private String mCookies; + private final String mCookies; - private String mUserAgent; + private final String mUserAgent; public FetchUrlMimeType(Context context, DownloadManager.Request request, String uri, String cookies, String userAgent) { @@ -78,10 +78,7 @@ public class FetchUrlMimeType extends Thread { contentDisposition = contentDispositionHeader; } } - } catch (IllegalArgumentException ex) { - if (connection != null) - connection.disconnect(); - } catch (IOException ex) { + } catch (IllegalArgumentException | IOException ex) { if (connection != null) connection.disconnect(); } finally { diff --git a/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java b/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java index 2439405..241a091 100644 --- a/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java +++ b/app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java @@ -16,7 +16,7 @@ import acr.browser.lightning.download.DownloadHandler; public class LightningDownloadListener implements DownloadListener { - private Activity mActivity; + private final Activity mActivity; public LightningDownloadListener(Activity activity) { mActivity = activity; diff --git a/app/src/main/java/acr/browser/lightning/download/WebAddress.java b/app/src/main/java/acr/browser/lightning/download/WebAddress.java index d459e08..9d2f87e 100644 --- a/app/src/main/java/acr/browser/lightning/download/WebAddress.java +++ b/app/src/main/java/acr/browser/lightning/download/WebAddress.java @@ -32,7 +32,7 @@ public class WebAddress { static final int MATCH_GROUP_HOST = 3; static final int MATCH_GROUP_PORT = 4; static final int MATCH_GROUP_PATH = 5; - static Pattern sAddressPattern = Pattern.compile( + static final Pattern sAddressPattern = Pattern.compile( /* scheme */"(?:(http|https|file)\\:\\/\\/)?" + /* authority */"(?:([-A-Za-z0-9$_.+!*'(),;?&=]+(?:\\:[-A-Za-z0-9$_.+!*'(),;?&=]+)?)@)?" + /* host */"([" + GOOD_IRI_CHAR + "%_-][" + GOOD_IRI_CHAR + "%_\\.-]*|\\[[0-9a-fA-F:\\.]+\\])?" + diff --git a/app/src/main/java/acr/browser/lightning/object/SearchAdapter.java b/app/src/main/java/acr/browser/lightning/object/SearchAdapter.java index c5b97e3..3cdf447 100644 --- a/app/src/main/java/acr/browser/lightning/object/SearchAdapter.java +++ b/app/src/main/java/acr/browser/lightning/object/SearchAdapter.java @@ -50,26 +50,26 @@ public class SearchAdapter extends BaseAdapter implements Filterable { private List mFilteredList; private List mAllBookmarks; private HistoryDatabase mDatabaseHandler; - private Context mContext; + private final Context mContext; private boolean mUseGoogle = true; private boolean mIsExecuting = false; - private boolean mDarkTheme; - private boolean mIncognito; - private BookmarkManager mBookmarkManager; + private final boolean mDarkTheme; + private final boolean mIncognito; + private final BookmarkManager mBookmarkManager; private static final String ENCODING = "ISO-8859-1"; private static final long INTERVAL_DAY = 86400000; - private String mSearchSubtitle; + private final String mSearchSubtitle; private static final int API = Build.VERSION.SDK_INT; - private Theme mTheme; + private final Theme mTheme; private SearchFilter mFilter; public SearchAdapter(Context context, boolean dark, boolean incognito) { mDatabaseHandler = HistoryDatabase.getInstance(context.getApplicationContext()); mTheme = context.getTheme(); - mFilteredList = new ArrayList(); - mHistory = new ArrayList(); - mBookmarks = new ArrayList(); - mSuggestions = new ArrayList(); + mFilteredList = new ArrayList<>(); + mHistory = new ArrayList<>(); + mBookmarks = new ArrayList<>(); + mSuggestions = new ArrayList<>(); mBookmarkManager = BookmarkManager.getInstance(context.getApplicationContext()); mAllBookmarks = mBookmarkManager.getBookmarks(true); mUseGoogle = PreferenceManager.getInstance().getGoogleSearchSuggestionsEnabled(); @@ -146,7 +146,7 @@ public class SearchAdapter extends BaseAdapter implements Filterable { @Override public View getView(int position, View convertView, ViewGroup parent) { View row = convertView; - SuggestionHolder holder = null; + SuggestionHolder holder; if (row == null) { LayoutInflater inflater = ((Activity) mContext).getLayoutInflater(); @@ -228,7 +228,7 @@ public class SearchAdapter extends BaseAdapter implements Filterable { @Override protected FilterResults performFiltering(CharSequence constraint) { FilterResults results = new FilterResults(); - if (constraint == null || constraint.toString() == null) { + if (constraint == null) { return results; } String query = constraint.toString().toLowerCase(Locale.getDefault()); @@ -237,7 +237,7 @@ public class SearchAdapter extends BaseAdapter implements Filterable { } int counter = 0; - mBookmarks = new ArrayList(); + mBookmarks = new ArrayList<>(); for (int n = 0; n < mAllBookmarks.size(); n++) { if (counter >= 5) { break; @@ -289,7 +289,7 @@ public class SearchAdapter extends BaseAdapter implements Filterable { protected List doInBackground(String... arg0) { mIsExecuting = true; - List filter = new ArrayList(); + List filter = new ArrayList<>(); String query = arg0[0]; try { query = query.replace(" ", "+"); @@ -397,7 +397,7 @@ public class SearchAdapter extends BaseAdapter implements Filterable { } public List getSuggestions() { - List filteredList = new ArrayList(); + List filteredList = new ArrayList<>(); int suggestionsSize = (mSuggestions == null) ? 0 : mSuggestions.size(); int historySize = (mHistory == null) ? 0 : mHistory.size(); diff --git a/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java b/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java index 5b6b788..a37ecb4 100644 --- a/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java +++ b/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java @@ -153,7 +153,7 @@ public class ArticleTextExtractor { } if (bestMatchElement != null) { - List images = new ArrayList(); + List images = new ArrayList<>(); Element imgEl = determineImageSource(bestMatchElement, images); if (imgEl != null) { res.setImageUrl(SHelper.replaceSpaces(imgEl.attr("src"))); @@ -321,7 +321,7 @@ public class ArticleTextExtractor { protected int weightChildNodes(Element rootEl) { int weight = 0; Element caption = null; - List pEls = new ArrayList(5); + List pEls = new ArrayList<>(5); for (Element child : rootEl.children()) { String ownText = child.ownText(); int ownTextLength = ownText.length(); @@ -373,6 +373,7 @@ public class ArticleTextExtractor { try { old = Integer.parseInt(el.attr("gravityScore")); } catch (Exception ex) { + ex.printStackTrace(); } return old; } @@ -444,6 +445,7 @@ public class ArticleTextExtractor { else weight -= 20; } catch (Exception ex) { + ex.printStackTrace(); } int width = 0; @@ -454,6 +456,7 @@ public class ArticleTextExtractor { else weight -= 20; } catch (Exception ex) { + ex.printStackTrace(); } String alt = e.attr("alt"); if (alt.length() > 35) @@ -463,7 +466,7 @@ public class ArticleTextExtractor { if (title.length() > 35) weight += 20; - String rel = null; + String rel; boolean noFollow = false; if (e.parent() != null) { rel = e.parent().attr("rel"); @@ -561,7 +564,7 @@ public class ArticleTextExtractor { * @return a set of all important nodes */ public Collection getNodes(Document doc) { - Set nodes = new HashSet(64); + Set nodes = new HashSet<>(64); int score = 100; for (Element el : doc.select("body").select("*")) { if (NODES.matcher(el.tagName()).matches()) { diff --git a/app/src/main/java/acr/browser/lightning/reading/Converter.java b/app/src/main/java/acr/browser/lightning/reading/Converter.java index 25c5310..fc1dc37 100644 --- a/app/src/main/java/acr/browser/lightning/reading/Converter.java +++ b/app/src/main/java/acr/browser/lightning/reading/Converter.java @@ -15,13 +15,17 @@ */ package acr.browser.lightning.reading; -import java.io.*; -import java.net.SocketTimeoutException; +import android.util.Log; + +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.util.Locale; import acr.browser.lightning.constant.Constants; -import android.util.Log; /** * This class is not thread safe. Use one new instance every time due to @@ -156,8 +160,6 @@ public class Converter { } return output.toString(encoding); - } catch (SocketTimeoutException e) { - Log.e(Constants.TAG, e.toString() + " url:" + url); } catch (IOException e) { Log.e(Constants.TAG, e.toString() + " url:" + url); } finally { @@ -165,6 +167,7 @@ public class Converter { try { in.close(); } catch (Exception e) { + e.printStackTrace(); } } } diff --git a/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java b/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java index 8dc5b6e..1d049fa 100644 --- a/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java +++ b/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java @@ -51,8 +51,8 @@ public class HtmlFetcher { public static void main(String[] args) throws Exception { BufferedReader reader = new BufferedReader(new FileReader("urls.txt")); - String line = null; - Set existing = new LinkedHashSet(); + String line; + Set existing = new LinkedHashSet<>(); while ((line = reader.readLine()) != null) { int index1 = line.indexOf("\""); int index2 = line.indexOf("\"", index1 + 1); @@ -81,10 +81,10 @@ public class HtmlFetcher { private String accept = "application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"; private String charset = "UTF-8"; private SCache cache; - private AtomicInteger cacheCounter = new AtomicInteger(0); + private final AtomicInteger cacheCounter = new AtomicInteger(0); private int maxTextLength = -1; private ArticleTextExtractor extractor = new ArticleTextExtractor(); - private Set furtherResolveNecessary = new LinkedHashSet() { + private final Set furtherResolveNecessary = new LinkedHashSet() { { add("bit.ly"); add("cli.gs"); diff --git a/app/src/main/java/acr/browser/lightning/reading/ImageResult.java b/app/src/main/java/acr/browser/lightning/reading/ImageResult.java index fbdf461..85d52d2 100644 --- a/app/src/main/java/acr/browser/lightning/reading/ImageResult.java +++ b/app/src/main/java/acr/browser/lightning/reading/ImageResult.java @@ -9,13 +9,13 @@ import org.jsoup.nodes.Element; */ public class ImageResult { - public String src; - public Integer weight; - public String title; - public int height; - public int width; - public String alt; - public boolean noFollow; + public final String src; + public final Integer weight; + public final String title; + public final int height; + public final int width; + public final String alt; + public final boolean noFollow; public Element element; public ImageResult(String src, Integer weight, String title, int height, int width, String alt, diff --git a/app/src/main/java/acr/browser/lightning/reading/JResult.java b/app/src/main/java/acr/browser/lightning/reading/JResult.java index b094e3d..c3ff764 100644 --- a/app/src/main/java/acr/browser/lightning/reading/JResult.java +++ b/app/src/main/java/acr/browser/lightning/reading/JResult.java @@ -133,7 +133,7 @@ public class JResult implements Serializable { public List getTextList() { if (this.textList == null) - return new ArrayList(); + return new ArrayList<>(); return this.textList; } diff --git a/app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java b/app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java index 2afd0a9..4c5b403 100644 --- a/app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java +++ b/app/src/main/java/acr/browser/lightning/reading/OutputFormatter.java @@ -74,7 +74,7 @@ public class OutputFormatter { * Takes an element and returns a list of texts extracted from the P tags */ public List getTextList(Element topNode) { - List texts = new ArrayList(); + List texts = new ArrayList<>(); for (Element element : topNode.select(this.nodesToKeepCssSelector)) { if (element.hasText()) { texts.add(element.text()); diff --git a/app/src/main/java/acr/browser/lightning/reading/SHelper.java b/app/src/main/java/acr/browser/lightning/reading/SHelper.java index 7be2ec9..08b0735 100644 --- a/app/src/main/java/acr/browser/lightning/reading/SHelper.java +++ b/app/src/main/java/acr/browser/lightning/reading/SHelper.java @@ -279,11 +279,10 @@ public class SHelper { if (url.startsWith("http://www.google.com/url?")) { url = url.substring("http://www.google.com/url?".length()); String arr[] = urlDecode(url).split("\\&"); - if (arr != null) - for (String str : arr) { - if (str.startsWith("q=")) - return str.substring("q=".length()); - } + for (String str : arr) { + if (str.startsWith("q=")) + return str.substring("q=".length()); + } } return null; @@ -382,6 +381,7 @@ public class SHelper { try { day = Integer.parseInt(str); } catch (Exception ex) { + ex.printStackTrace(); } if (day < 1 || day > 31) { day = -1; diff --git a/app/src/main/java/acr/browser/lightning/utils/AdBlock.java b/app/src/main/java/acr/browser/lightning/utils/AdBlock.java index 4abcbfe..a317f09 100644 --- a/app/src/main/java/acr/browser/lightning/utils/AdBlock.java +++ b/app/src/main/java/acr/browser/lightning/utils/AdBlock.java @@ -20,7 +20,7 @@ public class AdBlock { private static final String TAG = "AdBlock"; private static final String BLOCKED_DOMAINS_LIST_FILE_NAME = "hosts.txt"; - private static final Set mBlockedDomainsList = new HashSet(); + private static final Set mBlockedDomainsList = new HashSet<>(); private boolean mBlockAds; private static final Locale mLocale = Locale.getDefault(); private static AdBlock mInstance; diff --git a/app/src/main/java/acr/browser/lightning/utils/IntentUtils.java b/app/src/main/java/acr/browser/lightning/utils/IntentUtils.java index 60c4a47..324314d 100644 --- a/app/src/main/java/acr/browser/lightning/utils/IntentUtils.java +++ b/app/src/main/java/acr/browser/lightning/utils/IntentUtils.java @@ -19,7 +19,7 @@ import acr.browser.lightning.controller.BrowserController; public class IntentUtils { - private Activity mActivity; + private final Activity mActivity; static final Pattern ACCEPTED_URI_SCHEMA = Pattern.compile("(?i)" + // switch on case insensitive matching diff --git a/app/src/main/java/acr/browser/lightning/utils/Utils.java b/app/src/main/java/acr/browser/lightning/utils/Utils.java index cfa65c7..fcc8af8 100644 --- a/app/src/main/java/acr/browser/lightning/utils/Utils.java +++ b/app/src/main/java/acr/browser/lightning/utils/Utils.java @@ -115,7 +115,7 @@ public final class Utils { } public static List getOldBookmarks(Context context) { - List bookmarks = new ArrayList(); + List bookmarks = new ArrayList<>(); File bookUrl = new File(context.getFilesDir(), "bookurl"); File book = new File(context.getFilesDir(), "bookmarks"); try { @@ -128,8 +128,8 @@ public final class Utils { } readBook.close(); readUrl.close(); - } catch (FileNotFoundException ignored) { - } catch (IOException ignored) { + } catch (IOException e) { + e.printStackTrace(); } return bookmarks; } @@ -192,11 +192,10 @@ public final class Utils { String imageFileName = "JPEG_" + timeStamp + "_"; File storageDir = Environment .getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES); - File imageFile = File.createTempFile(imageFileName, /* prefix */ + return File.createTempFile(imageFileName, /* prefix */ ".jpg", /* suffix */ storageDir /* directory */ ); - return imageFile; } public static Bitmap getWebpageBitmap(Resources resources, boolean dark) { diff --git a/app/src/main/java/acr/browser/lightning/view/LightningView.java b/app/src/main/java/acr/browser/lightning/view/LightningView.java index a2e11be..f50b87d 100644 --- a/app/src/main/java/acr/browser/lightning/view/LightningView.java +++ b/app/src/main/java/acr/browser/lightning/view/LightningView.java @@ -4,14 +4,6 @@ package acr.browser.lightning.view; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.net.URISyntaxException; - import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; @@ -28,6 +20,7 @@ import android.net.Uri; import android.net.http.SslError; import android.os.Build; import android.os.Message; +import android.support.annotation.NonNull; import android.text.InputType; import android.text.method.PasswordTransformationMethod; import android.util.Log; @@ -52,29 +45,36 @@ import android.webkit.WebViewClient; import android.widget.EditText; import android.widget.LinearLayout; -import acr.browser.lightning.controller.BrowserController; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.net.URISyntaxException; + +import acr.browser.lightning.R; import acr.browser.lightning.constant.Constants; import acr.browser.lightning.constant.StartPage; +import acr.browser.lightning.controller.BrowserController; 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; + private final Title mTitle; private WebView mWebView; private BrowserController mBrowserController; private GestureDetector mGestureDetector; - private Activity mActivity; + private final Activity mActivity; private WebSettings mSettings; private static String mHomepage; private static String mDefaultUserAgent; private static Bitmap mWebpageBitmap; private static PreferenceManager mPreferences; - private AdBlock mAdBlock; + private final AdBlock mAdBlock; private IntentUtils mIntentUtils; private final Paint mPaint = new Paint(); private boolean isForegroundTab; @@ -195,6 +195,7 @@ public class LightningView { icon = "file:///android_asset/startpage.png"; // "https://startpage.com/graphics/startp_logo.gif"; searchUrl = Constants.STARTPAGE_MOBILE_SEARCH; + break; case 7: // DUCK_SEARCH; icon = "file:///android_asset/duckduckgo.png"; @@ -539,8 +540,6 @@ public class LightningView { icon.compress(Bitmap.CompressFormat.PNG, 100, fos); fos.flush(); fos.close(); - } catch (FileNotFoundException e) { - e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } @@ -637,7 +636,7 @@ public class LightningView { public class LightningWebClient extends WebViewClient { - Context mActivity; + final Context mActivity; LightningWebClient(Context context) { mActivity = context; @@ -690,7 +689,7 @@ public class LightningView { } @Override - public void onReceivedHttpAuthRequest(final WebView view, final HttpAuthHandler handler, + public void onReceivedHttpAuthRequest(final WebView view, @NonNull final HttpAuthHandler handler, final String host, final String realm) { AlertDialog.Builder builder = new AlertDialog.Builder(mActivity); @@ -760,7 +759,7 @@ public class LightningView { } @Override - public void onReceivedSslError(WebView view, final SslErrorHandler handler, SslError error) { + public void onReceivedSslError(WebView view, @NonNull final SslErrorHandler handler, SslError error) { AlertDialog.Builder builder = new AlertDialog.Builder(mActivity); builder.setTitle(mActivity.getString(R.string.title_warning)); builder.setMessage(mActivity.getString(R.string.message_untrusted_certificate)) @@ -789,7 +788,7 @@ public class LightningView { } @Override - public void onFormResubmission(WebView view, final Message dontResend, final Message resend) { + public void onFormResubmission(WebView view, @NonNull final Message dontResend, final Message resend) { AlertDialog.Builder builder = new AlertDialog.Builder(mActivity); builder.setTitle(mActivity.getString(R.string.title_form_resubmission)); builder.setMessage(mActivity.getString(R.string.message_form_resubmission)) @@ -830,7 +829,7 @@ public class LightningView { view.reload(); return true; } else if (url.startsWith("intent://")) { - Intent intent = null; + Intent intent; try { intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME); } catch (URISyntaxException ex) { @@ -851,7 +850,7 @@ public class LightningView { public class LightningChromeClient extends WebChromeClient { - Context mActivity; + final Context mActivity; LightningChromeClient(Context context) { mActivity = context; @@ -888,7 +887,7 @@ public class LightningView { final boolean remember = true; AlertDialog.Builder builder = new AlertDialog.Builder(mActivity); builder.setTitle(mActivity.getString(R.string.location)); - String org = null; + String org; if (origin.length() > 50) { org = origin.subSequence(0, 50) + "..."; } else { @@ -1012,7 +1011,7 @@ public class LightningView { private Bitmap mFavicon; private String mTitle; - private Bitmap mDefaultIcon; + private final Bitmap mDefaultIcon; public Title(Context context, boolean darkTheme) { mDefaultIcon = Utils.getWebpageBitmap(context.getResources(), darkTheme); From 99a23c2eef9ac0be8690c39502637ea1fab214e5 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Mon, 4 May 2015 12:07:15 -0400 Subject: [PATCH 19/22] Remove unused resources on build --- app/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 2e51b88..6c35462 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,10 +13,12 @@ android { buildTypes { release { minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt' } debug { minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt' } } From e335a2b93681d6747eec814947e2e53b02112e20 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 5 May 2015 20:57:42 -0400 Subject: [PATCH 20/22] Remove unused resources, code cleanup --- app/build.gradle | 8 ++++---- .../reading/ArticleTextExtractor.java | 2 +- .../lightning/reading/HtmlFetcher.java | 6 +++--- .../main/res/drawable-hdpi/ic_action_menu.png | Bin 296 -> 0 bytes .../res/drawable-xhdpi/ic_action_menu.png | Bin 391 -> 0 bytes .../res/drawable-xhdpi/progress_bar.9.png | Bin 174 -> 0 bytes .../res/drawable-xhdpi/progress_bar_bg.9.png | Bin 179 -> 0 bytes .../res/drawable-xxhdpi/ic_action_menu.png | Bin 722 -> 0 bytes app/src/main/res/drawable/progress.xml | 18 ------------------ app/src/main/res/values-v21/styles.xml | 4 ++-- 10 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_menu.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_menu.png delete mode 100644 app/src/main/res/drawable-xhdpi/progress_bar.9.png delete mode 100644 app/src/main/res/drawable-xhdpi/progress_bar_bg.9.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_menu.png delete mode 100644 app/src/main/res/drawable/progress.xml diff --git a/app/build.gradle b/app/build.gradle index 0f261e1..915c6ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "acr.browser.lightning" minSdkVersion 14 targetSdkVersion 22 - versionCode 77 - versionName "4.0.9a" + versionCode 78 + versionName "4.0.10a" } buildTypes { @@ -33,8 +33,8 @@ android { dependencies { compile(project(':libnetcipher')) { // Exclude any support-v4 modules because appcompat-v7 will import the latest - exclude module:'support-v4' - exclude module:'android-support-v4' + exclude module: 'support-v4' + exclude module: 'android-support-v4' } compile 'com.android.support:palette-v7:22.1.1' compile 'com.android.support:appcompat-v7:22.1.1' diff --git a/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java b/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java index a37ecb4..952b253 100644 --- a/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java +++ b/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) - throws Exception { + throws NullPointerException { if (doc == null) throw new NullPointerException("missing document"); diff --git a/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java b/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java index 1d049fa..81a62cc 100644 --- a/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java +++ b/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java @@ -298,13 +298,13 @@ public class HtmlFetcher { return SHelper.useDomainOfFirstArg4Second(url, urlOrPath); } - public String fetchAsString(String urlAsString, int timeout) throws MalformedURLException, + public String fetchAsString(String urlAsString, int timeout) throws IOException { return fetchAsString(urlAsString, timeout, true); } public String fetchAsString(String urlAsString, int timeout, boolean includeSomeGooseOptions) - throws MalformedURLException, IOException { + throws IOException { HttpURLConnection hConn = createUrlConnection(urlAsString, timeout, includeSomeGooseOptions); hConn.setInstanceFollowRedirects(true); String encoding = hConn.getContentEncoding(); @@ -401,7 +401,7 @@ public class HtmlFetcher { } protected HttpURLConnection createUrlConnection(String urlAsStr, int timeout, - boolean includeSomeGooseOptions) throws MalformedURLException, IOException { + boolean includeSomeGooseOptions) throws IOException { URL url = new URL(urlAsStr); // using proxy may increase latency HttpURLConnection hConn = (HttpURLConnection) url.openConnection(Proxy.NO_PROXY); diff --git a/app/src/main/res/drawable-hdpi/ic_action_menu.png b/app/src/main/res/drawable-hdpi/ic_action_menu.png deleted file mode 100644 index 36ff44804735685eb5d4a307e7acd6dedf3cda67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt_nt0}AsNnZryb;NHsEnB)Ss&! zxxk!l#V)tyFQr783z8dCM2Y9U%!|d>sx1QEI4|9%a4D>=DA5% z)aL0)br{-hx$t?_4a=n^>CDMPBJNLbwf7V@0rrfgTe~DWM4fa*K06 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_menu.png b/app/src/main/res/drawable-xhdpi/ic_action_menu.png deleted file mode 100644 index c3c626f98275a83c20034589368175a30c3c930b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)%ZvCWr;FfN=s?z_&pgVLvEI=3{4HAb{!Vp=2EI<|@3y=jq z5HN8y#=U@_Jof?`KO(=>R5=I*)IUdI6cCaeHP(UxG^mGE69t4c4UM&+01fIP)kFay lO+#ZXC_saHNHxtX;0gV_-a&E?BpUz#002ovPDHLkV1o7%oYMdR diff --git a/app/src/main/res/drawable-xhdpi/progress_bar.9.png b/app/src/main/res/drawable-xhdpi/progress_bar.9.png deleted file mode 100644 index 3ee17a7ef390839e2961bfa9249ae2ac9c45a8f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^tRT$61|)m))t&+=wj^(N7l!{JxM1({$v_d#0*}aI z1_r)^Ak4U9V)k30AbW|YuPggqZZ;+{qvtHYmjZ>XJzX3_IIf5G9OONqAaGdbS_1F3 zg!_31rPd_My;Zy#WVdnB3I>%xUWbrlo8y_++|2aM3*0j6&kwt`D`YOJOZ_^_!2bkj O41=eupUXO@geCwYY&aGG diff --git a/app/src/main/res/drawable-xhdpi/progress_bar_bg.9.png b/app/src/main/res/drawable-xhdpi/progress_bar_bg.9.png deleted file mode 100644 index daca8b722712f3bbe35e2bbf38049b10bddc2978..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^d_c^~!3HEt`|kO_w diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_menu.png b/app/src/main/res/drawable-xxhdpi/ic_action_menu.png deleted file mode 100644 index 18843e648c62d38b4714a3da57fc69ae409de8fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 722 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V4CUa;uum9_jaar-fagFSKpPV zm{?3d$+4^~e%-s|6xW?yMYBbBoN}6Ew(iT#=Bpf04qBeiSkx3)3O{&Eu&X#Hn6P8! zOzpd$_1cZs@A}ki6|nGCS3Dt9GsZzwY##&p-df{Qtf0X3o4@>yMrDnA&hN=Ub-H%sZyX{%6KA7Fx*c zdsntQe$Cp#uOST6PCu>9{q%lS{p(1ZTxh=l z^zQd$RtWmrJ9B2x1hxZ78!K{x*S`Mx%X{|6D-nzV=k~u^#(3eGV90(|+x20qMWhR* z81fDkgml-au+Chy|IacLPL23&GDntOet9=Ky)o%u-TvK}DRW{aYQj^cs`L9f`^hIp(xt};k zc4N80&-#fTn>p)46qp)Layc+;VBWBYQ^28`{Y}T#?`x(@mK~|uxbe5r#MK - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 9fa38ac..0e5a0b3 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -5,7 +5,7 @@ @color/primary_color - @drawable/list_bg + ?attr/listChoiceBackgroundIndicator @color/primary_color @color/secondary_color_settings @color/accent_color @@ -21,7 +21,7 @@ @color/primary_color_dark - @drawable/list_bg + ?attr/listChoiceBackgroundIndicator @color/primary_color_dark @color/secondary_color_settings_dark @color/accent_color From 459c5f8ff0da758dd0169c2a0776ff4b8604a190 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 10 May 2015 16:27:19 -0400 Subject: [PATCH 21/22] updated to latest netcipher library --- external/netcipher | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/netcipher b/external/netcipher index a7092a4..8441429 160000 --- a/external/netcipher +++ b/external/netcipher @@ -1 +1 @@ -Subproject commit a7092a4bcba198a5d5c7fe1b07d27039aebd2144 +Subproject commit 84414299123c73c42b861bb51eb7ed959e8acf42 From 2f3655045cf686ad4ea2914d77b29fdd3fbcecb4 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Sun, 10 May 2015 16:35:21 -0400 Subject: [PATCH 22/22] Updated to latest gradle plugin --- app/app.iml | 1 - build.gradle | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/app.iml b/app/app.iml index 6c59c00..9c6161c 100644 --- a/app/app.iml +++ b/app/app.iml @@ -91,7 +91,6 @@ - diff --git a/build.gradle b/build.gradle index 01de6ef..88d246d 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.2' + classpath 'com.android.tools.build:gradle:1.2.3' } }