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
msmannan00 2021-07-09 20:35:22 +05:00
parent bde9c1ea2c
commit 375f07fb87
129 changed files with 1086 additions and 976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
CODING STRUCTURE Normal file
View File

BIN
Release Checklist.xlsx
View File

Binary file not shown.

4
app/src/main/AndroidManifest.xml
View File

@ -120,7 +120,11 @@
<activity <activity
android:name="com.darkweb.genesissearchengine.appManager.landingManager.landingController" android:name="com.darkweb.genesissearchengine.appManager.landingManager.landingController"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
android:label="@string/SETTING_HEADER"
android:exported="true"
android:launchMode="singleTop"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name="com.darkweb.genesissearchengine.appManager.settingManager.trackingManager.settingTrackingController" android:name="com.darkweb.genesissearchengine.appManager.settingManager.trackingManager.settingTrackingController"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"

26
app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingController.java
View File

@ -13,17 +13,15 @@ import android.widget.EditText;
import android.widget.ScrollView; import android.widget.ScrollView;
import android.widget.TextView; import android.widget.TextView;
import com.darkweb.genesissearchengine.appManager.activityContextManager; import com.darkweb.genesissearchengine.appManager.activityContextManager;
import com.darkweb.genesissearchengine.appManager.activityThemeManager;
import com.darkweb.genesissearchengine.constants.keys; import com.darkweb.genesissearchengine.constants.keys;
import com.darkweb.genesissearchengine.eventObserver; import com.darkweb.genesissearchengine.eventObserver;
import com.darkweb.genesissearchengine.helperManager.helperMethod; import com.darkweb.genesissearchengine.helperManager.sharedUIMethod;
import com.darkweb.genesissearchengine.pluginManager.pluginController; import com.darkweb.genesissearchengine.pluginManager.pluginController;
import com.darkweb.genesissearchengine.pluginManager.pluginEnums; import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
import com.example.myapplication.R; import com.example.myapplication.R;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import static com.darkweb.genesissearchengine.constants.keys.M_ACTIVITY_RESPONSE; import static com.darkweb.genesissearchengine.constants.keys.M_ACTIVITY_RESPONSE;
import static com.darkweb.genesissearchengine.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_DELETE_ALERT; import static com.darkweb.genesissearchengine.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_DELETE_ALERT;
import static com.darkweb.genesissearchengine.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_SUCCESS_ALERT; import static com.darkweb.genesissearchengine.constants.responses.BOOKMARK_SETTING_CONTROLLER_SHOW_SUCCESS_ALERT;
@ -32,7 +30,7 @@ public class bookmarkSettingController extends AppCompatActivity {
/* Private Variables */ /* Private Variables */
private bookmarkSettingModel mBookmarkSettingModel; private bookmarkSettingModelController mBookmarkSettingModel;
private bookmarkSettingViewController mBookmarkSettingViewController; private bookmarkSettingViewController mBookmarkSettingViewController;
/* UI Variables */ /* UI Variables */
@ -70,8 +68,8 @@ public class bookmarkSettingController extends AppCompatActivity {
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
String mBookmarkName = (String) mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_GET_BOOKMARK_NAME); String mBookmarkName = (String) mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_GET_BOOKMARK_NAME);
boolean mValidationStatus = (boolean)mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_VALIDATE_FORM, Collections.singletonList(mBookmarkName)); boolean mValidationStatus = (boolean)mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_VALIDATE_FORM, Collections.singletonList(mBookmarkName));
mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_SET_BOOOKMARK_CHANGED_STATUS, Collections.singletonList(true)); mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_SET_BOOOKMARK_CHANGED_STATUS, Collections.singletonList(true));
mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_NAME_VALIDATION_RESPONSE, Collections.singletonList(mValidationStatus)); mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_NAME_VALIDATION_RESPONSE, Collections.singletonList(mValidationStatus));
} }
@ -82,11 +80,9 @@ public class bookmarkSettingController extends AppCompatActivity {
@Override @Override
public void onTextChanged(CharSequence s, int start,int before, int count) { public void onTextChanged(CharSequence s, int start,int before, int count) {
} }
}); });
mBookmarName.setOnFocusChangeListener((v, hasFocus) -> { mBookmarName.setOnFocusChangeListener((v, hasFocus) -> {
if(!hasFocus){ if(!hasFocus){
mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_CLEAR_FORM_FOCUS); mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_CLEAR_FORM_FOCUS);
@ -97,6 +93,7 @@ public class bookmarkSettingController extends AppCompatActivity {
mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_CLEAR_FORM_FOCUS); mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_CLEAR_FORM_FOCUS);
return false; return false;
}); });
} }
private void initializeModels(){ private void initializeModels(){
@ -106,7 +103,7 @@ public class bookmarkSettingController extends AppCompatActivity {
mBookmarkSettingViewController = new bookmarkSettingViewController(this, new bookmarkSettingViewCallback(), mBookmarName, mBookmarURL); mBookmarkSettingViewController = new bookmarkSettingViewController(this, new bookmarkSettingViewCallback(), mBookmarName, mBookmarURL);
mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_INITIALIZE, Arrays.asList(mBookmarkName,mBookmarkURL)); mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_INITIALIZE, Arrays.asList(mBookmarkName,mBookmarkURL));
mBookmarkSettingModel = new bookmarkSettingModel(this, new bookmarkSettingModelCallback(), mBookmarkID, mBookmarkURL); mBookmarkSettingModel = new bookmarkSettingModelController(this, new bookmarkSettingModelCallback(), mBookmarkID, mBookmarkURL);
} }
private void initCallableResponse(bookmarkSettingEnums.eActivityResponseCommands pResponse){ private void initCallableResponse(bookmarkSettingEnums.eActivityResponseCommands pResponse){
@ -124,13 +121,9 @@ public class bookmarkSettingController extends AppCompatActivity {
@Override @Override
public void onConfigurationChanged(@NonNull Configuration newConfig) { public void onConfigurationChanged(@NonNull Configuration newConfig) {
pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_ACTIVITY_CREATED); sharedUIMethod.onSharedConfigurationChanged(newConfig, this);
super.onConfigurationChanged(newConfig);
if(newConfig.uiMode != getResources().getConfiguration().uiMode){ super.onConfigurationChanged(newConfig);
activityContextManager.getInstance().onResetTheme();
activityThemeManager.getInstance().onConfigurationChanged(this);
}
} }
@Override @Override
@ -172,19 +165,20 @@ public class bookmarkSettingController extends AppCompatActivity {
if(mBookmarkChanged){ if(mBookmarkChanged){
initCallableResponse(bookmarkSettingEnums.eActivityResponseCommands.M_OPEN_UPDATE_ALERT); initCallableResponse(bookmarkSettingEnums.eActivityResponseCommands.M_OPEN_UPDATE_ALERT);
} }
onCloseTrigger(null);
}else { }else {
mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_NAME_VALIDATION_RESPONSE, Collections.singletonList(false)); mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_BOOKMARK_NAME_VALIDATION_RESPONSE, Collections.singletonList(false));
} }
onCloseTrigger(null);
} }
if(view.getId()==R.id.pRemoveBookmark){ if(view.getId()==R.id.pRemoveBookmark){
mBookmarkSettingViewController.onTrigger(bookmarkSettingEnums.eBookmarkSettingViewCommands.M_CLEAR_FORM_FOCUS);
initCallableResponse(bookmarkSettingEnums.eActivityResponseCommands.M_OPEN_DELETE_ALERT); initCallableResponse(bookmarkSettingEnums.eActivityResponseCommands.M_OPEN_DELETE_ALERT);
mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_DELETE_BOOKMARK); mBookmarkSettingModel.onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_DELETE_BOOKMARK);
onCloseTrigger(null); onCloseTrigger(null);
} }
} }
/* UI Callbacks */ /* Callbacks */
private class bookmarkSettingViewCallback implements eventObserver.eventListener{ private class bookmarkSettingViewCallback implements eventObserver.eventListener{

175
app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingModel.java → app/src/main/java/com/darkweb/genesissearchengine/appManager/bookmarkManager/BookmarkSettings/bookmarkSettingModelController.java
View File

@ -1,90 +1,87 @@
package com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings; package com.darkweb.genesissearchengine.appManager.bookmarkManager.BookmarkSettings;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import com.darkweb.genesissearchengine.appManager.activityContextManager; import com.darkweb.genesissearchengine.constants.strings;
import com.darkweb.genesissearchengine.constants.strings; import com.darkweb.genesissearchengine.dataManager.dataController;
import com.darkweb.genesissearchengine.dataManager.dataController; import com.darkweb.genesissearchengine.dataManager.dataEnums;
import com.darkweb.genesissearchengine.dataManager.dataEnums; import com.darkweb.genesissearchengine.eventObserver;
import com.darkweb.genesissearchengine.eventObserver; import java.util.Arrays;
import com.darkweb.genesissearchengine.helperManager.helperMethod; import java.util.Collections;
import com.darkweb.genesissearchengine.pluginManager.pluginController; import java.util.List;
import java.util.Arrays; import static com.darkweb.genesissearchengine.dataManager.dataEnums.eBookmarkCommands.M_DELETE_BOOKMARK_FROM_MENU;
import java.util.Collections;
import java.util.List; class bookmarkSettingModelController
import static com.darkweb.genesissearchengine.dataManager.dataEnums.eBookmarkCommands.M_DELETE_BOOKMARK_FROM_MENU; {
import static com.darkweb.genesissearchengine.pluginManager.pluginEnums.eMessageManager.M_DELETE_BOOKMARK; /* Local Variables Variables */
class bookmarkSettingModel private boolean mBookmarkUpdateStatus = false;
{ private int mBookmarkID;
/* Local Variables Variables */ private String mBookmarkURL;
private boolean mBookmarkUpdateStatus = false; /* Private Variables */
private int mBookmarkID;
private String mBookmarkURL; private AppCompatActivity mContext;
private eventObserver.eventListener mEvent;
/* Private Variables */
public bookmarkSettingModelController(AppCompatActivity pContext, eventObserver.eventListener pEvent, int pBookmarkID, String pBookmarkURL){
private AppCompatActivity mContext; this.mContext = pContext;
private eventObserver.eventListener mEvent; this.mEvent = pEvent;
this.mBookmarkID = pBookmarkID;
public bookmarkSettingModel(AppCompatActivity pContext, eventObserver.eventListener pEvent, int pBookmarkID, String pBookmarkURL){ this.mBookmarkURL = pBookmarkURL;
this.mContext = pContext; }
this.mEvent = pEvent;
this.mBookmarkID = pBookmarkID; /* Helper Methods */
this.mBookmarkURL = pBookmarkURL;
} private void onUpdateBookmark(String pBookmarkName){
dataController.getInstance().invokeBookmark(dataEnums.eBookmarkCommands.M_UPDATE_BOOKMARK, Arrays.asList(pBookmarkName, mBookmarkURL, mBookmarkID));
/* Helper Methods */ }
private void onUpdateBookmark(String pBookmarkName){ private boolean validateForm(String pBookmarkName){
dataController.getInstance().invokeBookmark(dataEnums.eBookmarkCommands.M_UPDATE_BOOKMARK, Arrays.asList(pBookmarkName, mBookmarkURL, mBookmarkID)); if(pBookmarkName.equals(strings.GENERIC_EMPTY_STR)){
} return false;
}else {
private boolean validateForm(String pBookmarkName){ return true;
if(pBookmarkName.equals(strings.GENERIC_EMPTY_STR)){ }
return false; }
}else {
return true; private boolean getBookmarkUpdateStatus(){
} return mBookmarkUpdateStatus;
} }
private boolean getBookmarkUpdateStatus(){ private void setBookmarkUpdateStatus(boolean pBookmarkUpdateStatus){
return mBookmarkUpdateStatus; mBookmarkUpdateStatus = pBookmarkUpdateStatus;
} }
private void setBookmarkUpdateStatus(boolean pBookmarkUpdateStatus){ private void onDeleteBookmark(){
mBookmarkUpdateStatus = pBookmarkUpdateStatus; dataController.getInstance().invokeBookmark(M_DELETE_BOOKMARK_FROM_MENU, Collections.singletonList(mBookmarkURL));
} }
private void onDeleteBookmark(){ /* Event Observer */
dataController.getInstance().invokeBookmark(M_DELETE_BOOKMARK_FROM_MENU, Collections.singletonList(mBookmarkURL));
} public Object onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands pCommands, List<Object> pData){
if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_UPDATE_BOOKMARK.equals(pCommands)){
/* Event Observer */ onUpdateBookmark((String) pData.get(0));
}
public Object onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands pCommands, List<Object> pData){ if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_VALIDATE_FORM.equals(pCommands)){
if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_UPDATE_BOOKMARK.equals(pCommands)){ return validateForm((String) pData.get(0));
onUpdateBookmark((String) pData.get(0)); }
} if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_SET_BOOOKMARK_CHANGED_STATUS.equals(pCommands)){
if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_VALIDATE_FORM.equals(pCommands)){ setBookmarkUpdateStatus((boolean)pData.get(0));
return validateForm((String) pData.get(0)); }
} if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_DELETE_BOOKMARK.equals(pCommands)){
if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_SET_BOOOKMARK_CHANGED_STATUS.equals(pCommands)){ onDeleteBookmark();
setBookmarkUpdateStatus((boolean)pData.get(0)); }
} return null;
if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_DELETE_BOOKMARK.equals(pCommands)){ }
onDeleteBookmark();
} public Object onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands pCommands){
return null; if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_DELETE_BOOKMARK.equals(pCommands)){
} onDeleteBookmark();
}
public Object onTrigger(bookmarkSettingEnums.eBookmarkSettingModelCommands pCommands){ if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_GET_UPDATE_STATUS.equals(pCommands)){
if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_DELETE_BOOKMARK.equals(pCommands)){ return getBookmarkUpdateStatus();
onDeleteBookmark(); }
} return null;
if(bookmarkSettingEnums.eBookmarkSettingModelCommands.M_GET_UPDATE_STATUS.equals(pCommands)){ }
return getBookmarkUpdateStatus();
}
return null;
}
} }

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

@ -409,7 +409,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
} }
public void initLandingPage(){ public void initLandingPage(){
if(status.sSettingFirstStart){ if(!status.sLandingPageStatus){
helperMethod.openActivity(landingController.class, constants.CONST_LIST_HISTORY, homeController.this,false); helperMethod.openActivity(landingController.class, constants.CONST_LIST_HISTORY, homeController.this,false);
} }
} }

82
app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/CustomSlideBigText.java
View File

@ -1,82 +0,0 @@
package com.darkweb.genesissearchengine.appManager.landingManager;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import com.example.myapplication.R;
public class CustomSlideBigText extends Fragment {
private static final String ARG_LAYOUT_RES_ID = "layoutResId";
private int layoutResId;
private String mTitle;
private String mButtonText;
private String mSubTitle;
private View.OnClickListener mButtonListener;
public static CustomSlideBigText newInstance(int layoutResId) {
CustomSlideBigText sampleSlide = new CustomSlideBigText();
Bundle args = new Bundle();
args.putInt(ARG_LAYOUT_RES_ID, layoutResId);
sampleSlide.setArguments(args);
return sampleSlide;
}
public void setTitle (String title)
{
mTitle = title;
}
public void setSubTitle(String subTitle) { mSubTitle = subTitle; }
public void showButton (String buttonText, View.OnClickListener buttonListener)
{
mButtonText = buttonText;
mButtonListener = buttonListener;
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null && getArguments().containsKey(ARG_LAYOUT_RES_ID)) {
layoutResId = getArguments().getInt(ARG_LAYOUT_RES_ID);
}
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
View view = inflater.inflate(layoutResId, container, false);
((TextView)view.findViewById(R.id.custom_slide_big_text)).setText(mTitle);
if (!TextUtils.isEmpty(mSubTitle)) {
TextView tv =
(TextView)view.findViewById(R.id.custom_slide_big_text_sub);
tv.setText(mSubTitle);
tv.setVisibility(View.VISIBLE);
}
if (mButtonText != null)
{
Button button = (Button)view.findViewById(R.id.custom_slide_button);
button.setVisibility(View.VISIBLE);
button.setText(mButtonText);
button.setOnClickListener(mButtonListener);
}
return view;
}
}

117
app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingController.java
View File

@ -1,77 +1,116 @@
package com.darkweb.genesissearchengine.appManager.landingManager; package com.darkweb.genesissearchengine.appManager.landingManager;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import android.view.View; import com.darkweb.genesissearchengine.appManager.landingManager.langingPageManager.landingPageController;
import com.darkweb.genesissearchengine.appManager.landingManager.langingPageManager.landingPageDataModel;
import com.darkweb.genesissearchengine.appManager.orbotManager.orbotController; import com.darkweb.genesissearchengine.appManager.orbotManager.orbotController;
import com.darkweb.genesissearchengine.constants.keys; import com.darkweb.genesissearchengine.constants.enums;
import com.darkweb.genesissearchengine.constants.status; import com.darkweb.genesissearchengine.eventObserver;
import com.darkweb.genesissearchengine.dataManager.dataController;
import com.darkweb.genesissearchengine.dataManager.dataEnums;
import com.darkweb.genesissearchengine.pluginManager.pluginController; import com.darkweb.genesissearchengine.pluginManager.pluginController;
import com.darkweb.genesissearchengine.pluginManager.pluginEnums; import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
import com.example.myapplication.R; import com.example.myapplication.R;
import com.github.paolorotolo.appintro.AppIntro; import com.github.paolorotolo.appintro.AppIntro;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import static com.darkweb.genesissearchengine.appManager.landingManager.landingEnums.eLandingPageControllerCallbackCommands.M_ON_LANDING_PAGE_FINISH_TRIGGERED;
public class landingController extends AppIntro { public class landingController extends AppIntro {
/* Private Variables */
private landingViewController mLandingViewController; private landingViewController mLandingViewController;
private landingModelController mLandingModel;
/* UI Variables */
private landingPageController mIntro_welcome;
private landingPageController mIntro_intro;
private landingPageController mIntro_start;
/* Initializations */
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_ACTIVITY_CREATED);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
CustomSlideBigText welcome = CustomSlideBigText.newInstance(R.layout.landing_view); initializePages();
welcome.setTitle(getString(R.string.LANDING_HELLO)); initializeModels();
welcome.setSubTitle(getString(R.string.LANDING_WELCOME));
addSlide(welcome);
CustomSlideBigText intro2 = CustomSlideBigText.newInstance(R.layout.landing_view);
intro2.setTitle(getString(R.string.LANDING_BROWSE_INFO));
intro2.setSubTitle(getString(R.string.LANDING_NO_TRACKING));
addSlide(intro2);
CustomSlideBigText cs2 = CustomSlideBigText.newInstance(R.layout.landing_view);
cs2.setTitle(getString(R.string.LANDING_BRIDGES_INFO));
cs2.showButton(getString(R.string.LANDING_MORE), new View.OnClickListener() {
@Override
public void onClick(View v) {
startActivity(new Intent(landingController.this, orbotController.class));
}
});
addSlide(cs2);
setBarColor(getResources().getColor(R.color.landing_ease_blue));
setSeparatorColor(getResources().getColor(R.color.headerblack));
showSkipButton(false);
setProgressButtonEnabled(true);
initConnections();
} }
private void initConnections(){ private void initializePages(){
mLandingViewController = new landingViewController(this,null); mIntro_welcome = new landingPageController();
mIntro_intro = new landingPageController();
mIntro_start = new landingPageController();
mIntro_welcome.onInitialize(new landingPageCallback(), new landingPageDataModel(getString(R.string.LANDING_HELLO), getString(R.string.LANDING_WELCOME),null, enums.LandingPageTypes.M_LANDING_WELCOME));
mIntro_intro.onInitialize(new landingPageCallback(), new landingPageDataModel(getString(R.string.LANDING_BROWSE_INFO), getString(R.string.LANDING_NO_TRACKING),null, enums.LandingPageTypes.M_LANDING_INTRO));
mIntro_start.onInitialize(new landingPageCallback(), new landingPageDataModel(getString(R.string.LANDING_BRIDGES_INFO),null,getString(R.string.LANDING_MORE), enums.LandingPageTypes.M_LANDING_START));
} }
private void initializeModels(){
mLandingViewController = new landingViewController(this,new landingViewCallback(), mIntro_welcome, mIntro_intro, mIntro_start);
mLandingModel = new landingModelController(this, new landingModelCallback());
}
/* Local Override */
@Override @Override
public void onDonePressed(Fragment currentFragment) { public void onDonePressed(Fragment currentFragment) {
super.onDonePressed(currentFragment); super.onDonePressed(currentFragment);
status.sSettingFirstStart = false; mLandingModel.onTrigger(landingEnums.eLandingModelCommands.M_UPDATE_LANDING_PAGE_SHOWN_STATUS);
dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.SETTING_FIRST_INSTALLED,false)); onCloseTrigger();
finish();
} }
@Override @Override
protected void onResume() { protected void onResume() {
pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
super.onResume(); super.onResume();
} }
/* Helper Methods */
public void onCloseTrigger(){
finish();
}
/* Callbacks */
private class landingViewCallback implements eventObserver.eventListener{
@Override
public Object invokeObserver(List<Object> pData, Object pType)
{
return null;
}
}
private class landingModelCallback implements eventObserver.eventListener{
@Override
public Object invokeObserver(List<Object> pData, Object pType)
{
return null;
}
}
private class landingPageCallback implements eventObserver.eventListener{
@Override
public Object invokeObserver(List<Object> pData, Object pType)
{
if(pType.equals(M_ON_LANDING_PAGE_FINISH_TRIGGERED)){
if((int)pData.get(0) == enums.LandingPageTypes.M_LANDING_START){
startActivity(new Intent(landingController.this, orbotController.class));
}
}
return null;
}
}
} }

20
app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingEnums.java Normal file
View File

@ -0,0 +1,20 @@
package com.darkweb.genesissearchengine.appManager.landingManager;
public class landingEnums
{
public enum eLandingViewCommands {
}
public enum eLandingModelCommands {
M_UPDATE_LANDING_PAGE_SHOWN_STATUS
}
public enum eLandingModelCallbackCommands {
}
public enum eLandingPageControllerCallbackCommands {
M_ON_LANDING_PAGE_FINISH_TRIGGERED
}
}

40
app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingModelController.java Normal file
View File

@ -0,0 +1,40 @@
package com.darkweb.genesissearchengine.appManager.landingManager;
import androidx.appcompat.app.AppCompatActivity;
import com.darkweb.genesissearchengine.constants.keys;
import com.darkweb.genesissearchengine.constants.status;
import com.darkweb.genesissearchengine.dataManager.dataController;
import com.darkweb.genesissearchengine.dataManager.dataEnums;
import com.darkweb.genesissearchengine.eventObserver;
import java.util.Arrays;
public class landingModelController {
/* Private Variables */
private AppCompatActivity mContext;
private eventObserver.eventListener mEvent;
public landingModelController(AppCompatActivity pContext, eventObserver.eventListener pEvent){
this.mContext = pContext;
this.mEvent = pEvent;
}
private void onUpdateLandingPageStatus(){
status.sLandingPageStatus = true;
dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_SET_BOOL, Arrays.asList(keys.sLandingPageStatus,true));
}
public Object onTrigger(landingEnums.eLandingModelCommands pCommands){
if(pCommands.equals(landingEnums.eLandingModelCommands.M_UPDATE_LANDING_PAGE_SHOWN_STATUS)){
onUpdateLandingPageStatus();
}
return null;
}
}

41
app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/landingViewController.java
View File

@ -1,29 +1,54 @@
package com.darkweb.genesissearchengine.appManager.landingManager; package com.darkweb.genesissearchengine.appManager.landingManager;
import android.os.Build;
import android.view.Window;
import android.view.WindowManager;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import com.darkweb.genesissearchengine.appManager.landingManager.langingPageManager.landingPageController;
import com.darkweb.genesissearchengine.eventObserver; import com.darkweb.genesissearchengine.eventObserver;
import com.example.myapplication.R; import com.example.myapplication.R;
import com.github.paolorotolo.appintro.AppIntro;
class landingViewController class landingViewController
{ {
/*Private Variables*/ /*Private Variables*/
private AppCompatActivity mContext; private AppIntro mContext;
private eventObserver.eventListener mEvent;
/*UI Variables*/
private landingPageController mIntroWelcome;
private landingPageController mIntroIntro;
private landingPageController mIntroStart;
/*Initializations*/ /*Initializations*/
landingViewController(AppCompatActivity mContext, eventObserver.eventListener event){ landingViewController(AppIntro pContext, eventObserver.eventListener pEvent, landingPageController pIntroWelcome, landingPageController pIntroIntro, landingPageController pIntroStart){
this.mContext = mContext; this.mContext = pContext;
this.mEvent = pEvent;
this.mIntroWelcome = pIntroWelcome;
this.mIntroIntro = pIntroIntro;
this.mIntroStart = pIntroStart;
setUIData();
initPostUI(); initPostUI();
} }
private void setUIData(){
mContext.addSlide(mIntroWelcome);
mContext.addSlide(mIntroIntro);
mContext.addSlide(mIntroStart);
mContext.setBarColor(mContext.getResources().getColor(R.color.landing_ease_blue));
mContext.setSeparatorColor(mContext.getResources().getColor(R.color.headerblack));
mContext.showSkipButton(false);
mContext.setProgressButtonEnabled(true);
}
private void initPostUI(){ private void initPostUI(){
mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue)); mContext.getWindow().setStatusBarColor(ContextCompat.getColor(mContext, R.color.landing_ease_blue));
} }
public Object onTrigger(landingEnums.eLandingViewCommands pCommands){
return null;
}
} }

85
app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/langingPageManager/landingPageController.java Normal file
View File

@ -0,0 +1,85 @@
package com.darkweb.genesissearchengine.appManager.landingManager.langingPageManager;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.darkweb.genesissearchengine.eventObserver;
import com.example.myapplication.R;
import java.util.Collections;
import java.util.List;
import static com.darkweb.genesissearchengine.appManager.landingManager.landingEnums.eLandingPageControllerCallbackCommands.M_ON_LANDING_PAGE_FINISH_TRIGGERED;
public class landingPageController extends Fragment {
/*UI Variables*/
private TextView mHeader;
private TextView mSubHeader;
private TextView mSubmit;
/*Local Variables*/
private eventObserver.eventListener mEvent;
private landingPageDataModel mDataModel;
private landingPageViewController mLandingPageViewController;
/*Initializations*/
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.landing_view, container, false);
initializeModels(view);
initializeLocalEventHandlers();
return view;
}
private void initializeModels(View pView){
mHeader = pView.findViewById(R.id.pHeader);
mSubHeader = pView.findViewById(R.id.pSubHeader);
mSubmit = pView.findViewById(R.id.pNextButton);
mLandingPageViewController = new landingPageViewController(this,new landingPageViewCallback(), mHeader, mSubHeader, mSubmit, mDataModel);
}
public landingPageController onInitialize(eventObserver.eventListener pEvent, landingPageDataModel pDataModel) {
landingPageController mSlidePage = new landingPageController();
Bundle args = new Bundle();
mDataModel = pDataModel;
mEvent = pEvent;
mSlidePage.setArguments(args);
return mSlidePage;
}
private void initializeLocalEventHandlers(){
mSubmit.setOnClickListener(v -> mEvent.invokeObserver(Collections.singletonList(mDataModel.getPageType()), M_ON_LANDING_PAGE_FINISH_TRIGGERED));
}
private class landingPageViewCallback implements eventObserver.eventListener{
@Override
public Object invokeObserver(List<Object> pData, Object pType)
{
return null;
}
}
}

31
app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/langingPageManager/landingPageDataModel.java Normal file
View File

@ -0,0 +1,31 @@
package com.darkweb.genesissearchengine.appManager.landingManager.langingPageManager;
public class landingPageDataModel {
private String mHeader;
private String mSubHeader;
private String mNextButtonText;
private int mLandingPageType;
public landingPageDataModel(String pHeader, String pSubHeader, String pNextButtonText, int pLandingPageType){
this.mHeader = pHeader;
this.mSubHeader = pSubHeader;
this.mNextButtonText = pNextButtonText;
this.mLandingPageType = pLandingPageType;
}
public String getHeader(){
return mHeader;
}
public String getSubHeader(){
return mSubHeader;
}
public String getNextButtonText(){
return mNextButtonText;
}
public int getPageType(){
return mLandingPageType;
}
}

48
app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/langingPageManager/landingPageViewController.java Normal file
View File

@ -0,0 +1,48 @@
package com.darkweb.genesissearchengine.appManager.landingManager.langingPageManager;
import android.view.View;
import android.widget.TextView;
import androidx.fragment.app.Fragment;
import com.darkweb.genesissearchengine.constants.enums;
import com.darkweb.genesissearchengine.eventObserver;
import com.example.myapplication.R;
public class landingPageViewController {
private Fragment mContext;
private TextView mHeader;
private TextView mSubHeader;
private TextView mSubmit;
private landingPageDataModel mLandingModel;
public landingPageViewController(Fragment pContext, eventObserver.eventListener pEvent, TextView pHeader, TextView pSubHeader, TextView pSubmit, landingPageDataModel pLandingModel){
this.mHeader = pHeader;
this.mSubHeader = pSubHeader;
this.mSubmit = pSubmit;
this.mContext = pContext;
this.mLandingModel = pLandingModel;
onInitializeView();
}
private void onInitializeView(){
if(this.mLandingModel.getPageType() == enums.LandingPageTypes.M_LANDING_WELCOME){
mHeader.setText(mLandingModel.getHeader());
mSubHeader.setText(mLandingModel.getSubHeader());
mSubHeader.setVisibility(View.VISIBLE);
}
else if(this.mLandingModel.getPageType() == enums.LandingPageTypes.M_LANDING_INTRO){
mHeader.setText(mLandingModel.getHeader());
mSubHeader.setText(mLandingModel.getSubHeader());
mSubHeader.setVisibility(View.VISIBLE);
}
else if(this.mLandingModel.getPageType() == enums.LandingPageTypes.M_LANDING_START){
mHeader.setText(mLandingModel.getHeader());
mSubHeader.setText(mLandingModel.getSubHeader());
mSubmit.setText(mLandingModel.getNextButtonText());
mSubHeader.setVisibility(View.VISIBLE);
mSubmit.setVisibility(View.VISIBLE);
}
}
}

15
app/src/main/java/com/darkweb/genesissearchengine/appManager/landingManager/viewPagerModel.java
View File

@ -1,15 +0,0 @@
package com.darkweb.genesissearchengine.appManager.landingManager;
public class viewPagerModel
{
private int image_drawable;
public int getImage_drawable() {
return image_drawable;
}
public void setImage_drawable(int image_drawable) {
this.image_drawable = image_drawable;
}
}

2
app/src/main/java/com/darkweb/genesissearchengine/appManager/languageManager/languageAdapter.java
View File

@ -96,7 +96,7 @@ public class languageAdapter extends RecyclerView.Adapter<languageAdapter.helpVi
try { try {
mDrawable = Drawable.createFromXml(res, res.getXml(R.xml.gx_border_left)); mDrawable = Drawable.createFromXml(res, res.getXml(R.xml.gx_border_left));
mContainer.setBackground(mDrawable); mContainer.setBackground(mDrawable);
mHeader.setTextColor(ContextCompat.getColor(mContext, R.color.white)); mHeader.setTextColor(ContextCompat.getColor(mContext, R.color.c_white));
mDescription.setTextColor(ContextCompat.getColor(mContext, R.color.white_darker)); mDescription.setTextColor(ContextCompat.getColor(mContext, R.color.white_darker));
mMarker.setVisibility(View.VISIBLE); mMarker.setVisibility(View.VISIBLE);
mCurrentIndex = getLayoutPosition(); mCurrentIndex = getLayoutPosition();

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

@ -306,9 +306,9 @@ public class tabAdapter extends RecyclerView.Adapter<tabAdapter.listViewHolder>
if(model.getSession().getTheme()==null){ if(model.getSession().getTheme()==null){
if(status.sTabGridLayoutEnabled){ if(status.sTabGridLayoutEnabled){
mBorder.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.c_ripple)); mBorder.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.c_ripple_gray));
}else { }else {
mBorder.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.c_ripple)); mBorder.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.c_ripple_gray));
} }
}else { }else {
try{ try{

7
app/src/main/java/com/darkweb/genesissearchengine/constants/enums.java
View File

@ -46,4 +46,11 @@ public class enums
public static final String OPEN_VOICE = "mOpenVoice"; public static final String OPEN_VOICE = "mOpenVoice";
} }
public static class LandingPageTypes {
public static final int M_LANDING_WELCOME = 0;
public static final int M_LANDING_INTRO = 1;
public static final int M_LANDING_START = 2;
}
} }

9
app/src/main/java/com/darkweb/genesissearchengine/constants/keys.java
View File

@ -32,7 +32,7 @@ public class keys
public static final String SETTING_LANGUAGE = "LANGUAGE_V1"; public static final String SETTING_LANGUAGE = "LANGUAGE_V1";
public static final String SETTING_LANGUAGE_REGION = "LANGUAGE_REGION_V1"; public static final String SETTING_LANGUAGE_REGION = "LANGUAGE_REGION_V1";
public static final String SETTING_SEARCH_ENGINE = "SEARCH_ENGINE_V1"; public static final String SETTING_SEARCH_ENGINE = "SEARCH_ENGINE_V1";
public static final String SETTING_FIRST_INSTALLED = "FIRST_INSTALLED_V1"; public static final String sLandingPageStatus = "FIRST_INSTALLED_V1";
public static final String SETTING_JAVA_SCRIPT = "JAVA_SCRIPT_V1"; public static final String SETTING_JAVA_SCRIPT = "JAVA_SCRIPT_V1";
public static final String SETTING_POPUP = "POPUP_V1"; public static final String SETTING_POPUP = "POPUP_V1";
public static final String SETTING_HISTORY_CLEAR = "HISTORY_CLEAR_V1"; public static final String SETTING_HISTORY_CLEAR = "HISTORY_CLEAR_V1";
@ -76,4 +76,11 @@ public class keys
public static final String BOOKMARK_SETTING_NAME = "BOOKMARK_SETTING_NAME"; public static final String BOOKMARK_SETTING_NAME = "BOOKMARK_SETTING_NAME";
public static final String BOOKMARK_SETTING_URL = "BOOKMARK_SETTING_URL"; public static final String BOOKMARK_SETTING_URL = "BOOKMARK_SETTING_URL";
public static final String BOOKMARK_SETTING_ID = "BOOKMARK_SETTING_ID"; public static final String BOOKMARK_SETTING_ID = "BOOKMARK_SETTING_ID";
/*Landing Settings*/
public static final String LANDING_TITLE_KEY = "LANDING_TITLE_KEY";
public static final String LANDING_SUB_TITLE_KEY = "LANDING_SUB_TITLE_KEY";
public static final String LANDING_SUBMIT_KEY = "LANDING_SUBMIT_KEY";
public static final String LANDING_LAYOUT_RESID = "LANDING_LAYOUT_RESID";
} }

4
app/src/main/java/com/darkweb/genesissearchengine/constants/status.java
View File

@ -49,7 +49,7 @@ public class status
public static boolean sSettingIsAppRestarting = false; public static boolean sSettingIsAppRestarting = false;
public static boolean sSettingIsAppRated = false; public static boolean sSettingIsAppRated = false;
public static boolean sSettingFontAdjustable = true; public static boolean sSettingFontAdjustable = true;
public static boolean sSettingFirstStart = true; public static boolean sLandingPageStatus = false;
public static boolean mThemeApplying = false; public static boolean mThemeApplying = false;
public static boolean sTabGridLayoutEnabled = true; public static boolean sTabGridLayoutEnabled = true;
public static boolean sStatusDoNotTrack = true; public static boolean sStatusDoNotTrack = true;
@ -107,7 +107,7 @@ public class status
status.sVPNStatus = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.BRIDGE_VPN_ENABLED,false)); status.sVPNStatus = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.BRIDGE_VPN_ENABLED,false));
status.sBridgeStatus = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.BRIDGE_ENABLES,false)); status.sBridgeStatus = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.BRIDGE_ENABLES,false));
status.sSettingFontAdjustable = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_FONT_ADJUSTABLE,true)); status.sSettingFontAdjustable = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_FONT_ADJUSTABLE,true));
status.sSettingFirstStart = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_FIRST_INSTALLED,true)); status.sLandingPageStatus = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.sLandingPageStatus,false));
status.sSettingEnableZoom = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_ZOOM,true)); status.sSettingEnableZoom = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_ZOOM,true));
status.sSettingEnableVoiceInput = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_VOICE_INPUT,true)); status.sSettingEnableVoiceInput = (boolean)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_BOOL, Arrays.asList(keys.SETTING_VOICE_INPUT,true));
status.sSettingTrackingProtection = (int)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_INT, Arrays.asList(keys.SETTING_TRACKING_PROTECTION, ContentBlocking.AntiTracking.DEFAULT)); status.sSettingTrackingProtection = (int)dataController.getInstance().invokePrefs(dataEnums.ePreferencesCommands.M_GET_INT, Arrays.asList(keys.SETTING_TRACKING_PROTECTION, ContentBlocking.AntiTracking.DEFAULT));

5
app/src/main/java/com/darkweb/genesissearchengine/constants/strings.java
View File

@ -68,5 +68,10 @@ public class strings
public static final String BOOKMARK_SETTING_VALIDATION_ERROR_2 = "bookmark url empty"; public static final String BOOKMARK_SETTING_VALIDATION_ERROR_2 = "bookmark url empty";
/*Landing Manager*/
public static final String LANDING_LAYOUT_RESID = "layoutResId";
} }

16
app/src/main/java/com/darkweb/genesissearchengine/helperManager/sharedUIMethod.java
View File

@ -1,6 +1,7 @@
package com.darkweb.genesissearchengine.helperManager; package com.darkweb.genesissearchengine.helperManager;
import android.content.res.Configuration;
import android.os.Build; import android.os.Build;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
@ -8,7 +9,12 @@ import android.view.WindowManager;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.app.AppCompatDelegate;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import com.darkweb.genesissearchengine.appManager.activityContextManager;
import com.darkweb.genesissearchengine.appManager.activityThemeManager;
import com.darkweb.genesissearchengine.pluginManager.pluginController;
import com.darkweb.genesissearchengine.pluginManager.pluginEnums;
import com.example.myapplication.R; import com.example.myapplication.R;
import java.util.Collections;
public class sharedUIMethod public class sharedUIMethod
{ {
@ -31,4 +37,14 @@ public class sharedUIMethod
} }
} }
} }
public static void onSharedConfigurationChanged(Configuration newConfig, AppCompatActivity pContext){
pluginController.getInstance().onLanguageInvoke(Collections.singletonList(pContext), pluginEnums.eLangManager.M_ACTIVITY_CREATED);
if(newConfig.uiMode != pContext.getResources().getConfiguration().uiMode){
activityContextManager.getInstance().onResetTheme();
activityThemeManager.getInstance().onConfigurationChanged(pContext);
}
}
} }

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

@ -13,6 +13,7 @@ import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RatingBar; import android.widget.RatingBar;
@ -99,14 +100,14 @@ public class messageManager
{ {
initializeDialog(R.layout.popup_language_support, Gravity.CENTER); initializeDialog(R.layout.popup_language_support, Gravity.CENTER);
// ((TextView) mDialog.findViewById(R.id.pLanguage)).setText((mData.get(0).toString())); // ((TextView) mDialog.findViewById(R.id.pLanguage)).setText((mData.get(0).toString()));
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
mDialog.setOnDismissListener(dialog -> onClearReference()); mDialog.setOnDismissListener(dialog -> onClearReference());
} }
private void rateFailure() private void rateFailure()
{ {
initializeDialog(R.layout.popup_rate_failure, Gravity.BOTTOM); initializeDialog(R.layout.popup_rate_failure, Gravity.BOTTOM);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
mDialog.findViewById(R.id.pNext).setOnClickListener(v -> { mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
mDialog.dismiss(); mDialog.dismiss();
final Handler handler = new Handler(); final Handler handler = new Handler();
@ -130,7 +131,7 @@ public class messageManager
Runnable runnable = () -> mDialog.dismiss(); Runnable runnable = () -> mDialog.dismiss();
initializeDialog(R.layout.popup_new_circuit, Gravity.BOTTOM); initializeDialog(R.layout.popup_new_circuit, Gravity.BOTTOM);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
mDialog.setOnDismissListener(dialog -> { mDialog.setOnDismissListener(dialog -> {
handler.removeCallbacks(runnable); handler.removeCallbacks(runnable);
@ -154,7 +155,7 @@ public class messageManager
mMessage = (String) mData.get(0); mMessage = (String) mData.get(0);
} }
((TextView)mDialog.findViewById(R.id.pDescription)).setText(("Request denied Error " + mMessage)); ((TextView)mDialog.findViewById(R.id.pDescription)).setText(("Request denied Error " + mMessage));
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
mDialog.setOnDismissListener(dialog -> { mDialog.setOnDismissListener(dialog -> {
handler.removeCallbacks(runnable); handler.removeCallbacks(runnable);
@ -228,46 +229,30 @@ public class messageManager
handler.postDelayed(runnable, 1500); handler.postDelayed(runnable, 1500);
} }
private void deleteBookmark() private void onShowToast(int mLayout, int mDelay, String mInfo, String mTriggerText, pluginEnums.eMessageManagerCallbacks pCallback)
{ {
initializeDialog(mLayout, Gravity.BOTTOM);
((TextView)mDialog.findViewById(R.id.pDescription)).setText(mInfo);
((Button)mDialog.findViewById(R.id.pTrigger)).setText(mTriggerText);
mDialog.getWindow().setDimAmount(0.3f);
final Handler handler = new Handler(); final Handler handler = new Handler();
Runnable runnable = () -> mDialog.dismiss(); Runnable runnable = () -> mDialog.dismiss();
initializeDialog(R.layout.popup_remove_bookmark, Gravity.BOTTOM);
mDialog.getWindow().setDimAmount(0.3f);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> {
mEvent.invokeObserver(null, M_UNDO_TAB);
mDialog.dismiss();
handler.removeCallbacks(runnable);
});
mDialog.setOnDismissListener(dialog -> { mDialog.setOnDismissListener(dialog -> {
handler.removeCallbacks(runnable); handler.removeCallbacks(runnable);
onClearReference(); onClearReference();
}); });
handler.postDelayed(runnable, 1500); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> {
} if(pCallback == null){
mEvent.invokeObserver(null, M_UNDO_TAB);
private void updateBookmark() mDialog.dismiss();
{ handler.removeCallbacks(runnable);
final Handler handler = new Handler(); }
Runnable runnable = () -> mDialog.dismiss();
initializeDialog(R.layout.popup_update_bookmark, Gravity.BOTTOM);
mDialog.getWindow().setDimAmount(0.3f);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> {
mEvent.invokeObserver(null, M_UNDO_TAB);
mDialog.dismiss();
handler.removeCallbacks(runnable);
}); });
mDialog.setOnDismissListener(dialog -> { handler.postDelayed(runnable, mDelay);
handler.removeCallbacks(runnable);
onClearReference();
});
handler.postDelayed(runnable, 1500);
} }
private void maxTabReached() private void maxTabReached()
@ -277,7 +262,7 @@ public class messageManager
initializeDialog(R.layout.popup_max_tab, Gravity.BOTTOM); initializeDialog(R.layout.popup_max_tab, Gravity.BOTTOM);
mDialog.getWindow().setDimAmount(0); mDialog.getWindow().setDimAmount(0);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> { mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> {
mDialog.dismiss(); mDialog.dismiss();
handler.removeCallbacks(runnable); handler.removeCallbacks(runnable);
}); });
@ -294,7 +279,7 @@ public class messageManager
private void notSupportMessage() private void notSupportMessage()
{ {
initializeDialog(R.layout.popup_not_supported, Gravity.BOTTOM); initializeDialog(R.layout.popup_not_supported, Gravity.BOTTOM);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(view -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(view -> mDialog.dismiss());
mDialog.setOnDismissListener(dialog -> onClearReference()); mDialog.setOnDismissListener(dialog -> onClearReference());
final Handler handler = new Handler(); final Handler handler = new Handler();
@ -309,7 +294,7 @@ public class messageManager
private void onPanic(){ private void onPanic(){
initializeDialog(R.layout.popup_panic, Gravity.BOTTOM); initializeDialog(R.layout.popup_panic, Gravity.BOTTOM);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
mDialog.setOnDismissListener(dialog -> onClearReference()); mDialog.setOnDismissListener(dialog -> onClearReference());
mDialog.findViewById(R.id.pNext).setOnClickListener(v -> { mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
mDialog.dismiss(); mDialog.dismiss();
@ -344,7 +329,7 @@ public class messageManager
Runnable runnable = () -> mDialog.dismiss(); Runnable runnable = () -> mDialog.dismiss();
initializeDialog(R.layout.popup_data_cleared, Gravity.BOTTOM); initializeDialog(R.layout.popup_data_cleared, Gravity.BOTTOM);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
mDialog.setOnDismissListener(dialog -> { mDialog.setOnDismissListener(dialog -> {
handler.removeCallbacks(runnable); handler.removeCallbacks(runnable);
@ -357,7 +342,7 @@ public class messageManager
private void applicationCrashed() private void applicationCrashed()
{ {
initializeDialog(R.layout.application_crash, Gravity.BOTTOM); initializeDialog(R.layout.application_crash, Gravity.BOTTOM);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
mDialog.setOnDismissListener(dialog -> onClearReference()); mDialog.setOnDismissListener(dialog -> onClearReference());
} }
@ -372,7 +357,7 @@ public class messageManager
mDialog.getWindow().setBackgroundDrawable(inset); mDialog.getWindow().setBackgroundDrawable(inset);
mDialog.setCancelable(true); mDialog.setCancelable(true);
mDialog.setCanceledOnTouchOutside(true); mDialog.setCanceledOnTouchOutside(true);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
mDialog.findViewById(R.id.pNext).setOnClickListener(v -> mEvent.invokeObserver(null, M_SECURE_CONNECTION)); mDialog.findViewById(R.id.pNext).setOnClickListener(v -> mEvent.invokeObserver(null, M_SECURE_CONNECTION));
if((boolean) mData.get(1)){ if((boolean) mData.get(1)){
@ -414,7 +399,7 @@ public class messageManager
String pURL = mData.get(0).toString().replace("genesis.onion","genesishiddentechnologies.com"); String pURL = mData.get(0).toString().replace("genesis.onion","genesishiddentechnologies.com");
((TextView)mDialog.findViewById(R.id.pURL)).setText(pURL); ((TextView)mDialog.findViewById(R.id.pURL)).setText(pURL);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> { mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> {
mDialog.dismiss(); mDialog.dismiss();
helperMethod.hideKeyboard(mContext); helperMethod.hideKeyboard(mContext);
}); });
@ -534,7 +519,7 @@ public class messageManager
((TextView) mDialog.findViewById(R.id.pDescription)).setText(mData.get(0).toString()); ((TextView) mDialog.findViewById(R.id.pDescription)).setText(mData.get(0).toString());
((TextView) mDialog.findViewById(R.id.pDescriptionLong)).setText(murl); ((TextView) mDialog.findViewById(R.id.pDescriptionLong)).setText(murl);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
mDialog.findViewById(R.id.pNext).setOnClickListener(v -> { mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
mDialog.dismiss(); mDialog.dismiss();
final Handler handler = new Handler(); final Handler handler = new Handler();
@ -551,7 +536,7 @@ public class messageManager
private void rateApp() private void rateApp()
{ {
initializeDialog(R.layout.popup_rate_us, Gravity.CENTER); initializeDialog(R.layout.popup_rate_us, Gravity.CENTER);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
mDialog.findViewById(R.id.pNext).setOnClickListener(v -> { mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
RatingBar mRatingBar = mDialog.findViewById(R.id.pRating); RatingBar mRatingBar = mDialog.findViewById(R.id.pRating);
if(mRatingBar.getRating()>=3){ if(mRatingBar.getRating()>=3){
@ -589,7 +574,7 @@ public class messageManager
initializeDialog(R.layout.popup_file_longpress, Gravity.CENTER); initializeDialog(R.layout.popup_file_longpress, Gravity.CENTER);
((TextView) mDialog.findViewById(R.id.pDescription)).setText((title + mData.get(0).toString())); ((TextView) mDialog.findViewById(R.id.pDescription)).setText((title + mData.get(0).toString()));
mEvent.invokeObserver(Arrays.asList(((ImageView) mDialog.findViewById(R.id.pFaviconLogo)), helperMethod.getDomainName(mData.get(0).toString())), enums.etype.fetch_favicon); mEvent.invokeObserver(Arrays.asList(((ImageView) mDialog.findViewById(R.id.pFaviconLogo)), helperMethod.getDomainName(mData.get(0).toString())), enums.etype.fetch_favicon);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
mDialog.findViewById(R.id.pOption1).setOnClickListener(v -> { mDialog.findViewById(R.id.pOption1).setOnClickListener(v -> {
if(mData!=null){ if(mData!=null){
mEvent.invokeObserver(Collections.singletonList(mData.get(0)), M_DOWNLOAD_FILE_MANUAL); mEvent.invokeObserver(Collections.singletonList(mData.get(0)), M_DOWNLOAD_FILE_MANUAL);
@ -624,7 +609,7 @@ public class messageManager
initializeDialog(R.layout.popup_url_longpress, Gravity.CENTER); initializeDialog(R.layout.popup_url_longpress, Gravity.CENTER);
((TextView) mDialog.findViewById(R.id.pDescription)).setText((title + mData.get(0))); ((TextView) mDialog.findViewById(R.id.pDescription)).setText((title + mData.get(0)));
mEvent.invokeObserver(Arrays.asList(((ImageView) mDialog.findViewById(R.id.pFaviconLogo)), helperMethod.getDomainName(mData.get(0).toString())), enums.etype.fetch_favicon); mEvent.invokeObserver(Arrays.asList(((ImageView) mDialog.findViewById(R.id.pFaviconLogo)), helperMethod.getDomainName(mData.get(0).toString())), enums.etype.fetch_favicon);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
mDialog.findViewById(R.id.pOption1).setOnClickListener(v -> { mDialog.findViewById(R.id.pOption1).setOnClickListener(v -> {
if(mData!=null){ if(mData!=null){
mEvent.invokeObserver(Collections.singletonList(mData.get(0)), M_OPEN_LINK_NEW_TAB); mEvent.invokeObserver(Collections.singletonList(mData.get(0)), M_OPEN_LINK_NEW_TAB);
@ -727,7 +712,7 @@ public class messageManager
private void sendBridgeMail() private void sendBridgeMail()
{ {
initializeDialog(R.layout.popup_bridge_mail, Gravity.BOTTOM); initializeDialog(R.layout.popup_bridge_mail, Gravity.BOTTOM);
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss()); mDialog.findViewById(R.id.pTrigger).setOnClickListener(v -> mDialog.dismiss());
mDialog.findViewById(R.id.pNext).setOnClickListener(v -> { mDialog.findViewById(R.id.pNext).setOnClickListener(v -> {
mDialog.dismiss(); mDialog.dismiss();
final Handler handler = new Handler(); final Handler handler = new Handler();
@ -888,12 +873,12 @@ public class messageManager
case M_DELETE_BOOKMARK: case M_DELETE_BOOKMARK:
/*VERIFIED*/ /*VERIFIED*/
deleteBookmark(); onShowToast(R.layout.popup_toast_generic, 2000, mContext.getString(R.string.HOME_MENU__BOOKMARK_REMOVED), mContext.getString(R.string.ALERT_DISMISS), null);
break; break;
case M_UPDATE_BOOKMARK: case M_UPDATE_BOOKMARK:
/*VERIFIED*/ /*VERIFIED*/
updateBookmark(); onShowToast(R.layout.popup_toast_generic, 2000, mContext.getString(R.string.HOME_MENU__BOOKMARK_UPDATE), mContext.getString(R.string.ALERT_DISMISS), null);
break; break;
} }
} }

2
app/src/main/res/custom-xml/alert/xml/ax_bottom_rounded_corner_right.xml
View File

@ -1,5 +1,5 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple"> android:color="@color/c_ripple_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/c_gray_light" /> <solid android:color="@color/c_gray_light" />

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

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/holo_gray"> android:color="@color/c_holo_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/holo_gray" /> <solid android:color="@color/c_holo_gray" />
<corners android:radius="5.5dp" /> <corners android:radius="5.5dp" />
</shape> </shape>
</item> </item>

13
app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round.xml
View File

@ -1,13 +0,0 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@color/c_button_text_v2" />
<corners
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp"
android:topLeftRadius="4dp"
android:topRightRadius="4dp"/>
</shape>
</item>
</ripple>

2
app/src/main/res/custom-xml/alert/xml/ax_ripple_default_round_left.xml
View File

@ -1,5 +1,5 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple"> android:color="@color/c_ripple_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/c_gray_light" /> <solid android:color="@color/c_gray_light" />

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

@ -1,8 +1,8 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple"> android:color="@color/c_ripple_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/c_button_text_v2" /> <solid android:color="@color/c_alert_toast_button_background" />
<corners <corners
android:bottomLeftRadius="0dp" android:bottomLeftRadius="0dp"
android:bottomRightRadius="4dp" android:bottomRightRadius="4dp"

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

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

2
app/src/main/res/custom-xml/alert/xml/ax_shadow.xml
View File

@ -64,7 +64,7 @@
</item> </item>
<item> <item>
<shape> <shape>
<solid android:color="@color/white" /> <solid android:color="@color/c_white" />
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

50
app/src/main/res/custom-xml/alert/xml/ax_background_inverted.xml → app/src/main/res/custom-xml/alert/xml/ax_toast_alert_background.xml
View File

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

13
app/src/main/res/custom-xml/alert/xml/ax_toast_alert_button.xml Normal file
View File

@ -0,0 +1,13 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple_gray">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@color/c_alert_toast_button_background" />
<corners
android:bottomLeftRadius="5dp"
android:bottomRightRadius="5dp"
android:topLeftRadius="5dp"
android:topRightRadius="5dp"/>
</shape>
</item>
</ripple>

4
app/src/main/res/custom-xml/bookmark/xml/bx_input_field.xml
View File

@ -6,7 +6,7 @@
<shape <shape
android:shape="rectangle" android:padding="10dp" > android:shape="rectangle" android:padding="10dp" >
<solid android:color="@color/c_edittext_background_blue"/> <solid android:color="@color/c_edittext_background_blue"/>
<corners android:radius="7dp"/> <corners android:radius="4.5dp"/>
<stroke android:width="2.5dp" android:color="@color/c_text_color_highlight_v2" /> <stroke android:width="2.5dp" android:color="@color/c_text_color_highlight_v2" />
</shape> </shape>
</item> </item>
@ -15,7 +15,7 @@
<shape <shape
android:shape="rectangle" android:padding="10dp"> android:shape="rectangle" android:padding="10dp">
<solid android:color="@color/c_edittext_background_blue"/> <solid android:color="@color/c_edittext_background_blue"/>
<corners android:radius="7dp"/> <corners android:radius="4.5dp"/>
<stroke android:width="2.5dp" android:color="@color/c_text_color_highlight_v2" /> <stroke android:width="2.5dp" android:color="@color/c_text_color_highlight_v2" />
</shape> </shape>
</item> </item>

2
app/src/main/res/custom-xml/bookmark/xml/bx_ripple_default_round.xml
View File

@ -1,5 +1,5 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple"> android:color="@color/c_ripple_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/c_gray_light" /> <solid android:color="@color/c_gray_light" />

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

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

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

@ -1,8 +1,8 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple"> android:color="@color/c_ripple_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/white" /> <solid android:color="@color/c_white" />
<corners android:radius="00dp" /> <corners android:radius="00dp" />
</shape> </shape>
</item> </item>

2
app/src/main/res/custom-xml/generic/xml/gx_ripple_default_round.xml
View File

@ -1,5 +1,5 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple"> android:color="@color/c_ripple_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/c_gray_light" /> <solid android:color="@color/c_gray_light" />

2
app/src/main/res/custom-xml/generic/xml/gx_ripple_gray.xml
View File

@ -1,5 +1,5 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple"> android:color="@color/c_ripple_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/c_gray_light" /> <solid android:color="@color/c_gray_light" />

2
app/src/main/res/custom-xml/generic/xml/gx_ripple_gray_round_left.xml
View File

@ -1,6 +1,6 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:autoMirrored="true" android:autoMirrored="true"
android:color="@color/c_ripple"> android:color="@color/c_ripple_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/c_gray_light" /> <solid android:color="@color/c_gray_light" />

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

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/holo_gray"> android:color="@color/c_holo_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/holo_gray" /> <solid android:color="@color/c_holo_gray" />
<corners android:radius="5.5dp" /> <corners android:radius="5.5dp" />
</shape> </shape>
</item> </item>

2
app/src/main/res/custom-xml/generic/xml/gx_side_item_popup.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/white"> android:color="@color/c_white">
<item android:id="@android:id/mask" > <item android:id="@android:id/mask" >
<shape android:shape="rectangle"> <shape android:shape="rectangle">

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

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/holo_gray"> android:color="@color/c_holo_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/holo_gray" /> <solid android:color="@color/c_holo_gray" />
</shape> </shape>
</item> </item>

2
app/src/main/res/custom-xml/generic/xml/gx_side_menu.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/white"> android:color="@color/c_white">
<item android:id="@android:id/mask" > <item android:id="@android:id/mask" >
<shape android:shape="rectangle"> <shape android:shape="rectangle">

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/white"> android:color="@color/c_white">
<item android:id="@android:id/mask" > <item android:id="@android:id/mask" >
<shape android:shape="rectangle"> <shape android:shape="rectangle">

2
app/src/main/res/custom-xml/home/xml/gx_ripple_gray_bottom.xml
View File

@ -1,5 +1,5 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple"> android:color="@color/c_ripple_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/c_gray_light" /> <solid android:color="@color/c_gray_light" />

2
app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_bar.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/holo_gray"> android:color="@color/c_holo_gray">
<item android:id="@android:id/background"> <item android:id="@android:id/background">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<gradient <gradient

2
app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_left.xml
View File

@ -1,5 +1,5 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple"> android:color="@color/c_ripple_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/c_gray_light" /> <solid android:color="@color/c_gray_light" />

2
app/src/main/res/custom-xml/home/xml/gx_ripple_gray_top_right.xml
View File

@ -1,5 +1,5 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple"> android:color="@color/c_ripple_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/c_gray_light" /> <solid android:color="@color/c_gray_light" />

8
app/src/main/res/custom-xml/home/xml/hox_rounded_corner.xml
View File

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

4
app/src/main/res/custom-xml/home/xml/hox_rounded_corner_bottom.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/holo_gray"> android:color="@color/c_holo_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/holo_gray" /> <solid android:color="@color/c_holo_gray" />
<corners android:bottomLeftRadius="4.0dp" <corners android:bottomLeftRadius="4.0dp"
android:bottomRightRadius="4.0dp"/> android:bottomRightRadius="4.0dp"/>
</shape> </shape>

4
app/src/main/res/custom-xml/home/xml/hox_rounded_corner_splash.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/holo_gray"> android:color="@color/c_holo_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/holo_gray" /> <solid android:color="@color/c_holo_gray" />
<corners android:radius="5.5dp" /> <corners android:radius="5.5dp" />
</shape> </shape>
</item> </item>

4
app/src/main/res/custom-xml/home/xml/hox_rounded_corner_splash_right.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/holo_gray"> android:color="@color/c_holo_gray">
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
@ -16,7 +16,7 @@
<item android:id="@android:id/mask" android:right="5dp"> <item android:id="@android:id/mask" android:right="5dp">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/holo_gray" /> <solid android:color="@color/c_holo_gray" />
<corners <corners
android:bottomLeftRadius = "5.5dp" android:bottomLeftRadius = "5.5dp"
android:bottomRightRadius = "0dp" android:bottomRightRadius = "0dp"

2
app/src/main/res/custom-xml/home/xml/hx_ripple_default_round.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple <ripple
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple"> android:color="@color/c_ripple_gray">
<!-- mask here... --> <!-- mask here... -->
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">

2
app/src/main/res/custom-xml/landing/xml/lx_round_drawable.xml
View File

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke <stroke
android:width="3dp" android:width="3dp"
android:color="#ffffff" /> android:color="@color/c_white" />
<padding <padding
android:left="5dp" android:left="5dp"

2
app/src/main/res/custom-xml/setting/xml/sx_button_round.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/holo_gray"> android:color="@color/c_holo_gray">
<item android:id="@android:id/mask"> <item android:id="@android:id/mask">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/holo_dark_gray_alpha" /> <solid android:color="@color/holo_dark_gray_alpha" />

2
app/src/main/res/custom-xml/setting/xml/sx_font_change_round_background.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/holo_gray"> android:color="@color/c_holo_gray">
<item android:id="@android:id/background"> <item android:id="@android:id/background">
<shape android:shape="rectangle"> <shape android:shape="rectangle">

2
app/src/main/res/custom-xml/tab/xml/tx_border.xml
View File

@ -3,7 +3,7 @@
<solid android:color="#ffffffff"/> <solid android:color="#ffffffff"/>
<stroke android:width="3dp" <stroke android:width="3dp"
android:color="@color/c_button_text_v2" android:color="@color/c_alert_toast_button_background"
/> />
<padding android:left="1dp" <padding android:left="1dp"

2
app/src/main/res/custom-xml/tab/xml/tx_ripple_light.xml
View File

@ -1,6 +1,6 @@
<ripple <ripple
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/c_ripple"> android:color="@color/c_ripple_gray">
<item> <item>
<color android:color="@color/clear_alpha" /> <color android:color="@color/clear_alpha" />
</item> </item>

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

@ -35,7 +35,7 @@
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
@ -45,7 +45,7 @@
android:background="@xml/ax_ripple_default_round_bottom" android:background="@xml/ax_ripple_default_round_bottom"
android:text="@string/ALERT_DISMISS" android:text="@string/ALERT_DISMISS"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

8
app/src/main/res/layouts/alert/layout/popup_block_popup.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="55dp" android:layout_height="55dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@xml/ax_background_inverted" android:background="@xml/ax_toast_alert_background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
@ -28,7 +28,7 @@
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="@string/SETTING_PRIVACY_POPUP_INFO_ALERT" android:text="@string/SETTING_PRIVACY_POPUP_INFO_ALERT"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted" android:textColor="@color/c_alert_toast_info_text"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -44,7 +44,7 @@
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:padding="0dp" android:padding="0dp"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
@ -62,7 +62,7 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@color/c_navigation_medium" android:background="@color/c_alert_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pOpenPrivacy" app:layout_constraintEnd_toStartOf="@+id/pOpenPrivacy"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

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

@ -48,14 +48,14 @@ android:layout_height="match_parent">
android:background="@xml/ax_ripple_default_round_bottom" android:background="@xml/ax_ripple_default_round_bottom"
android:text="@string/ALERT_MAIL" android:text="@string/ALERT_MAIL"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pDescription" /> app:layout_constraintTop_toBottomOf="@+id/pDescription" />
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
@ -65,7 +65,7 @@ android:layout_height="match_parent">
android:background="@xml/ax_ripple_default_round_bottom_secondary" android:background="@xml/ax_ripple_default_round_bottom_secondary"
android:text="@string/ALERT_DISMISS" android:text="@string/ALERT_DISMISS"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pNext" app:layout_constraintEnd_toStartOf="@+id/pNext"

8
app/src/main/res/layouts/alert/layout/popup_clear_bookmark.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="55dp" android:layout_height="55dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@xml/ax_background_inverted" android:background="@xml/ax_toast_alert_background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
@ -28,7 +28,7 @@
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="@string/ALERT_CLEAR_BOOKMARK_INFO" android:text="@string/ALERT_CLEAR_BOOKMARK_INFO"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted" android:textColor="@color/c_alert_toast_info_text"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -44,7 +44,7 @@
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:padding="0dp" android:padding="0dp"
android:text="@string/ALERT_CONFIRM" android:text="@string/ALERT_CONFIRM"
android:textAllCaps="false" android:textAllCaps="false"
@ -60,7 +60,7 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@color/c_navigation_medium" android:background="@color/c_alert_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pNext" app:layout_constraintEnd_toStartOf="@+id/pNext"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

8
app/src/main/res/layouts/alert/layout/popup_clear_history.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="55dp" android:layout_height="55dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@xml/ax_background_inverted" android:background="@xml/ax_toast_alert_background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
@ -28,7 +28,7 @@
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="@string/ALERT_CLEAR_HISTORY" android:text="@string/ALERT_CLEAR_HISTORY"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted" android:textColor="@color/c_alert_toast_info_text"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -44,7 +44,7 @@
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:padding="0dp" android:padding="0dp"
android:text="@string/ALERT_CONFIRM" android:text="@string/ALERT_CONFIRM"
android:textAllCaps="false" android:textAllCaps="false"
@ -60,7 +60,7 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@color/c_navigation_medium" android:background="@color/c_alert_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pNext" app:layout_constraintEnd_toStartOf="@+id/pNext"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

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

@ -93,14 +93,14 @@
android:background="@xml/ax_ripple_default_round_bottom" android:background="@xml/ax_ripple_default_round_bottom"
android:text="@string/ALERT_ADD" android:text="@string/ALERT_ADD"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pURL" /> app:layout_constraintTop_toBottomOf="@+id/pURL" />
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
@ -110,7 +110,7 @@
android:background="@xml/ax_ripple_default_round_bottom_secondary" android:background="@xml/ax_ripple_default_round_bottom_secondary"
android:text="@string/ALERT_DISMISS" android:text="@string/ALERT_DISMISS"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pNext" app:layout_constraintEnd_toStartOf="@+id/pNext"

12
app/src/main/res/layouts/alert/layout/popup_data_cleared.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="55dp" android:layout_height="55dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@xml/ax_background_inverted" android:background="@xml/ax_toast_alert_background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
@ -28,7 +28,7 @@
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="@string/ALERT_DATA_CLEARED_INFO" android:text="@string/ALERT_DATA_CLEARED_INFO"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted" android:textColor="@color/c_alert_toast_info_text"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -37,14 +37,14 @@
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:padding="0dp" android:padding="0dp"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
@ -62,9 +62,9 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@color/c_navigation_medium" android:background="@color/c_alert_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pDismiss" app:layout_constraintEnd_toStartOf="@+id/pTrigger"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/layouts/alert/layout/popup_data_cleared_shortcut.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="55dp" android:layout_height="55dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@xml/ax_background_inverted" android:background="@xml/ax_toast_alert_background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
@ -28,7 +28,7 @@
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="@string/ALERT_DATA_CLEARED_SHORTCUT" android:text="@string/ALERT_DATA_CLEARED_SHORTCUT"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted" android:textColor="@color/c_alert_toast_info_text"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -44,7 +44,7 @@
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:padding="0dp" android:padding="0dp"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
@ -62,7 +62,7 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@color/c_navigation_medium" android:background="@color/c_alert_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pOpenPrivacy" app:layout_constraintEnd_toStartOf="@+id/pOpenPrivacy"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

12
app/src/main/res/layouts/alert/layout/popup_download_failure.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="55dp" android:layout_height="55dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@xml/ax_background_inverted" android:background="@xml/ax_toast_alert_background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
@ -32,7 +32,7 @@
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="" android:text=""
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted" android:textColor="@color/c_alert_toast_info_text"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -42,14 +42,14 @@
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:padding="0dp" android:padding="0dp"
android:text="@string/ALERT_DISMISS" android:text="@string/ALERT_DISMISS"
android:textAllCaps="false" android:textAllCaps="false"
@ -65,9 +65,9 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@color/c_navigation_medium" android:background="@color/c_alert_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pDismiss" app:layout_constraintEnd_toStartOf="@+id/pTrigger"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

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

@ -36,7 +36,7 @@
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_browser" android:src="@xml/ic_baseline_browser"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/white" android:textColor="@color/c_white"
tools:ignore="RtlCompat" /> tools:ignore="RtlCompat" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>

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

@ -107,14 +107,14 @@
android:background="@xml/ax_ripple_default_round_bottom" android:background="@xml/ax_ripple_default_round_bottom"
android:text="@string/ALERT_DOWNLOAD_SINGLE_BUTTON" android:text="@string/ALERT_DOWNLOAD_SINGLE_BUTTON"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pDescriptionLong" /> app:layout_constraintTop_toBottomOf="@+id/pDescriptionLong" />
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
@ -124,7 +124,7 @@
android:background="@xml/ax_ripple_default_round_bottom_secondary" android:background="@xml/ax_ripple_default_round_bottom_secondary"
android:text="@string/ALERT_DISMISS" android:text="@string/ALERT_DISMISS"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pNext" app:layout_constraintEnd_toStartOf="@+id/pNext"

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

@ -36,7 +36,7 @@
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_browser" android:src="@xml/ic_baseline_browser"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/white" android:textColor="@color/c_white"
tools:ignore="RtlCompat" /> tools:ignore="RtlCompat" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
@ -277,7 +277,7 @@
app:layout_constraintTop_toBottomOf="@+id/pDivider"> app:layout_constraintTop_toBottomOf="@+id/pDivider">
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_weight="1" android:layout_weight="1"

8
app/src/main/res/layouts/alert/layout/popup_language_support.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="55dp" android:layout_height="55dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@xml/ax_background_inverted" android:background="@xml/ax_toast_alert_background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
@ -28,7 +28,7 @@
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="@string/ALERT_LANGUAGE_SUPPORT_FAILURE" android:text="@string/ALERT_LANGUAGE_SUPPORT_FAILURE"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted" android:textColor="@color/c_alert_toast_info_text"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -44,7 +44,7 @@
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:padding="0dp" android:padding="0dp"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
@ -62,7 +62,7 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@color/c_navigation_medium" android:background="@color/c_alert_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pOpenPrivacy" app:layout_constraintEnd_toStartOf="@+id/pOpenPrivacy"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

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

@ -43,7 +43,7 @@
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:padding="0dp" android:padding="0dp"
android:text="@string/ALERT_OPEN_NEW_TAB_LOAD" android:text="@string/ALERT_OPEN_NEW_TAB_LOAD"
android:textAllCaps="false" android:textAllCaps="false"

12
app/src/main/res/layouts/alert/layout/popup_max_tab.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_marginBottom="15dp" android:layout_marginBottom="15dp"
android:background="@xml/ax_background_inverted" android:background="@xml/ax_toast_alert_background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
@ -28,7 +28,7 @@
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="@string/SETTING_MAX_TAB_POPUP_INFO_ALERT" android:text="@string/SETTING_MAX_TAB_POPUP_INFO_ALERT"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted" android:textColor="@color/c_alert_toast_info_text"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -37,14 +37,14 @@
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:padding="0dp" android:padding="0dp"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
@ -62,9 +62,9 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@color/c_navigation_medium" android:background="@color/c_alert_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pDismiss" app:layout_constraintEnd_toStartOf="@+id/pTrigger"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

12
app/src/main/res/layouts/alert/layout/popup_new_circuit.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="55dp" android:layout_height="55dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@xml/ax_background_inverted" android:background="@xml/ax_toast_alert_background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
@ -28,7 +28,7 @@
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="@string/HOME_MENU__NEW_CIRCUIT_CREATED" android:text="@string/HOME_MENU__NEW_CIRCUIT_CREATED"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted" android:textColor="@color/c_alert_toast_info_text"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -37,14 +37,14 @@
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:padding="0dp" android:padding="0dp"
android:text="@string/ALERT_DISMISS" android:text="@string/ALERT_DISMISS"
android:textAllCaps="false" android:textAllCaps="false"
@ -60,9 +60,9 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@color/c_navigation_medium" android:background="@color/c_alert_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pDismiss" app:layout_constraintEnd_toStartOf="@+id/pTrigger"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

12
app/src/main/res/layouts/alert/layout/popup_not_supported.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_marginBottom="15dp" android:layout_marginBottom="15dp"
android:background="@xml/ax_background_inverted" android:background="@xml/ax_toast_alert_background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
@ -28,7 +28,7 @@
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="@string/ALERT_NOT_SUPPORTED" android:text="@string/ALERT_NOT_SUPPORTED"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted" android:textColor="@color/c_alert_toast_info_text"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -37,14 +37,14 @@
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:onClick="onRestoreTab" android:onClick="onRestoreTab"
android:padding="0dp" android:padding="0dp"
android:text="@string/ALERT_DISMISS" android:text="@string/ALERT_DISMISS"
@ -61,9 +61,9 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@color/c_navigation_medium" android:background="@color/c_alert_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pDismiss" app:layout_constraintEnd_toStartOf="@+id/pTrigger"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/layouts/alert/layout/popup_orbot_connecting.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@xml/ax_background_inverted" android:background="@xml/ax_toast_alert_background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
@ -27,7 +27,7 @@
android:alpha="0.8" android:alpha="0.8"
android:text="@string/ALERT_ORBOT_LOADING_INFO" android:text="@string/ALERT_ORBOT_LOADING_INFO"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted" android:textColor="@color/c_alert_toast_info_text"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -45,7 +45,7 @@
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:padding="0dp" android:padding="0dp"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
@ -63,7 +63,7 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@color/c_navigation_medium" android:background="@color/c_alert_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pNext" app:layout_constraintEnd_toStartOf="@+id/pNext"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

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

@ -48,14 +48,14 @@
android:background="@xml/ax_ripple_default_round_bottom" android:background="@xml/ax_ripple_default_round_bottom"
android:text="@string/ALERT_PANIC_BT_1" android:text="@string/ALERT_PANIC_BT_1"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pDescription" /> app:layout_constraintTop_toBottomOf="@+id/pDescription" />
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
@ -65,7 +65,7 @@
android:background="@xml/ax_ripple_default_round_bottom_secondary" android:background="@xml/ax_ripple_default_round_bottom_secondary"
android:text="@string/ALERT_DISMISS" android:text="@string/ALERT_DISMISS"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pNext" app:layout_constraintEnd_toStartOf="@+id/pNext"

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

@ -48,14 +48,14 @@
android:background="@xml/ax_ripple_default_round_bottom" android:background="@xml/ax_ripple_default_round_bottom"
android:text="@string/ALERT_MAIL" android:text="@string/ALERT_MAIL"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pDescription" /> app:layout_constraintTop_toBottomOf="@+id/pDescription" />
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
@ -65,7 +65,7 @@
android:background="@xml/ax_ripple_default_round_bottom_secondary" android:background="@xml/ax_ripple_default_round_bottom_secondary"
android:text="@string/ALERT_DISMISS" android:text="@string/ALERT_DISMISS"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pNext" app:layout_constraintEnd_toStartOf="@+id/pNext"

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

@ -56,7 +56,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:foregroundTint="@color/white" android:foregroundTint="@color/c_white"
android:progressBackgroundTint="@color/c_rateus_warning" android:progressBackgroundTint="@color/c_rateus_warning"
android:rating="0.5" android:rating="0.5"
android:scaleX="0.65" android:scaleX="0.65"
@ -79,7 +79,7 @@
android:background="@xml/ax_ripple_default_round_bottom" android:background="@xml/ax_ripple_default_round_bottom"
android:text="@string/ALERT_RATE" android:text="@string/ALERT_RATE"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -88,7 +88,7 @@
app:layout_constraintTop_toBottomOf="@+id/pRating" /> app:layout_constraintTop_toBottomOf="@+id/pRating" />
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
@ -97,7 +97,7 @@
android:background="@xml/ax_ripple_default_round_bottom_secondary" android:background="@xml/ax_ripple_default_round_bottom_secondary"
android:text="@string/ALERT_DISMISS" android:text="@string/ALERT_DISMISS"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintEnd_toStartOf="@+id/pNext" app:layout_constraintEnd_toStartOf="@+id/pNext"
app:layout_constraintHorizontal_bias="0.83" app:layout_constraintHorizontal_bias="0.83"

21
app/src/main/res/layouts/alert/layout/popup_remove_bookmark.xml → app/src/main/res/layouts/alert/layout/popup_toast_generic.xml
View File

@ -10,12 +10,15 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/pMainLayout" android:id="@+id/pMainLayout"
android:layout_width="match_parent" android:layout_width="0dp"
app:layout_constraintHorizontal_weight="1"
android:maxWidth="400dp"
android:layout_height="55dp" android:layout_height="55dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="9dp"
android:background="@xml/ax_background_inverted" android:background="@xml/ax_toast_alert_background"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<TextView <TextView
@ -28,7 +31,7 @@
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="@string/HOME_MENU__BOOKMARK_REMOVED" android:text="@string/HOME_MENU__BOOKMARK_REMOVED"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted" android:textColor="@color/c_alert_toast_info_text"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -37,18 +40,18 @@
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:padding="0dp" android:padding="0dp"
android:text="@string/ALERT_DISMISS" android:text="@string/ALERT_DISMISS"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/c_button_text_v1_inverted" android:textColor="@color/c_alert_toast_button_text"
android:textSize="15sp" android:textSize="15sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -60,9 +63,9 @@
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@color/c_navigation_medium" android:background="@color/c_alert_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pDismiss" app:layout_constraintEnd_toStartOf="@+id/pTrigger"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

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

@ -28,7 +28,7 @@
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="@string/ALERT_UNDO_TAB_REMOVE_INFO" android:text="@string/ALERT_UNDO_TAB_REMOVE_INFO"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted" android:textColor="@color/c_alert_toast_info_text"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -44,7 +44,7 @@
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/ax_ripple_default_round" android:background="@xml/ax_toast_alert_button"
android:onClick="onRestoreTab" android:onClick="onRestoreTab"
android:padding="0dp" android:padding="0dp"
android:text="@string/ALERT_UNDO_TAB_REMOVE_BUTTON" android:text="@string/ALERT_UNDO_TAB_REMOVE_BUTTON"

72
app/src/main/res/layouts/alert/layout/popup_update_bookmark.xml
View File

@ -1,72 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/pToastLayoutRoot"
android:translationZ="5dp"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/pMainLayout"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_marginBottom="10dp"
android:background="@xml/ax_background_inverted"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<TextView
android:id="@+id/pDescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:alpha="0.8"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:text="@string/HOME_MENU__BOOKMARK_UPDATE"
android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/pMainLayout"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="SmallSp" />
<Button
android:id="@+id/pDismiss"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:background="@xml/ax_ripple_default_round"
android:padding="0dp"
android:text="@string/ALERT_DISMISS"
android:textAllCaps="false"
android:textColor="@color/c_button_text_v1_inverted"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/view6"
android:layout_width="1dp"
android:layout_height="30dp"
android:layout_marginEnd="10dp"
android:background="@color/c_navigation_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pDismiss"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -132,7 +132,7 @@
android:background="@xml/ax_ripple_default_round_bottom" android:background="@xml/ax_ripple_default_round_bottom"
android:text="@string/ALERT_SAVE_BRIDGE" android:text="@string/ALERT_SAVE_BRIDGE"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -149,7 +149,7 @@
android:background="@xml/ax_ripple_default_round_bottom_secondary" android:background="@xml/ax_ripple_default_round_bottom_secondary"
android:text="@string/ALERT_REQUEST_BRIDGE" android:text="@string/ALERT_REQUEST_BRIDGE"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pBridgeRequest" app:layout_constraintEnd_toStartOf="@+id/pBridgeRequest"

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

@ -36,7 +36,7 @@
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_browser" android:src="@xml/ic_baseline_browser"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/white" android:textColor="@color/c_white"
tools:ignore="RtlCompat" /> tools:ignore="RtlCompat" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
@ -229,7 +229,7 @@
app:layout_constraintTop_toBottomOf="@+id/pDivider"> app:layout_constraintTop_toBottomOf="@+id/pDivider">
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_weight="1" android:layout_weight="1"

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

@ -313,7 +313,7 @@
app:layout_constraintTop_toBottomOf="@+id/infoContainer"> app:layout_constraintTop_toBottomOf="@+id/infoContainer">
<Button <Button
android:id="@+id/pDismiss" android:id="@+id/pTrigger"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
@ -321,7 +321,7 @@
android:padding="0dp" android:padding="0dp"
android:text="@string/ALERT_DISMISS" android:text="@string/ALERT_DISMISS"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="@color/c_button_text_v2" android:textColor="@color/c_alert_toast_button_background"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" /> android:textStyle="bold" />

4
app/src/main/res/layouts/bookmark/layout/bookmark_row_view.xml
View File

@ -33,7 +33,7 @@
android:textSize="17sp" android:textSize="17sp"
android:text="A" android:text="A"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/white" android:textColor="@color/c_white"
android:background="@xml/hx_circle_favicon" android:background="@xml/hx_circle_favicon"
android:gravity="center_vertical" android:gravity="center_vertical"
tools:ignore="RtlCompat" /> tools:ignore="RtlCompat" />
@ -57,7 +57,7 @@
android:src="@xml/ic_baseline_browser" android:src="@xml/ic_baseline_browser"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/white" android:textColor="@color/c_white"
tools:ignore="RtlCompat" /> tools:ignore="RtlCompat" />
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<ImageView <ImageView

21
app/src/main/res/layouts/bookmark/layout/bookmark_setting_view.xml
View File

@ -37,10 +37,11 @@
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:onClick="onCloseTrigger" android:onClick="onCloseTrigger"
android:src="@xml/ic_arrow_back" android:src="@xml/ic_arrow_back"
app:tint="@color/c_navigation_tint" /> app:tint="@color/c_navigation_tint"
tools:ignore="UsingOnClickInXml" />
<TextView <TextView
android:id="@+id/pHeaderText" android:id="@+id/pHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="-3dp" android:layout_marginTop="-3dp"
@ -51,7 +52,8 @@
android:text="@string/BOOKMARK_SETTING_HEADER" android:text="@string/BOOKMARK_SETTING_HEADER"
android:textColor="@color/c_text_v1" android:textColor="@color/c_text_v1"
android:textSize="17sp" android:textSize="17sp"
android:textStyle="bold" /> android:textStyle="bold"
tools:ignore="UsingOnClickInXml" />
<View <View
android:id="@+id/pSpace" android:id="@+id/pSpace"
@ -68,9 +70,10 @@
android:background="@xml/bx_ripple_default_round" android:background="@xml/bx_ripple_default_round"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:onClick="onUITrigger" android:onClick="onUITrigger"
android:padding="8dp" android:padding="10dp"
android:src="@xml/ic_baseline_delete" android:src="@xml/ic_baseline_cross"
app:tint="@color/c_header_icon_tint" /> app:tint="@color/c_bookmark_settings_header_icon_tint"
tools:ignore="UsingOnClickInXml" />
<View <View
android:id="@+id/pDivier" android:id="@+id/pDivier"
@ -90,9 +93,10 @@
android:background="@xml/bx_ripple_default_round" android:background="@xml/bx_ripple_default_round"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:onClick="onUITrigger" android:onClick="onUITrigger"
android:padding="8dp" android:padding="10dp"
android:src="@xml/ic_baseline_done" android:src="@xml/ic_baseline_done"
app:tint="@color/c_header_icon_tint" /> app:tint="@color/c_bookmark_settings_header_icon_tint"
tools:ignore="UsingOnClickInXml" />
</LinearLayout> </LinearLayout>
@ -129,6 +133,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:alpha="1" android:alpha="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"

4
app/src/main/res/layouts/bridge/layout/bridge_settings_view.xml
View File

@ -158,7 +158,7 @@
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="-1dp" android:layout_marginTop="-1dp"
android:elevation="2dp" android:elevation="2dp"
android:background="@color/white"/> android:background="@color/c_white"/>
<LinearLayout <LinearLayout
android:id="@+id/pOption1" android:id="@+id/pOption1"
@ -378,7 +378,7 @@
android:textSize="13sp" android:textSize="13sp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="4" android:layout_weight="4"
android:textColor="@color/white" android:textColor="@color/c_white"
android:onClick="requestBridges" android:onClick="requestBridges"
android:layout_height="45dp" android:layout_height="45dp"
android:background="@xml/hox_rounded_corner_bridge_settings" android:background="@xml/hox_rounded_corner_bridge_settings"

8
app/src/main/res/layouts/help/layout/help_view.xml
View File

@ -46,7 +46,7 @@
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:tint="@color/c_navigation_medium" /> app:tint="@color/c_alert_divider" />
<TextView <TextView
android:id="@+id/pErrorInfo" android:id="@+id/pErrorInfo"
@ -75,7 +75,7 @@
android:background="@xml/hox_rounded_corner_suggestion_settings" android:background="@xml/hox_rounded_corner_suggestion_settings"
android:onClick="onReloadData" android:onClick="onReloadData"
android:text="@string/HELP_RETRY" android:text="@string/HELP_RETRY"
android:textColor="@color/white" android:textColor="@color/c_white"
app:layout_constraintStart_toStartOf="@+id/pErrorInfo" app:layout_constraintStart_toStartOf="@+id/pErrorInfo"
app:layout_constraintTop_toBottomOf="@+id/pErrorInfo" /> app:layout_constraintTop_toBottomOf="@+id/pErrorInfo" />
@ -91,8 +91,8 @@
android:onClick="onOpenHelpExternal" android:onClick="onOpenHelpExternal"
android:src="@xml/ic_baseline_browser" android:src="@xml/ic_baseline_browser"
android:text="@string/HELP_RETRY" android:text="@string/HELP_RETRY"
android:textColor="@color/white" android:textColor="@color/c_white"
android:tint="@color/white" android:tint="@color/c_white"
app:layout_constraintStart_toEndOf="@+id/pReloadButton" app:layout_constraintStart_toEndOf="@+id/pReloadButton"
app:layout_constraintTop_toTopOf="@+id/pReloadButton" /> app:layout_constraintTop_toTopOf="@+id/pReloadButton" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layouts/home/layout/home_view.xml
View File

@ -749,7 +749,7 @@
android:paddingBottom="15dp" android:paddingBottom="15dp"
android:text="@string/HOME_LOADING" android:text="@string/HOME_LOADING"
android:textAlignment="textStart" android:textAlignment="textStart"
android:textColor="@color/white" android:textColor="@color/c_white"
android:textFontWeight="5" android:textFontWeight="5"
android:textSize="14sp" android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@+id/pSettings" app:layout_constraintBottom_toTopOf="@+id/pSettings"

4
app/src/main/res/layouts/home/layout/notification_menu.xml
View File

@ -23,7 +23,7 @@
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_weight="1" android:layout_weight="1"
android:gravity="start" android:gravity="start"
android:background="@color/white" android:background="@color/c_white"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -57,7 +57,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:gravity="end" android:gravity="end"
android:background="@color/white" android:background="@color/c_white"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

24
app/src/main/res/layouts/home/layout/popup_side_menu.xml
View File

@ -139,7 +139,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_new_tab" android:src="@xml/ic_baseline_new_tab"
app:tint="@color/c_navigation_medium" /> app:tint="@color/c_alert_divider" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -183,7 +183,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_history" android:src="@xml/ic_baseline_history"
app:tint="@color/c_navigation_medium" /> app:tint="@color/c_alert_divider" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -218,7 +218,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_arrow_down" android:src="@xml/ic_arrow_down"
app:tint="@color/c_navigation_medium" /> app:tint="@color/c_alert_divider" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -253,7 +253,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_bookmark_menu" android:src="@xml/ic_baseline_bookmark_menu"
app:tint="@color/c_navigation_medium" /> app:tint="@color/c_alert_divider" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -288,7 +288,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_star_fill" android:src="@xml/ic_baseline_star_fill"
app:tint="@color/c_navigation_medium" /> app:tint="@color/c_alert_divider" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -333,7 +333,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_vpn" android:src="@xml/ic_baseline_vpn"
app:tint="@color/c_navigation_medium" /> app:tint="@color/c_alert_divider" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -368,7 +368,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_perm_identity" android:src="@xml/ic_baseline_perm_identity"
app:tint="@color/c_navigation_medium" /> app:tint="@color/c_alert_divider" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -403,7 +403,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_language" android:src="@xml/ic_baseline_language"
app:tint="@color/c_navigation_medium" /> app:tint="@color/c_alert_divider" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -438,7 +438,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_find" android:src="@xml/ic_baseline_find"
app:tint="@color/c_navigation_medium" /> app:tint="@color/c_alert_divider" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -473,7 +473,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_desktop" android:src="@xml/ic_baseline_desktop"
app:tint="@color/c_navigation_medium" /> app:tint="@color/c_alert_divider" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -534,7 +534,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_setting" android:src="@xml/ic_baseline_setting"
app:tint="@color/c_navigation_medium" /> app:tint="@color/c_alert_divider" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@ -569,7 +569,7 @@
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:src="@xml/ic_baseline_quit" android:src="@xml/ic_baseline_quit"
app:tint="@color/c_navigation_medium" /> app:tint="@color/c_alert_divider" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"

15
app/src/main/res/layouts/landing/layout/landing_view.xml
View File

@ -4,27 +4,27 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:background="@color/landing_ease_blue" android:background="@color/c_landing_page_background"
> >
<TextView <TextView
android:translationY="-50dp" android:translationY="-50dp"
android:id="@+id/custom_slide_big_text" android:id="@+id/pHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="" android:text=""
android:textColor="@color/white" android:textColor="@color/c_white"
android:gravity="center" android:gravity="center"
android:layout_margin="12dp" android:layout_margin="12dp"
android:textStyle="bold" android:textStyle="bold"
android:textSize="28sp"/> android:textSize="28sp"/>
<TextView <TextView
android:translationY="-50dp" android:translationY="-50dp"
android:id="@+id/custom_slide_big_text_sub" android:id="@+id/pSubHeader"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="" android:text=""
android:textColor="@color/white" android:textColor="@color/c_white"
android:gravity="center" android:gravity="center"
android:layout_margin="12dp" android:layout_margin="12dp"
android:textStyle="bold" android:textStyle="bold"
@ -34,11 +34,12 @@
<Button <Button
android:translationY="-50dp" android:translationY="-50dp"
android:id="@+id/custom_slide_button" android:id="@+id/pNextButton"
android:layout_width="120dp" android:layout_width="120dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:padding="10dp"
android:background="@xml/lx_round_drawable" android:background="@xml/lx_round_drawable"
android:textColor="@color/white" android:textColor="@color/c_white"
android:visibility="gone"/> android:visibility="gone"/>
</LinearLayout> </LinearLayout>

2
app/src/main/res/layouts/language/layout/lang_row_view.xml
View File

@ -68,7 +68,7 @@
android:scaleX="0.5" android:scaleX="0.5"
android:scaleY="0.5" android:scaleY="0.5"
app:srcCompat="@xml/ic_baseline_done" app:srcCompat="@xml/ic_baseline_done"
app:tint="@color/white" /> app:tint="@color/c_white" />
</LinearLayout> </LinearLayout>

2
app/src/main/res/layouts/orbotLog/layout/orbot_log_view.xml
View File

@ -160,7 +160,7 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:onClick="onScrollBottomAnimated" android:onClick="onScrollBottomAnimated"
android:clickable="true" android:clickable="true"
android:tint="@color/white" android:tint="@color/c_white"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@xml/ic_baseline_keyboard_arrow_down" app:srcCompat="@xml/ic_baseline_keyboard_arrow_down"

2
app/src/main/res/layouts/searchWidget/layout/widget_search_controller.xml
View File

@ -67,7 +67,7 @@
android:layout_marginStart="-48dp" android:layout_marginStart="-48dp"
android:layout_marginTop="-1dp" android:layout_marginTop="-1dp"
android:layout_marginEnd="-5dp" android:layout_marginEnd="-5dp"
android:background="@color/white" android:background="@color/c_white"
android:clickable="false" android:clickable="false"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:focusable="false" android:focusable="false"

4
app/src/main/res/layouts/setting/layout/setting_advance_view.xml
View File

@ -284,7 +284,7 @@
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="-1dp" android:layout_marginTop="-1dp"
android:elevation="2dp" android:elevation="2dp"
android:background="@color/white"/> android:background="@color/c_white"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -448,7 +448,7 @@
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="-1dp" android:layout_marginTop="-1dp"
android:elevation="2dp" android:elevation="2dp"
android:background="@color/white"/> android:background="@color/c_white"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layouts/setting/layout/setting_clear_view.xml
View File

@ -626,7 +626,7 @@
android:paddingBottom="0dp" android:paddingBottom="0dp"
android:elevation="7dp" android:elevation="7dp"
android:background="@xml/hox_rounded_corner_suggestion_settings" android:background="@xml/hox_rounded_corner_suggestion_settings"
android:textColor="@color/white" android:textColor="@color/c_white"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:textAllCaps="false" android:textAllCaps="false"
android:text="@string/SETTING_CLEAR_BUTTON" android:text="@string/SETTING_CLEAR_BUTTON"

2
app/src/main/res/layouts/setting/layout/setting_general_view.xml
View File

@ -256,7 +256,7 @@
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="-1dp" android:layout_marginTop="-1dp"
android:elevation="2dp" android:elevation="2dp"
android:background="@color/white"/> android:background="@color/c_white"/>
<LinearLayout <LinearLayout
android:id="@+id/pOption1" android:id="@+id/pOption1"

2
app/src/main/res/layouts/setting/layout/setting_privacy_view.xml
View File

@ -502,7 +502,7 @@
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="-1dp" android:layout_marginTop="-1dp"
android:elevation="2dp" android:elevation="2dp"
android:background="@color/white"/> android:background="@color/c_white"/>
<LinearLayout <LinearLayout
android:id="@+id/pCookieOption1" android:id="@+id/pCookieOption1"

Some files were not shown because too many files have changed in this diff Show More