Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Still cleaning

This commit is contained in:
tom79 2020-03-07 17:00:21 +01:00
parent 84e832e19c
commit a1121fc6ce
9 changed files with 253 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/src/main/java/app/fedilab/android/activities/AdminActivity.java
View File

@ -14,7 +14,6 @@
* see <http://www.gnu.org/licenses>. */
package app.fedilab.android.activities;
import android.content.SharedPreferences;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.view.LayoutInflater;
@ -39,6 +38,8 @@ import androidx.viewpager.widget.ViewPager;
import com.google.android.material.tabs.TabLayout;
import org.jetbrains.annotations.NotNull;
import app.fedilab.android.R;
import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
import app.fedilab.android.fragments.DisplayAdminAccountsFragment;
@ -63,7 +64,6 @@ public class AdminActivity extends BaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
setTheme(R.style.AppAdminTheme);
@ -79,12 +79,7 @@ public class AdminActivity extends BaseActivity {
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
toolbar_close.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
toolbar_close.setOnClickListener(v -> finish());
toolbar_title.setText(String.format(getString(R.string.administration) + " %s", Helper.getLiveInstance(getApplicationContext())));
}
setContentView(R.layout.activity_admin);
@ -99,9 +94,7 @@ public class AdminActivity extends BaseActivity {
final LinearLayout tabStrip = (LinearLayout) admin_tablayout.getChildAt(0);
tabStrip.getChildAt(0).setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
tabStrip.getChildAt(0).setOnLongClickListener(v -> {
PopupMenu popup = new PopupMenu(AdminActivity.this, tabStrip.getChildAt(0));
popup.getMenuInflater()
.inflate(R.menu.option_filter_admin_reports, popup.getMenu());
@ -111,9 +104,7 @@ public class AdminActivity extends BaseActivity {
itemUnresolved.setChecked(unresolved);
popup.setOnDismissListener(new PopupMenu.OnDismissListener() {
@Override
public void onDismiss(PopupMenu menu) {
popup.setOnDismissListener(menu12 -> {
FragmentTransaction fragTransaction = getSupportFragmentManager().beginTransaction();
fragTransaction.detach(displayAdminReportsFragment);
Bundle bundle = new Bundle();
@ -121,10 +112,8 @@ public class AdminActivity extends BaseActivity {
displayAdminReportsFragment.setArguments(bundle);
fragTransaction.attach(displayAdminReportsFragment);
fragTransaction.commit();
}
});
popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
popup.setOnMenuItemClickListener(item -> {
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
item.setActionView(new View(getApplicationContext()));
item.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
@ -143,17 +132,13 @@ public class AdminActivity extends BaseActivity {
}
itemUnresolved.setChecked(unresolved);
return false;
}
});
popup.show();
return true;
}
});
tabStrip.getChildAt(1).setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
tabStrip.getChildAt(1).setOnLongClickListener(v -> {
PopupMenu popup = new PopupMenu(AdminActivity.this, tabStrip.getChildAt(1));
popup.getMenuInflater()
.inflate(R.menu.option_filter_admin_accounts, popup.getMenu());
@ -179,9 +164,7 @@ public class AdminActivity extends BaseActivity {
itemSilenced.setChecked(silenced);
itemSuspended.setChecked(suspended);
popup.setOnDismissListener(new PopupMenu.OnDismissListener() {
@Override
public void onDismiss(PopupMenu menu) {
popup.setOnDismissListener(menu1 -> {
FragmentTransaction fragTransaction = getSupportFragmentManager().beginTransaction();
fragTransaction.detach(displayAdminAccountsFragment);
Bundle bundle = new Bundle();
@ -196,10 +179,8 @@ public class AdminActivity extends BaseActivity {
fragTransaction.attach(displayAdminAccountsFragment);
fragTransaction.commit();
}
});
popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
popup.setOnMenuItemClickListener(item -> {
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
item.setActionView(new View(getApplicationContext()));
@ -282,11 +263,9 @@ public class AdminActivity extends BaseActivity {
itemSilenced.setChecked(silenced);
itemSuspended.setChecked(suspended);
return false;
}
});
popup.show();
return true;
}
});
@ -334,20 +313,20 @@ public class AdminActivity extends BaseActivity {
private class AdminPagerAdapter extends FragmentStatePagerAdapter {
AdminPagerAdapter(FragmentManager fm) {
super(fm);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull
@Override
public Fragment getItem(int position) {
Bundle bundle = new Bundle();
switch (position) {
case 0:
Bundle bundle;
if (position == 0) {
displayAdminReportsFragment = new DisplayAdminReportsFragment();
bundle = new Bundle();
bundle.putBoolean("unresolved", unresolved);
displayAdminReportsFragment.setArguments(bundle);
return displayAdminReportsFragment;
case 1:
}
displayAdminAccountsFragment = new DisplayAdminAccountsFragment();
bundle = new Bundle();
bundle.putBoolean("local", local);
@ -360,8 +339,6 @@ public class AdminActivity extends BaseActivity {
displayAdminAccountsFragment.setArguments(bundle);
return displayAdminAccountsFragment;
}
return null;
}
@Override
public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {

16
app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java
View File

@ -72,9 +72,6 @@ public class SearchResultTabActivity extends BaseActivity {
case Helper.THEME_LIGHT:
setTheme(R.style.AppTheme_Fedilab);
break;
case Helper.THEME_DARK:
setTheme(R.style.AppThemeDark);
break;
case Helper.THEME_BLACK:
setTheme(R.style.AppThemeBlack);
break;
@ -113,12 +110,7 @@ public class SearchResultTabActivity extends BaseActivity {
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
toolbar_close.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
toolbar_close.setOnClickListener(v -> finish());
toolbar_title.setText(search);
}
setTitle(search);
@ -198,9 +190,10 @@ public class SearchResultTabActivity extends BaseActivity {
private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
ScreenSlidePagerAdapter(FragmentManager fm) {
super(fm);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull
@Override
public Fragment getItem(int position) {
Bundle bundle = new Bundle();
@ -223,7 +216,7 @@ public class SearchResultTabActivity extends BaseActivity {
bundle.putSerializable("tag", search);
displayStatusFragment.setArguments(bundle);
return displayStatusFragment;
case 3:
default:
displayStatusFragment = new DisplayStatusFragment();
bundle = new Bundle();
bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.SEARCH);
@ -231,7 +224,6 @@ public class SearchResultTabActivity extends BaseActivity {
displayStatusFragment.setArguments(bundle);
return displayStatusFragment;
}
return null;
}
@Override

22
app/src/main/java/app/fedilab/android/activities/SettingsActivity.java
View File

@ -18,7 +18,6 @@ package app.fedilab.android.activities;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.drawable.ColorDrawable;
@ -87,16 +86,13 @@ public class SettingsActivity extends BaseActivity {
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
toolbar_close.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
toolbar_close.setOnClickListener(v -> {
if (needRestart) {
showDialog();
} else {
finish();
}
}
});
toolbar_title.setText(R.string.settings);
}
@ -161,9 +157,7 @@ public class SettingsActivity extends BaseActivity {
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(SettingsActivity.this);
dialogBuilder.setMessage(R.string.restart_message);
dialogBuilder.setTitle(R.string.apply_changes);
dialogBuilder.setPositiveButton(R.string.restart, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialogBuilder.setPositiveButton(R.string.restart, (dialog, id) -> {
Intent mStartActivity = new Intent(getApplicationContext(), MainActivity.class);
int mPendingIntentId = 123456;
PendingIntent mPendingIntent = PendingIntent.getActivity(getApplicationContext(), mPendingIntentId, mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT);
@ -171,14 +165,8 @@ public class SettingsActivity extends BaseActivity {
assert mgr != null;
mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent);
System.exit(0);
}
});
dialogBuilder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
}
});
dialogBuilder.setNegativeButton(R.string.no, (dialog, id) -> dialog.dismiss());
AlertDialog alertDialog = dialogBuilder.create();
alertDialog.setCancelable(false);
alertDialog.show();
@ -195,10 +183,10 @@ public class SettingsActivity extends BaseActivity {
}
}
private class SettingsPagerAdapter extends FragmentStatePagerAdapter {
private static class SettingsPagerAdapter extends FragmentStatePagerAdapter {
SettingsPagerAdapter(FragmentManager fm) {
super(fm);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull

2
app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
View File

@ -1487,7 +1487,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
ScreenSlidePagerAdapter(FragmentManager fm) {
super(fm);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull

40
app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java
View File

@ -146,15 +146,8 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
ImageView media_save = getSupportActionBar().getCustomView().findViewById(R.id.media_save);
ImageView media_share = getSupportActionBar().getCustomView().findViewById(R.id.media_share);
toolbar_close.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
media_save.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
toolbar_close.setOnClickListener(v -> finish());
media_save.setOnClickListener(view12 -> {
int position = mPager.getCurrentItem();
Attachment attachment = attachments.get(position);
if( attachment.getType().compareTo("image") == 0 ){
@ -181,11 +174,8 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
}
}
}
});
media_share.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
media_share.setOnClickListener(view1 -> {
int position = mPager.getCurrentItem();
Attachment attachment = attachments.get(position);
if( attachment.getType().compareTo("image") == 0 ){
@ -203,7 +193,6 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
downloadID = Helper.manageDownloadsNoPopup(SlideMediaActivity.this, attachment.getUrl());
}
}
}
});
toolbar_title.setText("");
}
@ -227,12 +216,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
media_description.setText(description);
media_description.setVisibility(View.VISIBLE);
handler.postDelayed(new Runnable() {
@Override
public void run() {
media_description.setVisibility(View.GONE);
}
}, med_desc_timeout);
handler.postDelayed(() -> media_description.setVisibility(View.GONE), med_desc_timeout);
} else {
media_description.setVisibility(View.GONE);
@ -254,12 +238,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
media_description.setText(description);
media_description.setVisibility(View.VISIBLE);
handler.postDelayed(new Runnable() {
@Override
public void run() {
media_description.setVisibility(View.GONE);
}
}, med_desc_timeout);
handler.postDelayed(() -> media_description.setVisibility(View.GONE), med_desc_timeout);
} else {
media_description.setVisibility(View.GONE);
@ -316,12 +295,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
media_description.setText(description);
media_description.setVisibility(View.VISIBLE);
handler.postDelayed(new Runnable() {
@Override
public void run() {
media_description.setVisibility(View.GONE);
}
}, med_desc_timeout);
handler.postDelayed(() -> media_description.setVisibility(View.GONE), med_desc_timeout);
} else {
media_description.setVisibility(View.GONE);
@ -435,7 +409,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
ScreenSlidePagerAdapter(FragmentManager fm) {
super(fm);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull

13
app/src/main/java/app/fedilab/android/activities/TootInfoActivity.java
View File

@ -29,6 +29,8 @@ import androidx.viewpager.widget.ViewPager;
import com.google.android.material.tabs.TabLayout;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
import app.fedilab.android.R;
@ -134,28 +136,27 @@ public class TootInfoActivity extends BaseActivity {
private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
ScreenSlidePagerAdapter(FragmentManager fm) {
super(fm);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull
@Override
public Fragment getItem(int position) {
Bundle bundle = new Bundle();
switch (position) {
case 0:
if (position == 0) {
DisplayAccountsFragment displayAccountsFragment = new DisplayAccountsFragment();
bundle.putSerializable("type", RetrieveAccountsAsyncTask.Type.REBLOGGED);
bundle.putString("targetedid", toot_id);
displayAccountsFragment.setArguments(bundle);
return displayAccountsFragment;
case 1:
}
DisplayAccountsFragment displayAccountsFragment;
displayAccountsFragment = new DisplayAccountsFragment();
bundle.putSerializable("type", RetrieveAccountsAsyncTask.Type.FAVOURITED);
bundle.putString("targetedid", toot_id);
displayAccountsFragment.setArguments(bundle);
return displayAccountsFragment;
}
return null;
}
@Override

2
app/src/main/java/app/fedilab/android/fragments/TabLayoutNotificationsFragment.java
View File

@ -210,7 +210,7 @@ public class TabLayoutNotificationsFragment extends Fragment {
int mNumOfTabs;
private PagerAdapter(FragmentManager fm, int NumOfTabs) {
super(fm);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
this.mNumOfTabs = NumOfTabs;
}

2
app/src/main/java/app/fedilab/android/fragments/TabLayoutScheduleFragment.java
View File

@ -86,7 +86,7 @@ public class TabLayoutScheduleFragment extends Fragment {
int mNumOfTabs;
private PagerAdapter(FragmentManager fm, int NumOfTabs) {
super(fm);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
this.mNumOfTabs = NumOfTabs;
}

2
app/src/main/java/app/fedilab/android/fragments/TabLayoutTootsFragment.java
View File

@ -101,7 +101,7 @@ public class TabLayoutTootsFragment extends Fragment {
int mNumOfTabs;
private PagerAdapter(FragmentManager fm, int NumOfTabs) {
super(fm);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
this.mNumOfTabs = NumOfTabs;
}