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-04-27 02:25:23 +05:00
parent dce1daf69b
commit 10a9426b67
1000 changed files with 443 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/gradle.xml
View File

@ -22,7 +22,7 @@
<option value="$PROJECT_DIR$/chromiumTabs" /> <option value="$PROJECT_DIR$/chromiumTabs" />
<option value="$PROJECT_DIR$/httpclient" /> <option value="$PROJECT_DIR$/httpclient" />
<option value="$PROJECT_DIR$/intentintegrator" /> <option value="$PROJECT_DIR$/intentintegrator" />
<option value="$PROJECT_DIR$/orbotservice" /> <option value="$PROJECT_DIR$/orbotservicemanager" />
<option value="$PROJECT_DIR$/shutterbug" /> <option value="$PROJECT_DIR$/shutterbug" />
</set> </set>
</option> </option>

2
app/build.gradle
View File

@ -132,7 +132,7 @@ dependencies {
/* Orbot Service */ /* Orbot Service */
implementation project(path: ':orbotservice') implementation project(path: ':orbotservicemanager')
/* Helper Libraries */ /* Helper Libraries */

72
app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/NestedGeckoView.java
View File

@ -4,11 +4,12 @@ import android.content.Context;
import androidx.core.view.NestedScrollingChildHelper; import androidx.core.view.NestedScrollingChildHelper;
import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.MotionEvent; import android.view.MotionEvent;
import com.darkweb.genesissearchengine.constants.status; import com.darkweb.genesissearchengine.constants.status;
import com.darkweb.genesissearchengine.helperManager.eventObserver; import com.darkweb.genesissearchengine.helperManager.eventObserver;
import org.mozilla.geckoview.GeckoView; import org.mozilla.geckoview.GeckoView;
import org.mozilla.geckoview.PanZoomController;
import java.util.Collections; import java.util.Collections;
import static com.darkweb.genesissearchengine.constants.enums.etype.GECKO_SCROLL_CHANGED; import static com.darkweb.genesissearchengine.constants.enums.etype.GECKO_SCROLL_CHANGED;
@ -19,7 +20,7 @@ public class NestedGeckoView extends GeckoView {
private int mNestedOffsetY; private int mNestedOffsetY;
private NestedScrollingChildHelper mChildHelper; private NestedScrollingChildHelper mChildHelper;
private eventObserver.eventListener mEvent; private eventObserver.eventListener mEvent;
private int mInputResult = PanZoomController.INPUT_RESULT_UNHANDLED;
public void onSetHomeEvent(eventObserver.eventListener pEvent){ public void onSetHomeEvent(eventObserver.eventListener pEvent){
mEvent = pEvent; mEvent = pEvent;
@ -30,79 +31,85 @@ public class NestedGeckoView extends GeckoView {
mChildHelper = null; mChildHelper = null;
} }
public NestedGeckoView(Context context, AttributeSet attrs) { public NestedGeckoView(final Context context) {
super(context.getApplicationContext(), attrs); this(context, null);
}
public NestedGeckoView(final Context context, final AttributeSet attrs) {
super(context, attrs);
mChildHelper = new NestedScrollingChildHelper(this); mChildHelper = new NestedScrollingChildHelper(this);
setNestedScrollingEnabled(true); setNestedScrollingEnabled(true);
} }
@Override @Override
public boolean onTouchEvent(MotionEvent ev) { public boolean onTouchEvent(MotionEvent ev) {
final MotionEvent event = MotionEvent.obtain(ev); boolean eventHandled = false;
final int action = ev.getActionMasked();
final MotionEvent event = MotionEvent.obtain(ev);
final int action = event.getActionMasked();
if (action == MotionEvent.ACTION_DOWN) { if (action == MotionEvent.ACTION_DOWN) {
mNestedOffsetY = 0; mNestedOffsetY = 0;
} }
final int eventY = (int) event.getY(); final int eventY = (int) event.getY();
event.offsetLocation(0, mNestedOffsetY); event.offsetLocation(0, mNestedOffsetY);
switch (action) { switch (action) {
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
// mEvent.invokeObserver(Collections.singletonList(null), GECKO_SCROLL_FINISHED);
final boolean allowScroll = status.sFullScreenBrowsing; final boolean allowScroll = status.sFullScreenBrowsing;
int deltaY = mLastY - eventY; int deltaY = mLastY - eventY;
if (allowScroll && dispatchNestedPreScroll(0, deltaY, mScrollConsumed, mScrollOffset)) { if (allowScroll && dispatchNestedPreScroll(0, deltaY, mScrollConsumed, mScrollOffset)) {
deltaY -= mScrollConsumed[1]; deltaY -= mScrollConsumed[1];
mLastY = eventY - mScrollOffset[1];
event.offsetLocation(0, -mScrollOffset[1]); event.offsetLocation(0, -mScrollOffset[1]);
mNestedOffsetY += mScrollOffset[1]; mNestedOffsetY += mScrollOffset[1];
} }
eventHandled = super.onTouchEvent(event);
mLastY = eventY - mScrollOffset[1]; mEvent.invokeObserver(Collections.singletonList(deltaY), GECKO_SCROLL_CHANGED);
if (allowScroll && dispatchNestedScroll(0, mScrollOffset[1], 0, deltaY, mScrollOffset)) { if (allowScroll && dispatchNestedScroll(0, mScrollOffset[1], 0, deltaY, mScrollOffset)) {
mLastY -= mScrollOffset[1];
event.offsetLocation(0, mScrollOffset[1]); event.offsetLocation(0, mScrollOffset[1]);
mNestedOffsetY += mScrollOffset[1]; mNestedOffsetY += mScrollOffset[1];
mLastY -= mScrollOffset[1];
} }
if(status.sFullScreenBrowsing){
Log.i("wow1", eventY + "");
mEvent.invokeObserver(Collections.singletonList(deltaY), GECKO_SCROLL_CHANGED);
}
break; break;
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
eventHandled = super.onTouchEvent(event);
mLastY = eventY; mLastY = eventY;
startNestedScroll(ViewCompat.SCROLL_AXIS_VERTICAL); startNestedScroll(ViewCompat.SCROLL_AXIS_VERTICAL);
// mEvent.invokeObserver(Collections.singletonList(null), GECKO_SCROLL_FINISHED);
break; break;
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
// mEvent.invokeObserver(Collections.singletonList(null), GECKO_SCROLL_FINISHED);
case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_CANCEL:
// mEvent.invokeObserver(Collections.singletonList(null), GECKO_SCROLL_FINISHED); eventHandled = super.onTouchEvent(event);
stopNestedScroll(); stopNestedScroll();
break; break;
default: default:
// mEvent.invokeObserver(Collections.singletonList(null), GECKO_SCROLL_FINISHED); // We don't care about other touch events
} }
// Execute event handler from parent class in all cases
boolean eventHandled = super.onTouchEvent(event);
// Recycle previously obtained event
event.recycle();
return eventHandled; return eventHandled;
} }
private boolean callSuperOnTouchEvent(MotionEvent event) {
return super.onTouchEvent(event);
}
private void updateInputResult(MotionEvent event) {
super.onTouchEventForResult(event).accept(inputResult -> {
mInputResult = inputResult;
startNestedScroll(ViewCompat.SCROLL_AXIS_VERTICAL);
});
}
public int getInputResult() {
return mInputResult;
}
@Override @Override
public void setNestedScrollingEnabled(boolean enabled) { public void setNestedScrollingEnabled(boolean enabled) {
mChildHelper.setNestedScrollingEnabled(enabled); mChildHelper.setNestedScrollingEnabled(enabled);
@ -129,7 +136,11 @@ public class NestedGeckoView extends GeckoView {
} }
@Override @Override
public boolean dispatchNestedScroll(int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed, int[] offsetInWindow) { public boolean dispatchNestedScroll(int dxConsumed,
int dyConsumed,
int dxUnconsumed,
int dyUnconsumed,
int[] offsetInWindow) {
return mChildHelper.dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, offsetInWindow); return mChildHelper.dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, offsetInWindow);
} }
@ -142,4 +153,9 @@ public class NestedGeckoView extends GeckoView {
public boolean dispatchNestedFling(float velocityX, float velocityY, boolean consumed) { public boolean dispatchNestedFling(float velocityX, float velocityY, boolean consumed) {
return mChildHelper.dispatchNestedFling(velocityX, velocityY, consumed); return mChildHelper.dispatchNestedFling(velocityX, velocityY, consumed);
} }
@Override
public boolean dispatchNestedPreFling(float velocityX, float velocityY) {
return mChildHelper.dispatchNestedPreFling(velocityX, velocityY);
}
} }

4
app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoClients.java
View File

@ -281,12 +281,12 @@ public class geckoClients
mRuntime.getStorageController().clearData(COOKIES); mRuntime.getStorageController().clearData(COOKIES);
} }
public void onBackPressed(boolean isFinishAllowed){ public void onBackPressed(boolean isFinishAllowed, int mTabSize){
if(mSession.canGoBack()){ if(mSession.canGoBack()){
mSession.goBackSession(); mSession.goBackSession();
} }
else if(isFinishAllowed){ else if(isFinishAllowed){
if(mSession.getRemovableFromBackPressed()){ if(mSession.getRemovableFromBackPressed() && mTabSize>1){
event.invokeObserver(null, enums.etype.M_CLOSE_TAB); event.invokeObserver(null, enums.etype.M_CLOSE_TAB);
}else { }else {
event.invokeObserver(null, enums.etype.back_list_empty); event.invokeObserver(null, enums.etype.back_list_empty);

5
app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/geckoManager/geckoSession.java
View File

@ -114,6 +114,7 @@ public class geckoSession extends GeckoSession implements GeckoSession.MediaDele
private boolean mIsProgressBarChanging = false; private boolean mIsProgressBarChanging = false;
private Handler mFindHandler; private Handler mFindHandler;
private boolean mClosed = false; private boolean mClosed = false;
private SessionState mSessionState;
geckoSession(eventObserver.eventListener event,String mSessionID,AppCompatActivity mContext, GeckoView pGeckoView){ geckoSession(eventObserver.eventListener event,String mSessionID,AppCompatActivity mContext, GeckoView pGeckoView){
@ -369,6 +370,10 @@ public class geckoSession extends GeckoSession implements GeckoSession.MediaDele
mHistoryList = var2; mHistoryList = var2;
} }
@UiThread
public void onSessionStateChange(@NonNull GeckoSession session, @NonNull SessionState sessionState) {
mSessionState = sessionState;
}
/*Navigation Delegate*/ /*Navigation Delegate*/
public void onLocationChange(@NonNull GeckoSession var1, @Nullable String var2) { public void onLocationChange(@NonNull GeckoSession var1, @Nullable String var2) {

161
app/src/main/java/com/darkweb/genesissearchengine/appManager/homeManager/hintManager/hintAdapter.java
View File

@ -1,6 +1,7 @@
package com.darkweb.genesissearchengine.appManager.homeManager.hintManager; package com.darkweb.genesissearchengine.appManager.homeManager.hintManager;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.res.ColorStateList;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
@ -46,9 +47,6 @@ public class hintAdapter extends RecyclerView.Adapter<hintAdapter.listViewHolder
private ArrayList<historyRowModel> mHintList; private ArrayList<historyRowModel> mHintList;
private AppCompatActivity mContext; private AppCompatActivity mContext;
private eventObserver.eventListener mEvent; private eventObserver.eventListener mEvent;
private Map<String, Drawable> mWebIcon = new HashMap<>();
private ArrayList<String> mKeys = new ArrayList<>();
private Map<Integer,Handler> mHandlers = new HashMap<>();
private Map<Integer, Drawable> mPastWebIcon = new HashMap<>(); private Map<Integer, Drawable> mPastWebIcon = new HashMap<>();
private Map<Integer, String> mPastIconFlicker = new HashMap<>(); private Map<Integer, String> mPastIconFlicker = new HashMap<>();
@ -70,9 +68,10 @@ public class hintAdapter extends RecyclerView.Adapter<hintAdapter.listViewHolder
} }
public void onClearAdapter(){ public void onClearAdapter(){
// mHandlers.clear(); //mPastWebIcon.clear();
// mPastIconFlicker.clear(); mPastWebIcon.remove(0);
// mWebIcon.clear(); mPastWebIcon.remove(1);
mPastWebIcon.remove(2);
} }
/*Initializations*/ /*Initializations*/
@ -123,6 +122,26 @@ public class hintAdapter extends RecyclerView.Adapter<hintAdapter.listViewHolder
mHintWebIcon = itemView.findViewById(R.id.pHintWebIcon); mHintWebIcon = itemView.findViewById(R.id.pHintWebIcon);
mHindTypeIconTemp = new ImageView(mContext); mHindTypeIconTemp = new ImageView(mContext);
mHintWebIcon.setImageTintList(ColorStateList.valueOf(mContext.getResources().getColor(R.color.c_text_v6)));
if(mPastWebIcon.containsKey(getLayoutPosition())){
mHintWebIcon.setImageDrawable(mPastWebIcon.get(getLayoutPosition()));
mHintWebIcon.setImageTintList(null);
}else {
mHintWebIcon.setImageTintList(ColorStateList.valueOf(mContext.getResources().getColor(R.color.c_text_v8)));
Drawable mDrawable;
Resources res = itemView.getContext().getResources();
try {
mDrawable = Drawable.createFromXml(res, res.getXml(R.xml.ic_baseline_browser));
mMoveURL.setVisibility(View.VISIBLE);
mMoveURL.setOnTouchListener(listViewHolder.this);
mHintWebIcon.setImageDrawable(mDrawable);
} catch (Exception ignored) {
}
}
String mURLLink; String mURLLink;
if(model.getDescription().equals(strings.GENERIC_EMPTY_STR)){ if(model.getDescription().equals(strings.GENERIC_EMPTY_STR)){
mURLLink = model.getHeader(); mURLLink = model.getHeader();
@ -169,118 +188,42 @@ public class hintAdapter extends RecyclerView.Adapter<hintAdapter.listViewHolder
mpHintListener.setOnTouchListener(listViewHolder.this); mpHintListener.setOnTouchListener(listViewHolder.this);
String mURLPast = mURLLink; if(mURLLink.contains("boogle.store") || mURLLink.contains("genesis.onion")){
mPastIconFlicker.put(getLayoutPosition(),mURLPast);
if(mWebIcon.containsKey(mURLLink)){
mHintWebIcon.setColorFilter(null);
mHintWebIcon.clearColorFilter();
mHintWebIcon.setImageTintList(null); mHintWebIcon.setImageTintList(null);
mHintWebIcon.setClipToOutline(true); mHintWebIcon.setImageDrawable(itemView.getResources().getDrawable(R.drawable.genesis));
mHintWebIcon.setImageDrawable(mPastWebIcon.get(getLayoutPosition())); mPastWebIcon.put(getLayoutPosition(),mHintWebIcon.getDrawable());
}else
{
new Thread(){
}else if(mHandlers.containsKey(getLayoutPosition())){ public void run(){
if(mPastWebIcon.containsKey(getLayoutPosition())){ try {
mHintWebIcon.setColorFilter(null); String mURLPast = mURLLink;
mHintWebIcon.clearColorFilter(); mPastIconFlicker.put(getLayoutPosition(),mURLPast);
mHintWebIcon.setImageTintList(null);
mHintWebIcon.setClipToOutline(true);
mHintWebIcon.setImageDrawable(mPastWebIcon.get(getLayoutPosition()));
Log.i("FUSSSS1111","FUSSSS3333");
}else { mHindTypeIconTemp.setImageDrawable(null);
Resources res1 = itemView.getContext().getResources(); mEvent.invokeObserver(Arrays.asList(mHindTypeIconTemp, "https://" + helperMethod.getDomainName(model.getDescription())), enums.etype.fetch_favicon);
try { sleep(200);
mHintWebIcon.setImageDrawable(Drawable.createFromXml(res1, res1.getXml(R.xml.ic_baseline_browser)));
mPastWebIcon.put(getLayoutPosition(),mHintWebIcon.getDrawable());
} catch (Exception ignored) {
}
}
}
if(!mWebIcon.containsKey(mURLLink)){ mContext.runOnUiThread(() -> new Handler().postDelayed(() ->
if(mURLLink.contains("boogle.store") || mURLLink.contains("genesis.onion")){ {
mHintWebIcon.setColorFilter(null); if(mHindTypeIconTemp.getDrawable() != null){
mHintWebIcon.clearColorFilter(); if(mURLPast.equals(mPastIconFlicker.get(getLayoutPosition()))){
mHintWebIcon.setImageTintList(null); mHintWebIcon.setImageTintList(null);
mHintWebIcon.setClipToOutline(true); mHintWebIcon.setImageDrawable(mHindTypeIconTemp.getDrawable());
mHintWebIcon.setImageDrawable(itemView.getResources().getDrawable(R.drawable.genesis)); mPastWebIcon.put(getLayoutPosition(),mHintWebIcon.getDrawable());
mPastWebIcon.put(getLayoutPosition(),mHintWebIcon.getDrawable());
}else
{
new Thread(){
public void run(){
try {
mHindTypeIconTemp.setImageDrawable(null);
mEvent.invokeObserver(Arrays.asList(mHindTypeIconTemp, "http://" + helperMethod.getDomainName(model.getDescription())), enums.etype.fetch_favicon);
while (true){
int mCounter=0;
if(mHindTypeIconTemp.isAttachedToWindow() || mHindTypeIconTemp.getDrawable()==null){
sleep(50);
mCounter+=1;
}else {
break;
} }
if(mCounter>6){ if(getLayoutPosition() == 1){
break; Log.i("FUSSSS1111","FUSSSS4444");
} }
} }
}, 200));
mContext.runOnUiThread(() -> { } catch (InterruptedException e) {
mWebIcon.put(mURLLink,mHindTypeIconTemp.getDrawable()); e.printStackTrace();
mKeys.add(mURLLink);
if(mKeys.size()>5){
mWebIcon.remove(mKeys.get(0));
mKeys.remove(0);
}
if(mHindTypeIconTemp.getDrawable() != null){
if(mHandlers.containsKey(getLayoutPosition())){
mHandlers.get(getLayoutPosition()).removeCallbacksAndMessages(null);
if(getLayoutPosition()==1){
Log.i("SUPERFUCK1","SUPERFUCK1");
}
}else {
mHandlers.put(getLayoutPosition(), new Handler());
}
if(mURLPast.equals(mPastIconFlicker.get(getLayoutPosition()))){
Runnable mRunnable = () -> {
mHintWebIcon.setColorFilter(null);
mHintWebIcon.clearColorFilter();
mHintWebIcon.setImageTintList(null);
mHintWebIcon.setClipToOutline(true);
mHintWebIcon.setImageDrawable(mHindTypeIconTemp.getDrawable());
mPastWebIcon.put(getLayoutPosition(),mHindTypeIconTemp.getDrawable());
if(getLayoutPosition() == 1){
Log.i("FUSSSS1111","FUSSSS1111");
}
};
mHandlers.get(getLayoutPosition()).postDelayed(mRunnable, 200);
}
}else {
if(mURLPast.equals(mPastIconFlicker.get(getLayoutPosition()))){
Resources res = itemView.getContext().getResources();
try {
Log.i("FUSSSS1111","FUSSSS2222");
mHintWebIcon.setImageDrawable(Drawable.createFromXml(res, res.getXml(R.xml.ic_baseline_browser)));
} catch (Exception ignored) {
}
}
}
});
} catch (InterruptedException e) {
e.printStackTrace();
}
} }
}.start(); }
} }.start();
} }
} }

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

@ -814,10 +814,12 @@ public class homeController extends AppCompatActivity implements ComponentCallba
int[] location = new int[2]; int[] location = new int[2];
mTopLayout.getLocationOnScreen(location); mTopLayout.getLocationOnScreen(location);
int y = location[1]; int y = location[1];
if(y<=-12){ if(status.sFullScreenBrowsing){
mAppBar.setExpanded(false,true); if(y<=-helperMethod.pxFromDp(6)){
}else { mAppBar.setExpanded(false,true);
mAppBar.setExpanded(true,true); }else {
mAppBar.setExpanded(true,true);
}
} }
} }
@ -869,7 +871,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
mEdittextChanged.removeCallbacks(postToServerRunnable); mEdittextChanged.removeCallbacks(postToServerRunnable);
mSuggestions = (ArrayList<historyRowModel>)dataController.getInstance().invokeSuggestions(dataEnums.eSuggestionCommands.M_GET_SUGGESTIONS, Collections.singletonList(mText)); mSuggestions = (ArrayList<historyRowModel>)dataController.getInstance().invokeSuggestions(dataEnums.eSuggestionCommands.M_GET_SUGGESTIONS, Collections.singletonList(mText));
mEdittextChanged.postDelayed(postToServerRunnable, 350); mEdittextChanged.postDelayed(postToServerRunnable, 150);
return; return;
} }
if(mSuggestions.size()>0){ if(mSuggestions.size()>0){
@ -882,7 +884,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
mSearchBarLoading = true; mSearchBarLoading = true;
mEdittextChanged.postDelayed(postToServerRunnable, 0); mEdittextChanged.postDelayed(postToServerRunnable, 0);
}else{ }else{
mEdittextChanged.postDelayed(postToServerRunnable, 350); mEdittextChanged.postDelayed(postToServerRunnable, 150);
} }
} }
} }
@ -975,7 +977,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
final Handler handler = new Handler(); final Handler handler = new Handler();
handler.postDelayed(() -> { handler.postDelayed(() -> {
mSearchBarLoading = false; mSearchBarLoading = false;
}, 350); }, 150);
}; };
public void onSearchBarInvoked(View view){ public void onSearchBarInvoked(View view){
@ -1086,7 +1088,12 @@ public class homeController extends AppCompatActivity implements ComponentCallba
} }
public void postNewLinkTabAnimationInBackgroundTrigger(String url){ public void postNewLinkTabAnimationInBackgroundTrigger(String url){
initTabCount(M_NEW_LINK_IN_NEW_TAB, Collections.singletonList(url)); String mExtention = helperMethod.getMimeType(url, this);
if(mExtention == null || mExtention.equals("text/html") || mExtention.equals("application/vnd.ms-htmlhelp") || mExtention.equals("application/vnd.sun.xml.writer") || mExtention.equals("application/vnd.sun.xml.writer.global") || mExtention.equals("application/vnd.sun.xml.writer.template") || mExtention.equals("application/xhtml+xml")){
initTabCount(M_NEW_LINK_IN_NEW_TAB, Collections.singletonList(url));
}else {
postNewLinkTabAnimation(url, true);
}
} }
public void postNewLinkTabAnimationInBackground(String url){ public void postNewLinkTabAnimationInBackground(String url){
@ -1185,6 +1192,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
if(!status.mThemeApplying){ if(!status.mThemeApplying){
runOnUiThread(() -> { runOnUiThread(() -> {
mHomeViewController.onShowTabContainer(); mHomeViewController.onShowTabContainer();
pluginController.getInstance().onMessageManagerInvoke(null, M_RESET);
activityContextManager.getInstance().getTabController().onInitInvoked(); activityContextManager.getInstance().getTabController().onInitInvoked();
}); });
} }
@ -1207,7 +1215,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
initLocalLanguage(); initLocalLanguage();
helperMethod.hideKeyboard(this); helperMethod.hideKeyboard(this);
mHomeViewController.onOpenMenu(view,mGeckoClient.canGoForward(),!(mProgressBar.getAlpha()<=0 || mProgressBar.getVisibility() ==View.INVISIBLE),mGeckoClient.getUserAgent()); mHomeViewController.onOpenMenu(view,mGeckoClient.canGoForward(),!(mProgressBar.getAlpha()<=0 || mProgressBar.getVisibility() ==View.INVISIBLE),mGeckoClient.getUserAgent(), mGeckoClient.getSession().getCurrentURL());
view.setClickable(false); view.setClickable(false);
new Handler().postDelayed(() -> new Handler().postDelayed(() ->
@ -1259,7 +1267,8 @@ public class homeController extends AppCompatActivity implements ComponentCallba
mHomeViewController.onClearSelections(true); mHomeViewController.onClearSelections(true);
} }
else if(!mSearchBarWasBackButtonPressed){ else if(!mSearchBarWasBackButtonPressed){
mGeckoClient.onBackPressed(true); int mTabSize = (int)dataController.getInstance().invokeTab(dataEnums.eTabCommands.GET_TOTAL_TAB, null);
mGeckoClient.onBackPressed(true, mTabSize);
} }
} }
@ -1325,6 +1334,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME); pluginController.getInstance().onLanguageInvoke(Collections.singletonList(this), pluginEnums.eLangManager.M_RESUME);
mHomeViewController.onClearSelections(true); mHomeViewController.onClearSelections(true);
mHomeViewController.onUpdateSearchBar(mGeckoClient.getSession().getCurrentURL(),false,true, true); mHomeViewController.onUpdateSearchBar(mGeckoClient.getSession().getCurrentURL(),false,true, true);
mHomeViewController.initTopBarPadding();
} }
@Override @Override
@ -1635,6 +1645,9 @@ public class homeController extends AppCompatActivity implements ComponentCallba
onNewTab(isKeyboardOpened, true); onNewTab(isKeyboardOpened, true);
} }
} }
else if (menuId == R.id.menuItem25) {
pluginController.getInstance().onMessageManagerInvoke(Arrays.asList(mGeckoClient.getSession().getCurrentURL(), this), M_DOWNLOAD_SINGLE);
}
else { else {
mSearchbar.clearFocus(); mSearchbar.clearFocus();
if (menuId == R.id.menu12) { if (menuId == R.id.menu12) {
@ -1646,6 +1659,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
helperMethod.hideKeyboard(this); helperMethod.hideKeyboard(this);
mGeckoClient.onRedrawPixel(homeController.this); mGeckoClient.onRedrawPixel(homeController.this);
mHomeViewController.onShowTabContainer(); mHomeViewController.onShowTabContainer();
pluginController.getInstance().onMessageManagerInvoke(null, M_RESET);
Log.i("I AM FUCKED,","I AM FUCKED : 1"); Log.i("I AM FUCKED,","I AM FUCKED : 1");
activityContextManager.getInstance().getTabController().onInit(); activityContextManager.getInstance().getTabController().onInit();
} }
@ -2061,7 +2075,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_UPDATE_PIXEL, Arrays.asList(mGeckoClient.getSession().getSessionID(), mRenderedBitmap, null, mGeckoView, true)); dataController.getInstance().invokeTab(dataEnums.eTabCommands.M_UPDATE_PIXEL, Arrays.asList(mGeckoClient.getSession().getSessionID(), mRenderedBitmap, null, mGeckoView, true));
} }
} }
}, 400); }, 100);
}; };
mScrollHandler.postDelayed(mScrollRunnable, 450); mScrollHandler.postDelayed(mScrollRunnable, 450);

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

@ -8,6 +8,7 @@ import android.animation.ValueAnimator;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
@ -220,6 +221,16 @@ class homeViewController
int paddingDp = 110; int paddingDp = 110;
if(isFullScreen){ if(isFullScreen){
paddingDp = 60; paddingDp = 60;
}else {
if(mContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE){
paddingDp = 0;
}else {
mGeckoView.setPadding(0,0,0,0);
View child = mAppBar.getChildAt(0);
AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) child.getLayoutParams();
params.setScrollFlags(0);
return;
}
} }
float density = mContext.getResources().getDisplayMetrics().density; float density = mContext.getResources().getDisplayMetrics().density;
int paddingPixel = (int)(paddingDp * density); int paddingPixel = (int)(paddingDp * density);
@ -282,7 +293,7 @@ class homeViewController
} }
public void onShowTabContainer(){ public void onShowTabContainer(){
onHideLoadTabDialog();
if(mTabFragment.getAlpha()==0 || mTabFragment.getAlpha()==1){ if(mTabFragment.getAlpha()==0 || mTabFragment.getAlpha()==1){
onUpdateStatusBarTheme(null, false); onUpdateStatusBarTheme(null, false);
@ -294,6 +305,7 @@ class homeViewController
} }
public void onHideTabContainer(){ public void onHideTabContainer(){
onHideLoadTabDialog();
if(mTabFragment.getAlpha()>0 || mTabFragment.getVisibility()!=View.GONE){ if(mTabFragment.getAlpha()>0 || mTabFragment.getVisibility()!=View.GONE){
Log.i("SUPERFUCK4","SUPERFUCK"); Log.i("SUPERFUCK4","SUPERFUCK");
mNewTab.setPressed(false); mNewTab.setPressed(false);
@ -683,7 +695,7 @@ class homeViewController
/*-------------------------------------------------------Helper Methods-------------------------------------------------------*/ /*-------------------------------------------------------Helper Methods-------------------------------------------------------*/
void onOpenMenu(View view, boolean canGoForward, boolean isLoading, int userAgent){ void onOpenMenu(View view, boolean canGoForward, boolean isLoading, int userAgent, String mURL){
if(popupWindow!=null){ if(popupWindow!=null){
popupWindow.dismiss(); popupWindow.dismiss();
@ -720,17 +732,28 @@ class homeViewController
ImageButton back = popupView.findViewById(R.id.menu22); ImageButton back = popupView.findViewById(R.id.menu22);
ImageButton close = popupView.findViewById(R.id.menu20); ImageButton close = popupView.findViewById(R.id.menu20);
ImageButton mRefresh = popupView.findViewById(R.id.menu21);
ImageButton mDownload = popupView.findViewById(R.id.menuItem25);
CheckBox desktop = popupView.findViewById(R.id.menu27); CheckBox desktop = popupView.findViewById(R.id.menu27);
LinearLayout newTab = popupView.findViewById(R.id.menu11); LinearLayout newTab = popupView.findViewById(R.id.menu11);
desktop.setChecked(userAgent==USER_AGENT_MODE_DESKTOP); desktop.setChecked(userAgent==USER_AGENT_MODE_DESKTOP);
String mExtention = helperMethod.getMimeType(mURL, mContext);
if(mExtention == null || mExtention.equals("text/html") || mExtention.equals("application/vnd.ms-htmlhelp") || mExtention.equals("application/vnd.sun.xml.writer") || mExtention.equals("application/vnd.sun.xml.writer.global") || mExtention.equals("application/vnd.sun.xml.writer.template") || mExtention.equals("application/xhtml+xml")){
mDownload.setEnabled(false);
mDownload.setColorFilter(Color.argb(255, 191, 191, 191));
}
if(!canGoForward){ if(!canGoForward){
back.setEnabled(false); back.setEnabled(false);
back.setColorFilter(Color.argb(255, 191, 191, 191)); back.setColorFilter(Color.argb(255, 191, 191, 191));
} }
if(!isLoading){ if(!isLoading){
close.setEnabled(false); close.setVisibility(View.GONE);
close.setColorFilter(Color.argb(255, 191, 191, 191)); mRefresh.setVisibility(View.VISIBLE);
}else {
close.setVisibility(View.VISIBLE);
mRefresh.setVisibility(View.GONE);
} }
newTab.setClickable(false); newTab.setClickable(false);

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

@ -5,7 +5,7 @@ public class enums
/*Settings Manager*/ /*Settings Manager*/
public enum etype{ public enum etype{
on_update_favicon,ON_UPDATE_TAB_TITLE, ON_OPEN_TAB_VIEW,ON_NEW_TAB_ANIMATION, ON_LOAD_REQUEST,GECKO_SCROLL_CHANGED,ON_UPDATE_SEARCH_BAR,M_ON_MAIL,SESSION_ID,M_UPDATE_PIXEL_BACKGROUND,M_CACHE_UPDATE_TAB, on_update_favicon,ON_UPDATE_TAB_TITLE, ON_OPEN_TAB_VIEW,ON_NEW_TAB_ANIMATION, ON_LOAD_REQUEST,GECKO_SCROLL_CHANGED,ON_UPDATE_SEARCH_BAR,M_ON_MAIL,SESSION_ID,M_UPDATE_PIXEL_BACKGROUND,M_CACHE_UPDATE_TAB,
on_verify_selected_url_menu,FINDER_RESULT_CALLBACK,M_ADMOB_BANNER_RECHECK,M_OPEN_SESSION, on_verify_selected_url_menu,FINDER_RESULT_CALLBACK,M_ADMOB_BANNER_RECHECK,M_OPEN_SESSION,M_DOWNLOAD_FAILURE,
welcome, reload,download_folder, M_UPDATE_THEME,M_ON_BANNER_UPDATE, M_LOAD_HOMEPAGE_GENESIS,M_INIT_TAB_COUNT_FORCED,M_SPLASH_DISABLE,M_NEW_LINK_IN_NEW_TAB,M_RESET_SUGGESTION, welcome, reload,download_folder, M_UPDATE_THEME,M_ON_BANNER_UPDATE, M_LOAD_HOMEPAGE_GENESIS,M_INIT_TAB_COUNT_FORCED,M_SPLASH_DISABLE,M_NEW_LINK_IN_NEW_TAB,M_RESET_SUGGESTION,
url_triggered, url_triggered_new_tab,url_clear,fetch_favicon,url_clear_at,remove_from_database,is_empty,M_HOME_PAGE,M_PRELOAD_URL,ON_KEYBOARD_CLOSE,M_CLOSE_TAB, url_triggered, url_triggered_new_tab,url_clear,fetch_favicon,url_clear_at,remove_from_database,is_empty,M_HOME_PAGE,M_PRELOAD_URL,ON_KEYBOARD_CLOSE,M_CLOSE_TAB,
on_close_sesson,on_long_press, on_full_screen,on_handle_external_intent,on_update_suggestion_url,progress_update,progress_update_forced, ON_EXPAND_TOP_BAR,recheck_orbot,on_url_load,on_playstore_load,back_list_empty,start_proxy, ON_UPDATE_THEME, M_INITIALIZE_TAB_SINGLE, M_INITIALIZE_TAB_LINK,on_request_completed, on_update_history,on_update_suggestion,M_WELCOME_MESSAGE,ON_FIRST_PAINT, ON_LOAD_TAB_ON_RESUME, ON_SESSION_REINIT,on_page_loaded,on_load_error,download_file_popup,on_init_ads,search_update, open_new_tab,open_new_tab_instant on_close_sesson,on_long_press, on_full_screen,on_handle_external_intent,on_update_suggestion_url,progress_update,progress_update_forced, ON_EXPAND_TOP_BAR,recheck_orbot,on_url_load,on_playstore_load,back_list_empty,start_proxy, ON_UPDATE_THEME, M_INITIALIZE_TAB_SINGLE, M_INITIALIZE_TAB_LINK,on_request_completed, on_update_history,on_update_suggestion,M_WELCOME_MESSAGE,ON_FIRST_PAINT, ON_LOAD_TAB_ON_RESUME, ON_SESSION_REINIT,on_page_loaded,on_load_error,download_file_popup,on_init_ads,search_update, open_new_tab,open_new_tab_instant

13
app/src/main/java/com/darkweb/genesissearchengine/helperManager/helperMethod.java
View File

@ -293,6 +293,19 @@ public class helperMethod
return bitmap; return bitmap;
} }
public static String getMimeType(Context context, Uri uri) {
String extension;
if (uri.getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
final MimeTypeMap mime = MimeTypeMap.getSingleton();
extension = mime.getExtensionFromMimeType(context.getContentResolver().getType(uri));
} else {
extension = MimeTypeMap.getFileExtensionFromUrl(Uri.fromFile(new File(uri.getPath())).toString());
}
return extension;
}
public static void hideKeyboard(AppCompatActivity context) { public static void hideKeyboard(AppCompatActivity context) {
View view = context.findViewById(android.R.id.content); View view = context.findViewById(android.R.id.content);
if (view != null) if (view != null)

9
app/src/main/java/com/darkweb/genesissearchengine/helperManager/localFileDownloader.java
View File

@ -37,12 +37,14 @@ import java.net.URI;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.Collections;
import ch.boye.httpclientandroidlib.HttpHost; import ch.boye.httpclientandroidlib.HttpHost;
import ch.boye.httpclientandroidlib.HttpResponse; import ch.boye.httpclientandroidlib.HttpResponse;
import ch.boye.httpclientandroidlib.client.methods.HttpGet; import ch.boye.httpclientandroidlib.client.methods.HttpGet;
import ch.boye.httpclientandroidlib.conn.params.ConnRoutePNames; import ch.boye.httpclientandroidlib.conn.params.ConnRoutePNames;
import static com.darkweb.genesissearchengine.constants.enums.etype.M_DOWNLOAD_FAILURE;
import static java.lang.Thread.sleep; import static java.lang.Thread.sleep;
@ -64,12 +66,14 @@ public class localFileDownloader extends AsyncTask<String, Integer, String> {
private float mTotalByte; private float mTotalByte;
private float mDownloadByte; private float mDownloadByte;
private String mURL; private String mURL;
private eventObserver.eventListener mEvent;
public localFileDownloader(Context pContext, String pURL, String pFileName, int pID) { public localFileDownloader(Context pContext, String pURL, String pFileName, int pID, eventObserver.eventListener pEvent) {
this.context = pContext; this.context = pContext;
this.mFileName = pFileName; this.mFileName = pFileName;
this.mURL = pURL; this.mURL = pURL;
this.mID = pID; this.mID = pID;
this.mEvent = pEvent;
StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build(); StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
@ -193,6 +197,7 @@ public class localFileDownloader extends AsyncTask<String, Integer, String> {
} catch (Exception ex) { } catch (Exception ex) {
Log.i("FIZZAHFUCK", ex.getMessage()); Log.i("FIZZAHFUCK", ex.getMessage());
if(mRequestCode>300){ if(mRequestCode>300){
mEvent.invokeObserver(Collections.singletonList(mRequestCode), M_DOWNLOAD_FAILURE);
//Toast.makeText(context,"Request Forbidden Error Code : ",mRequestCode).show(); //Toast.makeText(context,"Request Forbidden Error Code : ",mRequestCode).show();
} }
onCancel(); onCancel();
@ -256,7 +261,7 @@ public class localFileDownloader extends AsyncTask<String, Integer, String> {
mStream.close(); mStream.close();
}catch (Exception ex){ }catch (Exception ex){
if(mRequestCode>300){ if(mRequestCode>300){
//Toast.makeText(context,"Request Forbidden Error Code : ",mRequestCode).show(); mEvent.invokeObserver(Collections.singletonList(mRequestCode), M_DOWNLOAD_FAILURE);
} }
onCancel(); onCancel();
} }

5
app/src/main/java/com/darkweb/genesissearchengine/pluginManager/downloadManager.java
View File

@ -16,11 +16,14 @@ class downloadManager
private WeakReference<AppCompatActivity> mAppContext; private WeakReference<AppCompatActivity> mAppContext;
private Map<Integer, localFileDownloader> mDownloads = new HashMap<>(); private Map<Integer, localFileDownloader> mDownloads = new HashMap<>();
private eventObserver.eventListener mEvent;
/*Initializations*/ /*Initializations*/
downloadManager(WeakReference<AppCompatActivity> pAppContext, eventObserver.eventListener pEvent){ downloadManager(WeakReference<AppCompatActivity> pAppContext, eventObserver.eventListener pEvent){
this.mAppContext = pAppContext; this.mAppContext = pAppContext;
this.mEvent = pEvent;
initialize(); initialize();
} }
@ -30,7 +33,7 @@ class downloadManager
private void startDownload(String pPath,String pFile) { private void startDownload(String pPath,String pFile) {
int mID = helperMethod.createNotificationID(); int mID = helperMethod.createNotificationID();
localFileDownloader mFileDownloader = (localFileDownloader)new localFileDownloader(mAppContext.get().getApplicationContext(),pPath, pFile, mID).execute(pPath); localFileDownloader mFileDownloader = (localFileDownloader)new localFileDownloader(mAppContext.get().getApplicationContext(),pPath, pFile, mID, mEvent).execute(pPath);
mDownloads.put(mID,mFileDownloader); mDownloads.put(mID,mFileDownloader);
} }

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

@ -174,6 +174,26 @@ class messageManager
handler.postDelayed(runnable, 1500); handler.postDelayed(runnable, 1500);
} }
private void mDownloadFailure()
{
mContext.runOnUiThread(() -> {
final Handler handler = new Handler();
Runnable runnable = () -> mDialog.dismiss();
initializeDialog(R.layout.popup_download_failure, Gravity.BOTTOM);
((TextView)mDialog.findViewById(R.id.pDescription)).setText(("Request denied Error " + mData.get(0)));
mDialog.findViewById(R.id.pDismiss).setOnClickListener(v -> mDialog.dismiss());
mDialog.setOnDismissListener(dialog -> {
handler.removeCallbacks(runnable);
onClearReference();
});
handler.postDelayed(runnable, 20000);
});
}
private void popupBlocked() private void popupBlocked()
{ {
final Handler handler = new Handler(); final Handler handler = new Handler();
@ -440,14 +460,14 @@ class messageManager
mDialog.dismiss(); mDialog.dismiss();
}); });
mDialog.findViewById(R.id.pOption2).setOnClickListener(v -> { mDialog.findViewById(R.id.pOption2).setOnClickListener(v -> {
mEvent.invokeObserver(Collections.singletonList(mData.get(0)), M_OPEN_LINK_CURRENT_TAB);
mDialog.dismiss();
});
mDialog.findViewById(R.id.pOption3).setOnClickListener(v -> {
mEvent.invokeObserver(Collections.singletonList(mData.get(0)), M_OPEN_LINK_NEW_TAB); mEvent.invokeObserver(Collections.singletonList(mData.get(0)), M_OPEN_LINK_NEW_TAB);
mDialog.dismiss(); mDialog.dismiss();
}); });
mDialog.findViewById(R.id.pOption3).setOnClickListener(v -> { mDialog.findViewById(R.id.pOption3).setOnClickListener(v -> {
mEvent.invokeObserver(Collections.singletonList(mData.get(0)), M_OPEN_LINK_CURRENT_TAB);
mDialog.dismiss();
});
mDialog.findViewById(R.id.pOption4).setOnClickListener(v -> {
mEvent.invokeObserver(Collections.singletonList(mData.get(0)), M_COPY_LINK); mEvent.invokeObserver(Collections.singletonList(mData.get(0)), M_COPY_LINK);
mDialog.dismiss(); mDialog.dismiss();
}); });
@ -672,6 +692,11 @@ class messageManager
newIdentityCreated(); newIdentityCreated();
break; break;
case M_DOWNLOAD_FAILURE:
/*VERIFIED*/
mDownloadFailure();
break;
case M_POPUP_BLOCKED: case M_POPUP_BLOCKED:
/*VERIFIED*/ /*VERIFIED*/
popupBlocked(); popupBlocked();

12
app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginController.java
View File

@ -138,8 +138,12 @@ public class pluginController
/*Download Manager*/ /*Download Manager*/
private class downloadCallback implements eventObserver.eventListener{ private class downloadCallback implements eventObserver.eventListener{
@Override @Override
public Object invokeObserver(List<Object> data, Object event_type) public Object invokeObserver(List<Object> pData, Object event_type)
{ {
if(event_type.equals(enums.etype.M_DOWNLOAD_FAILURE))
{
mMessageManager.onTrigger(Arrays.asList(Collections.singletonList(pData.get(0).toString()), mHomeController.get()),M_DOWNLOAD_FAILURE);
}
return null; return null;
} }
} }
@ -202,7 +206,11 @@ public class pluginController
activityContextManager.getInstance().getHomeController().panicExitInvoked(); activityContextManager.getInstance().getHomeController().panicExitInvoked();
} }
else if(pEventType.equals(M_DOWNLOAD_SINGLE)){ else if(pEventType.equals(M_DOWNLOAD_SINGLE)){
activityContextManager.getInstance().getHomeController().onManualDownloadFileName((String)pData.get(2),(String)pData.get(0)); if(pData.size()<3){
((homeController)mHomeController.get()).onManualDownload(pData.get(0).toString());
}else {
activityContextManager.getInstance().getHomeController().onManualDownloadFileName((String)pData.get(2),(String)pData.get(0));
}
} }
else if(pEventType.equals(M_SECURE_CONNECTION)){ else if(pEventType.equals(M_SECURE_CONNECTION)){
helperMethod.openActivity(settingPrivacyController.class, constants.CONST_LIST_HISTORY, mHomeController.get(),true); helperMethod.openActivity(settingPrivacyController.class, constants.CONST_LIST_HISTORY, mHomeController.get(),true);

2
app/src/main/java/com/darkweb/genesissearchengine/pluginManager/pluginEnums.java
View File

@ -28,7 +28,7 @@ public class pluginEnums
/*Message Manager*/ /*Message Manager*/
public enum eMessageManager{ public enum eMessageManager{
M_RESET, M_DATA_CLEARED, M_SECURE_CONNECTION, M_POPUP_BLOCKED, M_PANIC, M_MAX_TAB_REACHED,M_DOWNLOAD_SINGLE, M_UPDATE_BRIDGES, M_NEW_IDENTITY, M_NOT_SUPPORTED, M_BRIDGE_MAIL, M_LONG_PRESS_WITH_LINK, M_LONG_PRESS_URL, M_LONG_PRESS_DOWNLOAD, M_START_ORBOT, M_DOWNLOAD_FILE, M_RATE_APP, M_REPORT_URL, M_CLEAR_BOOKMARK, M_CLEAR_HISTORY, M_BOOKMARK, M_PANIC_RESET, M_RATE_SUCCESS, M_RATE_FAILURE, M_LANGUAGE_SUPPORT_FAILURE, M_WELCOME M_RESET, M_DATA_CLEARED, M_SECURE_CONNECTION, M_POPUP_BLOCKED, M_PANIC, M_MAX_TAB_REACHED,M_DOWNLOAD_SINGLE, M_UPDATE_BRIDGES, M_NEW_IDENTITY, M_NOT_SUPPORTED, M_BRIDGE_MAIL, M_LONG_PRESS_WITH_LINK, M_LONG_PRESS_URL, M_LONG_PRESS_DOWNLOAD, M_START_ORBOT, M_DOWNLOAD_FAILURE, M_DOWNLOAD_FILE, M_RATE_APP, M_REPORT_URL, M_CLEAR_BOOKMARK, M_CLEAR_HISTORY, M_BOOKMARK, M_PANIC_RESET, M_RATE_SUCCESS, M_RATE_FAILURE, M_LANGUAGE_SUPPORT_FAILURE, M_WELCOME
} }
public enum eMessageManagerCallbacks{ public enum eMessageManagerCallbacks{
M_CANCEL_WELCOME, M_APP_RATED, M_DOWNLOAD_FILE_MANUAL, M_OPEN_LINK_CURRENT_TAB, M_COPY_LINK, M_REQUEST_BRIDGES, M_SET_BRIDGES, M_OPEN_LINK_NEW_TAB, M_CLEAR_TAB, M_RATE_APPLICATION, M_OPEN_PRIVACY M_CANCEL_WELCOME, M_APP_RATED, M_DOWNLOAD_FILE_MANUAL, M_OPEN_LINK_CURRENT_TAB, M_COPY_LINK, M_REQUEST_BRIDGES, M_SET_BRIDGES, M_OPEN_LINK_NEW_TAB, M_CLEAR_TAB, M_RATE_APPLICATION, M_OPEN_PRIVACY

10
app/src/main/res/custom-xml/images/xml/ic_baseline_arrow_downward.xml Normal file
View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"/>
</vector>

10
app/src/main/res/custom-xml/images/xml/ic_baseline_file_download.xml Normal file
View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
</vector>

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

@ -41,7 +41,7 @@
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="15dp" 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_ripple_default_round"
@ -61,7 +61,7 @@
android:id="@+id/view6" android:id="@+id/view6"
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="15dp" android:layout_marginEnd="10dp"
android:background="@color/c_border_background_divider" android:background="@color/c_border_background_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pOpenPrivacy" app:layout_constraintEnd_toStartOf="@+id/pOpenPrivacy"

77
app/src/main/res/layouts/alert/layout/popup_download_failure.xml Normal file
View File

@ -0,0 +1,77 @@
<?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="60dp"
android:layout_marginBottom="15dp"
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="0dp"
app:layout_constraintHorizontal_weight="1"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:ellipsize="end"
android:maxLines="2"
android:layout_marginEnd="10dp"
android:alpha="0.8"
android:paddingStart="5dp"
android:paddingEnd="15dp"
android:text=""
android:textAlignment="textStart"
android:textColor="@color/c_alert_text_inverted"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/view6"
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_border_background_divider"
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_load_new_tab.xml
View File

@ -43,7 +43,7 @@
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="15dp" 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_ripple_default_round"
@ -77,7 +77,7 @@
android:id="@+id/view4" android:id="@+id/view4"
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="15dp" android:layout_marginEnd="10dp"
android:background="#3973ac" android:background="#3973ac"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pDismiss" app:layout_constraintEnd_toStartOf="@+id/pDismiss"

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

@ -41,7 +41,7 @@
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="15dp" 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_ripple_default_round"
@ -61,7 +61,7 @@
android:id="@+id/view6" android:id="@+id/view6"
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="15dp" android:layout_marginEnd="10dp"
android:background="@color/c_border_background_divider" android:background="@color/c_border_background_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pDismiss" app:layout_constraintEnd_toStartOf="@+id/pDismiss"

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

@ -41,7 +41,7 @@
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="15dp" 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_ripple_default_round"
@ -59,7 +59,7 @@
android:id="@+id/view6" android:id="@+id/view6"
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="15dp" android:layout_marginEnd="10dp"
android:background="@color/c_border_background_divider" android:background="@color/c_border_background_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pDismiss" app:layout_constraintEnd_toStartOf="@+id/pDismiss"

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

@ -43,7 +43,7 @@
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="15dp" 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_ripple_default_round"
@ -77,7 +77,7 @@
android:id="@+id/view6" android:id="@+id/view6"
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_marginEnd="15dp" android:layout_marginEnd="10dp"
android:background="@color/c_border_background_divider" android:background="@color/c_border_background_divider"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/pDismiss" app:layout_constraintEnd_toStartOf="@+id/pDismiss"

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

@ -172,13 +172,12 @@
android:paddingStart="0dp" android:paddingStart="0dp"
android:onClick="onObfsChecked" android:onClick="onObfsChecked"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="8"
android:focusable="true" android:focusable="true"
tools:ignore="RtlSymmetry"> tools:ignore="RtlSymmetry">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="7" android:layout_weight="1"
android:layout_height="55dp" android:layout_height="55dp"
android:orientation="vertical"> android:orientation="vertical">
@ -202,10 +201,9 @@
<RadioButton <RadioButton
android:id="@+id/pBridgeObfs" android:id="@+id/pBridgeObfs"
android:layout_width="0dp" android:layout_width="35dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clickable="false" android:clickable="false"
android:layout_weight="1"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginStart="50dp" android:layout_marginStart="50dp"
android:checked="true" android:checked="true"
@ -230,13 +228,12 @@
android:clickable="true" android:clickable="true"
android:onClick="onMeekChecked" android:onClick="onMeekChecked"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="8"
android:focusable="true" android:focusable="true"
tools:ignore="RtlSymmetry"> tools:ignore="RtlSymmetry">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="7" android:layout_weight="1"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
@ -259,11 +256,10 @@
</LinearLayout> </LinearLayout>
<RadioButton <RadioButton
android:layout_width="0dp" android:layout_width="35dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:id="@+id/pBridgeChina" android:id="@+id/pBridgeChina"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_marginStart="50dp" android:layout_marginStart="50dp"
android:src="@xml/ic_arrow_right" android:src="@xml/ic_arrow_right"
@ -287,13 +283,12 @@
android:clickable="true" android:clickable="true"
android:onClick="onCustomChecked" android:onClick="onCustomChecked"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="8"
android:focusable="true" android:focusable="true"
tools:ignore="RtlSymmetry"> tools:ignore="RtlSymmetry">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="7" android:layout_weight="1"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
@ -317,11 +312,10 @@
</LinearLayout> </LinearLayout>
<RadioButton <RadioButton
android:layout_width="0dp" android:layout_width="35dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:id="@+id/pBridgeCustom" android:id="@+id/pBridgeCustom"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_marginStart="50dp" android:layout_marginStart="50dp"
android:src="@xml/ic_arrow_right" android:src="@xml/ic_arrow_right"

3
app/src/main/res/layouts/home/layout/hint_view.xml
View File

@ -31,7 +31,7 @@
android:id="@+id/pHindTypeIcon" android:id="@+id/pHindTypeIcon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="13dp"
android:alpha="0.6" android:alpha="0.6"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -45,6 +45,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="13dp" android:layout_marginStart="13dp"
android:layout_marginTop="1dp"
android:layout_marginBottom="3dp" android:layout_marginBottom="3dp"
android:background="@xml/hox_round_outline" android:background="@xml/hox_round_outline"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"

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

@ -33,6 +33,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:fitsSystemWindows="true"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
@ -44,6 +45,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:fitsSystemWindows="true"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
<LinearLayout <LinearLayout

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

@ -44,21 +44,34 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="47dp" android:layout_height="47dp"
android:layout_weight="1" android:layout_weight="1"
android:scaleX="0.95" android:scaleX="0.96"
android:scaleY="0.95" android:scaleY="0.96"
android:background="@xml/gx_ripple_gray_top_left" android:background="@xml/gx_ripple_gray_top_left"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:onClick="onMenuItemInvoked" android:onClick="onMenuItemInvoked"
android:src="@xml/ic_home" android:src="@xml/ic_home"
android:tint="@color/c_navigation_tint" /> android:tint="@color/c_navigation_tint" />
<ImageButton
android:id="@+id/menu22"
android:layout_width="wrap_content"
android:layout_height="47dp"
android:layout_weight="1"
android:background="@xml/gx_ripple_gray"
android:contentDescription="@string/GENERAL_TODO"
android:onClick="onMenuItemInvoked"
android:scaleX="0.96"
android:scaleY="0.96"
android:src="@xml/ic_arrow_right"
android:tint="@color/c_navigation_tint" />
<ImageButton <ImageButton
android:id="@+id/menu23" android:id="@+id/menu23"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="47dp" android:layout_height="47dp"
android:layout_weight="1" android:layout_weight="1"
android:scaleX="0.95" android:scaleX="0.96"
android:scaleY="0.95" android:scaleY="0.96"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:onClick="onMenuItemInvoked" android:onClick="onMenuItemInvoked"
@ -66,24 +79,24 @@
android:tint="@color/c_navigation_tint" /> android:tint="@color/c_navigation_tint" />
<ImageButton <ImageButton
android:id="@+id/menu22" android:id="@+id/menuItem25"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="47dp" android:layout_height="47dp"
android:layout_weight="1" android:layout_weight="1"
android:scaleX="0.95"
android:scaleY="0.95"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:onClick="onMenuItemInvoked" android:onClick="onMenuItemInvoked"
android:src="@xml/ic_arrow_right" android:scaleX="0.96"
android:scaleY="0.96"
android:src="@xml/ic_baseline_file_download"
android:tint="@color/c_navigation_tint" /> android:tint="@color/c_navigation_tint" />
<ImageButton <ImageButton
android:id="@+id/menu21" android:id="@+id/menu21"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="47dp" android:layout_height="47dp"
android:scaleX="0.95" android:scaleX="0.96"
android:scaleY="0.95" android:scaleY="0.96"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
@ -96,8 +109,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="47dp" android:layout_height="47dp"
android:layout_gravity="center" android:layout_gravity="center"
android:scaleX="0.95" android:scaleX="0.96"
android:scaleY="0.95" android:scaleY="0.96"
android:layout_weight="1" android:layout_weight="1"
android:background="@xml/gx_ripple_gray_top_right" android:background="@xml/gx_ripple_gray_top_right"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"

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

@ -84,12 +84,10 @@
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:onClick="onDefaultBrowser" android:onClick="onDefaultBrowser"
android:weightSum="8"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:layout_weight="1" android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:padding="10dp" android:padding="10dp"
@ -128,12 +126,10 @@
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:onClick="onManageGeneral" android:onClick="onManageGeneral"
android:orientation="horizontal" android:orientation="horizontal">
android:weightSum="8">
<ImageView <ImageView
android:layout_weight="1" android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:padding="10dp" android:padding="10dp"
@ -146,7 +142,7 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="6" android:layout_weight="1"
android:clickable="false" android:clickable="false"
android:orientation="vertical"> android:orientation="vertical">
@ -181,9 +177,8 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:autoMirrored="true" android:autoMirrored="true"
android:background="@android:color/transparent" android:background="@android:color/transparent"
@ -207,12 +202,10 @@
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:onClick="onManageSearchEngine" android:onClick="onManageSearchEngine"
android:orientation="horizontal" android:orientation="horizontal">
android:weightSum="8">
<ImageView <ImageView
android:layout_weight="1" android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:padding="10dp" android:padding="10dp"
@ -260,9 +253,8 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:clickable="false" android:clickable="false"
@ -285,12 +277,10 @@
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:onClick="onManageSearchPrivacy" android:onClick="onManageSearchPrivacy"
android:orientation="horizontal" android:orientation="horizontal">
android:weightSum="8">
<ImageView <ImageView
android:layout_weight="1" android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:padding="10dp" android:padding="10dp"
@ -338,9 +328,8 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:clickable="false" android:clickable="false"
@ -358,12 +347,10 @@
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:onClick="onManageTracking" android:onClick="onManageTracking"
android:orientation="horizontal" android:orientation="horizontal">
android:weightSum="8">
<ImageView <ImageView
android:layout_weight="1" android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:padding="10dp" android:padding="10dp"
@ -411,9 +398,8 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:clickable="false" android:clickable="false"
@ -436,12 +422,10 @@
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:onClick="onManageNotification" android:onClick="onManageNotification"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:orientation="horizontal" android:orientation="horizontal">
android:weightSum="8">
<ImageView <ImageView
android:layout_weight="1" android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
app:tint="@color/c_icon_tint" app:tint="@color/c_icon_tint"
@ -487,9 +471,8 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:clickable="false" android:clickable="false"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
@ -512,12 +495,10 @@
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:onClick="onManageSearchAccessibility" android:onClick="onManageSearchAccessibility"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:orientation="horizontal" android:orientation="horizontal">
android:weightSum="8">
<ImageView <ImageView
android:layout_weight="1" android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:padding="10dp" android:padding="10dp"
@ -564,9 +545,8 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:clickable="false" android:clickable="false"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
@ -589,12 +569,10 @@
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:onClick="onManageSearchClearData" android:onClick="onManageSearchClearData"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:orientation="horizontal" android:orientation="horizontal">
android:weightSum="8">
<ImageView <ImageView
android:layout_weight="1" android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:padding="10dp" android:padding="10dp"
@ -641,9 +619,8 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:clickable="false" android:clickable="false"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
@ -666,12 +643,10 @@
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:onClick="onManageSearchAdvanced" android:onClick="onManageSearchAdvanced"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:orientation="horizontal" android:orientation="horizontal">
android:weightSum="8">
<ImageView <ImageView
android:layout_weight="1" android:layout_width="wrap_content"
android:layout_width="0dp"
app:tint="@color/c_icon_tint" app:tint="@color/c_icon_tint"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
@ -718,9 +693,8 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:clickable="false" android:clickable="false"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
@ -744,16 +718,14 @@
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:onClick="onOpenProxyStatus" android:onClick="onOpenProxyStatus"
android:orientation="horizontal" android:orientation="horizontal">
android:weightSum="8">
<ImageView <ImageView
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_weight="1"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:padding="10dp" android:padding="10dp"
android:src="@xml/ic_baseline_vpn" android:src="@xml/ic_baseline_vpn"
@ -797,10 +769,9 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:clickable="false" android:clickable="false"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
@ -823,16 +794,14 @@
android:onClick="onRateApplication" android:onClick="onRateApplication"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp">
android:weightSum="8">
<ImageView <ImageView
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_weight="1"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:padding="10dp" android:padding="10dp"
android:src="@xml/ic_baseline_rate" android:src="@xml/ic_baseline_rate"
@ -876,10 +845,9 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:clickable="false" android:clickable="false"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
@ -896,16 +864,14 @@
android:onClick="onShareApplication" android:onClick="onShareApplication"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp">
android:weightSum="8">
<ImageView <ImageView
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_weight="1"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:padding="10dp" android:padding="10dp"
android:src="@xml/ic_baseline_share" android:src="@xml/ic_baseline_share"
@ -949,10 +915,9 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:clickable="false" android:clickable="false"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
@ -976,16 +941,14 @@
android:onClick="onPrivacyPolicy" android:onClick="onPrivacyPolicy"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp">
android:weightSum="8">
<ImageView <ImageView
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_weight="1"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:padding="10dp" android:padding="10dp"
android:src="@xml/ic_baseline_policy" android:src="@xml/ic_baseline_policy"
@ -1029,10 +992,9 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:clickable="false" android:clickable="false"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
@ -1049,16 +1011,14 @@
android:onClick="onReportWebsite" android:onClick="onReportWebsite"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp">
android:weightSum="8">
<ImageView <ImageView
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_weight="1"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:padding="10dp" android:padding="10dp"
android:src="@xml/ic_baseline_report" android:src="@xml/ic_baseline_report"
@ -1102,10 +1062,9 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:clickable="false" android:clickable="false"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
@ -1122,16 +1081,14 @@
android:onClick="onSitemap" android:onClick="onSitemap"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp">
android:weightSum="8">
<ImageView <ImageView
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_weight="1"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"
android:padding="10dp" android:padding="10dp"
android:src="@xml/ic_baseline_sitemap" android:src="@xml/ic_baseline_sitemap"
@ -1175,10 +1132,9 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="45dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:clickable="false" android:clickable="false"
android:contentDescription="@string/GENERAL_TODO" android:contentDescription="@string/GENERAL_TODO"

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

@ -324,7 +324,7 @@
<RadioButton <RadioButton
android:id="@+id/pAdvanceGridOption1" android:id="@+id/pAdvanceGridOption1"
android:layout_width="wrap_content" android:layout_width="35dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clickable="false" android:clickable="false"
android:background="@android:color/transparent" android:background="@android:color/transparent"
@ -377,7 +377,7 @@
<RadioButton <RadioButton
android:id="@+id/pAdvanceGridOption2" android:id="@+id/pAdvanceGridOption2"
android:layout_width="wrap_content" android:layout_width="35dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clickable="false" android:clickable="false"
android:background="@android:color/transparent" android:background="@android:color/transparent"
@ -488,7 +488,7 @@
<RadioButton <RadioButton
android:id="@+id/pAdvanceImageOption1" android:id="@+id/pAdvanceImageOption1"
android:layout_width="wrap_content" android:layout_width="35dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clickable="false" android:clickable="false"
android:background="@android:color/transparent" android:background="@android:color/transparent"
@ -541,7 +541,7 @@
<RadioButton <RadioButton
android:id="@+id/pAdvanceImageOption2" android:id="@+id/pAdvanceImageOption2"
android:layout_width="wrap_content" android:layout_width="35dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clickable="false" android:clickable="false"
android:background="@android:color/transparent" android:background="@android:color/transparent"

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

@ -302,7 +302,7 @@
<RadioButton <RadioButton
android:id="@+id/pThemeDark" android:id="@+id/pThemeDark"
android:layout_width="wrap_content" android:layout_width="35dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clickable="false" android:clickable="false"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
@ -358,7 +358,7 @@
</LinearLayout> </LinearLayout>
<RadioButton <RadioButton
android:layout_width="wrap_content" android:layout_width="35dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:id="@+id/pThemeLight" android:id="@+id/pThemeLight"
@ -416,7 +416,7 @@
</LinearLayout> </LinearLayout>
<RadioButton <RadioButton
android:layout_width="wrap_content" android:layout_width="35dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:id="@+id/pThemeDefault" android:id="@+id/pThemeDefault"
@ -541,13 +541,12 @@
android:layout_height="65dp" android:layout_height="65dp"
android:onClick="onManageLanguage" android:onClick="onManageLanguage"
android:background="@xml/gx_ripple_gray" android:background="@xml/gx_ripple_gray"
android:orientation="horizontal" android:orientation="horizontal">
android:weightSum="7">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="65dp" android:layout_height="65dp"
android:layout_weight="6" android:layout_weight="1"
android:clickable="false" android:clickable="false"
android:orientation="vertical"> android:orientation="vertical">
@ -587,9 +586,8 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:layout_width="0dp" android:layout_width="50dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:tint="@color/c_navigation_tint" android:tint="@color/c_navigation_tint"
android:src="@xml/ic_arrow_right" android:src="@xml/ic_arrow_right"

45
app/src/main/res/layouts/setting/layout/setting_search_view.xml
View File

@ -128,12 +128,10 @@
android:paddingStart="3dp" android:paddingStart="3dp"
android:onClick="onSelectSearchEngine" android:onClick="onSelectSearchEngine"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="8"
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:layout_width="0dp" android:layout_width="40dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:padding="3dp" android:padding="3dp"
@ -142,7 +140,7 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="6" android:layout_weight="1"
android:layout_height="55dp" android:layout_height="55dp"
android:orientation="vertical"> android:orientation="vertical">
<Button <Button
@ -181,10 +179,9 @@
<RadioButton <RadioButton
android:id="@+id/mRadioSearch_1" android:id="@+id/mRadioSearch_1"
android:layout_width="0dp" android:layout_width="50dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clickable="false" android:clickable="false"
android:layout_weight="1"
android:layout_marginStart="50dp" android:layout_marginStart="50dp"
android:buttonTint="@color/c_radio_tint" android:buttonTint="@color/c_radio_tint"
android:background="@android:color/transparent" android:background="@android:color/transparent"
@ -208,12 +205,10 @@
android:paddingStart="3dp" android:paddingStart="3dp"
android:onClick="onSelectSearchEngine" android:onClick="onSelectSearchEngine"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="8"
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:layout_width="0dp" android:layout_width="40dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="false" android:clickable="false"
android:padding="6dp" android:padding="6dp"
@ -223,7 +218,7 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="6" android:layout_weight="1"
android:layout_height="55dp" android:layout_height="55dp"
android:orientation="vertical"> android:orientation="vertical">
<Button <Button
@ -260,10 +255,9 @@
</LinearLayout> </LinearLayout>
<RadioButton <RadioButton
android:layout_width="0dp" android:layout_width="50dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/mRadioSearch_2" android:id="@+id/mRadioSearch_2"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_marginStart="50dp" android:layout_marginStart="50dp"
android:src="@xml/ic_arrow_right" android:src="@xml/ic_arrow_right"
@ -288,12 +282,10 @@
android:paddingStart="3dp" android:paddingStart="3dp"
android:onClick="onSelectSearchEngine" android:onClick="onSelectSearchEngine"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="8"
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:layout_width="0dp" android:layout_width="40dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="3dp" android:padding="3dp"
android:layout_marginStart="7dp" android:layout_marginStart="7dp"
@ -302,7 +294,7 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="6" android:layout_weight="1"
android:layout_height="55dp" android:layout_height="55dp"
android:orientation="vertical"> android:orientation="vertical">
<Button <Button
@ -340,11 +332,10 @@
</LinearLayout> </LinearLayout>
<RadioButton <RadioButton
android:layout_width="0dp" android:layout_width="50dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/mRadioSearch_3" android:id="@+id/mRadioSearch_3"
android:clickable="false" android:clickable="false"
android:layout_weight="1"
android:layout_marginStart="50dp" android:layout_marginStart="50dp"
android:buttonTint="@color/c_radio_tint" android:buttonTint="@color/c_radio_tint"
android:background="@android:color/transparent" android:background="@android:color/transparent"
@ -368,12 +359,10 @@
android:paddingStart="3dp" android:paddingStart="3dp"
android:onClick="onSelectSearchEngine" android:onClick="onSelectSearchEngine"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="8"
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:layout_width="0dp" android:layout_width="40dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="7dp" android:layout_marginStart="7dp"
android:padding="5dp" android:padding="5dp"
@ -382,7 +371,7 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="6" android:layout_weight="1"
android:layout_height="55dp" android:layout_height="55dp"
android:orientation="vertical"> android:orientation="vertical">
<Button <Button
@ -420,10 +409,9 @@
</LinearLayout> </LinearLayout>
<RadioButton <RadioButton
android:layout_width="0dp" android:layout_width="50dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/mRadioSearch_4" android:id="@+id/mRadioSearch_4"
android:layout_weight="1"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_marginStart="50dp" android:layout_marginStart="50dp"
android:buttonTint="@color/c_radio_tint" android:buttonTint="@color/c_radio_tint"
@ -448,12 +436,10 @@
android:paddingStart="3dp" android:paddingStart="3dp"
android:onClick="onSelectSearchEngine" android:onClick="onSelectSearchEngine"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="8"
android:focusable="true"> android:focusable="true">
<ImageView <ImageView
android:layout_width="0dp" android:layout_width="40dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp" android:padding="5dp"
android:layout_marginStart="7dp" android:layout_marginStart="7dp"
@ -462,7 +448,7 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="6" android:layout_weight="1"
android:layout_height="55dp" android:layout_height="55dp"
android:orientation="vertical"> android:orientation="vertical">
<Button <Button
@ -500,10 +486,9 @@
</LinearLayout> </LinearLayout>
<RadioButton <RadioButton
android:layout_width="0dp" android:layout_width="50dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/mRadioSearch_5" android:id="@+id/mRadioSearch_5"
android:layout_weight="1"
android:clickable="false" android:clickable="false"
android:layout_marginStart="50dp" android:layout_marginStart="50dp"
android:buttonTint="@color/c_radio_tint" android:buttonTint="@color/c_radio_tint"

12
app/src/main/res/layouts/setting/layout/setting_tracking_view.xml
View File

@ -166,7 +166,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layoutDirection="ltr" android:layoutDirection="ltr"
android:layout_marginTop="-2dp" android:layout_marginTop="3dp"
android:textColor="@color/c_text_v1" android:textColor="@color/c_text_v1"
android:textSize="15sp" android:textSize="15sp"
android:text="@string/SETTING_PRIVACY_TRACKING_OPTION1" android:text="@string/SETTING_PRIVACY_TRACKING_OPTION1"
@ -191,9 +191,9 @@
android:clickable="false" android:clickable="false"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:buttonTint="@color/c_radio_tint" android:buttonTint="@color/c_radio_tint"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_gravity="center_vertical"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
tools:ignore="RtlHardcoded" tools:ignore="RtlHardcoded"
@ -229,7 +229,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layoutDirection="ltr" android:layoutDirection="ltr"
android:layout_marginTop="-2dp" android:layout_marginTop="3dp"
android:textColor="@color/c_text_v1" android:textColor="@color/c_text_v1"
android:textSize="15sp" android:textSize="15sp"
android:text="@string/SETTING_PRIVACY_TRACKING_OPTION2" android:text="@string/SETTING_PRIVACY_TRACKING_OPTION2"
@ -254,7 +254,7 @@
android:clickable="false" android:clickable="false"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:buttonTint="@color/c_radio_tint" android:buttonTint="@color/c_radio_tint"
android:layout_marginTop="10dp" android:layout_gravity="center_vertical"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:paddingStart="10dp" android:paddingStart="10dp"
@ -292,7 +292,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layoutDirection="ltr" android:layoutDirection="ltr"
android:layout_marginTop="-2dp" android:layout_marginTop="3dp"
android:textColor="@color/c_text_v1" android:textColor="@color/c_text_v1"
android:textSize="15sp" android:textSize="15sp"
android:text="@string/SETTING_PRIVACY_TRACKING_OPTION3" android:text="@string/SETTING_PRIVACY_TRACKING_OPTION3"
@ -317,7 +317,7 @@
android:clickable="false" android:clickable="false"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:buttonTint="@color/c_radio_tint" android:buttonTint="@color/c_radio_tint"
android:layout_marginTop="10dp" android:layout_gravity="center_vertical"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:paddingStart="10dp" android:paddingStart="10dp"

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

@ -12,6 +12,7 @@
<color name="c_text_v4">#a6a6a6</color> <color name="c_text_v4">#a6a6a6</color>
<color name="c_text_v5">#ffffff</color> <color name="c_text_v5">#ffffff</color>
<color name="c_text_v7">#248f8f</color> <color name="c_text_v7">#248f8f</color>
<color name="c_text_v8">#a6a6a6</color>
<color name="c_icon_tint">#ffffff</color> <color name="c_icon_tint">#ffffff</color>
<color name="c_security_popup_background">#121216</color> <color name="c_security_popup_background">#121216</color>
<color name="c_security_popup_divider">#121216</color> <color name="c_security_popup_divider">#121216</color>

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

@ -14,6 +14,7 @@
<color name="c_text_v5">#000000</color> <color name="c_text_v5">#000000</color>
<color name="c_text_v6">#8c8c8c</color> <color name="c_text_v6">#8c8c8c</color>
<color name="c_text_v7">#7591bd</color> <color name="c_text_v7">#7591bd</color>
<color name="c_text_v8">#666666</color>
<color name="c_icon_tint">#425e8a</color> <color name="c_icon_tint">#425e8a</color>
<color name="c_icon_tint_light">#7591bd</color> <color name="c_icon_tint_light">#7591bd</color>
<color name="c_lang_row">#7591bd</color> <color name="c_lang_row">#7591bd</color>

0
orbotservice/.gitignore → orbotservicemanager/.gitignore vendored
View File

2
orbotservice/build.gradle → orbotservicemanager/build.gradle
View File

@ -1,7 +1,7 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 30 compileSdkVersion 31
buildToolsVersion '30.0.3' buildToolsVersion '30.0.3'
ndkVersion '21.4.7075529' ndkVersion '21.4.7075529'

0
orbotservice/proguard-rules.pro → orbotservicemanager/proguard-rules.pro vendored
View File

0
orbotservice/src/main/AndroidManifest.xml → orbotservicemanager/src/main/AndroidManifest.xml
View File

0
orbotservice/src/main/assets/fronts → orbotservicemanager/src/main/assets/fronts
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/OrbotConstants.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/OrbotConstants.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/OrbotService.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/OrbotService.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/StartTorReceiver.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/StartTorReceiver.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/TorEventHandler.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/TorEventHandler.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/TorServiceConstants.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/TorServiceConstants.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/util/CustomNativeLoader.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/util/CustomNativeLoader.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/util/CustomShell.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/util/CustomShell.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/util/CustomTorResourceInstaller.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/util/CustomTorResourceInstaller.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/util/DummyActivity.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/util/DummyActivity.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/util/ExternalIPFetcher.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/util/ExternalIPFetcher.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/util/NativeLoader.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/util/NativeLoader.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/util/PortForwarder.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/util/PortForwarder.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/util/Prefs.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/util/Prefs.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/util/TCPSourceApp.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/util/TCPSourceApp.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/util/TorServiceUtils.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/util/TorServiceUtils.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/util/Utils.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/util/Utils.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/vpn/OrbotVpnManager.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/vpn/OrbotVpnManager.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/vpn/TorifiedApp.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/vpn/TorifiedApp.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/vpn/Tun2Socks.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/vpn/Tun2Socks.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/vpn/VpnPrefs.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/vpn/VpnPrefs.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/vpn/VpnUtils.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/vpn/VpnUtils.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/wrapper/LocaleHelper.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/wrapper/LocaleHelper.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/wrapper/localHelperMethod.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/wrapper/localHelperMethod.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/wrapper/logRowModel.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/wrapper/logRowModel.java
View File

0
orbotservice/src/main/java/org/torproject/android/proxy/wrapper/orbotLocalConstants.java → orbotservicemanager/src/main/java/org/torproject/android/proxy/wrapper/orbotLocalConstants.java
View File

0
orbotservice/src/main/jni/Android.mk → orbotservicemanager/src/main/jni/Android.mk
View File

0
orbotservice/src/main/jni/Application.mk → orbotservicemanager/src/main/jni/Application.mk
View File

0
orbotservice/src/main/jni/libancillary/API → orbotservicemanager/src/main/jni/libancillary/API
View File

0
orbotservice/src/main/jni/libancillary/COPYING → orbotservicemanager/src/main/jni/libancillary/COPYING
View File

0
orbotservice/src/main/jni/libancillary/Makefile → orbotservicemanager/src/main/jni/libancillary/Makefile
View File

0
orbotservice/src/main/jni/libancillary/ancillary.h → orbotservicemanager/src/main/jni/libancillary/ancillary.h
View File

0
orbotservice/src/main/jni/libancillary/fd_recv.c → orbotservicemanager/src/main/jni/libancillary/fd_recv.c
View File

0
orbotservice/src/main/jni/libancillary/fd_send.c → orbotservicemanager/src/main/jni/libancillary/fd_send.c
View File

0
orbotservice/src/main/jni/libancillary/test.c → orbotservicemanager/src/main/jni/libancillary/test.c
View File

0
orbotservice/src/main/jni/pdnsd/AUTHORS → orbotservicemanager/src/main/jni/pdnsd/AUTHORS Executable file → Normal file
View File

0
orbotservice/src/main/jni/pdnsd/COPYING → orbotservicemanager/src/main/jni/pdnsd/COPYING
View File

0
orbotservice/src/main/jni/pdnsd/COPYING.BSD → orbotservicemanager/src/main/jni/pdnsd/COPYING.BSD
View File

0
orbotservice/src/main/jni/pdnsd/ChangeLog → orbotservicemanager/src/main/jni/pdnsd/ChangeLog
View File

0
orbotservice/src/main/jni/pdnsd/ChangeLog.old → orbotservicemanager/src/main/jni/pdnsd/ChangeLog.old
View File

0
orbotservice/src/main/jni/pdnsd/INSTALL → orbotservicemanager/src/main/jni/pdnsd/INSTALL
View File

0
orbotservice/src/main/jni/pdnsd/Makefile.am → orbotservicemanager/src/main/jni/pdnsd/Makefile.am
View File

0
orbotservice/src/main/jni/pdnsd/Makefile.in → orbotservicemanager/src/main/jni/pdnsd/Makefile.in
View File

0
orbotservice/src/main/jni/pdnsd/NEWS → orbotservicemanager/src/main/jni/pdnsd/NEWS
View File

0
orbotservice/src/main/jni/pdnsd/PKGBUILD.in → orbotservicemanager/src/main/jni/pdnsd/PKGBUILD.in
View File

0
orbotservice/src/main/jni/pdnsd/README → orbotservicemanager/src/main/jni/pdnsd/README
View File

0
orbotservice/src/main/jni/pdnsd/README.par → orbotservicemanager/src/main/jni/pdnsd/README.par
View File

0
orbotservice/src/main/jni/pdnsd/README.par.old → orbotservicemanager/src/main/jni/pdnsd/README.par.old
View File

0
orbotservice/src/main/jni/pdnsd/THANKS → orbotservicemanager/src/main/jni/pdnsd/THANKS
View File

0
orbotservice/src/main/jni/pdnsd/TODO → orbotservicemanager/src/main/jni/pdnsd/TODO Executable file → Normal file
View File

0
orbotservice/src/main/jni/pdnsd/acconfig.h → orbotservicemanager/src/main/jni/pdnsd/acconfig.h
View File

0
orbotservice/src/main/jni/pdnsd/aclocal.m4 → orbotservicemanager/src/main/jni/pdnsd/aclocal.m4 vendored
View File

0
orbotservice/src/main/jni/pdnsd/compile → orbotservicemanager/src/main/jni/pdnsd/compile
View File

0
orbotservice/src/main/jni/pdnsd/config.h → orbotservicemanager/src/main/jni/pdnsd/config.h
View File

0
orbotservice/src/main/jni/pdnsd/config.h.in → orbotservicemanager/src/main/jni/pdnsd/config.h.in
View File

0
orbotservice/src/main/jni/pdnsd/configure → orbotservicemanager/src/main/jni/pdnsd/configure vendored
View File

0
orbotservice/src/main/jni/pdnsd/configure.in → orbotservicemanager/src/main/jni/pdnsd/configure.in
View File

0
orbotservice/src/main/jni/pdnsd/contrib/Makefile.am → orbotservicemanager/src/main/jni/pdnsd/contrib/Makefile.am
View File

0
orbotservice/src/main/jni/pdnsd/contrib/Makefile.in → orbotservicemanager/src/main/jni/pdnsd/contrib/Makefile.in
View File

0
orbotservice/src/main/jni/pdnsd/contrib/README → orbotservicemanager/src/main/jni/pdnsd/contrib/README
View File

0
orbotservice/src/main/jni/pdnsd/contrib/change_pdnsd_server_ip.pl → orbotservicemanager/src/main/jni/pdnsd/contrib/change_pdnsd_server_ip.pl
View File

0
orbotservice/src/main/jni/pdnsd/contrib/dhcp2pdnsd → orbotservicemanager/src/main/jni/pdnsd/contrib/dhcp2pdnsd Executable file → Normal file
View File

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