diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 205f5d9f..e466d869 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,8 +28,8 @@ + android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" + android:launchMode="singleTask" /> currentX+100 ) + { + helperMethod.openActivity(orbotLogController.class, constants.CONST_LIST_HISTORY, homeController.this,true); + } + } + default: + return super.onTouchEvent(event); + } + } + public void initPreFixes() { try { Class clazz = Class.forName("java.lang.Daemons$FinalizerWatchdogDaemon"); diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogController.java index 6ffbf227..f65952b1 100644 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogController.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotLogManager/orbotLogController.java @@ -1,11 +1,13 @@ package com.darkweb.genesissearchengine.appManager.orbotLogManager; import android.os.Bundle; +import android.view.MotionEvent; import android.view.View; import android.view.animation.AnimationUtils; import android.view.animation.LayoutAnimationController; import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.view.MotionEventCompat; import androidx.core.widget.NestedScrollView; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -191,4 +193,27 @@ public class orbotLogController extends AppCompatActivity { mActivityClosed = true; } + float oldTouchValue; + @Override + public boolean dispatchTouchEvent(MotionEvent event) { + + int action=event.getAction(); + + switch (action) { + case (MotionEvent.ACTION_DOWN): + oldTouchValue = event.getX(); + case (MotionEvent.ACTION_MOVE): + float currentX = event.getX(); + if (oldTouchValue < currentX-100) + { + finish(); + }else { + return super.onTouchEvent(event); + } + default: + return super.onTouchEvent(event); + } + + } + } \ No newline at end of file diff --git a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java index fe4cf13e..fa72d020 100755 --- a/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java +++ b/app/src/main/java/com/darkweb/genesissearchengine/appManager/orbotManager/orbotController.java @@ -1,12 +1,17 @@ package com.darkweb.genesissearchengine.appManager.orbotManager; import android.os.Bundle; +import android.view.MotionEvent; import android.view.View; import android.widget.LinearLayout; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.view.MotionEventCompat; + import com.darkweb.genesissearchengine.appManager.activityContextManager; import com.darkweb.genesissearchengine.appManager.bridgeManager.bridgeController; import com.darkweb.genesissearchengine.appManager.helpManager.helpController; +import com.darkweb.genesissearchengine.appManager.homeManager.homeController; +import com.darkweb.genesissearchengine.appManager.orbotLogManager.orbotLogController; import com.darkweb.genesissearchengine.constants.constants; import com.darkweb.genesissearchengine.constants.keys; import com.darkweb.genesissearchengine.constants.status; @@ -106,4 +111,27 @@ public class orbotController extends AppCompatActivity { public void onClose(View view){ finish(); } + + float oldTouchValue; + @Override + public boolean dispatchTouchEvent(MotionEvent event) { + + int action=event.getAction(); + + switch (action) { + case (MotionEvent.ACTION_DOWN): + oldTouchValue = event.getX(); + case (MotionEvent.ACTION_MOVE): + float currentX = event.getX(); + if (oldTouchValue < currentX-100) + { + finish(); + }else { + return super.onTouchEvent(event); + } + default: + return super.onTouchEvent(event); + } + + } } \ No newline at end of file diff --git a/app/src/main/res/custom-xml/home/xml/hx_border_left.xml b/app/src/main/res/custom-xml/home/xml/hx_border_left.xml index a0464396..a3c18067 100644 --- a/app/src/main/res/custom-xml/home/xml/hx_border_left.xml +++ b/app/src/main/res/custom-xml/home/xml/hx_border_left.xml @@ -1,13 +1,10 @@ - + - \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/genesis_logo_bordered.png b/app/src/main/res/drawable-hdpi/genesis_logo_bordered.png new file mode 100644 index 00000000..0c42bd0a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/genesis_logo_bordered.png differ diff --git a/app/src/main/res/drawable-hdpi/sheild_logo_bordered.png b/app/src/main/res/drawable-hdpi/sheild_logo_bordered.png new file mode 100644 index 00000000..bdc8df6b Binary files /dev/null and b/app/src/main/res/drawable-hdpi/sheild_logo_bordered.png differ diff --git a/app/src/main/res/layouts/other/layout/home_view.xml b/app/src/main/res/layouts/other/layout/home_view.xml index 93ee1a4a..e49a3c38 100644 --- a/app/src/main/res/layouts/other/layout/home_view.xml +++ b/app/src/main/res/layouts/other/layout/home_view.xml @@ -241,12 +241,12 @@ android:id="@+id/pTopImage" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="50dp" + android:layout_marginTop="35dp" android:adjustViewBounds="true" android:background="@color/white" android:contentDescription="@string/GENERAL_TODO" - android:scaleX="1.5" - android:scaleY="1.5" + android:scaleX="1.4" + android:scaleY="1.4" android:src="@drawable/wall2" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -256,18 +256,19 @@ android:id="@+id/pImageDivider" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="270dp" + android:layout_marginTop="190dp" android:adjustViewBounds="true" android:contentDescription="@string/GENERAL_TODO" + android:paddingBottom="15dp" android:src="@drawable/glide" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@+id/pTopImage" />