Clean code (bf447d82) · Commits · Android-smartphones / Fedilab

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -212,6 +212,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		public static String regex_home, regex_local, regex_public;
		public static BaseAccount currentAccount;
		public static iconLauncher mLauncher = iconLauncher.BUBBLES;
		public static boolean headerMenuOpen;
		Fragment currentFragment;
		private AppBarConfiguration mAppBarConfiguration;
		private ActivityMainBinding binding;
		@@ -330,7 +331,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		}
		};
		private NetworkStateReceiver networkStateReceiver;
		public static boolean headerMenuOpen;

		public static void fetchRecentAccounts(Activity activity, NavHeaderMainBinding headerMainBinding) {
		SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity);
		@@ -644,8 +644,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		popup.show();
		}

		protected abstract void rateThisApp();

		/**
		* Open notifications tab when coming from a notification device
		*
		@@ -1034,6 +1032,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		intent.setFlags(0);
		}

		protected abstract void rateThisApp();

		@Override
		protected void onNewIntent(Intent intent) {
		super.onNewIntent(intent);

+10 −10

Original line number	Diff line number	Diff line
		@@ -404,12 +404,21 @@ public class CheckHomeCacheActivity extends BaseBarActivity {
		}).start();
		}

		@Override
		public boolean onOptionsItemSelected(MenuItem item) {
		if (item.getItemId() == android.R.id.home) {
		finish();
		return true;
		}
		return super.onOptionsItemSelected(item);
		}


		public enum range {
		ALL,
		DAY
		}


		public static class GraphElement {
		String dateLabel;
		int count;
		@@ -424,15 +433,6 @@ public class CheckHomeCacheActivity extends BaseBarActivity {
		}
		}

		@Override
		public boolean onOptionsItemSelected(MenuItem item) {
		if (item.getItemId() == android.R.id.home) {
		finish();
		return true;
		}
		return super.onOptionsItemSelected(item);
		}

		public class CustomMarkerView extends MarkerView {

		private final TextView tvContent;

+7 −7

Original line number	Diff line number	Diff line
		@@ -79,34 +79,34 @@ class InstanceHealthActivity : DialogFragment() {
		}
		binding.name.text = instance.name
		if (instance.up) {
		binding.up.setText(app.fedilab.android.R.string.is_up)
		binding.up.setText(R.string.is_up)
		binding.up.setTextColor(
		ThemeHelper.getAttColor(
		requireContext(),
		app.fedilab.android.R.attr.colorPrimary
		R.attr.colorPrimary
		)
		)
		} else {
		binding.up.setText(app.fedilab.android.R.string.is_down)
		binding.up.setText(R.string.is_down)
		binding.up.setTextColor(
		ThemeHelper.getAttColor(
		requireContext(),
		app.fedilab.android.R.attr.colorError
		R.attr.colorError
		)
		)
		}
		binding.uptime.text = getString(
		app.fedilab.android.R.string.instance_health_uptime,
		R.string.instance_health_uptime,
		instance.uptime * 100
		)
		if (instance.checked_at != null)
		binding.checkedAt.text =
		getString(
		app.fedilab.android.R.string.instance_health_checkedat,
		R.string.instance_health_checkedat,
		Helper.dateToString(instance.checked_at)
		)
		binding.values.text = getString(
		app.fedilab.android.R.string.instance_health_indication,
		R.string.instance_health_indication,
		instance.version,
		Helper.withSuffix(instance.active_users.toLong()),
		Helper.withSuffix(instance.statuses.toLong())

+2 −1

Original line number	Diff line number	Diff line
		@@ -373,7 +373,8 @@ public class MastodonListActivity extends BaseBarActivity implements MastodonLis
		Intent intentBD = new Intent(Helper.BROADCAST_DATA);
		intentBD.putExtras(b);
		LocalBroadcastManager.getInstance(MastodonListActivity.this).sendBroadcast(intentBD);
		} catch (DBException e) {
		} catch (
		DBException e) {
		e.printStackTrace();
		}
		}).start();

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,10 +67,10 @@ import es.dmoral.toasty.Toasty;
		public class SearchResultTabActivity extends BaseBarActivity {


		public Boolean tagEmpty, accountEmpty;
		private String search;
		private ActivitySearchResultTabsBinding binding;
		private TabLayout.Tab initial;
		public Boolean tagEmpty, accountEmpty;

		@Override
		protected void onCreate(Bundle savedInstanceState) {