mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-01-03 14:40:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Move admin request in menu

Browse source
This commit is contained in:
Thomas 2022-05-26 16:58:01 +02:00
parent 1f347ccf98
commit 35c248bcb2
4 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/app/fedilab/android/activities/LoginActivity.java
View file

@ -149,6 +149,10 @@ public class LoginActivity extends BaseActivity {
editor.putBoolean(getString(R.string.SET_EMBEDDED_BROWSER), !item.isChecked()); editor.putBoolean(getString(R.string.SET_EMBEDDED_BROWSER), !item.isChecked());
editor.apply(); editor.apply();
return false; return false;
} else if (id == R.id.action_request_admin) {
item.setChecked(!item.isChecked());
requestedAdmin = item.isChecked();
return false;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }

26
app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginMain.java
View file

@ -76,7 +76,6 @@ public class FragmentLoginMain extends Fragment {
binding.menuIcon.setOnClickListener(this::showMenu); binding.menuIcon.setOnClickListener(this::showMenu);
binding.loginInstance.setOnItemClickListener((parent, view, position, id) -> oldSearch = parent.getItemAtPosition(position).toString().trim()); binding.loginInstance.setOnItemClickListener((parent, view, position, id) -> oldSearch = parent.getItemAtPosition(position).toString().trim());
binding.adminScope.setOnCheckedChangeListener((compoundButton, checked) -> ((LoginActivity) requireActivity()).setAdmin(checked));
binding.loginInstance.addTextChangedListener(new TextWatcher() { binding.loginInstance.addTextChangedListener(new TextWatcher() {
@Override @Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) { public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@ -173,9 +172,11 @@ public class FragmentLoginMain extends Fragment {
MenuInflater menuInflater = popupMenu.getMenuInflater(); MenuInflater menuInflater = popupMenu.getMenuInflater();
menuInflater.inflate(R.menu.main_login, popupMenu.getMenu()); menuInflater.inflate(R.menu.main_login, popupMenu.getMenu());
MenuItem customTabItem = popupMenu.getMenu().findItem(R.id.action_custom_tabs); MenuItem customTabItem = popupMenu.getMenu().findItem(R.id.action_custom_tabs);
MenuItem adminTabItem = popupMenu.getMenu().findItem(R.id.action_request_admin);
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity()); SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());
boolean embedded_browser = sharedpreferences.getBoolean(getString(R.string.SET_EMBEDDED_BROWSER), true); boolean embedded_browser = sharedpreferences.getBoolean(getString(R.string.SET_EMBEDDED_BROWSER), true);
customTabItem.setChecked(!embedded_browser); customTabItem.setChecked(!embedded_browser);
adminTabItem.setChecked(((LoginActivity) requireActivity()).requestedAdmin());
popupMenu.setOnMenuItemClickListener(item -> { popupMenu.setOnMenuItemClickListener(item -> {
int itemId = item.getItemId(); int itemId = item.getItemId();
if (itemId == R.id.action_proxy) { if (itemId == R.id.action_proxy) {
@ -200,6 +201,23 @@ public class FragmentLoginMain extends Fragment {
} }
}); });
editor.apply(); editor.apply();
} else if (itemId == R.id.action_request_admin) {
boolean checked = !((LoginActivity) requireActivity()).requestedAdmin();
((LoginActivity) requireActivity()).setAdmin(checked);
item.setChecked(!item.isChecked());
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
item.setActionView(new View(requireContext()));
item.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
@Override
public boolean onMenuItemActionExpand(MenuItem item) {
return false;
}
@Override
public boolean onMenuItemActionCollapse(MenuItem item) {
return false;
}
});
} }
return false; return false;
}); });
@ -230,7 +248,7 @@ public class FragmentLoginMain extends Fragment {
Toasty.error(requireActivity(), getString(R.string.client_error), Toast.LENGTH_LONG).show(); Toasty.error(requireActivity(), getString(R.string.client_error), Toast.LENGTH_LONG).show();
} }
if (api == Account.API.MASTODON) { if (api == Account.API.MASTODON) {
String scopes = binding.adminScope.isChecked() ? Helper.OAUTH_SCOPES_ADMIN : Helper.OAUTH_SCOPES; String scopes = ((LoginActivity) requireActivity()).requestedAdmin() ? Helper.OAUTH_SCOPES_ADMIN : Helper.OAUTH_SCOPES;
AppsVM appsVM = new ViewModelProvider(requireActivity()).get(AppsVM.class); AppsVM appsVM = new ViewModelProvider(requireActivity()).get(AppsVM.class);
appsVM.createApp(currentInstance, getString(R.string.app_name), appsVM.createApp(currentInstance, getString(R.string.app_name),
Helper.REDIRECT_CONTENT_WEB, Helper.REDIRECT_CONTENT_WEB,
@ -239,13 +257,13 @@ public class FragmentLoginMain extends Fragment {
).observe(requireActivity(), app -> { ).observe(requireActivity(), app -> {
client_id = app.client_id; client_id = app.client_id;
client_secret = app.client_secret; client_secret = app.client_secret;
String redirectUrl = MastodonHelper.authorizeURL(currentInstance, client_id, binding.adminScope.isChecked()); String redirectUrl = MastodonHelper.authorizeURL(currentInstance, client_id, ((LoginActivity) requireActivity()).requestedAdmin());
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity()); SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());
boolean embedded_browser = sharedpreferences.getBoolean(getString(R.string.SET_EMBEDDED_BROWSER), true); boolean embedded_browser = sharedpreferences.getBoolean(getString(R.string.SET_EMBEDDED_BROWSER), true);
if (embedded_browser) { if (embedded_browser) {
Intent i = new Intent(requireActivity(), WebviewConnectActivity.class); Intent i = new Intent(requireActivity(), WebviewConnectActivity.class);
i.putExtra("login_url", redirectUrl); i.putExtra("login_url", redirectUrl);
i.putExtra("requestedAdmin", binding.adminScope.isChecked()); i.putExtra("requestedAdmin", ((LoginActivity) requireActivity()).requestedAdmin());
startActivity(i); startActivity(i);
requireActivity().finish(); requireActivity().finish();
} else { } else {

8
app/src/main/res/layout/fragment_login_main.xml
View file

@ -48,14 +48,6 @@
android:imeOptions="actionNext" android:imeOptions="actionNext"
android:inputType="textWebEmailAddress" android:inputType="textWebEmailAddress"
android:singleLine="true" /> android:singleLine="true" />
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/admin_scope"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/admin_scope"
app:buttonTint="@color/cyanea_accent_reference" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton

5
app/src/main/res/menu/main_login.xml
View file

@ -21,6 +21,11 @@
android:checkable="true" android:checkable="true"
android:title="@string/custom_tabs" android:title="@string/custom_tabs"
app:actionViewClass="android.widget.CheckBox" /> app:actionViewClass="android.widget.CheckBox" />
<item
android:id="@+id/action_request_admin"
android:checkable="true"
android:title="@string/admin_scope"
app:actionViewClass="android.widget.CheckBox" />
<!-- <!--
<item <item
android:id="@+id/action_import_data" android:id="@+id/action_import_data"