From 1f2ae7f1d9fcc7f672503716b2d809d58e3cbdac Mon Sep 17 00:00:00 2001 From: adrian Date: Fri, 23 Jan 2026 17:50:02 -0300 Subject: [PATCH] Cleanup before tagging 1.4.1 and add license to about page. - Add missing separator in about "Special Thanks" section - Add margin to separators in about page - Moved registering and unregistering of receiver from onResume and onPause to onCreate and onDestroy in SplashActivity.java - Better UX reaction to STATE_OFFLINE in MainActivity.java - Remove redundant check for ApiClient in LoginService - AbsMusicContentActivity calls onStateOffline() instead of handling navigation by itself. --- .../geleia/activities/MainActivity.java | 11 ++-- .../geleia/activities/SplashActivity.java | 33 +++++++----- .../base/AbsMusicContentActivity.java | 2 +- .../geleia/service/LoginService.java | 5 -- app/src/main/res/layout/card_about_app.xml | 52 +++++++++++++++++++ .../main/res/layout/card_special_thanks.xml | 13 ++++- app/src/main/res/layout/fragment_offline.xml | 2 +- app/src/main/res/values/strings.xml | 3 ++ 8 files changed, 94 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/org/adrianvictor/geleia/activities/MainActivity.java b/app/src/main/java/org/adrianvictor/geleia/activities/MainActivity.java index e8cb9410..7df0491d 100644 --- a/app/src/main/java/org/adrianvictor/geleia/activities/MainActivity.java +++ b/app/src/main/java/org/adrianvictor/geleia/activities/MainActivity.java @@ -1,12 +1,9 @@ package org.adrianvictor.geleia.activities; -import static org.adrianvictor.geleia.adapter.CustomFragmentStatePagerAdapter.TAG; - import android.content.Intent; import android.os.Build; import android.os.Bundle; import android.os.Handler; -import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -23,6 +20,7 @@ import com.afollestad.materialcab.attached.AttachedCabKt; import org.adrianvictor.geleia.activities.base.AbsMusicContentActivity; import org.adrianvictor.geleia.fragments.OfflineFragment; import org.adrianvictor.geleia.interfaces.CabHolder; +import org.adrianvictor.geleia.util.NavigationUtil; import org.adrianvictor.geleia.util.PreferenceUtil; import org.adrianvictor.geleia.util.ThemeUtil; import org.adrianvictor.geleia.databinding.ActivityMainContentBinding; @@ -105,7 +103,6 @@ public class MainActivity extends AbsMusicContentActivity implements CabHolder { @Override public void onStateOffline() { - Log.d(TAG, "onStateOffline() foi chamado."); Menu menu = binding.navigationView.getMenu(); menu.clear(); @@ -118,7 +115,11 @@ public class MainActivity extends AbsMusicContentActivity implements CabHolder { setUpDrawerLayout(); - pendingShowOffline = true; + if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) { + NavigationUtil.startUnreachable(this); + } else { + pendingShowOffline = true; + } } @Override diff --git a/app/src/main/java/org/adrianvictor/geleia/activities/SplashActivity.java b/app/src/main/java/org/adrianvictor/geleia/activities/SplashActivity.java index da451a59..d3460d22 100644 --- a/app/src/main/java/org/adrianvictor/geleia/activities/SplashActivity.java +++ b/app/src/main/java/org/adrianvictor/geleia/activities/SplashActivity.java @@ -45,20 +45,6 @@ public class SplashActivity extends AbsBaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_splash); - } - - @Override - public void onPause() { - super.onPause(); - unregisterReceiver(receiver); - overridePendingTransition(0, R.anim.fade_delay); - } - - @Override - protected void onResume() { - super.onResume(); - final IntentFilter filter = new IntentFilter(); filter.addAction(LoginService.STATE_ONLINE); filter.addAction(LoginService.STATE_OFFLINE); @@ -69,6 +55,19 @@ public class SplashActivity extends AbsBaseActivity { registerReceiver(receiver, filter); } + setContentView(R.layout.activity_splash); + } + + @Override + public void onPause() { + super.onPause(); + overridePendingTransition(0, R.anim.fade_delay); + } + + @Override + protected void onResume() { + super.onResume(); + User user = App.getDatabase().userDao().getUser(PreferenceUtil.getInstance(this).getUser()); List available = App.getDatabase().userDao().getUsers(); @@ -82,4 +81,10 @@ public class SplashActivity extends AbsBaseActivity { startService(new Intent(this, LoginService.class)); } } + + @Override + protected void onDestroy() { + unregisterReceiver(receiver); + super.onDestroy(); + } } diff --git a/app/src/main/java/org/adrianvictor/geleia/activities/base/AbsMusicContentActivity.java b/app/src/main/java/org/adrianvictor/geleia/activities/base/AbsMusicContentActivity.java index 2c760a46..90843227 100644 --- a/app/src/main/java/org/adrianvictor/geleia/activities/base/AbsMusicContentActivity.java +++ b/app/src/main/java/org/adrianvictor/geleia/activities/base/AbsMusicContentActivity.java @@ -29,7 +29,7 @@ public abstract class AbsMusicContentActivity extends AbsMusicPanelActivity impl onStateOnline(); break; case LoginService.STATE_OFFLINE: - NavigationUtil.startSelect(context); + onStateOffline(); break; } } diff --git a/app/src/main/java/org/adrianvictor/geleia/service/LoginService.java b/app/src/main/java/org/adrianvictor/geleia/service/LoginService.java index f00c69d1..55db8664 100644 --- a/app/src/main/java/org/adrianvictor/geleia/service/LoginService.java +++ b/app/src/main/java/org/adrianvictor/geleia/service/LoginService.java @@ -59,11 +59,6 @@ public class LoginService extends Service { } } - if (App.getApiClient() == null) { - sendBroadcast(new Intent(STATE_OFFLINE)); - return; - } - App.getApiClient().ChangeServerLocation(user.server); App.getApiClient().SetAuthenticationInfo(user.token, user.id); App.getApiClient().GetSystemInfoAsync(new Response() { diff --git a/app/src/main/res/layout/card_about_app.xml b/app/src/main/res/layout/card_about_app.xml index 9bc04637..59e36ce1 100644 --- a/app/src/main/res/layout/card_about_app.xml +++ b/app/src/main/res/layout/card_about_app.xml @@ -82,6 +82,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/card_special_thanks.xml b/app/src/main/res/layout/card_special_thanks.xml index d99e26e6..2d21f38a 100644 --- a/app/src/main/res/layout/card_special_thanks.xml +++ b/app/src/main/res/layout/card_special_thanks.xml @@ -27,7 +27,8 @@ + android:layout_marginBottom="10dp" + android:background="?attr/dividerColor"/> + + Oops! I did it again... ;( Sorry, but we couldn\'t reach this server right now. + License + GNU General Public License v3.0 + GNU General Public License v3.0