Cleaning code 1 (5cca26e0) · Commits · Android-smartphones / Fedilab

app/src/main/java/app/fedilab/android/activities/LoginActivity.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,6 @@ public class LoginActivity extends BaseActivity {
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);

		SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(LoginActivity.this);
		setContentView(new FrameLayout(this));
		FragmentLoginMain fragmentLoginMain = new FragmentLoginMain();
		Helper.addFragment(getSupportFragmentManager(), android.R.id.content, fragmentLoginMain, null, null, null);

app/src/main/java/app/fedilab/android/mastodon/activities/AccountReportActivity.java

+16 −29

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import androidx.lifecycle.ViewModelProvider;
		import androidx.recyclerview.widget.LinearLayoutManager;

		import java.util.ArrayList;
		import java.util.Objects;

		import app.fedilab.android.R;
		import app.fedilab.android.activities.MainActivity;
		@@ -134,12 +135,12 @@ public class AccountReportActivity extends BaseBarActivity {
		binding.reject.setOnClickListener(view -> adminVM.reject(MainActivity.currentInstance, MainActivity.currentToken, account_id).observe(this, account -> fillReport(account, actionType.REJECT)));
		binding.allow.setOnClickListener(view -> adminVM.approve(MainActivity.currentInstance, MainActivity.currentToken, account_id).observe(this, account -> fillReport(account, actionType.APPROVE)));
		binding.warn.setOnClickListener(view -> {
		adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "none", null, null, binding.comment.getText().toString().trim(), binding.emailUser.isChecked());
		adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "none", null, null, Objects.requireNonNull(binding.comment.getText()).toString().trim(), binding.emailUser.isChecked());
		fillReport(accountAdmin, actionType.NONE);
		});
		binding.silence.setOnClickListener(view -> {
		if (!accountAdmin.silenced) {
		adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "silence", null, null, binding.comment.getText().toString().trim(), binding.emailUser.isChecked());
		adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "silence", null, null, Objects.requireNonNull(binding.comment.getText()).toString().trim(), binding.emailUser.isChecked());
		accountAdmin.silenced = true;
		fillReport(accountAdmin, actionType.SILENCE);
		} else {
		@@ -148,7 +149,7 @@ public class AccountReportActivity extends BaseBarActivity {
		});
		binding.disable.setOnClickListener(view -> {
		if (!accountAdmin.disabled) {
		adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "disable", null, null, binding.comment.getText().toString().trim(), binding.emailUser.isChecked());
		adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "disable", null, null, Objects.requireNonNull(binding.comment.getText()).toString().trim(), binding.emailUser.isChecked());
		accountAdmin.disabled = true;
		fillReport(accountAdmin, actionType.DISABLE);
		} else {
		@@ -158,7 +159,7 @@ public class AccountReportActivity extends BaseBarActivity {

		binding.suspend.setOnClickListener(view -> {
		if (!accountAdmin.suspended) {
		adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "suspend", null, null, binding.comment.getText().toString().trim(), binding.emailUser.isChecked());
		adminVM.performAction(MainActivity.currentInstance, MainActivity.currentToken, account_id, "suspend", null, null, Objects.requireNonNull(binding.comment.getText()).toString().trim(), binding.emailUser.isChecked());
		accountAdmin.suspended = true;
		fillReport(accountAdmin, actionType.SUSPEND);
		} else {
		@@ -170,35 +171,21 @@ public class AccountReportActivity extends BaseBarActivity {
		if (type != null) {
		String message = null;
		switch (type) {
		case SILENCE:
		message = getString(R.string.account_silenced);
		break;
		case UNSILENCE:
		message = getString(R.string.account_unsilenced);
		break;
		case DISABLE:
		message = getString(R.string.account_disabled);
		break;
		case ENABLE:
		message = getString(R.string.account_undisabled);
		break;
		case SUSPEND:
		message = getString(R.string.account_suspended);
		break;
		case UNSUSPEND:
		message = getString(R.string.account_unsuspended);
		break;
		case NONE:
		message = getString(R.string.account_warned);
		break;
		case APPROVE:
		case SILENCE -> message = getString(R.string.account_silenced);
		case UNSILENCE -> message = getString(R.string.account_unsilenced);
		case DISABLE -> message = getString(R.string.account_disabled);
		case ENABLE -> message = getString(R.string.account_undisabled);
		case SUSPEND -> message = getString(R.string.account_suspended);
		case UNSUSPEND -> message = getString(R.string.account_unsuspended);
		case NONE -> message = getString(R.string.account_warned);
		case APPROVE -> {
		binding.allowRejectGroup.setVisibility(View.GONE);
		message = getString(R.string.account_approved);
		break;
		case REJECT:
		}
		case REJECT -> {
		binding.allowRejectGroup.setVisibility(View.GONE);
		message = getString(R.string.account_rejected);
		break;
		}
		}
		if (message != null) {
		Toasty.success(AccountReportActivity.this, message, Toast.LENGTH_LONG).show();

app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java

+28 −28

Original line number	Diff line number	Diff line
		@@ -73,73 +73,73 @@ public class BaseActivity extends AppCompatActivity {
		int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
		if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {
		switch (currentNightMode) {
		case Configuration.UI_MODE_NIGHT_NO:
		case Configuration.UI_MODE_NIGHT_NO -> {
		String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
		switch (defaultLight) {
		case "LIGHT":
		case "LIGHT" -> {
		setTheme(R.style.AppTheme);
		currentThemeId = R.style.AppTheme;
		break;
		case "SOLARIZED_LIGHT":
		}
		case "SOLARIZED_LIGHT" -> {
		setTheme(R.style.SolarizedAppTheme);
		currentThemeId = R.style.SolarizedAppTheme;
		break;
		}
		break;
		case Configuration.UI_MODE_NIGHT_YES:
		}
		}
		case Configuration.UI_MODE_NIGHT_YES -> {
		String defaultDark = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_DARK), "DARK");
		switch (defaultDark) {
		case "DARK":
		case "DARK" -> {
		setTheme(R.style.AppTheme);
		currentThemeId = R.style.AppTheme;
		break;
		case "SOLARIZED_DARK":
		}
		case "SOLARIZED_DARK" -> {
		setTheme(R.style.SolarizedAppTheme);
		currentThemeId = R.style.SolarizedAppTheme;
		break;
		case "BLACK":
		}
		case "BLACK" -> {
		setTheme(R.style.BlackAppTheme);
		currentThemeId = R.style.BlackAppTheme;
		break;
		case "DRACULA":
		}
		case "DRACULA" -> {
		setTheme(R.style.DraculaAppTheme);
		currentThemeId = R.style.DraculaAppTheme;
		break;
		}
		break;
		}
		}
		}
		} else {
		switch (currentTheme) {
		case "LIGHT":
		case "LIGHT" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
		setTheme(R.style.AppTheme);
		currentThemeId = R.style.AppTheme;
		break;
		case "DARK":
		}
		case "DARK" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
		setTheme(R.style.AppTheme);
		currentThemeId = R.style.AppTheme;
		break;
		case "SOLARIZED_LIGHT":
		}
		case "SOLARIZED_LIGHT" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
		setTheme(R.style.SolarizedAppTheme);
		currentThemeId = R.style.SolarizedAppTheme;
		break;
		case "SOLARIZED_DARK":
		}
		case "SOLARIZED_DARK" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
		setTheme(R.style.SolarizedAppTheme);
		currentThemeId = R.style.SolarizedAppTheme;
		break;
		case "BLACK":
		}
		case "BLACK" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
		setTheme(R.style.BlackAppTheme);
		currentThemeId = R.style.BlackAppTheme;
		break;
		case "DRACULA":
		}
		case "DRACULA" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
		setTheme(R.style.DraculaAppTheme);
		currentThemeId = R.style.DraculaAppTheme;
		break;
		}
		}
		}
		super.onCreate(savedInstanceState);

app/src/main/java/app/fedilab/android/mastodon/activities/BaseBarActivity.java

+22 −34

Original line number	Diff line number	Diff line
		@@ -68,62 +68,50 @@ public class BaseBarActivity extends AppCompatActivity {
		int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
		if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {
		switch (currentNightMode) {
		case Configuration.UI_MODE_NIGHT_NO:
		case Configuration.UI_MODE_NIGHT_NO -> {
		String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
		switch (defaultLight) {
		case "LIGHT":
		setTheme(R.style.AppThemeBar);
		break;
		case "SOLARIZED_LIGHT":
		setTheme(R.style.SolarizedAppThemeBar);
		break;
		case "LIGHT" -> setTheme(R.style.AppThemeBar);
		case "SOLARIZED_LIGHT" -> setTheme(R.style.SolarizedAppThemeBar);
		}
		break;
		case Configuration.UI_MODE_NIGHT_YES:
		}
		case Configuration.UI_MODE_NIGHT_YES -> {
		String defaultDark = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_DARK), "DARK");
		switch (defaultDark) {
		case "DARK":
		setTheme(R.style.AppThemeBar);
		break;
		case "SOLARIZED_DARK":
		setTheme(R.style.SolarizedAppThemeBar);
		break;
		case "BLACK":
		setTheme(R.style.BlackAppThemeBar);
		break;
		case "DRACULA":
		setTheme(R.style.DraculaAppThemeBar);
		break;
		case "DARK" -> setTheme(R.style.AppThemeBar);
		case "SOLARIZED_DARK" -> setTheme(R.style.SolarizedAppThemeBar);
		case "BLACK" -> setTheme(R.style.BlackAppThemeBar);
		case "DRACULA" -> setTheme(R.style.DraculaAppThemeBar);
		}
		}
		break;
		}

		} else {
		switch (currentTheme) {
		case "LIGHT":
		case "LIGHT" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
		setTheme(R.style.AppThemeBar);
		break;
		case "DARK":
		}
		case "DARK" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
		setTheme(R.style.AppThemeBar);
		break;
		case "SOLARIZED_LIGHT":
		}
		case "SOLARIZED_LIGHT" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
		setTheme(R.style.SolarizedAppThemeBar);
		break;
		case "SOLARIZED_DARK":
		}
		case "SOLARIZED_DARK" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
		setTheme(R.style.SolarizedAppThemeBar);
		break;
		case "BLACK":
		}
		case "BLACK" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
		setTheme(R.style.BlackAppThemeBar);
		break;
		case "DRACULA":
		}
		case "DRACULA" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
		setTheme(R.style.DraculaAppThemeBar);
		break;
		}
		}
		}
		super.onCreate(savedInstanceState);

app/src/main/java/app/fedilab/android/mastodon/activities/BaseTransparentActivity.java

+22 −34

Original line number	Diff line number	Diff line
		@@ -69,62 +69,50 @@ public class BaseTransparentActivity extends AppCompatActivity {
		if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {

		switch (currentNightMode) {
		case Configuration.UI_MODE_NIGHT_NO:
		case Configuration.UI_MODE_NIGHT_NO -> {
		String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
		switch (defaultLight) {
		case "LIGHT":
		setTheme(R.style.Transparent);
		break;
		case "SOLARIZED_LIGHT":
		setTheme(R.style.TransparentSolarized);
		break;
		case "LIGHT" -> setTheme(R.style.Transparent);
		case "SOLARIZED_LIGHT" -> setTheme(R.style.TransparentSolarized);
		}
		break;
		case Configuration.UI_MODE_NIGHT_YES:
		}
		case Configuration.UI_MODE_NIGHT_YES -> {
		String defaultDark = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_DARK), "DARK");
		switch (defaultDark) {
		case "DARK":
		setTheme(R.style.Transparent);
		break;
		case "SOLARIZED_DARK":
		setTheme(R.style.TransparentSolarized);
		break;
		case "BLACK":
		setTheme(R.style.TransparentBlack);
		break;
		case "DRACULA":
		setTheme(R.style.TransparentDracula);
		break;
		case "DARK" -> setTheme(R.style.Transparent);
		case "SOLARIZED_DARK" -> setTheme(R.style.TransparentSolarized);
		case "BLACK" -> setTheme(R.style.TransparentBlack);
		case "DRACULA" -> setTheme(R.style.TransparentDracula);
		}
		}
		break;
		}

		} else {
		switch (currentTheme) {
		case "LIGHT":
		case "LIGHT" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
		setTheme(R.style.Transparent);
		break;
		case "DARK":
		}
		case "DARK" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
		setTheme(R.style.Transparent);
		break;
		case "SOLARIZED_LIGHT":
		}
		case "SOLARIZED_LIGHT" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
		setTheme(R.style.TransparentSolarized);
		break;
		case "SOLARIZED_DARK":
		}
		case "SOLARIZED_DARK" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
		setTheme(R.style.TransparentSolarized);
		break;
		case "BLACK":
		}
		case "BLACK" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
		setTheme(R.style.TransparentBlack);
		break;
		case "DRACULA":
		}
		case "DRACULA" -> {
		AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
		setTheme(R.style.TransparentDracula);
		break;
		}
		}
		}
		super.onCreate(savedInstanceState);