diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 242c758e..07727caf 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7c988e3c..febbc86b 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -28,7 +28,6 @@ - diff --git a/.idea/misc.xml b/.idea/misc.xml index 74bb5bc2..af079604 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -80,8 +80,21 @@ - - + + + + + + + + + + + + + + + diff --git a/app/orion/release/output-metadata.json b/app/orion/release/output-metadata.json index 8f45788f..5374ea58 100644 --- a/app/orion/release/output-metadata.json +++ b/app/orion/release/output-metadata.json @@ -4,7 +4,7 @@ "type": "APK", "kind": "Directory" }, - "applicationId": "com.darkweb.genesissearchengine.production", + "applicationId": "com.hiddenservices.onionservices", "variantName": "orionRelease", "elements": [ { @@ -33,19 +33,6 @@ "versionName": "Build | Dark-Origin 1.0.5.0", "outputFile": "app-orion-armeabi-v7a-release.apk" }, - { - "type": "ONE_OF_MANY", - "filters": [ - { - "filterType": "ABI", - "value": "x86" - } - ], - "attributes": [], - "versionCode": 382, - "versionName": "Build | Dark-Origin 1.0.5.0", - "outputFile": "app-orion-x86-release.apk" - }, { "type": "ONE_OF_MANY", "filters": [ @@ -58,6 +45,19 @@ "versionCode": 381, "versionName": "Build | Dark-Origin 1.0.5.0", "outputFile": "app-orion-arm64-v8a-release.apk" + }, + { + "type": "ONE_OF_MANY", + "filters": [ + { + "filterType": "ABI", + "value": "x86" + } + ], + "attributes": [], + "versionCode": 382, + "versionName": "Build | Dark-Origin 1.0.5.0", + "outputFile": "app-orion-x86-release.apk" } ], "elementType": "File" diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoClients.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoClients.java index 38a8d767..c19bb67d 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoClients.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoClients.java @@ -605,13 +605,14 @@ public class geckoClients { public void onReloadDelay(NestedGeckoView mNestedGeckoView, AppCompatActivity pcontext, boolean isThemeCall) { new Handler().postDelayed(() -> - { - mSession.stop(); - String url = mSession.getCurrentURL(); - if (url.startsWith("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/?pG") || url.startsWith("https://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion?pG") || url.endsWith("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || url.contains(constants.CONST_GENESIS_HELP_URL_SUB) || url.contains(constants.CONST_GENESIS_HELP_URL_CACHE) || url.contains(constants.CONST_GENESIS_HELP_URL_CACHE_DARK)) { - loadURL(mSession.getCurrentURL(), mNestedGeckoView, pcontext); - } else if (!isThemeCall) { - mSession.reload(); + { if(mSession != null){ + mSession.stop(); + String url = mSession.getCurrentURL(); + if (url.startsWith("http://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion/?pG") || url.startsWith("https://trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion?pG") || url.endsWith("trcip42ymcgvv5hsa7nxpwdnott46ebomnn5pm5lovg5hpszyo4n35yd.onion") || url.contains(constants.CONST_GENESIS_HELP_URL_SUB) || url.contains(constants.CONST_GENESIS_HELP_URL_CACHE) || url.contains(constants.CONST_GENESIS_HELP_URL_CACHE_DARK)) { + loadURL(mSession.getCurrentURL(), mNestedGeckoView, pcontext); + } else if (!isThemeCall) { + mSession.reload(); + } } }, 1000); } diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoSession.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoSession.java index 9f927eaa..18a6ef97 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoSession.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoSession.java @@ -601,9 +601,9 @@ geckoSession extends GeckoSession implements MediaSession.Delegate, GeckoSession private String setGenesisVerificationToken(String pString) { try { if (pString.contains("?")) { - pString += "&" + constants.CONST_GENESIS_GMT_TIME_GET_KEY + "=" + trueTimeEncryption.getInstance().getSecretToken(); + pString += "&" + constants.CONST_GENESIS_GMT_TIME_GET_KEY + "=" + trueTimeEncryption.getInstance().getSecretToken() + "&theme=" + status.sTheme; } else { - pString += "?" + constants.CONST_GENESIS_GMT_TIME_GET_KEY + "=" + trueTimeEncryption.getInstance().getSecretToken(); + pString += "?" + constants.CONST_GENESIS_GMT_TIME_GET_KEY + "=" + trueTimeEncryption.getInstance().getSecretToken() + "&theme=" + status.sTheme; } return pString; } catch (Exception ex) { diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java index 17d2590c..46a71de3 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java @@ -2035,7 +2035,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba public void onReInitTheme() { recreate(); - mHomeViewController.onUpdateStatusBarTheme(mGeckoClient.getTheme(), true); + //mHomeViewController.onUpdateStatusBarTheme(mGeckoClient.getTheme(), true); } public void onResetData() { diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java index c086f807..36fcc42c 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java @@ -1431,33 +1431,37 @@ class homeViewController { scaleDown.start(); alpha.start(); - scaleDown.addListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation, boolean isReverse) { - } + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) { + scaleDown.addListener(new Animator.AnimatorListener() { + @Override + public void onAnimationStart(Animator animation, boolean isReverse) { + } - @Override - public void onAnimationEnd(Animator animation, boolean isReverse) { - mEvent.invokeObserver(data, e_type); - } + @Override + public void onAnimationEnd(Animator animation, boolean isReverse) { + mEvent.invokeObserver(data, e_type); + } - @Override - public void onAnimationStart(Animator animation) { - } + @Override + public void onAnimationStart(Animator animation) { + } - @Override - public void onAnimationEnd(Animator animation) { - } + @Override + public void onAnimationEnd(Animator animation) { + } - @Override - public void onAnimationCancel(Animator animation) { + @Override + public void onAnimationCancel(Animator animation) { - } + } - @Override - public void onAnimationRepeat(Animator animation) { - } - }); + @Override + public void onAnimationRepeat(Animator animation) { + } + }); + }else { + mEvent.invokeObserver(data, e_type); + } } public void onHomeTabAnimation(List data, Object e_type) { diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/generalManager/settingGeneralController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/generalManager/settingGeneralController.java index 6582efef..6675dd99 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/generalManager/settingGeneralController.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/generalManager/settingGeneralController.java @@ -140,18 +140,20 @@ public class settingGeneralController extends AppCompatActivity { status.mThemeApplying = true; + //activityContextManager.getInstance().getHomeController().onReInitTheme(); new Handler().postDelayed(() -> { - if (activityContextManager.getInstance().getHomeController() != null) { - activityContextManager.getInstance().getHomeController().onReInitTheme(); - activityContextManager.getInstance().getSettingController().onInitTheme(); - activityContextManager.getInstance().getHomeController().onCloseAllTabs(); + try { + if (activityContextManager.getInstance().getHomeController() != null) { + activityContextManager.getInstance().getSettingController().onInitTheme(); + activityContextManager.getInstance().getHomeController().onCloseAllTabs(); - onBackPressed(); - overridePendingTransition(R.anim.fade_in_lang, R.anim.fade_out_lang); - helperMethod.openActivity(settingGeneralController.class, constants.CONST_LIST_HISTORY, settingGeneralController.this, true); + //onBackPressed(); + //overridePendingTransition(R.anim.fade_in_lang, R.anim.fade_out_lang); + //helperMethod.openActivity(settingGeneralController.class, constants.CONST_LIST_HISTORY, settingGeneralController.this, true); - } + } + }catch (Exception ex){} }, 100); } diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/settingHomeManager/settingHomeController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/settingHomeManager/settingHomeController.java index 7a519b6b..4802bb1d 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/settingHomeManager/settingHomeController.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/settingHomeManager/settingHomeController.java @@ -82,6 +82,7 @@ public class settingHomeController extends AppCompatActivity { helperMethod.updateResources(this, status.mSystemLocale.getDisplayName()); activityContextManager.getInstance().getHomeController().updateResources(this, status.mSystemLocale.getDisplayName()); + pluginController.getInstance().onMessageManagerInvoke(null, M_RESET); super.onConfigurationChanged(newConfig); } diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabAdapter.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabAdapter.java index 9d034ea5..8c659e7b 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabAdapter.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabAdapter.java @@ -27,7 +27,6 @@ import com.hiddenservices.onionservices.appManager.activityContextManager; import com.hiddenservices.onionservices.constants.enums; import com.hiddenservices.onionservices.constants.status; import com.hiddenservices.onionservices.dataManager.models.tabRowModel; -import com.hiddenservices.onionservices.libs.views.ThumbnailCrop; import com.hiddenservices.onionservices.eventObserver; import com.hiddenservices.onionservices.helperManager.helperMethod; import com.example.myapplication.R; @@ -436,7 +435,7 @@ public class tabAdapter extends RecyclerView.Adapter if (status.sTheme == enums.Theme.THEME_DARK || status.sDefaultNightMode) { mCardView.setCardBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.c_button_text_v1_inverted)); } else { - mCardView.setCardBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.c_alert_rateus_header)); + mCardView.setCardBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.c_alert_header)); } } else { diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabController.java index 1ea3b445..2ee0db93 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabController.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabController.java @@ -572,7 +572,7 @@ public class tabController extends Fragment { onNewTabInvoked(); mHomeController.onBackPressed(); mClosedByNewTab = true; - } else if (pView.getId() == R.id.pCloseTab) { + } else if (pView.getId() == R.id.pPopupRateusClose) { mTouchable = false; onClearTabBackup(); mListModel.onTrigger(tabEnums.eModelCallback.M_CLEAR_BACKUP_RETAIN_DATABASE, null); diff --git a/app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabViewController.java b/app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabViewController.java index 9d69ca25..4fbd305c 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabViewController.java +++ b/app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabViewController.java @@ -124,7 +124,7 @@ class tabViewController { } if (pSize <= 0) { Button mTabClear = mPopupView.findViewById(R.id.pCloseTabTrigger); - LinearLayout mCloseTab = mPopupView.findViewById(R.id.pCloseTab); + LinearLayout mCloseTab = mPopupView.findViewById(R.id.pPopupRateusClose); mTabClear.setAlpha(0.35f); mCloseTab.setEnabled(false); } diff --git a/app/src/main/java/com/hiddenservices/onionservices/constants/status.java b/app/src/main/java/com/hiddenservices/onionservices/constants/status.java index 446257fe..3842c9e9 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/constants/status.java +++ b/app/src/main/java/com/hiddenservices/onionservices/constants/status.java @@ -18,7 +18,7 @@ public class status { public static boolean sPaidStatus = false; public static boolean sDeveloperBuild = false; - public static int sStoreType = enums.StoreType.AMAZON; + public static int sStoreType = enums.StoreType.GOOGLE_PLAY; /*Settings Status*/ public static Locale mSystemLocale = null; diff --git a/app/src/main/java/com/hiddenservices/onionservices/dataManager/crawlerDataModel.java b/app/src/main/java/com/hiddenservices/onionservices/dataManager/crawlerDataModel.java index efba1328..8182d933 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/dataManager/crawlerDataModel.java +++ b/app/src/main/java/com/hiddenservices/onionservices/dataManager/crawlerDataModel.java @@ -78,7 +78,6 @@ class crawlerDataModel { public void onExecute() { new Thread() { - String mHtml = strings.GENERIC_EMPTY_STR; String mURL = strings.GENERIC_EMPTY_STR; diff --git a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java index 56e816b0..d83c3677 100644 --- a/app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java +++ b/app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java @@ -20,14 +20,12 @@ import android.widget.EditText; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.RatingBar; import android.widget.ScrollView; import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.widget.ConstraintLayout; -import com.hiddenservices.onionservices.appManager.activityContextManager; import com.hiddenservices.onionservices.constants.constants; import com.hiddenservices.onionservices.constants.enums; import com.hiddenservices.onionservices.constants.status; @@ -209,13 +207,23 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD private void rateApp() { initializeDialog(R.layout.popup_rate_us, Gravity.CENTER); - mDialog.setCancelable(false); + mDialog.setCancelable(true); - Button mPopupRateusNext = mDialog.findViewById(R.id.pPopupRateusNext); - Button mPopupRateusDismiss = mDialog.findViewById(R.id.pPopupRateusDismiss); + LinearLayout mPopupRate1 = mDialog.findViewById(R.id.pPopupRateus1); + LinearLayout mPopupRate2 = mDialog.findViewById(R.id.pPopupRateus2); + LinearLayout mPopupRate3 = mDialog.findViewById(R.id.pPopupRateus3); + LinearLayout mPopupRate4 = mDialog.findViewById(R.id.pPopupRateus4); + LinearLayout mPopupRate5 = mDialog.findViewById(R.id.pPopupRateus5); + ImageButton mPopupRateusClose = mDialog.findViewById(R.id.pPopupRateusClose); - mPopupRateusNext.setOnClickListener(this); - mPopupRateusDismiss.setOnClickListener(this); + + mPopupRate1.setOnClickListener(this); + mPopupRate2.setOnClickListener(this); + mPopupRate3.setOnClickListener(this); + mPopupRate4.setOnClickListener(this); + mPopupRate5.setOnClickListener(this); + mPopupRate5.setOnClickListener(this); + mPopupRateusClose.setOnClickListener(this); } private void sendBridgeMail() { @@ -473,9 +481,9 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD view.getId() == R.id.pTorSwtichPopupDismiss || view.getId() == R.id.pPopupURLLongPressDismiss || view.getId() == R.id.pPopupLongPressDismiss || + view.getId() == R.id.pPopupRateusClose || view.getId() == R.id.pCertificateDesciption || - view.getId() == R.id.pCertificateRootBackground || - view.getId() == R.id.pPopupRateusDismiss + view.getId() == R.id.pCertificateRootBackground ) { onDismiss(); } else if (view.getId() == R.id.pDownloadPopuInfoNext) { @@ -546,9 +554,8 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD mURL = "https://orion.onion/privacy"; } mEvent.invokeObserver(Arrays.asList(mURL, mBookmarkName), M_BOOKMARK); - } else if (view.getId() == R.id.pPopupRateusNext) { - RatingBar mPopupRateusRating = mDialog.findViewById(R.id.pPopupRateusRating); - if (mPopupRateusRating.getRating() >= 3) { + } else if (view.getId() == R.id.pPopupRateus1 || view.getId() == R.id.pPopupRateus2 || view.getId() == R.id.pPopupRateus3 || view.getId() == R.id.pPopupRateus4 || view.getId() == R.id.pPopupRateus5) { + if (view.getId() == R.id.pPopupRateus1 || view.getId() == R.id.pPopupRateus2 || view.getId() == R.id.pPopupRateus3) { mEvent.invokeObserver(null, M_APP_RATED); String mStoreURL = getStoreLink(); Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mStoreURL)); @@ -558,7 +565,7 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD helperMethod.showToastMessage(MESSAGE_PLAYSTORE_NOT_FOUND, mContext); } onDismiss(); - } else if (mPopupRateusRating.getRating() > 0) { + } else{ mEvent.invokeObserver(null, M_APP_RATED); final Handler handler = new Handler(); handler.postDelayed(() -> { @@ -854,6 +861,11 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD switchTorBrowsing(); break; + case M_RATE_FAILURE: + /*VERIFIED*/ + rateFailure(); + break; + case M_OPEN_ACTIVITY_FAILED: /*VERIFIED*/ onShowToast(R.layout.popup_toast_generic, R.xml.ax_background_generic, 2000, mContext.getString(R.string.TOAST_ALERT_OPEN_ACTIVITY_FAILED), mContext.getString(R.string.ALERT_DISMISS), null); diff --git a/app/src/main/res/custom-xml/alert/xml/ax_generic_input.xml b/app/src/main/res/custom-xml/alert/xml/ax_generic_input.xml index 9f8447db..78b5564b 100644 --- a/app/src/main/res/custom-xml/alert/xml/ax_generic_input.xml +++ b/app/src/main/res/custom-xml/alert/xml/ax_generic_input.xml @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/app/src/main/res/custom-xml/alert/xml/ax_round_corner.xml b/app/src/main/res/custom-xml/alert/xml/ax_round_corner.xml index 428c737d..b151de80 100644 --- a/app/src/main/res/custom-xml/alert/xml/ax_round_corner.xml +++ b/app/src/main/res/custom-xml/alert/xml/ax_round_corner.xml @@ -22,8 +22,8 @@ diff --git a/app/src/main/res/custom-xml/alert/xml/ax_round_corner_bottomless.xml b/app/src/main/res/custom-xml/alert/xml/ax_round_corner_bottomless.xml new file mode 100644 index 00000000..d2615e89 --- /dev/null +++ b/app/src/main/res/custom-xml/alert/xml/ax_round_corner_bottomless.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/custom-xml/alert/xml/ax_round_corner_cross.xml b/app/src/main/res/custom-xml/alert/xml/ax_round_corner_cross.xml new file mode 100644 index 00000000..58088231 --- /dev/null +++ b/app/src/main/res/custom-xml/alert/xml/ax_round_corner_cross.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/custom-xml/alert/xml/ax_round_corner_inverted.xml b/app/src/main/res/custom-xml/alert/xml/ax_round_corner_inverted.xml new file mode 100644 index 00000000..b151de80 --- /dev/null +++ b/app/src/main/res/custom-xml/alert/xml/ax_round_corner_inverted.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/custom-xml/alert/xml/ax_round_corner_rate.xml b/app/src/main/res/custom-xml/alert/xml/ax_round_corner_rate.xml new file mode 100644 index 00000000..19503233 --- /dev/null +++ b/app/src/main/res/custom-xml/alert/xml/ax_round_corner_rate.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/custom-xml/alert/xml/ax_rounded_corner_button.xml b/app/src/main/res/custom-xml/alert/xml/ax_rounded_corner_button.xml new file mode 100644 index 00000000..c326b37e --- /dev/null +++ b/app/src/main/res/custom-xml/alert/xml/ax_rounded_corner_button.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/custom-xml/generic/xml/gx_generic_input_create_bookmark.xml b/app/src/main/res/custom-xml/generic/xml/gx_generic_input_create_bookmark.xml index 2457ab70..2e2ee8fa 100644 --- a/app/src/main/res/custom-xml/generic/xml/gx_generic_input_create_bookmark.xml +++ b/app/src/main/res/custom-xml/generic/xml/gx_generic_input_create_bookmark.xml @@ -7,8 +7,8 @@ - - + + - - + + diff --git a/app/src/main/res/custom-xml/history/xml/hx_ripple_default_round_bottom.xml b/app/src/main/res/custom-xml/history/xml/hx_ripple_default_round_bottom.xml index ffc6f082..b835f82b 100644 --- a/app/src/main/res/custom-xml/history/xml/hx_ripple_default_round_bottom.xml +++ b/app/src/main/res/custom-xml/history/xml/hx_ripple_default_round_bottom.xml @@ -6,7 +6,7 @@ + android:color="@color/c_alert_borders" /> diff --git a/app/src/main/res/drawable/angry.png b/app/src/main/res/drawable/angry.png new file mode 100644 index 00000000..e5f7cf0c Binary files /dev/null and b/app/src/main/res/drawable/angry.png differ diff --git a/app/src/main/res/drawable/confused.png b/app/src/main/res/drawable/confused.png new file mode 100644 index 00000000..79d970f9 Binary files /dev/null and b/app/src/main/res/drawable/confused.png differ diff --git a/app/src/main/res/drawable/sad.png b/app/src/main/res/drawable/sad.png new file mode 100644 index 00000000..f79b7257 Binary files /dev/null and b/app/src/main/res/drawable/sad.png differ diff --git a/app/src/main/res/drawable/smile.png b/app/src/main/res/drawable/smile.png new file mode 100644 index 00000000..17ee915e Binary files /dev/null and b/app/src/main/res/drawable/smile.png differ diff --git a/app/src/main/res/drawable/star.png b/app/src/main/res/drawable/star.png new file mode 100644 index 00000000..e9eebd12 Binary files /dev/null and b/app/src/main/res/drawable/star.png differ diff --git a/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml b/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml index 45bfdea5..62186199 100644 --- a/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml +++ b/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml @@ -49,7 +49,7 @@ android:paddingEnd="15dp" android:text="@string/ALERT_BRIDGE_MAIL_INFO" android:textAlignment="textStart" - android:textColor="@color/c_text_v8" + android:textColor="@color/c_alert_background_description" android:textSize="13.5sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layouts/alert/layout/popup_bridge_setting_custom.xml b/app/src/main/res/layouts/alert/layout/popup_bridge_setting_custom.xml index 6262159f..93b693d7 100644 --- a/app/src/main/res/layouts/alert/layout/popup_bridge_setting_custom.xml +++ b/app/src/main/res/layouts/alert/layout/popup_bridge_setting_custom.xml @@ -24,19 +24,19 @@ android:layout_marginTop="18dp" android:alpha="1" android:background="@xml/ax_border_left" - android:gravity="start" android:lineSpacingExtra="3.5dp" + android:textStyle="bold" + android:gravity="start" android:paddingStart="15dp" android:paddingEnd="15dp" - android:text="@string/ALERT_CUSTOM_BRIDGES" + android:text="PROVIDE BRIDGE" android:textAlignment="textStart" - android:textColor="@color/c_text_v8" + android:textColor="@color/c_text_v10" android:textSize="13.5sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:ignore="SmallSp,TextContrastCheck" /> - diff --git a/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml b/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml index 64abf5bb..0513ac13 100644 --- a/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml +++ b/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml @@ -1,5 +1,6 @@ - @@ -124,7 +124,7 @@ android:text="@string/ALERT_DOWNLOAD_OPTION_1" android:textAlignment="textStart" android:textAllCaps="false" - android:textColor="@color/c_alert_text_static" + android:textColor="@color/c_alert_background_description" android:textSize="14sp" /> + app:tint="@color/c_navigation_tint_alert" /> @@ -174,7 +174,7 @@ android:text="@string/ALERT_DOWNLOAD_OPTION_2" android:textAlignment="textStart" android:textAllCaps="false" - android:textColor="@color/c_alert_text_static" + android:textColor="@color/c_alert_background_description" android:textSize="14sp" /> + app:tint="@color/c_navigation_tint_alert" /> @@ -224,7 +224,7 @@ android:text="@string/ALERT_DOWNLOAD_OPTION_3" android:textAlignment="textStart" android:textAllCaps="false" - android:textColor="@color/c_alert_text_static" + android:textColor="@color/c_alert_background_description" android:textSize="14sp" /> + app:tint="@color/c_navigation_tint_alert" /> @@ -277,7 +277,7 @@ android:text="@string/ALERT_DOWNLOAD_OPTION_4" android:textAlignment="textStart" android:textAllCaps="false" - android:textColor="@color/c_alert_text_static" + android:textColor="@color/c_alert_background_description" android:textSize="14sp" /> + app:tint="@color/c_navigation_tint_alert" /> @@ -330,7 +330,7 @@ android:text="@string/ALERT_DOWNLOAD_OPTION_5" android:textAlignment="textStart" android:textAllCaps="false" - android:textColor="@color/c_alert_text_static" + android:textColor="@color/c_alert_background_description" android:textSize="14sp" /> + app:tint="@color/c_navigation_tint_alert" /> @@ -383,7 +383,7 @@ android:text="@string/ALERT_DOWNLOAD_OPTION_6" android:textAlignment="textStart" android:textAllCaps="false" - android:textColor="@color/c_alert_text_static" + android:textColor="@color/c_alert_background_description" android:textSize="14sp" /> + app:tint="@color/c_navigation_tint_alert" /> @@ -436,7 +436,7 @@ android:text="@string/ALERT_DOWNLOAD_OPTION_7" android:textAlignment="textStart" android:textAllCaps="false" - android:textColor="@color/c_alert_text_static" + android:textColor="@color/c_alert_background_description" android:textSize="14sp" /> diff --git a/app/src/main/res/layouts/alert/layout/popup_download_url.xml b/app/src/main/res/layouts/alert/layout/popup_download_url.xml index d544a6e1..777cc6a5 100644 --- a/app/src/main/res/layouts/alert/layout/popup_download_url.xml +++ b/app/src/main/res/layouts/alert/layout/popup_download_url.xml @@ -70,7 +70,7 @@ android:paddingEnd="15dp" android:text="@string/GENERAL_DEFAULT_TEXT" android:textAlignment="textStart" - android:textColor="@color/c_alert_text_static" + android:textColor="@color/c_alert_background_description" android:textSize="12.5sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_weight="1" @@ -90,7 +90,7 @@ android:paddingEnd="15dp" android:text="@string/GENERAL_DEFAULT_TEXT" android:textAlignment="textStart" - android:textColor="@color/c_alert_text_static" + android:textColor="@color/c_alert_background_description" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_weight="1" diff --git a/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml b/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml index c0aeb335..d388f05a 100644 --- a/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml +++ b/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml @@ -42,8 +42,8 @@ @@ -105,7 +105,7 @@ android:text="@string/ALERT_LONG_URL_OPTION_4" android:textAlignment="textStart" android:textAllCaps="false" - android:textColor="@color/c_alert_text_static" + android:textColor="@color/c_alert_background_description" android:textSize="14sp" /> + app:tint="@color/c_navigation_tint_alert" /> @@ -126,7 +126,7 @@ android:id="@+id/view5" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/c_orbot_setting_divider_static" + android:background="@color/c_secure_alert_border_light" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" /> @@ -156,7 +156,7 @@ android:text="@string/ALERT_LONG_URL_OPTION_1" android:textAlignment="textStart" android:textAllCaps="false" - android:textColor="@color/c_alert_text_static" + android:textColor="@color/c_alert_background_description" android:textSize="14sp" /> + app:tint="@color/c_navigation_tint_alert" /> @@ -206,7 +206,7 @@ android:text="@string/ALERT_LONG_URL_OPTION_2" android:textAlignment="textStart" android:textAllCaps="false" - android:textColor="@color/c_alert_text_static" + android:textColor="@color/c_alert_background_description" android:textSize="14sp" /> + app:tint="@color/c_navigation_tint_alert" /> @@ -256,7 +256,7 @@ android:text="@string/ALERT_LONG_URL_OPTION_3" android:textAlignment="textStart" android:textAllCaps="false" - android:textColor="@color/c_alert_text_static" + android:textColor="@color/c_alert_background_description" android:textSize="14sp" /> + app:tint="@color/c_navigation_tint_alert" /> @@ -278,7 +278,7 @@ android:layout_height="1dp" android:layout_marginEnd="30dp" android:layout_marginStart="30dp" - android:background="@color/c_orbot_setting_divider_static" + android:background="@color/c_secure_alert_border_light" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" /> diff --git a/app/src/main/res/layouts/alert/layout/popup_find.xml b/app/src/main/res/layouts/alert/layout/popup_find.xml index b8eed19b..98b1eac5 100644 --- a/app/src/main/res/layouts/alert/layout/popup_find.xml +++ b/app/src/main/res/layouts/alert/layout/popup_find.xml @@ -12,7 +12,7 @@ android:layout_height="60dp" android:layout_marginTop="2dp" android:layout_marginBottom="2dp" - android:background="@color/c_background" + android:background="@color/c_alert_background_gradient_down" android:elevation="8dp" android:orientation="horizontal" app:layout_constraintBottom_toBottomOf="parent" @@ -25,7 +25,7 @@ android:layout_height="match_parent" android:layout_weight="5" android:autofillHints="yes" - android:background="@color/c_background" + android:background="@color/c_alert_background_gradient_down" android:focusedByDefault="true" android:hint="@string/GENERAL_FIND_HINT" android:importantForAutofill="yes" @@ -57,7 +57,7 @@ android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:layout_marginEnd="5dp" - android:background="@color/c_divider_line_light" + android:background="@color/c_secure_alert_border_light" app:layout_constraintBottom_toTopOf="@+id/pPopupFindNavigationContainer" /> - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent"> -