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 2021-08-28 02:13:52 -07:00
parent 1e972fbdec
commit 3d9b789228
26 changed files with 598 additions and 547 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/codeStyles/Project.xml
View File

@ -1,5 +1,8 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
<codeStyleSettings language="XML">
<option name="FORCE_REARRANGE_MODE" value="1" />
<indentOptions>
@ -113,5 +116,8 @@
</rules>
</arrangement>
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</codeStyleSettings>
</code_scheme>
</component>

12
.idea/misc.xml
View File

@ -29,19 +29,19 @@
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout-land/secure_connection_popup.xml" value="0.1728395061728395" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout-v26/popup_find.xml" value="0.20416666666666666" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/application_crash.xml" value="0.5" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/certificate_info.xml" value="1.25" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/certificate_info.xml" value="0.22619734564339297" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_block_popup.xml" value="0.203125" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_bridge_mail.xml" value="0.25" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_bridge_setting_custom.xml" value="0.25" />
<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_clear_bookmark.xml" value="0.203125" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_clear_history.xml" value="0.20416666666666666" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_create_bookmark.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.xml" value="0.203125" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_data_cleared_shortcut.xml" value="0.203125" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_download_failure.xml" value="0.18541666666666667" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_download_full.xml" value="0.25" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_download_full.xml" value="0.5" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_download_url.xml" value="0.33" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml" value="0.7575757575757576" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_file_longpress.xml" value="0.25" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_find.xml" value="0.20416666666666666" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_language_support.xml" value="0.20416666666666666" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_load_new_tab.xml" value="0.203125" />
@ -57,7 +57,7 @@
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_undo.xml" value="0.203125" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/popup_update_bridges.xml" value="0.2015625" />
<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="1.1" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/alert/layout/secure_connection_popup.xml" value="0.33" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/history/layout/history_view.xml" value="0.22083333333333333" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/home/layout/home_view.xml" value="0.22" />
<entry key="..\:/Workspace/Genesis-Android/app/src/main/res/layouts/home/layout/popup_search_view.xml" value="0.2" />

6
app/src/main/java/com/darkweb/genesissearchengine/appManager/externalCommandManager/externalShortcutController.java
View File

@ -5,9 +5,12 @@ import android.os.Bundle;
import android.view.View;
import androidx.appcompat.app.AppCompatActivity;
import com.darkweb.genesissearchengine.appManager.activityContextManager;
import com.darkweb.genesissearchengine.appManager.homeManager.homeController.homeController;
import com.darkweb.genesissearchengine.constants.constants;
import com.darkweb.genesissearchengine.constants.status;
import com.darkweb.genesissearchengine.constants.strings;
import com.darkweb.genesissearchengine.dataManager.dataController;
import com.darkweb.genesissearchengine.helperManager.helperMethod;
import com.example.myapplication.R;
@ -23,6 +26,7 @@ public class externalShortcutController extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
status.sExternalWebsite = strings.GENERIC_EMPTY_STR;
orbotLocalConstants.mIsTorInitialized = false;
Intent mIntent = new Intent(this, homeController.class);
@ -41,6 +45,7 @@ public class externalShortcutController extends AppCompatActivity {
panicExitInvoked();
break;
case constants.CONST_EXTERNAL_SHORTCUT_COMMAND_RESTART:
activityContextManager.getInstance().onClearStack();
break;
}
}
@ -48,6 +53,7 @@ public class externalShortcutController extends AppCompatActivity {
/* Start Required Activity */
finish();
helperMethod.openIntent(mIntent, this, constants.CONST_LIST_EXTERNAL_SHORTCUT);
}

12
app/src/main/java/com/darkweb/genesissearchengine/appManager/externalCommandManager/externalURLNavigationContoller.java
View File

@ -9,6 +9,8 @@ import androidx.appcompat.app.AppCompatActivity;
import com.darkweb.genesissearchengine.appManager.activityContextManager;
import com.darkweb.genesissearchengine.appManager.homeManager.homeController.homeController;
import com.darkweb.genesissearchengine.constants.constants;
import com.darkweb.genesissearchengine.constants.status;
import com.darkweb.genesissearchengine.constants.strings;
import com.darkweb.genesissearchengine.helperManager.helperMethod;
import static com.darkweb.genesissearchengine.constants.constants.CONST_PACKAGE_NAME;
import static com.darkweb.genesissearchengine.constants.keys.EXTERNAL_SHORTCUT_COMMAND_NAVIGATE;
@ -18,6 +20,8 @@ public class externalURLNavigationContoller extends AppCompatActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
status.sExternalWebsite = strings.GENERIC_EMPTY_STR;
Uri mData = externalURLNavigationContoller.this.getIntent().getData();
if(mData == null){
mData = Uri.parse(constants.CONST_BACKEND_GENESIS_URL);
@ -27,6 +31,14 @@ public class externalURLNavigationContoller extends AppCompatActivity {
Intent mIntent = new Intent(this, homeController.class);
mIntent.putExtra(EXTERNAL_SHORTCUT_COMMAND_NAVIGATE, mData.toString());
helperMethod.openIntent(mIntent, this, constants.CONST_LIST_EXTERNAL_SHORTCUT);
Uri finalMData = mData;
helperMethod.onDelayHandler(this, 3000, () -> {
activityContextManager.getInstance().getHomeController().onStartApplication(null);
activityContextManager.getInstance().getHomeController().onExternalURLInvoke(finalMData.toString());
return null;
});
}
else {
activityContextManager.getInstance().getHomeController().onExternalURLInvoke(mData.toString());

8
app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeController.java
View File

@ -258,6 +258,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
onStartApplication(null);
}
}
getIntent().setData(null);
}
public boolean isSplashScreenLoading(){
@ -1556,7 +1557,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
}
if(status.sSettingIsAppStarted && mAppRestarted) {
activityContextManager.getInstance().onClearStack();
//activityContextManager.getInstance().onClearStack();
tabRowModel model = (tabRowModel)dataController.getInstance().invokeTab(dataEnums.eTabCommands.GET_CURRENT_TAB, null);
if(model==null){
@ -1932,6 +1933,10 @@ public class homeController extends AppCompatActivity implements ComponentCallba
private void onInitTheme(){
if(status.sSettingIsAppStarted){
status.sExternalWebsite = strings.GENERIC_EMPTY_STR;
}
if(status.mThemeApplying){
if(status.sTheme == enums.Theme.THEME_DARK){
setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
@ -2243,6 +2248,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
}
else if(e_type.equals(enums.etype.open_new_tab_instant)){
postNewLinkTabAnimation(dataToStr(data.get(0)), true);
//status.sExternalWebsite = strings.GENERIC_EMPTY_STR;
}
else if(e_type.equals(enums.etype.M_HOME_PAGE)){
geckoSession mSession = (geckoSession)dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_HOME_PAGE, null);

16
app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/homeController/homeViewController.java
View File

@ -31,7 +31,6 @@ import android.view.WindowManager;
import android.view.animation.AccelerateInterpolator;
import android.view.inputmethod.InputMethodManager;
import android.widget.*;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
@ -51,7 +50,6 @@ import com.darkweb.genesissearchengine.helperManager.helperMethod;
import com.example.myapplication.R;
import com.google.android.material.appbar.AppBarLayout;
import com.mopub.mobileads.MoPubView;
import org.mozilla.geckoview.GeckoView;
import org.torproject.android.service.wrapper.orbotLocalConstants;
import java.util.Arrays;
@ -60,8 +58,6 @@ import java.util.List;
import java.util.concurrent.Callable;
import static android.content.Context.LAYOUT_INFLATER_SERVICE;
import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_DOMAIN_URL;
import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_HELP_URL_CACHE;
import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_HELP_URL_CACHE_DARK;
import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_URL_CACHED;
import static com.darkweb.genesissearchengine.constants.constants.CONST_GENESIS_URL_CACHED_DARK;
import static org.mozilla.geckoview.GeckoSessionSettings.USER_AGENT_MODE_DESKTOP;
@ -490,7 +486,7 @@ class homeViewController
public void initStatusBarColor(boolean mInstant) {
int mDelay = 1500;
if(status.mThemeApplying || mInstant){
if(status.mThemeApplying || mInstant || status.sSettingIsAppStarted){
mDelay = 0;
}
@ -614,7 +610,7 @@ class homeViewController
while (!orbotLocalConstants.mIsTorInitialized || !orbotLocalConstants.mNetworkState){
try
{
boolean mFastConnect = !status.sRestoreTabs && status.sAppInstalled && status.sSettingDefaultSearchEngine.equals(constants.CONST_BACKEND_GENESIS_URL) && !status.sBridgeStatus && status.sExternalWebsite.equals(strings.GENERIC_EMPTY_STR);
boolean mFastConnect = status.sSettingIsAppStarted || !status.sRestoreTabs && status.sAppInstalled && status.sSettingDefaultSearchEngine.equals(constants.CONST_BACKEND_GENESIS_URL) && !status.sBridgeStatus && status.sExternalWebsite.equals(strings.GENERIC_EMPTY_STR);
if(mFastConnect){
sleep(1000);
if(orbotLocalConstants.mNetworkState){
@ -651,7 +647,7 @@ class homeViewController
}
if(!status.sSettingIsAppStarted){
mContext.runOnUiThread(() -> {
splashScreenDisable();
onDisableSplashScreen();
});
startPostTask(messages.MESSAGE_ON_URL_LOAD);
}else {
@ -683,7 +679,7 @@ class homeViewController
mSearchbar.setEnabled(true);
mProgressBar.bringToFront();
mSplashScreen.bringToFront();
splashScreenDisable();
onDisableSplashScreen();
}
public void stopScroll() {
@ -694,11 +690,11 @@ class homeViewController
mSplashScreen.setVisibility(View.GONE);
mSplashScreen.setVisibility(View.GONE);
mBlocker.setEnabled(false);
disableCoordinatorSwipe();
//disableCoordinatorSwipe();
}
private boolean mIsAnimating = false;
public void splashScreenDisable(){
public void onDisableSplashScreen(){
mTopBar.setAlpha(1);
mGeckoView.setVisibility(View.VISIBLE);
disableCoordinatorSwipe();

2
app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/generalManager/settingGeneralController.java
View File

@ -147,6 +147,8 @@ public class settingGeneralController extends AppCompatActivity {
{
if(activityContextManager.getInstance().getHomeController() != null){
activityContextManager.getInstance().getHomeController().onReInitTheme();
activityContextManager.getInstance().getSettingController().onInitTheme();
}
}, 100);
}

5
app/src/main/java/com/darkweb/genesissearchengine/appManager/settingManager/settingHomeManager/settingHomeController.java
View File

@ -78,7 +78,7 @@ public class settingHomeController extends AppCompatActivity
super.onConfigurationChanged(newConfig);
}
private void onInitTheme(){
public void onInitTheme(){
if(status.mThemeApplying){
if(status.sTheme == enums.Theme.THEME_DARK){
@ -93,6 +93,7 @@ public class settingHomeController extends AppCompatActivity
}
}
}
recreate();
}
private void viewsInitializations()
@ -149,7 +150,7 @@ public class settingHomeController extends AppCompatActivity
if(status.mThemeApplying){
// activityContextManager.getInstance().onStack(this);
}
//onInitTheme();
pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
activityContextManager.getInstance().setCurrentActivity(this);
status.sSettingIsAppPaused = false;

22
app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabAdapter.java
View File

@ -431,7 +431,6 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
params.topMargin = helperMethod.pxFromDp(3.5f);
params.bottomMargin = helperMethod.pxFromDp(3.5f);
params_main.topMargin = helperMethod.pxFromDp(3f);
//params_main.bottomMargin = helperMethod.pxFromDp(1f);
if(status.sTheme == enums.Theme.THEME_DARK || status.sDefaultNightMode){
mCardView.setCardBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.c_button_text_v1_inverted));
@ -439,13 +438,8 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
mCardView.setCardBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.c_alert_rateus_header));
}
//params_main.leftMargin = helperMethod.pxFromDp(9f);
}else {
if(getLayoutPosition() == 0){
//params_main.rightMargin = helperMethod.pxFromDp(9f);
}
if(status.sTheme == enums.Theme.THEME_DARK || status.sDefaultNightMode){
params.leftMargin = helperMethod.pxFromDp(2.5f);
params.rightMargin = helperMethod.pxFromDp(2.5f);
@ -462,22 +456,6 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
mCardView.setCardBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.clear_alpha));
}
if(getLayoutPosition() == 1){
//params_main.leftMargin = helperMethod.pxFromDp(3f);
//params_main.rightMargin = helperMethod.pxFromDp(9f);
//params_main.topMargin = helperMethod.pxFromDp(14f);
//params_main.bottomMargin = helperMethod.pxFromDp(1f);
}else {
if(getLayoutPosition()%2==0){
//params_main.leftMargin = helperMethod.pxFromDp(9f);
//params_main.rightMargin = helperMethod.pxFromDp(3f);
//params_main.topMargin = helperMethod.pxFromDp(3f);
}else {
//params_main.leftMargin = helperMethod.pxFromDp(3f);
//params_main.rightMargin = helperMethod.pxFromDp(9f);
//params_main.topMargin = helperMethod.pxFromDp(3f);
}
}
}
}

3
app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabController.java
View File

@ -502,7 +502,8 @@ public class tabController extends Fragment
}
public void openTabMenu(View view) {
mtabViewController.onTrigger(tabEnums.eTabViewCommands.M_SHOW_MENU, Collections.singletonList(view));
mtabViewController.onTrigger(tabEnums.eTabViewCommands.ON_HIDE_UNDO_DIALOG_INIT, null);
mtabViewController.onTrigger(tabEnums.eTabViewCommands.M_SHOW_MENU, Arrays.asList(view, mListModel.getList().size()));
}
public int getSelectionCount(){

15
app/src/main/java/com/darkweb/genesissearchengine/appManager/tabManager/tabViewController.java
View File

@ -19,6 +19,7 @@ import android.widget.ActionMenuView;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.PopupWindow;
import android.widget.RelativeLayout;
import android.widget.TextView;
@ -94,8 +95,8 @@ class tabViewController
}
public void initUI(){
mMenuButton.setAlpha(0f);
mMenuButton.animate().setStartDelay(200).setDuration(350).alpha(1);
// mMenuButton.setAlpha(0f);
// mMenuButton.animate().setStartDelay(200).setDuration(350).alpha(1);
mMenuButton.setVisibility(View.VISIBLE);
if(status.sTabGridLayoutEnabled){
@ -114,7 +115,7 @@ class tabViewController
private void initPostUI(){
}
public void onOpenTabMenu(View view) {
public void onOpenTabMenu(View view, int pSize) {
onCloseTabMenu();
LayoutInflater layoutInflater = (LayoutInflater) view.getContext().getSystemService(LAYOUT_INFLATER_SERVICE);
@SuppressLint("InflateParams") final View mPopupView = layoutInflater.inflate(R.layout.tab_menu, null);
@ -130,6 +131,12 @@ class tabViewController
}else {
mTabOptionMenu.showAsDropDown(view,helperMethod.pxFromDp(-125), helperMethod.pxFromDp(-55));
}
if(pSize<=0){
Button mTabClear = mPopupView.findViewById(R.id.pCloseTabTrigger);
LinearLayout mCloseTab = mPopupView.findViewById(R.id.pCloseTab);
mTabClear.setAlpha(0.35f);
mCloseTab.setEnabled(false);
}
}
private void onCloseTabMenu() {
@ -255,7 +262,7 @@ class tabViewController
public Object onTrigger(tabEnums.eTabViewCommands pCommands, List<Object> pData){
if(pCommands.equals(tabEnums.eTabViewCommands.M_SHOW_MENU)){
onOpenTabMenu((View) pData.get(0));
onOpenTabMenu((View) pData.get(0), (int) pData.get(1));
}else if(pCommands.equals(tabEnums.eTabViewCommands.M_DISMISS_MENU)){
onCloseTabMenu();
}else if(pCommands.equals(tabEnums.eTabViewCommands.INIT_TAB_COUNT)){

4
app/src/main/java/com/darkweb/genesissearchengine/pluginManager/messagePluginManager/messageManager.java
View File

@ -145,6 +145,10 @@ public class messageManager implements View.OnClickListener, DialogInterface.OnD
mPopupToastNext.setOnClickListener(this);
mDialog.setOnDismissListener(this);
mPopupToastContainer.setBackground(helperMethod.getDrawableXML(mContext, pBackground));
if(pBackground == R.xml.ax_background_important){
mPopupToastInfo.setText(Color.WHITE);
mPopupToastNext.setText(Color.WHITE);
}
mToastHandler.postDelayed(() ->
{

23
app/src/main/res/custom-xml/alert/xml/ax_generic_input.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:top="113dp">
<shape
android:shape="rectangle" android:padding="10dp" >
<solid android:color="@color/c_white"/>
<corners android:radius="7dp"/>
</shape>
</item>
<item android:state_pressed="false"
android:top="113dp">
<shape
android:shape="rectangle" android:padding="10dp">
<solid android:color="@color/c_white"/>
<corners android:radius="7dp"/>
</shape>
</item>
</selector>

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

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

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

@ -4,7 +4,7 @@
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<corners android:radius="4.5dp" />
<stroke android:width="1dip" android:color="@color/c_edittext_border"/>
<stroke android:width="1dip" android:color="@color/c_edittext_border_static"/>
</shape>
</item>
</ripple>

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

@ -49,7 +49,7 @@
android:paddingEnd="15dp"
android:text="@string/ALERT_CUSTOM_BRIDGES_INFO"
android:textAlignment="textStart"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_black_light"
android:textSize="13.5sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -82,7 +82,7 @@
android:layout_marginStart="10dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="60dp"
android:background="@xml/gx_generic_input"
android:background="@xml/ax_generic_input"
android:elevation="3dp"
android:ems="10"
android:hint="@string/ALERT_BRIDGE_ADD_BRIDGES"
@ -94,7 +94,7 @@
android:paddingEnd="8dp"
android:textColor="@color/c_text_v1"
android:textColorHighlight="@color/c_text_color_highlight_v2"
android:textColorHint="@color/c_text_v2"
android:textColorHint="@color/c_text_v2_static"
android:textCursorDrawable="@xml/gx_search_cursor_state"
android:textSize="14sp"
app:layout_constraintEnd_toStartOf="@+id/pBridgeSettingCustomClear"

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

@ -58,7 +58,7 @@
android:padding="7dp"
android:paddingStart="11dp"
android:paddingEnd="8dp"
android:textColor="@color/c_text_v8"
android:textColor="@color/c_text_v8_static"
android:textColorHighlight="@color/c_text_color_highlight_v2"
android:textColorHint="@color/c_text_v2"
android:textCursorDrawable="@xml/gx_search_cursor_state"

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

@ -51,7 +51,7 @@
android:paddingStart="15dp"
android:paddingEnd="41dp"
android:text="@string/GENERAL_DEFAULT_TEXT"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textDirection="locale"
android:textSize="13.5sp"
android:translationY="-1dp"
@ -71,7 +71,7 @@
android:paddingStart="16.6dp"
android:paddingEnd="41dp"
android:text="@string/GENERAL_DEFAULT_TEXT"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textDirection="locale"
android:textSize="11sp"
android:translationY="-1dp"
@ -85,7 +85,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="15dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pPopupDownloadFullImageContainer" />
@ -125,7 +125,7 @@
android:text="@string/ALERT_DOWNLOAD_OPTION_1"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView
@ -145,7 +145,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
@ -175,7 +175,7 @@
android:text="@string/ALERT_DOWNLOAD_OPTION_2"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView
@ -195,7 +195,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
@ -225,7 +225,7 @@
android:text="@string/ALERT_DOWNLOAD_OPTION_3"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView
@ -245,7 +245,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
@ -278,7 +278,7 @@
android:text="@string/ALERT_DOWNLOAD_OPTION_4"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView
@ -298,7 +298,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
@ -331,7 +331,7 @@
android:text="@string/ALERT_DOWNLOAD_OPTION_5"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView
@ -351,7 +351,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
@ -384,7 +384,7 @@
android:text="@string/ALERT_DOWNLOAD_OPTION_6"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView
@ -404,7 +404,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
@ -437,7 +437,7 @@
android:text="@string/ALERT_DOWNLOAD_OPTION_7"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView

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

@ -51,7 +51,7 @@
android:singleLine="true"
android:text="@string/ALERT_DOWNLOAD_SINGLE"
android:textAlignment="textStart"
android:textColor="@color/c_alert_rateus_header"
android:textColor="@color/c_alert_rateus_header_static"
android:textSize="14.5sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@+id/pDownloadPopupIcon"
@ -70,7 +70,7 @@
android:paddingEnd="15dp"
android:text="@string/GENERAL_DEFAULT_TEXT"
android:textAlignment="textStart"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
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"
android:textColor="@color/c_alert_text_static"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"

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

@ -52,7 +52,7 @@
android:paddingStart="15dp"
android:paddingEnd="41dp"
android:text="@string/GENERAL_DEFAULT_TEXT"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textDirection="locale"
android:textSize="12sp"
android:translationY="-1dp"
@ -67,7 +67,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="15dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pPopupLongPressImageContainer" />
@ -106,7 +106,7 @@
android:text="@string/ALERT_LONG_URL_OPTION_4"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView
@ -127,7 +127,7 @@
android:id="@+id/view5"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
@ -157,7 +157,7 @@
android:text="@string/ALERT_LONG_URL_OPTION_1"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView
@ -177,7 +177,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
@ -207,7 +207,7 @@
android:text="@string/ALERT_LONG_URL_OPTION_2"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView
@ -227,7 +227,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
@ -257,7 +257,7 @@
android:text="@string/ALERT_LONG_URL_OPTION_3"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView
@ -279,7 +279,7 @@
android:layout_height="1dp"
android:layout_marginEnd="30dp"
android:layout_marginStart="30dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
@ -303,7 +303,7 @@
android:text="@string/ALERT_DISMISS"
android:textAlignment="center"
android:textAllCaps="false"
android:textColor="@color/c_button_text_v1"
android:textColor="@color/c_alert_text_v2"
android:textSize="14sp"
android:textStyle="bold"
tools:ignore="TouchTargetSizeCheck" />

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

@ -43,7 +43,7 @@
android:paddingEnd="10dp"
android:text="@string/ALERT_RATEUS_INFO"
android:textAlignment="textStart"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="13sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"

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

@ -12,8 +12,8 @@
android:id="@+id/pPopupToastContainer"
android:layout_width="0dp"
android:layout_height="55dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="20dp"
android:background="@xml/ax_background_important"
app:layout_constraintBottom_toBottomOf="parent"
@ -59,7 +59,7 @@
android:padding="0dp"
android:text="@string/TOAST_ALERT_UNDO_TRIGGER"
android:textAllCaps="false"
android:textColor="@color/c_alert_toast_button_text"
android:textColor="@color/c_white"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"

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

@ -51,7 +51,7 @@
android:paddingStart="15dp"
android:paddingEnd="41dp"
android:text="@string/GENERAL_DEFAULT_TEXT"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textDirection="locale"
android:textSize="12.5sp"
android:translationY="-1dp"
@ -65,7 +65,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="15dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pPopupURLImageContainer" />
@ -104,7 +104,7 @@
android:text="@string/ALERT_LONG_URL_OPTION_1"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView
@ -124,7 +124,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
@ -154,7 +154,7 @@
android:text="@string/ALERT_LONG_URL_OPTION_2"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView
@ -174,7 +174,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
@ -204,7 +204,7 @@
android:text="@string/ALERT_LONG_URL_OPTION_3"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_alert_text"
android:textColor="@color/c_alert_text_static"
android:textSize="14sp" />
<ImageView
@ -226,7 +226,7 @@
android:layout_height="1dp"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:background="@color/c_orbot_setting_divider"
android:background="@color/c_orbot_setting_divider_static"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pOrbotRowDescription" />
@ -250,10 +250,10 @@
android:text="@string/ALERT_DISMISS"
android:textAlignment="center"
android:textAllCaps="false"
android:textColor="@color/c_button_text_v1"
android:textColor="@color/c_alert_text_v2"
android:textSize="14sp"
android:textStyle="bold"
tools:ignore="TouchTargetSizeCheck,TextContrastCheck" />
tools:ignore="TouchTargetSizeCheck" />
</LinearLayout>

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

@ -117,7 +117,7 @@
android:id="@+id/view7"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="31dp"
android:layout_marginTop="32dp"
android:background="@color/c_orbot_setting_divider"
app:layout_constraintTop_toBottomOf="@+id/linearLayout" />

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

@ -49,10 +49,10 @@
android:background="@color/clear_alpha"
android:clickable="false"
android:focusable="false"
android:textAlignment="textStart"
android:paddingEnd="15dp"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:text="@string/TAB_MENU_OPEN_TAB"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_text_v1"
android:textSize="14.5sp"
@ -75,16 +75,17 @@
app:layout_constraintTop_toTopOf="parent">
<Button
android:id="@+id/pCloseTabTrigger"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_weight="1"
android:background="@color/clear_alpha"
android:clickable="false"
android:focusable="false"
android:textAlignment="textStart"
android:paddingEnd="15dp"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:text="@string/TAB_MENU_CLOSE_TAB"
android:textAlignment="textStart"
android:textAllCaps="false"
android:textColor="@color/c_text_v1"
android:textSize="14.5sp"

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

@ -18,6 +18,7 @@
<color name="c_divider_line_light">#e6e6e6</color>
<color name="c_topbar_divider">#ebebeb</color>
<color name="c_edittext_border">#e2e7e9</color>
<color name="c_edittext_border_static">#e2e7e9</color>
<color name="c_edittext_error_border">#f32323</color>
<color name="c_edittext_error_background">#f9e2eb</color>
<color name="c_text_short_header">#3385ff</color>
@ -25,9 +26,13 @@
<color name="c_icon_tint">#425e8a</color>
/* Text Colors Version*/
<color name="c_black_light">#212d45</color>
<color name="c_text_v1">#111722</color>
<color name="c_text_v1_static">#111722</color>
<color name="c_text_v2">#999999</color>
<color name="c_text_v2_static">#999999</color>
<color name="c_text_v8">#666666</color>
<color name="c_text_v8_static">#666666</color>
/* Bookmark Setting Controller Color */
<color name="c_bookmark_settings_header_icon_tint">#7591bd</color>
@ -42,8 +47,11 @@
<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_rateus_header_static">#00b3b3</color>
<color name="c_alert_text">#212d45</color>
<color name="c_alert_text_static">#212d45</color>
<color name="c_alert_warning">#f65555</color>
<color name="c_alert_text_v2">#3385ff</color>
/* Secure Alerts */
<color name="c_secure_alert_start">#ffffff</color>
@ -58,6 +66,7 @@
/* Orbot Setting */
<color name="c_orbot_setting_divider">#e6e6e6</color>
<color name="c_orbot_setting_divider_static">#e6e6e6</color>
/* Tab */
<color name="c_tab_border_v1">#993a5278</color>
@ -75,7 +84,6 @@
<color name="c_text_v9">#7591bd</color>
<color name="c_lang_row">#7591bd</color>
<color name="c_lang_row_border">#3a5278</color>
<color name="c_button_text_v1">#3385ff</color>
<color name="c_button_text_v1_inverted">#ffffff</color>
<color name="c_button_text_v3">#3385ff</color>
<color name="c_navigation_light">#bfbfbf</color>