diff --git a/app/build.gradle b/app/build.gradle index ab69749c..6e0406b8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,7 +41,7 @@ android { flavorDimensions project.ext.dimen productFlavors { - arm { + /*arm { versionCode project.ext.arm_vcode versionName project.ext.arm_vname dimension project.ext.dimen @@ -50,17 +50,17 @@ android { versionCode project.ext.aarch_vcode versionName project.ext.aarch_vname dimension project.ext.dimen - } + }*/ x86 { versionCode project.ext.x86_vcode versionName project.ext.x86_vname dimension project.ext.dimen } - x86_64 { + /*x86_64 { versionCode project.ext.x64_vcode versionName project.ext.x64_vname dimension project.ext.dimen - } + }*/ } @@ -91,16 +91,16 @@ dependencies { implementation 'cz.msebera.android:httpclient:4.5.8' implementation 'androidx.appcompat:appcompat:1.1.0-rc01' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2' - implementation 'com.google.android.material:material:1.1.0-alpha08' + implementation 'com.google.android.material:material:1.1.0-alpha09' implementation 'androidx.preference:preference:1.1.0-rc01' implementation 'com.android.support:design:28.0.0' implementation 'com.android.support:appcompat-v7:28.0.0' /*Firefox ABI Splits*/ - x86Implementation "org.mozilla.geckoview:geckoview-x86:67.0.20190613202504" - x86_64Implementation "org.mozilla.geckoview:geckoview-x86_64:67.0.20190613202504" - armImplementation "org.mozilla.geckoview:geckoview-armeabi-v7a:67.0.20190613202504" - aarch64Implementation "org.mozilla.geckoview:geckoview-arm64-v8a:67.0.20190613202504" + x86Implementation "org.mozilla.geckoview:geckoview-x86:68.0.20190711090008" + //x86_64Implementation "org.mozilla.geckoview:geckoview-x86_64:68.0.20190711090008" + //armImplementation "org.mozilla.geckoview:geckoview-armeabi-v7a:68.0.20190711090008" + //aarch64Implementation "org.mozilla.geckoview:geckoview-arm64-v8a:68.0.20190711090008" /*Alert Dialog*/ implementation 'com.crowdfire.cfalertdialog:cfalertdialog:1.1.0' @@ -111,7 +111,7 @@ dependencies { implementation 'org.slf4j:slf4j-android:1.7.26' /*Ads Manager*/ - implementation 'com.google.android.gms:play-services-ads:18.1.0' + implementation 'com.google.android.gms:play-services-ads:18.1.1' /*Crashlytics*/ implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 41104a36..2377d09c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,10 +10,10 @@ diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 00000000..c2f8d9bc Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/application_controller.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/application_controller.java index c3860185..e6877b26 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/application_controller.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/application_controller.java @@ -142,6 +142,15 @@ public class application_controller extends AppCompatActivity webView = findViewById(R.id.pageLoader1); geckoView = findViewById(R.id.webLoader); + + geckoView.Browser browser = mGeckoView.getCurrentBrowser(); + if (browser == null) { + browser = mGeckoView.addBrowser(text.getText().toString()); + } else { + browser.loadUrl(text.getText().toString()); + } + + progressBar = findViewById(R.id.progressBar); requestFailure = findViewById(R.id.requestFailure); splashScreen = findViewById(R.id.splashScreen); @@ -149,7 +158,6 @@ public class application_controller extends AppCompatActivity floatingButton = findViewById(R.id.floatingActionButton3); loadingIcon = findViewById(R.id.imageView_loading_back); splashlogo = findViewById(R.id.backsplash); - geckoView = findViewById(R.id.webLoader); loadingText = findViewById(R.id.loadingText); webviewclient = new webviewClient(); diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/webviewClient.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/webviewClient.java index 2d3b006a..fdca1593 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/webviewClient.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/home_activity/webviewClient.java @@ -6,6 +6,7 @@ import android.webkit.WebViewClient; import com.darkweb.genesissearchengine.constants.constants; import com.darkweb.genesissearchengine.constants.enums; import com.darkweb.genesissearchengine.constants.status; +import com.darkweb.genesissearchengine.helperMethod; import com.darkweb.genesissearchengine.pluginManager.fabricManager; import com.darkweb.genesissearchengine.pluginManager.orbot_manager; @@ -28,6 +29,11 @@ public class webviewClient } if(!url.contains("boogle")) { + if(url.startsWith("advert")) + { + helperMethod.openPlayStore(url.split("__")[1]); + return true; + } app_model.getInstance().getAppInstance().stopHiddenView(false,false); fabricManager.getInstance().sendEvent("BASE SIMPLE SEARCHED : " + url); isGeckoView = true; diff --git a/app/src/main/java/com/darkweb/genesissearchengine/helperMethod.java b/app/src/main/java/com/darkweb/genesissearchengine/helperMethod.java index 59175201..93dead56 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/helperMethod.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/helperMethod.java @@ -167,4 +167,11 @@ public class helperMethod } + public static void openPlayStore(String packageName) + { + Intent intent = new Intent(Intent.ACTION_VIEW); + intent.setData(Uri.parse("market://details?id="+packageName)); + app_model.getInstance().getAppInstance().startActivity(intent); + } + } diff --git a/app/src/main/res/drawable/icon_logolarge.webp b/app/src/main/res/drawable/icon_logolarge.webp deleted file mode 100644 index 57cd9c9e..00000000 Binary files a/app/src/main/res/drawable/icon_logolarge.webp and /dev/null differ diff --git a/app/src/main/res/drawable/icon_logosmall.webp b/app/src/main/res/drawable/icon_logosmall.webp deleted file mode 100644 index 2817589f..00000000 Binary files a/app/src/main/res/drawable/icon_logosmall.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index bbd3e021..036d09bc 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index bbd3e021..036d09bc 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..269140c0 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..77da0ff0 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..c840f497 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round_v1.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round_v1.webp deleted file mode 100644 index e2ba5a6a..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round_v1.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_v1.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_v1.webp deleted file mode 100644 index e2ba5a6a..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_v1.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..0cdc439c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..1e7d06ae Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..be31aa36 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round_v1.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round_v1.webp deleted file mode 100644 index 6fbc9201..00000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round_v1.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round_v2.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round_v2.webp deleted file mode 100644 index 85d22d76..00000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round_v2.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_v1.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_v1.webp deleted file mode 100644 index 6fbc9201..00000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_v1.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..b2884e77 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..30c9e66e Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..6ee92631 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round_v1.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round_v1.webp deleted file mode 100644 index 0e6b55eb..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round_v1.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round_v2.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round_v2.webp deleted file mode 100644 index 85d22d76..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round_v2.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_v1.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_v1.webp deleted file mode 100644 index 0e6b55eb..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_v1.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..964fc0c2 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..d68dc9bc Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..90f96b60 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round_v1.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round_v1.webp deleted file mode 100644 index 45f31150..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round_v1.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round_v2.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round_v2.webp deleted file mode 100644 index 85d22d76..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round_v2.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_v1.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_v1.webp deleted file mode 100644 index 45f31150..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_v1.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..23c62075 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..c5d55b73 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..0f5a7b71 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round_v1.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round_v1.webp deleted file mode 100644 index 85d22d76..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round_v1.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round_v2.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round_v2.webp deleted file mode 100644 index 85d22d76..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round_v2.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v1.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v1.webp deleted file mode 100644 index 85d22d76..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_v1.webp and /dev/null differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 00000000..c5d5899f --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/variables.gradle b/app/variables.gradle index 5f163e56..ea187fec 100644 --- a/app/variables.gradle +++ b/app/variables.gradle @@ -1,18 +1,18 @@ /*arm versions*/ - project.ext.arm_vname = '196' - project.ext.arm_vcode = 196 + project.ext.arm_vname = '200' + project.ext.arm_vcode = 200 /*aarch versions*/ - project.ext.aarch_vname = '197' - project.ext.aarch_vcode = 197 + project.ext.aarch_vname = '201' + project.ext.aarch_vcode = 201 /*x86 versions*/ - project.ext.x86_vname = '198' - project.ext.x86_vcode = 198 + project.ext.x86_vname = '202' + project.ext.x86_vcode = 202 /*x64 versions*/ - project.ext.x64_vname = '199' - project.ext.x64_vcode = 199 + project.ext.x64_vname = '203' + project.ext.x64_vcode = 203 /*dimension*/ project.ext.dimen = 'abi' @@ -22,9 +22,9 @@ project.ext.firefox_channel = "" /*Application Preferences*/ - project.ext.compileSdkVersion = 28 + project.ext.compileSdkVersion = 29 project.ext.minSdkVersion = 21 - project.ext.targetSdkVersion = 28 + project.ext.targetSdkVersion = 29 project.ext.versionCode = 126 project.ext.versionName = "126.0" project.ext.applicationId = "com.darkweb.genesissearchengine"