JoJo
/
LeOS-Genesis
mirror of https://github.com/LeOS-GSI/LeOS-Genesis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug Fixes 

Bug Fixes
master
Abdul Mannan Saeed 2022-05-14 13:31:18 +05:00
parent 7ba7fe34ef
commit aa1793fa33
47 changed files with 618 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/deploymentTargetDropDown.xml
View File

@ -7,11 +7,11 @@
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\msman\.android\avd\Pixel_2_API_Tiramisu_2.avd" />
<value value="C:\Users\msman\.android\avd\Pixel_2_API_Tiramisu_1.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2022-05-05T18:53:01.772847Z" />
<timeTargetWasSelectedWithDropDown value="2022-05-13T22:51:24.221202700Z" />
</component>
</project>

1
.idea/gradle.xml
View File

@ -28,7 +28,6 @@
<option value="$PROJECT_DIR$/shutterbug" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
</component>

17
.idea/misc.xml
View File

@ -80,8 +80,21 @@
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/tab/layout/tab_view.xml" value="0.203125" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/certificate_info.xml" value="0.18541666666666667" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml" value="0.5" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml" value="0.20989583333333334" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_tor_change.xml" value="0.7655913978494624" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_bridge_setting_custom.xml" value="0.5" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml" value="0.25" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_data_cleared_shortcut.xml" value="0.18541666666666667" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_download_full.xml" value="0.33" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_download_url.xml" value="0.5" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml" value="0.33" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_find.xml" value="0.5" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_panic.xml" value="0.67" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_rate_failure.xml" value="0.5" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_rate_us.xml" value="0.33" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_toast_generic.xml" value="0.25" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_toast_undo.xml" value="0.25" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_tor_change.xml" value="0.5" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_url_longpress.xml" value="0.33" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/secure_connection_popup.xml" value="0.157421875" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml" value="0.18541666666666667" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/bookmark/layout/bookmark_view.xml" value="0.18541666666666667" />
<entry key="..\:/workspace/Genesis-Android/app/src/main/res/layouts/help/layout/help_view.xml" value="0.358695652173913" />

28
app/orion/release/output-metadata.json
View File

@ -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"

3
app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoClients.java
View File

@ -605,7 +605,7 @@ public class geckoClients {
public void onReloadDelay(NestedGeckoView mNestedGeckoView, AppCompatActivity pcontext, boolean isThemeCall) {
new Handler().postDelayed(() ->
{
{ 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)) {
@ -613,6 +613,7 @@ public class geckoClients {
} else if (!isThemeCall) {
mSession.reload();
}
}
}, 1000);
}

4
app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/geckoManager/geckoSession.java
View File

@ -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) {

2
app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeController.java
View File

@ -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() {

4
app/src/main/java/com/hiddenservices/onionservices/appManager/homeManager/homeController/homeViewController.java
View File

@ -1431,6 +1431,7 @@ class homeViewController {
scaleDown.start();
alpha.start();
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
scaleDown.addListener(new Animator.AnimatorListener() {
@Override
public void onAnimationStart(Animator animation, boolean isReverse) {
@ -1458,6 +1459,9 @@ class homeViewController {
public void onAnimationRepeat(Animator animation) {
}
});
}else {
mEvent.invokeObserver(data, e_type);
}
}
public void onHomeTabAnimation(List<Object> data, Object e_type) {

10
app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/generalManager/settingGeneralController.java
View File

@ -140,18 +140,20 @@ public class settingGeneralController extends AppCompatActivity {
status.mThemeApplying = true;
//activityContextManager.getInstance().getHomeController().onReInitTheme();
new Handler().postDelayed(() ->
{
try {
if (activityContextManager.getInstance().getHomeController() != null) {
activityContextManager.getInstance().getHomeController().onReInitTheme();
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);
}

1
app/src/main/java/com/hiddenservices/onionservices/appManager/settingManager/settingHomeManager/settingHomeController.java
View File

@ -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);
}

3
app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabAdapter.java
View File

@ -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<tabAdapter.listViewHolder>
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 {

2
app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabController.java
View File

@ -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);

2
app/src/main/java/com/hiddenservices/onionservices/appManager/tabManager/tabViewController.java
View File

@ -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);
}

2
app/src/main/java/com/hiddenservices/onionservices/constants/status.java
View File

@ -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;

1
app/src/main/java/com/hiddenservices/onionservices/dataManager/crawlerDataModel.java
View File

@ -78,7 +78,6 @@ class crawlerDataModel {
public void onExecute() {
new Thread() {
String mHtml = strings.GENERIC_EMPTY_STR;
String mURL = strings.GENERIC_EMPTY_STR;

38
app/src/main/java/com/hiddenservices/onionservices/pluginManager/messagePluginManager/messageManager.java
View File

@ -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);

4
app/src/main/res/custom-xml/alert/xml/ax_generic_input.xml
View File

@ -7,7 +7,7 @@
<shape
android:shape="rectangle"
android:padding="10dp">
<solid android:color="@color/c_white" />
<solid android:color="@color/c_edittext_background" />
<corners android:radius="7dp" />
</shape>
</item>
@ -17,7 +17,7 @@
<shape
android:shape="rectangle"
android:padding="10dp">
<solid android:color="@color/c_white" />
<solid android:color="@color/c_edittext_background" />
<corners android:radius="7dp" />
</shape>
</item>

4
app/src/main/res/custom-xml/alert/xml/ax_round_corner.xml
View File

@ -22,8 +22,8 @@
<gradient
android:angle="90"
android:startColor="#e4e8f7"
android:endColor="@color/c_white"
android:startColor="@color/c_alert_background_gradient_up"
android:endColor="@color/c_alert_background_gradient_down"
android:type="linear" />
<corners android:radius="8dp" />

36
app/src/main/res/custom-xml/alert/xml/ax_round_corner_bottomless.xml Normal file
View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Bottom 2dp Shadow -->
<item>
<shape android:shape="rectangle">
<solid android:color="@color/cursor_blue" />
<corners android:radius="12dp" />
</shape>
</item>
<!-- White Top color -->
<item
android:bottom="0dp"
android:left="0px"
android:right="0px"
android:top="15px">
<shape android:shape="rectangle">
<gradient
android:angle="90"
android:startColor="@color/c_alert_background_gradient_up_rate"
android:endColor="@color/c_alert_background_gradient_down_rate"
android:type="linear" />
<corners android:radius="12dp" />
</shape>
</item>
</layer-list>

40
app/src/main/res/custom-xml/alert/xml/ax_round_corner_cross.xml Normal file
View File

@ -0,0 +1,40 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple_gray">
<item>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Bottom 2dp Shadow -->
<item>
<shape android:shape="rectangle">
<solid android:color="@color/cursor_blue" />
<corners android:radius="12dp" />
</shape>
</item>
<!-- White Top color -->
<item
android:bottom="0dp"
android:left="0px"
android:right="0px"
android:top="0px">
<shape android:shape="rectangle">
<gradient
android:angle="90"
android:startColor="#7591bd"
android:endColor="#7591bd"
android:type="linear" />
<corners android:radius="12dp" />
</shape>
</item>
</layer-list>
</item>
</ripple>

36
app/src/main/res/custom-xml/alert/xml/ax_round_corner_inverted.xml Normal file
View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Bottom 2dp Shadow -->
<item>
<shape android:shape="rectangle">
<solid android:color="@color/cursor_blue" />
<corners android:radius="8dp" />
</shape>
</item>
<!-- White Top color -->
<item
android:bottom="6dp"
android:left="0px"
android:right="0px"
android:top="0px">
<shape android:shape="rectangle">
<gradient
android:angle="90"
android:startColor="@color/c_alert_background_gradient_up"
android:endColor="@color/c_alert_background_gradient_down"
android:type="linear" />
<corners android:radius="8dp" />
</shape>
</item>
</layer-list>

46
app/src/main/res/custom-xml/alert/xml/ax_round_corner_rate.xml Normal file
View File

@ -0,0 +1,46 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple_gray">
<item>
<layer-list>
<!-- Bottom 2dp Shadow -->
<item
android:bottom="0dp"
android:left="0px"
android:right="0px"
android:top="0px">
<shape android:shape="rectangle">
<solid android:color="@color/secondary" />
<corners android:radius="8dp" />
</shape>
</item>
<!-- White Top color -->
<item
android:bottom="2dp"
android:left="0px"
android:right="0px"
android:top="0px">
<shape android:shape="rectangle">
<gradient
android:angle="90"
android:startColor="@color/c_alert_background_gradient_down"
android:endColor="@color/c_background"
android:type="linear" />
<corners android:radius="8dp" />
</shape>
</item>
</layer-list>
</item>
</ripple>

21
app/src/main/res/custom-xml/alert/xml/ax_rounded_corner_button.xml Normal file
View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_holo_gray">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@color/c_holo_gray" />
<corners android:radius="5.5dp" />
</shape>
</item>
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<gradient
android:angle="90"
android:endColor="@color/c_edittext_background"
android:startColor="@color/c_edittext_background"
android:type="linear" />
<corners android:radius="5.5dp" />
</shape>
</item>
</ripple>

8
app/src/main/res/custom-xml/generic/xml/gx_generic_input_create_bookmark.xml
View File

@ -7,8 +7,8 @@
<shape
android:shape="rectangle"
android:padding="10dp">
<solid android:color="@color/c_white" />
<corners android:radius="3dp" />
<solid android:color="@color/c_edittext_background" />
<corners android:radius="5dp" />
</shape>
</item>
<item
@ -17,8 +17,8 @@
<shape
android:shape="rectangle"
android:padding="10dp">
<solid android:color="@color/c_white" />
<corners android:radius="3dp" />
<solid android:color="@color/c_edittext_background" />
<corners android:radius="5dp" />
</shape>
</item>
</selector>

2
app/src/main/res/custom-xml/history/xml/hx_ripple_default_round_bottom.xml
View File

@ -6,7 +6,7 @@
<corners android:radius="4.5dp" />
<stroke
android:width="1dip"
android:color="@color/c_edittext_border_static" />
android:color="@color/c_alert_borders" />
</shape>
</item>
</ripple>

BIN
app/src/main/res/drawable/angry.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
app/src/main/res/drawable/confused.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
app/src/main/res/drawable/sad.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
app/src/main/res/drawable/smile.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
app/src/main/res/drawable/star.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

2
app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml
View File

@ -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"

13
app/src/main/res/layouts/alert/layout/popup_bridge_setting_custom.xml
View File

@ -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" />
<TextView
android:id="@+id/pBridgeSettingCustomDescription"
android:layout_width="match_parent"
@ -48,7 +48,7 @@
android:paddingEnd="15dp"
android:text="@string/ALERT_CUSTOM_BRIDGES_INFO"
android:textAlignment="textStart"
android:textColor="@color/c_black_light"
android:textColor="@color/c_alert_background_description"
android:textSize="13.5sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -134,12 +134,13 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="17dp"
android:layout_marginBottom="4dp"
android:background="@xml/hox_rounded_corner_splash"
android:background="@xml/ax_rounded_corner_button"
android:contentDescription="@string/GENERAL_TODO"
android:elevation="3dp"
android:src="@xml/ic_baseline_cross"
app:layout_constraintBottom_toTopOf="@+id/pBridgeSettingCustomError"
app:layout_constraintEnd_toEndOf="parent"
android:tint="@color/c_navigation_light"
app:layout_constraintTop_toBottomOf="@+id/pBridgeSettingCustomDescription"
tools:ignore="TouchTargetSizeCheck" />

13
app/src/main/res/layouts/alert/layout/popup_create_bookmark.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -32,7 +33,7 @@
android:background="@xml/ax_border_left"
android:text="@string/ALERT_CREATE_BOOKMARK_INFO"
android:textAlignment="textStart"
android:textColor="@color/c_alert_rateus_header"
android:textColor="@color/c_alert_rateus_header_static"
android:textSize="13.5sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -42,10 +43,10 @@
<EditText
android:id="@+id/pPopupCreateBookmarkInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="15dp"
android:layout_height="35dp"
android:layout_marginStart="13dp"
android:layout_marginTop="14dp"
android:layout_marginEnd="14dp"
android:background="@xml/gx_generic_input_create_bookmark"
android:elevation="3dp"
android:ems="10"

50
app/src/main/res/layouts/alert/layout/popup_download_full.xml
View File

@ -9,7 +9,7 @@
android:id="@+id/pPopupDownloadFullContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@xml/ax_round_corner"
android:background="@xml/ax_round_corner_inverted"
android:paddingBottom="6dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -50,7 +50,7 @@
android:paddingStart="15dp"
android:paddingEnd="41dp"
android:text="@string/GENERAL_DEFAULT_TEXT"
android:textColor="@color/c_alert_text_static"
android:textColor="@color/c_alert_background_description"
android:textDirection="locale"
android:textSize="13.5sp"
android:translationY="-1dp"
@ -67,10 +67,10 @@
android:alpha="0.6"
android:gravity="start |center_vertical"
android:maxLines="1"
android:paddingStart="16.6dp"
android:paddingStart="15.2dp"
android:paddingEnd="41dp"
android:text="@string/GENERAL_DEFAULT_TEXT"
android:textColor="@color/c_alert_text_static"
android:textColor="@color/c_alert_background_description"
android:textDirection="locale"
android:textSize="11sp"
android:translationY="-1dp"
@ -84,7 +84,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="15dp"
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/pPopupDownloadFullImageContainer" />
@ -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" />
<ImageView
@ -137,14 +137,14 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue" />
app:tint="@color/c_navigation_tint_alert" />
</LinearLayout>
<View
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" />
@ -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" />
<ImageView
@ -187,14 +187,14 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue" />
app:tint="@color/c_navigation_tint_alert" />
</LinearLayout>
<View
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" />
@ -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" />
<ImageView
@ -237,14 +237,14 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue" />
app:tint="@color/c_navigation_tint_alert" />
</LinearLayout>
<View
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" />
@ -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" />
<ImageView
@ -290,14 +290,14 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue" />
app:tint="@color/c_navigation_tint_alert" />
</LinearLayout>
<View
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" />
@ -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" />
<ImageView
@ -343,14 +343,14 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue" />
app:tint="@color/c_navigation_tint_alert" />
</LinearLayout>
<View
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" />
@ -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" />
<ImageView
@ -396,14 +396,14 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue" />
app:tint="@color/c_navigation_tint_alert" />
</LinearLayout>
<View
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" />
@ -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" />
<ImageView
@ -449,7 +449,7 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue"
app:tint="@color/c_navigation_tint_alert"
tools:ignore="ImageContrastCheck" />
</LinearLayout>

4
app/src/main/res/layouts/alert/layout/popup_download_url.xml
View File

@ -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"

32
app/src/main/res/layouts/alert/layout/popup_file_longpress.xml
View File

@ -42,8 +42,8 @@
<TextView
android:id="@+id/pPopupLongPressDescription"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_height="38dp"
android:layout_marginTop="12dp"
android:alpha="0.6"
android:gravity="start |center_vertical"
android:lineSpacingExtra="4dp"
@ -51,7 +51,7 @@
android:paddingStart="15dp"
android:paddingEnd="41dp"
android:text="@string/GENERAL_DEFAULT_TEXT"
android:textColor="@color/c_alert_text_static"
android:textColor="@color/c_alert_background_description"
android:textDirection="locale"
android:textSize="12sp"
android:translationY="-1dp"
@ -66,7 +66,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="15dp"
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/pPopupLongPressImageContainer" />
@ -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" />
<ImageView
@ -118,7 +118,7 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue" />
app:tint="@color/c_navigation_tint_alert" />
</LinearLayout>
@ -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" />
<ImageView
@ -169,14 +169,14 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue" />
app:tint="@color/c_navigation_tint_alert" />
</LinearLayout>
<View
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" />
@ -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" />
<ImageView
@ -219,14 +219,14 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue" />
app:tint="@color/c_navigation_tint_alert" />
</LinearLayout>
<View
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" />
@ -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" />
<ImageView
@ -269,7 +269,7 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue" />
app:tint="@color/c_navigation_tint_alert" />
</LinearLayout>
@ -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" />

6
app/src/main/res/layouts/alert/layout/popup_find.xml
View File

@ -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" />
<ImageButton

2
app/src/main/res/layouts/alert/layout/popup_panic.xml
View File

@ -49,7 +49,7 @@
android:paddingEnd="15dp"
android:text="@string/ALERT_PANIC_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"

2
app/src/main/res/layouts/alert/layout/popup_rate_failure.xml
View File

@ -49,7 +49,7 @@
android:paddingEnd="15dp"
android:text="@string/ALERT_RATEUS_FAILURE_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"

274
app/src/main/res/layouts/alert/layout/popup_rate_us.xml
View File

@ -5,12 +5,21 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fillViewport="true"
android:paddingBottom="15dp"
android:paddingTop="15dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/pPopupRateusContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@xml/ax_round_corner"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@xml/ax_round_corner_bottomless"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
@ -23,92 +32,209 @@
android:layout_marginTop="15dp"
android:text="@string/ALERT_RATEUS"
android:textAlignment="textStart"
android:textColor="@color/c_alert_rateus_header"
android:textSize="17sp"
android:textColor="@color/c_alert_header"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pPopupRateusClose"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="TextContrastCheck" />
<TextView
android:id="@+id/pPopupRateusDescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:alpha="0.6"
android:paddingStart="15dp"
android:paddingEnd="10dp"
android:text="@string/ALERT_RATEUS_INFO"
android:textAlignment="textStart"
android:textColor="@color/c_alert_text_static"
android:textSize="13sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pPopupRateusHeader"
tools:ignore="TextContrastCheck">
</TextView>
<RatingBar
android:id="@+id/pPopupRateusRating"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:foregroundTint="@color/c_white"
android:progressBackgroundTint="@color/c_alert_rateus_warning"
android:rating="0.5"
android:scaleX="0.65"
android:scaleY="0.65"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pPopupRateusDescription"
tools:ignore="SpeakableTextPresentCheck">
</RatingBar>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:layout_marginBottom="20dp"
android:gravity="center_horizontal"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="vertical"
android:paddingLeft="11dp"
android:paddingRight="11dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pPopupRateusRating">
app:layout_constraintTop_toBottomOf="@+id/pPopupRateusHeader">
<Button
android:id="@+id/pPopupRateusNext"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_gravity="center"
android:layout_marginEnd="15dp"
android:background="@xml/ax_ripple_default_round_bottom"
android:text="@string/ALERT_RATE"
android:textAllCaps="false"
android:textColor="@color/c_white"
android:textSize="14sp"
tools:ignore="ButtonStyle,TextContrastCheck,TouchTargetSizeCheck" />
<LinearLayout
android:id="@+id/pPopupRateus1"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="10dp"
android:background="@xml/ax_round_corner_rate"
android:orientation="horizontal">
<Button
android:id="@+id/pPopupRateusDismiss"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_gravity="center"
android:background="@xml/ax_ripple_default_round_bottom_secondary"
android:text="@string/ALERT_DISMISS"
android:textAllCaps="false"
android:textColor="@color/c_white"
android:textSize="14sp"
tools:ignore="ButtonStyle,TextContrastCheck,TouchTargetSizeCheck" />
<ImageView
android:layout_width="50dp"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/star" />
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="Love this browser\n5/5"
android:textColor="@color/c_alert_background_description"
android:textSize="14sp" />
<ImageView
android:layout_width="50dp"
android:layout_height="wrap_content"
android:padding="16dp"
android:src="@xml/ic_arrow_right"
app:tint="@color/c_navigation_light" />
</LinearLayout>
<LinearLayout
android:id="@+id/pPopupRateus2"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="10dp"
android:background="@xml/ax_round_corner_rate"
android:orientation="horizontal">
<ImageView
android:layout_width="50dp"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/smile" />
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="Like the browser\n4/5"
android:textColor="@color/c_alert_background_description"
android:textSize="14sp" />
<ImageView
android:layout_width="50dp"
android:layout_height="wrap_content"
android:padding="16dp"
android:src="@xml/ic_arrow_right"
app:tint="@color/c_navigation_light" />
</LinearLayout>
<LinearLayout
android:id="@+id/pPopupRateus3"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="10dp"
android:background="@xml/ax_round_corner_rate"
android:orientation="horizontal">
<ImageView
android:layout_width="50dp"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/confused" />
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="Satisfactory\n3/5"
android:textColor="@color/c_alert_background_description"
android:textSize="14sp" />
<ImageView
android:layout_width="50dp"
android:layout_height="wrap_content"
android:padding="16dp"
android:src="@xml/ic_arrow_right"
app:tint="@color/c_navigation_light" />
</LinearLayout>
<LinearLayout
android:id="@+id/pPopupRateus4"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="10dp"
android:background="@xml/ax_round_corner_rate"
android:orientation="horizontal">
<ImageView
android:layout_width="50dp"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/sad" />
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="Below average\n2/5"
android:textColor="@color/c_alert_background_description"
android:textSize="14sp" />
<ImageView
android:layout_width="50dp"
android:layout_height="wrap_content"
android:padding="16dp"
android:src="@xml/ic_arrow_right"
app:tint="@color/c_navigation_light" />
</LinearLayout>
<LinearLayout
android:id="@+id/pPopupRateus5"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginBottom="15dp"
android:background="@xml/ax_round_corner_rate"
android:orientation="horizontal">
<ImageView
android:layout_width="50dp"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/angry" />
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="Poor browser\n1/5"
android:textColor="@color/c_alert_background_description"
android:textSize="14sp" />
<ImageView
android:layout_width="50dp"
android:layout_height="wrap_content"
android:padding="16dp"
android:src="@xml/ic_arrow_right"
app:tint="@color/c_navigation_light" />
</LinearLayout>
</LinearLayout>
<ImageButton
android:id="@+id/pPopupRateusClose"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginTop="13dp"
android:layout_marginEnd="13dp"
android:background="@xml/ax_round_corner_cross"
android:padding="13dp"
android:visibility="gone"
android:src="@xml/ic_baseline_cross"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="@color/c_white" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layouts/alert/layout/popup_tor_change.xml
View File

@ -31,7 +31,7 @@
android:paddingEnd="15dp"
android:text="Switch Tor"
android:textAlignment="textStart"
android:textColor="@color/c_text_v8"
android:textColor="@color/c_text_v10"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@ -50,7 +50,7 @@
android:paddingEnd="15dp"
android:text="Using this you can switch between normal browsing using duckduckgo or advance secure dark web browsing using Orion search."
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"

24
app/src/main/res/layouts/alert/layout/popup_url_longpress.xml
View File

@ -42,7 +42,7 @@
<TextView
android:id="@+id/pPopupURLLongPressHeader"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="38dp"
android:layout_marginTop="12dp"
android:alpha="0.6"
android:gravity="start |center_vertical"
@ -50,7 +50,7 @@
android:paddingStart="15dp"
android:paddingEnd="41dp"
android:text="@string/GENERAL_DEFAULT_TEXT"
android:textColor="@color/c_alert_text_static"
android:textColor="@color/c_alert_background_description"
android:textDirection="locale"
android:textSize="12.5sp"
android:translationY="-1dp"
@ -64,7 +64,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="15dp"
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/pPopupURLImageContainer" />
@ -103,7 +103,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" />
<ImageView
@ -116,14 +116,14 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue" />
app:tint="@color/c_navigation_tint_alert" />
</LinearLayout>
<View
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" />
@ -153,7 +153,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" />
<ImageView
@ -166,14 +166,14 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue" />
app:tint="@color/c_navigation_tint_alert" />
</LinearLayout>
<View
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" />
@ -203,7 +203,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" />
<ImageView
@ -216,7 +216,7 @@
android:scaleX="0.5"
android:scaleY="0.5"
app:srcCompat="@xml/ic_arrow_right"
app:tint="@color/cursor_blue" />
app:tint="@color/c_navigation_tint_alert" />
</LinearLayout>
@ -225,7 +225,7 @@
android:layout_height="1dp"
android:layout_marginStart="30dp"
android:layout_marginEnd="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" />

2
app/src/main/res/layouts/tab/layout/tab_menu.xml
View File

@ -60,7 +60,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/pCloseTab"
android:id="@+id/pPopupRateusClose"
android:onClick="onMenuTrigger"
android:layout_width="match_parent"
android:layout_height="52dp"

14
app/src/main/res/values-night/colors.xml
View File

@ -32,7 +32,7 @@
<color name="c_alert_toast_button_background">#ffffff</color>
<color name="c_alert_toast_button_text">#3385ff</color>
<color name="c_alert_rateus_warning">#b3b3b3</color>
<color name="c_alert_rateus_header">#33cccc</color>
<color name="c_alert_header">#33cccc</color>
<color name="c_alert_text">#ffffff</color>
<color name="c_alert_warning">#f65555</color>
@ -40,6 +40,7 @@
<color name="c_secure_alert_start">#1c1b21</color>
<color name="c_secure_alert_end">#1c1b21</color>
<color name="c_secure_alert_border">#2d2d39</color>
<color name="c_secure_alert_border_light">#2d2d39</color>
<color name="c_secure_alert_background">#99000000</color>
<color name="c_secure_alert_button">#2d2d39</color>
<color name="c_secure_alert_button_pressed">#16161d</color>
@ -62,6 +63,7 @@
<color name="c_text_v5">#ffffff</color>
<color name="c_text_v7">#248f8f</color>
<color name="c_text_v9">#e6e6e6</color>
<color name="c_text_v10">#00b3b3</color>
<color name="c_security_popup_background">#121216</color>
<color name="c_security_popup_divider">#121216</color>
<color name="c_lang_row">#293a56</color>
@ -121,4 +123,14 @@
<color name="green_dark_v2">#1c1b21</color>
<color name="c_icon_divider">#141414</color>
/* Alerts */
<color name="c_alert_background_gradient_up">#0f0f0f</color>
<color name="c_alert_background_gradient_down">#252429</color>
<color name="c_alert_background_description">#a6a6a6</color>
<color name="c_divider_line_alert">#999999</color>
<color name="c_alert_background_gradient_up_rate">#3e3d43</color>
<color name="c_alert_background_gradient_down_rate">#252428</color>
<color name="c_alert_borders">#4d4d4d</color>
<color name="c_navigation_tint_alert">#a6a6a6</color>
</resources>

14
app/src/main/res/values/colors.xml
View File

@ -46,7 +46,7 @@
<color name="c_alert_toast_button_background">#b3b3b3</color>
<color name="c_alert_toast_button_text">#ffffff</color>
<color name="c_alert_rateus_warning">#b3b3b3</color>
<color name="c_alert_rateus_header">#00b3b3</color>
<color name="c_alert_header">#00b3b3</color>
<color name="c_alert_rateus_header_static">#00b3b3</color>
<color name="c_alert_text">#212d45</color>
<color name="c_alert_text_static">#212d45</color>
@ -57,6 +57,7 @@
<color name="c_secure_alert_start">#ffffff</color>
<color name="c_secure_alert_end">#e8ebf8</color>
<color name="c_secure_alert_border">#7e7e9a</color>
<color name="c_secure_alert_border_light">#dedede</color>
<color name="c_secure_alert_background">#99000000</color>
<color name="c_secure_alert_button">#9b9bb0</color>
<color name="c_secure_alert_button_pressed">#7e7e9a</color>
@ -82,6 +83,7 @@
<color name="c_text_v6">#8c8c8c</color>
<color name="c_text_v7">#7591bd</color>
<color name="c_text_v9">#7591bd</color>
<color name="c_text_v10">#00b3b3</color>
<color name="c_lang_row">#7591bd</color>
<color name="c_lang_row_border">#3a5278</color>
<color name="c_button_text_v1_inverted">#ffffff</color>
@ -139,6 +141,16 @@
<color name="c_ripple_light">#e6e6e6</color>
<color name="c_icon_divider">#f0f0f0</color>
/* Alerts */
<color name="c_alert_background_gradient_up">#e1e5f9</color>
<color name="c_alert_background_gradient_down">#ffffff</color>
<color name="c_alert_background_description">#666666</color>
<color name="c_divider_line_alert">#d9d9d9</color>
<color name="c_alert_background_gradient_up_rate">#e4e8f7</color>
<color name="c_alert_background_gradient_down_rate">#ffffff</color>
<color name="c_alert_borders">#dde3ee</color>
<color name="c_navigation_tint_alert">#3385ff</color>
/* Shared Colors */
<color name="blue">#0066FF</color>
<color name="ease_blue_light">#fdfeff</color>

2
app/src/main/res/values/strings.xml
View File

@ -135,7 +135,7 @@
<string name="ALERT_DOWNLOAD_SINGLE_BUTTON" translatable="true">Download</string>
<!-- Alert Rateus -->
<string name="ALERT_RATEUS" translatable="true">Rate US</string>
<string name="ALERT_RATEUS" translatable="true">Rate \u0020Browser</string>
<string name="ALERT_RATEUS_INFO" translatable="true">Tell others what you think about this app</string>
<string name="ALERT_RATE" translatable="true">Rate</string>

4
app/variables.gradle
View File

@ -33,9 +33,7 @@ project.ext.min_sdk_version = 21
project.ext.target_sdk_version = 31
project.ext.build_tool_version = '31'
project.ext.ndk_version = '21.4.7075529'
project.ext.application_id = "com.darkweb.genesissearchengine.production"
//project.ext.application_id = "com.hiddenservices.onionservices"
project.ext.application_id = "com.hiddenservices.onionservices"
project.ext.debugSymbolLevel = 'FULL'
/* Splits */