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 0000000..8c0fb64 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..0c71e76 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..91a7e26 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + 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