LBRYCommunity/lbry-fdroid
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/lbryio/lbry-android

Browse source
This commit is contained in:
Javi Rueda 2020-08-09 12:59:58 +02:00
commit e5dcc527eb
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -14,8 +14,8 @@ android {
applicationId "io.lbry.browser" applicationId "io.lbry.browser"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 1516 versionCode 1517
versionName "0.15.16" versionName "0.15.17"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

20
app/src/main/java/io/lbry/browser/MainActivity.java
View file

@ -857,7 +857,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
findViewById(R.id.content_main).setVisibility(View.GONE); findViewById(R.id.content_main).setVisibility(View.GONE);
findViewById(R.id.floating_balance_main_container).setVisibility(View.GONE); findViewById(R.id.floating_balance_main_container).setVisibility(View.GONE);
findViewById(R.id.global_now_playing_card).setVisibility(View.GONE); findViewById(R.id.global_now_playing_card).setVisibility(View.GONE);
findViewById(R.id.global_sdk_initializing_status).setVisibility(View.GONE); //findViewById(R.id.global_sdk_initializing_status).setVisibility(View.GONE);
findViewById(R.id.app_bar_main_container).setFitsSystemWindows(true); findViewById(R.id.app_bar_main_container).setFitsSystemWindows(true);
hideActionBar(); hideActionBar();
@ -893,9 +893,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
if (!(fragment instanceof FileViewFragment) && !inFullscreenMode) { if (!(fragment instanceof FileViewFragment) && !inFullscreenMode) {
findViewById(R.id.global_now_playing_card).setVisibility(View.VISIBLE); findViewById(R.id.global_now_playing_card).setVisibility(View.VISIBLE);
} }
if (!Lbry.SDK_READY && !inFullscreenMode) { /*if (!Lbry.SDK_READY && !inFullscreenMode) {
findViewById(R.id.global_sdk_initializing_status).setVisibility(View.VISIBLE); findViewById(R.id.global_sdk_initializing_status).setVisibility(View.VISIBLE);
} }*/
for (PIPModeListener listener : pipModeListeners) { for (PIPModeListener listener : pipModeListeners) {
listener.onExitPIPMode(); listener.onExitPIPMode();
} }
@ -992,16 +992,16 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
serviceRunning = isServiceRunning(this, LbrynetService.class); serviceRunning = isServiceRunning(this, LbrynetService.class);
if (!serviceRunning) { if (!serviceRunning) {
Lbry.SDK_READY = false; Lbry.SDK_READY = false;
findViewById(R.id.global_sdk_initializing_status).setVisibility(View.VISIBLE); //findViewById(R.id.global_sdk_initializing_status).setVisibility(View.VISIBLE);
ServiceHelper.start(this, "", LbrynetService.class, "lbrynetservice"); ServiceHelper.start(this, "", LbrynetService.class, "lbrynetservice");
} }
checkSdkReady(); checkSdkReady();
showSignedInUser(); showSignedInUser();
checkPendingOpens(); checkPendingOpens();
if (Lbry.SDK_READY) { /*if (Lbry.SDK_READY) {
findViewById(R.id.global_sdk_initializing_status).setVisibility(View.GONE); findViewById(R.id.global_sdk_initializing_status).setVisibility(View.GONE);
} }*/
} }
private void checkPendingOpens() { private void checkPendingOpens() {
@ -1432,7 +1432,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
if (actionBar != null) { if (actionBar != null) {
actionBar.hide(); actionBar.hide();
} }
findViewById(R.id.global_sdk_initializing_status).setVisibility(View.GONE); //findViewById(R.id.global_sdk_initializing_status).setVisibility(View.GONE);
findViewById(R.id.app_bar_main_container).setFitsSystemWindows(false); findViewById(R.id.app_bar_main_container).setFitsSystemWindows(false);
lockDrawer(); lockDrawer();
@ -1463,9 +1463,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
appBarMainContainer.setFitsSystemWindows(true); appBarMainContainer.setFitsSystemWindows(true);
decorView.setSystemUiVisibility(flags); decorView.setSystemUiVisibility(flags);
if (!Lbry.SDK_READY) { /*if (!Lbry.SDK_READY) {
findViewById(R.id.global_sdk_initializing_status).setVisibility(View.VISIBLE); findViewById(R.id.global_sdk_initializing_status).setVisibility(View.VISIBLE);
} }*/
showFloatingWalletBalance(); showFloatingWalletBalance();
ActionBar actionBar = getSupportActionBar(); ActionBar actionBar = getSupportActionBar();
if (actionBar != null) { if (actionBar != null) {
@ -1554,7 +1554,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
checkSyncedWallet(); checkSyncedWallet();
} }
findViewById(R.id.global_sdk_initializing_status).setVisibility(View.GONE); //findViewById(R.id.global_sdk_initializing_status).setVisibility(View.GONE);
scheduleWalletBalanceUpdate(); scheduleWalletBalanceUpdate();
scheduleWalletSyncTask(); scheduleWalletSyncTask();

1
app/src/main/res/layout/content_main.xml
View file

@ -42,6 +42,7 @@
android:background="@color/lbryGreen" android:background="@color/lbryGreen"
android:elevation="12dp" android:elevation="12dp"
android:padding="8dp" android:padding="8dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"> app:layout_constraintBottom_toBottomOf="parent">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"