mirror of https://github.com/LeOS-GSI/LeOS-Genesis
parent
2ef3c40a53
commit
7a9cbd43e8
|
@ -26,7 +26,7 @@
|
|||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/AppTheme"
|
||||
android:usesCleartextTraffic="false">
|
||||
android:usesCleartextTraffic="true">
|
||||
|
||||
<activity
|
||||
android:launchMode="singleTask"
|
||||
|
|
|
@ -191,7 +191,6 @@ public class homeController extends AppCompatActivity implements ComponentCallba
|
|||
private ConstraintLayout mInfoPortrait;
|
||||
private ConstraintLayout mInfoLandscape;
|
||||
private com.google.android.material.appbar.AppBarLayout mAppBar;
|
||||
private ProgressBar mProgressBarIndeterminate;
|
||||
private FragmentContainerView mTabFragment;
|
||||
private LinearLayout mTopBarContainer;
|
||||
private ImageView mTopBarHider;
|
||||
|
@ -277,12 +276,6 @@ public class homeController extends AppCompatActivity implements ComponentCallba
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void onStart() {
|
||||
super.onStart();
|
||||
}
|
||||
|
||||
public void initTor() {
|
||||
|
||||
mHandler = new Handler();
|
||||
|
@ -593,7 +586,6 @@ public class homeController extends AppCompatActivity implements ComponentCallba
|
|||
mFindBar = findViewById(R.id.pFindBar);
|
||||
mInfoPortrait = findViewById(R.id.pInfoPortrait);
|
||||
mInfoLandscape = findViewById(R.id.pInfoLandscape);
|
||||
mProgressBarIndeterminate = findViewById(R.id.pProgressBarIndeterminate);
|
||||
mTabFragment = findViewById(R.id.mTabFragment);
|
||||
mTopBarHider = findViewById(R.id.pTopBarHider);
|
||||
mNewTabBlocker = findViewById(R.id.pNewTabBlocker);
|
||||
|
@ -612,7 +604,7 @@ public class homeController extends AppCompatActivity implements ComponentCallba
|
|||
mGeckoView.setAutofillEnabled(true);
|
||||
|
||||
mGeckoClient = new geckoClients();
|
||||
mHomeViewController.initialization(new homeViewCallback(), this, mNewTab, mWebViewContainer, mLoadingText, mProgressBar, mSearchbar, mSplashScreen, mLoadingIcon, mBannerAds, mGatewaySplash, mTopBar, mGeckoView, mBackSplash, mConnectButton, mConnectNoTorButton, mFindBar, mFindText, mFindCount, mTopLayout, mVoiceInput, mMenu, mNestedScroll, mBlocker, mBlockerFullSceen, mSearchEngineBar, mCopyright, mHintListView, mAppBar, mOrbotLogManager, mInfoLandscape, mInfoPortrait, mProgressBarIndeterminate, mTabFragment, mTopBarContainer, mSearchLock, mTopBarHider, mNewTabBlocker, mCoordinatorLayout, mImageDivider, mPanicButton, mGenesisLogo, mPanicButtonLandscape, mTorDisabled, mSupportButton);
|
||||
mHomeViewController.initialization(new homeViewCallback(), this, mNewTab, mWebViewContainer, mLoadingText, mProgressBar, mSearchbar, mSplashScreen, mLoadingIcon, mBannerAds, mGatewaySplash, mTopBar, mGeckoView, mBackSplash, mConnectButton, mConnectNoTorButton, mFindBar, mFindText, mFindCount, mTopLayout, mVoiceInput, mMenu, mNestedScroll, mBlocker, mBlockerFullSceen, mSearchEngineBar, mCopyright, mHintListView, mAppBar, mOrbotLogManager, mInfoLandscape, mInfoPortrait, mTabFragment, mTopBarContainer, mSearchLock, mTopBarHider, mNewTabBlocker, mCoordinatorLayout, mImageDivider, mPanicButton, mGenesisLogo, mPanicButtonLandscape, mTorDisabled, mSupportButton);
|
||||
mGeckoView.onSetHomeEvent(new nestedGeckoViewCallback());
|
||||
}
|
||||
|
||||
|
|
|
@ -112,7 +112,6 @@ public class homeViewController {
|
|||
private ConstraintLayout mInfoPortrait;
|
||||
private ConstraintLayout mInfoLandscape;
|
||||
private NestedScrollView mNestedScroll;
|
||||
private ProgressBar mProgressBarIndeterminate;
|
||||
private FragmentContainerView mTabFragment;
|
||||
private LinearLayout mTopBarContainer;
|
||||
private ImageView mSearchLock;
|
||||
|
@ -133,7 +132,7 @@ public class homeViewController {
|
|||
private boolean mIsTopBarExpanded = true;
|
||||
private NestedScrollView.MarginLayoutParams mDefaultMargin = null;
|
||||
|
||||
public void initialization(eventObserver.eventListener event, AppCompatActivity context, Button mNewTab, ConstraintLayout webviewContainer, TextView loadingText, ProgressBar progressBar, editTextManager searchbar, ConstraintLayout splashScreen, ImageView loading, View banner_ads, ImageButton gateway_splash, LinearLayout top_bar, GeckoView gecko_view, ImageView backsplash, Button connect_button, Button connect_no_tor_button, View pFindBar, EditText pFindText, TextView pFindCount, androidx.constraintlayout.widget.ConstraintLayout pTopLayout, ImageButton pVoiceInput, ImageButton pMenu, androidx.core.widget.NestedScrollView pNestedScroll, ImageView pBlocker, ImageView pBlockerFullSceen, View mSearchEngineBar, TextView pCopyright, RecyclerView pHistListView, com.google.android.material.appbar.AppBarLayout pAppBar, ImageButton pOrbotLogManager, ConstraintLayout pInfoLandscape, ConstraintLayout pInfoPortrait, ProgressBar pProgressBarIndeterminate, FragmentContainerView pTabFragment, LinearLayout pTopBarContainer, ImageView pSearchLock, ImageView pTopBarHider, ImageView pNewTabBlocker, CoordinatorLayout mCoordinatorLayout, ImageView pImageDivider, ImageButton pPanicButton, ImageView pGenesisLogo, ImageButton pPanicButtonLandscape, ImageView pTorDisabled, ImageButton pSupportButton) {
|
||||
public void initialization(eventObserver.eventListener event, AppCompatActivity context, Button mNewTab, ConstraintLayout webviewContainer, TextView loadingText, ProgressBar progressBar, editTextManager searchbar, ConstraintLayout splashScreen, ImageView loading, View banner_ads, ImageButton gateway_splash, LinearLayout top_bar, GeckoView gecko_view, ImageView backsplash, Button connect_button, Button connect_no_tor_button, View pFindBar, EditText pFindText, TextView pFindCount, androidx.constraintlayout.widget.ConstraintLayout pTopLayout, ImageButton pVoiceInput, ImageButton pMenu, androidx.core.widget.NestedScrollView pNestedScroll, ImageView pBlocker, ImageView pBlockerFullSceen, View mSearchEngineBar, TextView pCopyright, RecyclerView pHistListView, com.google.android.material.appbar.AppBarLayout pAppBar, ImageButton pOrbotLogManager, ConstraintLayout pInfoLandscape, ConstraintLayout pInfoPortrait, FragmentContainerView pTabFragment, LinearLayout pTopBarContainer, ImageView pSearchLock, ImageView pTopBarHider, ImageView pNewTabBlocker, CoordinatorLayout mCoordinatorLayout, ImageView pImageDivider, ImageButton pPanicButton, ImageView pGenesisLogo, ImageButton pPanicButtonLandscape, ImageView pTorDisabled, ImageButton pSupportButton) {
|
||||
this.mContext = context;
|
||||
this.mProgressBar = progressBar;
|
||||
this.mSearchbar = searchbar;
|
||||
|
@ -162,7 +161,6 @@ public class homeViewController {
|
|||
this.mInfoPortrait = pInfoPortrait;
|
||||
this.mInfoLandscape = pInfoLandscape;
|
||||
this.mNestedScroll = pNestedScroll;
|
||||
this.mProgressBarIndeterminate = pProgressBarIndeterminate;
|
||||
this.mTabFragment = pTabFragment;
|
||||
this.mTopBarContainer = pTopBarContainer;
|
||||
this.mSearchLock = pSearchLock;
|
||||
|
@ -596,7 +594,6 @@ public class homeViewController {
|
|||
}
|
||||
|
||||
public void onPostScreenDisable() {
|
||||
mProgressBarIndeterminate.setVisibility(View.GONE);
|
||||
mSplashScreen.setClickable(false);
|
||||
mSplashScreen.setFocusable(false);
|
||||
mSearchbar.setEnabled(true);
|
||||
|
@ -621,8 +618,6 @@ public class homeViewController {
|
|||
mLoadingText.animate().setStartDelay(0).setDuration(250).alpha(1);
|
||||
}
|
||||
|
||||
mProgressBarIndeterminate.setVisibility(View.VISIBLE);
|
||||
mProgressBarIndeterminate.animate().alpha(1);
|
||||
mConnectButton.setEnabled(false);
|
||||
mConnectNoTorButton.setEnabled(false);
|
||||
mSplashScreen.setEnabled(false);
|
||||
|
|
|
@ -216,7 +216,7 @@ public class settingGeneralController extends AppCompatActivity {
|
|||
}
|
||||
|
||||
public void onSelectTheme(View view) {
|
||||
if(status.sLowMemory == enums.MemoryStatus.CRITICAL_MEMORY){
|
||||
if(status.sLowMemory == enums.MemoryStatus.CRITICAL_MEMORY || status.sLowMemory == enums.MemoryStatus.LOW_MEMORY){
|
||||
pluginController.getInstance().onMessageManagerInvoke(Collections.singletonList(this), M_LOW_MEMORY);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -746,21 +746,6 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
tools:ignore="RtlSymmetry" />
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/pProgressBarIndeterminate"
|
||||
style="?android:attr/progressBarStyleHorizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="16dp"
|
||||
android:alpha="0"
|
||||
android:elevation="5dp"
|
||||
android:indeterminate="true"
|
||||
android:indeterminateTint="#99ffff"
|
||||
android:translationY="6.5dp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toTopOf="@+id/pCopyright"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<View
|
||||
android:id="@+id/pDivider1"
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* Version */
|
||||
project.ext.vname = 'Build | Dark-Origin 1.1.0.2'
|
||||
project.ext.vcode = 530
|
||||
project.ext.vname = 'Build | Dark-Origin 1.1.0.3'
|
||||
project.ext.vcode = 535
|
||||
project.ext.buildType = 'release'
|
||||
project.ext.jvmTarget = "1.8"
|
||||
project.ext.applovin_key = "pCPe4EeU2ZQVwQPeHLgseRqHBX1V5pvo9Piuu4J809dRhadEgukXa1A8po_UeXu5hmPOTaP1v4QPaMKIEOhh50"
|
||||
|
|
|
@ -1156,7 +1156,7 @@ public class OrbotService extends VpnService implements OrbotConstants {
|
|||
}
|
||||
orbotLocalConstants.mNetworkState = mConnectivity;
|
||||
if(mConnectivity){
|
||||
showToolbarNotification(getString(R.string.newnym), NOTIFY_ID, R.mipmap.ic_stat_tor_logo);
|
||||
//showToolbarNotification(getString(R.string.newnym), NOTIFY_ID, R.mipmap.ic_stat_tor_logo);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue