Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code cleanup

This commit is contained in:
nuclearfog 2022-10-25 20:57:07 +02:00
parent 32b6018318
commit 270a02c6ab
No known key found for this signature in database
GPG Key ID: 03488A185C476379
9 changed files with 57 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/nuclearfog/twidda/adapter/ImageAdapter.java
View File

@ -19,7 +19,6 @@ import org.nuclearfog.twidda.adapter.holder.PlaceHolder;
import org.nuclearfog.twidda.database.GlobalSettings;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@ -33,20 +32,19 @@ public class ImageAdapter extends Adapter<ViewHolder> {
/**
* View type for an image item
*/
private static final int PICTURE = 0;
private static final int ITEM_IMAGE = 0;
/**
* View type for a circle view
*/
private static final int LOADING = 1;
private static final int ITEM_PLACEHOLDER = 1;
private OnImageClickListener itemClickListener;
private GlobalSettings settings;
private List<Uri> imageUri = new ArrayList<>(5);
private boolean loading = false;
private boolean enableSaveButton = true;
private boolean loading = false;
/**
* @param itemClickListener click listener
@ -56,10 +54,15 @@ public class ImageAdapter extends Adapter<ViewHolder> {
this.settings = GlobalSettings.getInstance(context);
}
public void addAll(Uri[] uris) {
/**
* replace all image links
*
* @param uris list of image links
*/
@MainThread
public void addAll(List<Uri> uris) {
imageUri.clear();
imageUri.addAll(Arrays.asList(uris));
imageUri.addAll(uris);
notifyDataSetChanged();
}
@ -107,8 +110,8 @@ public class ImageAdapter extends Adapter<ViewHolder> {
@Override
public int getItemViewType(int position) {
if (loading && position == imageUri.size())
return LOADING;
return PICTURE;
return ITEM_PLACEHOLDER;
return ITEM_IMAGE;
}
@ -123,7 +126,7 @@ public class ImageAdapter extends Adapter<ViewHolder> {
@NonNull
@Override
public ViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, int viewType) {
if (viewType == PICTURE) {
if (viewType == ITEM_IMAGE) {
final ImageHolder item = new ImageHolder(parent, settings);
item.preview.setOnClickListener(new OnClickListener() {
@Override

1
app/src/main/java/org/nuclearfog/twidda/adapter/LocationAdapter.java
View File

@ -33,7 +33,6 @@ public class LocationAdapter extends BaseAdapter {
this.settings = settings;
}
/**
* Add a single item to top
*

1
app/src/main/java/org/nuclearfog/twidda/adapter/UserlistAdapter.java
View File

@ -112,7 +112,6 @@ public class UserlistAdapter extends Adapter<ViewHolder> {
}
}
/**
* update a single item
*

32
app/src/main/java/org/nuclearfog/twidda/ui/activities/ImageViewer.java
View File

@ -25,6 +25,8 @@ import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.zoomview.ZoomView;
import java.io.File;
import java.util.LinkedList;
import java.util.List;
/**
* Activity to show online and local images
@ -79,21 +81,25 @@ public class ImageViewer extends MediaActivity implements OnImageClickListener {
Parcelable[] links = getIntent().getParcelableArrayExtra(IMAGE_URIS);
boolean online = getIntent().getBooleanExtra(IMAGE_DOWNLOAD, true);
Uri[] uris = {null};
if (links != null) {
uris = new Uri[links.length];
for (int i = 0; i < uris.length; i++) {
uris[i] = (Uri) links[i];
List<Uri> uris = new LinkedList<>();
for (Parcelable link : links) {
if (link instanceof Uri) {
uris.add((Uri) link);
}
}
if (!uris.isEmpty()) {
if (online) {
imageAsync = new ImageLoader(this, cacheFolder);
imageAsync.execute(uris.toArray(new Uri[0]));
} else {
adapter.addAll(uris);
adapter.disableSaveButton();
zoomImage.setImageURI(uris.get(0));
loadingCircle.setVisibility(INVISIBLE);
}
}
}
if (online) {
imageAsync = new ImageLoader(this, cacheFolder);
imageAsync.execute(uris);
} else {
adapter.addAll(uris);
adapter.disableSaveButton();
zoomImage.setImageURI(uris[0]);
loadingCircle.setVisibility(INVISIBLE);
}
}

5
app/src/main/java/org/nuclearfog/twidda/ui/activities/TweetEditor.java
View File

@ -123,9 +123,8 @@ public class TweetEditor extends MediaActivity implements OnClickListener, OnPro
confirmDialog = new ConfirmDialog(this);
AppStyles.setEditorTheme(root, background);
Intent data = getIntent();
long inReplyId = data.getLongExtra(KEY_TWEETPOPUP_REPLYID, 0);
String prefix = data.getStringExtra(KEY_TWEETPOPUP_TEXT);
long inReplyId = getIntent().getLongExtra(KEY_TWEETPOPUP_REPLYID, 0);
String prefix = getIntent().getStringExtra(KEY_TWEETPOPUP_TEXT);
tweetUpdate.setReplyId(inReplyId);
if (prefix != null) {

3
app/src/main/java/org/nuclearfog/twidda/ui/activities/UserlistActivity.java
View File

@ -149,7 +149,8 @@ public class UserlistActivity extends AppCompatActivity implements OnTabSelected
protected void onStart() {
super.onStart();
if (listLoaderTask == null && userList != null) {
if (!getIntent().getBooleanExtra(KEY_LIST_NO_UPDATE, false)) {
boolean blockUpdate = getIntent().getBooleanExtra(KEY_LIST_NO_UPDATE, false);
if (!blockUpdate) {
// update list information
listLoaderTask = new ListAction(this, userList.getId(), ListAction.LOAD);
listLoaderTask.execute();

7
app/src/main/java/org/nuclearfog/twidda/ui/activities/UserlistsActivity.java
View File

@ -81,12 +81,11 @@ public class UserlistsActivity extends AppCompatActivity implements TabLayout.On
tabLayout.setupWithViewPager(pager);
tabLayout.addOnTabSelectedListener(this);
Intent data = getIntent();
long ownerId = data.getLongExtra(KEY_USERLIST_OWNER_ID, -1);
String ownerName = data.getStringExtra(KEY_USERLIST_OWNER_NAME);
long ownerId = getIntent().getLongExtra(KEY_USERLIST_OWNER_ID, -1);
String ownerName = getIntent().getStringExtra(KEY_USERLIST_OWNER_NAME);
isHome = ownerId == settings.getCurrentUserId();
adapter.setupListPage(ownerId, ownerName);
AppStyles.setTabIcons(tabLayout, settings, R.array.userlist_tab_icons);
}

13
app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java
View File

@ -99,6 +99,7 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis
private Toolbar toolbar;
private TabLayout tablayout;
private ViewPager pager;
private int mode;
@ -115,7 +116,7 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis
ViewGroup root = findViewById(R.id.userexclude_root);
toolbar = findViewById(R.id.userexclude_toolbar);
tablayout = findViewById(R.id.userexclude_tab);
ViewPager pager = findViewById(R.id.userexclude_pager);
pager = findViewById(R.id.userexclude_pager);
adapter = new FragmentAdapter(getSupportFragmentManager());
pager.setAdapter(adapter);
@ -178,6 +179,16 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis
}
@Override
public void onBackPressed() {
if (tablayout.getVisibility() == View.VISIBLE && tablayout.getSelectedTabPosition() > 0) {
pager.setCurrentItem(0);
} else {
super.onBackPressed();
}
}
@Override
public boolean onCreateOptionsMenu(@NonNull Menu m) {
if (mode == USERLIST_EXCLUDED_USERS) {

8
app/src/main/java/org/nuclearfog/twidda/ui/activities/VideoViewer.java
View File

@ -27,6 +27,7 @@ import android.location.Location;
import android.media.MediaPlayer;
import android.net.Uri;
import android.os.Bundle;
import android.os.Parcelable;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
@ -118,6 +119,7 @@ public class VideoViewer extends MediaActivity implements OnSeekBarChangeListene
private VideoView videoView;
private ViewGroup controlPanel;
private Uri link;
private boolean enableVideoExtras;
private int playStatus = IDLE;
@ -153,9 +155,10 @@ public class VideoViewer extends MediaActivity implements OnSeekBarChangeListene
// get extras
enableVideoExtras = getIntent().getBooleanExtra(ENABLE_VIDEO_CONTROLS, false);
Uri link = getIntent().getParcelableExtra(VIDEO_URI);
Parcelable data = getIntent().getParcelableExtra(VIDEO_URI);
if (link != null) {
if (data instanceof Uri) {
link = (Uri) data;
// enable control bar if set
if (enableVideoExtras) {
controlPanel.setVisibility(VISIBLE);
@ -381,7 +384,6 @@ public class VideoViewer extends MediaActivity implements OnSeekBarChangeListene
@Override
public void onConfirm(int type, boolean rememberChoice) {
if (type == ConfirmDialog.VIDEO_ERROR) {
Uri link = getIntent().getParcelableExtra(VIDEO_URI);
if (link != null) {
// open link in a browser
Intent intent = new Intent(Intent.ACTION_VIEW);