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

adapter bug fix, error message update, code fix 

Signed-off-by: nuclearfog <hatespirit666@gmail.com>
This commit is contained in:
nuclearfog 2021-04-03 17:57:59 +02:00
parent 2197d7273f
commit 0d456bb2b2
No known key found for this signature in database
GPG Key ID: AA0271FBE406DB98
6 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/org/nuclearfog/twidda/activity/TweetEditor.java
View File

@ -21,6 +21,7 @@ import org.nuclearfog.twidda.backend.holder.TweetHolder;
import org.nuclearfog.twidda.backend.utils.AppStyles;
import org.nuclearfog.twidda.backend.utils.DialogBuilder;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnDialogConfirmListener;
import org.nuclearfog.twidda.backend.utils.DialogBuilder.OnProgressStopListener;
import org.nuclearfog.twidda.backend.utils.ErrorHandler;
import org.nuclearfog.twidda.backend.utils.StringTools;
import org.nuclearfog.twidda.database.GlobalSettings;
@ -42,11 +43,11 @@ import static org.nuclearfog.twidda.backend.utils.DialogBuilder.DialogType.TWEET
import static org.nuclearfog.twidda.backend.utils.DialogBuilder.DialogType.TWEET_EDITOR_LEAVE;
/**
* Activity to create a tweet
* Tweet editor activity. Media files and location can be attached to a tweet.
*
* @author nuclearfog
*/
public class TweetEditor extends MediaActivity implements OnClickListener, DialogBuilder.OnProgressStopListener, OnDialogConfirmListener {
public class TweetEditor extends MediaActivity implements OnClickListener, OnProgressStopListener, OnDialogConfirmListener {
/**
* type of media attached to the tweet
@ -85,13 +86,11 @@ public class TweetEditor extends MediaActivity implements OnClickListener, Dialo
private AlertDialog errorDialog;
private Dialog loadingCircle, closingDialog;
private EditText tweetText;
private View locationProg;
private View locationPending;
private Location location;
private List<String> mediaPath = new LinkedList<>();
private MediaType selectedFormat = MediaType.NONE;
private String tweetStr = "";
private long inReplyId = 0;
@Override
protected void onCreate(@Nullable Bundle b) {
@ -105,7 +104,7 @@ public class TweetEditor extends MediaActivity implements OnClickListener, Dialo
mediaBtn = findViewById(R.id.tweet_add_media);
previewBtn = findViewById(R.id.tweet_prev_media);
tweetText = findViewById(R.id.tweet_input);
locationProg = findViewById(R.id.location_progress);
locationPending = findViewById(R.id.location_progress);
loadingCircle = DialogBuilder.createProgress(this, this);
errorDialog = DialogBuilder.create(this, TWEET_EDITOR_ERROR, this);
closingDialog = DialogBuilder.create(this, TWEET_EDITOR_LEAVE, this);
@ -113,7 +112,6 @@ public class TweetEditor extends MediaActivity implements OnClickListener, Dialo
settings = GlobalSettings.getInstance(this);
Intent data = getIntent();
inReplyId = data.getLongExtra(KEY_TWEETPOPUP_REPLYID, 0);
String prefix = data.getStringExtra(KEY_TWEETPOPUP_TEXT);
if (prefix != null)
tweetText.append(prefix);
@ -151,7 +149,7 @@ public class TweetEditor extends MediaActivity implements OnClickListener, Dialo
public void onClick(View v) {
// send tweet
if (v.getId() == R.id.tweet_send) {
tweetStr = tweetText.getText().toString();
String tweetStr = tweetText.getText().toString();
// check if tweet is empty
if (tweetStr.trim().isEmpty() && mediaPath.isEmpty()) {
Toast.makeText(this, R.string.error_empty_tweet, LENGTH_SHORT).show();
@ -195,7 +193,7 @@ public class TweetEditor extends MediaActivity implements OnClickListener, Dialo
}
// add location to the tweet
else if (v.getId() == R.id.tweet_add_location) {
locationProg.setVisibility(VISIBLE);
locationPending.setVisibility(VISIBLE);
locationBtn.setVisibility(INVISIBLE);
getLocation();
}
@ -209,7 +207,7 @@ public class TweetEditor extends MediaActivity implements OnClickListener, Dialo
} else {
Toast.makeText(this, R.string.error_gps, LENGTH_LONG).show();
}
locationProg.setVisibility(INVISIBLE);
locationPending.setVisibility(INVISIBLE);
locationBtn.setVisibility(VISIBLE);
this.location = location;
}
@ -234,7 +232,7 @@ public class TweetEditor extends MediaActivity implements OnClickListener, Dialo
}
}
} else {
Toast.makeText(this, R.string.info_cant_add_video, LENGTH_SHORT).show();
Toast.makeText(this, R.string.info_cant_add_gif, LENGTH_SHORT).show();
}
break;
@ -326,6 +324,9 @@ public class TweetEditor extends MediaActivity implements OnClickListener, Dialo
* update tweet information
*/
private void updateTweet() {
Intent data = getIntent();
long inReplyId = data.getLongExtra(KEY_TWEETPOPUP_REPLYID, 0);
String tweetStr = tweetText.getText().toString();
TweetHolder tweet = new TweetHolder(tweetStr, inReplyId);
// add media
if (selectedFormat == MediaType.IMAGE || selectedFormat == MediaType.GIF)

2
app/src/main/java/org/nuclearfog/twidda/adapter/ListAdapter.java
View File

@ -72,6 +72,7 @@ public class ListAdapter extends Adapter<ViewHolder> {
*/
@MainThread
public void setData(UserLists newData) {
disableLoading();
if (newData.isEmpty()) {
if (!data.isEmpty() && data.peekLast() == null) {
// remove footer
@ -96,7 +97,6 @@ public class ListAdapter extends Adapter<ViewHolder> {
data.addAt(newData, end);
notifyItemRangeInserted(end, newData.size());
}
disableLoading();
}

7
app/src/main/java/org/nuclearfog/twidda/adapter/MessageAdapter.java
View File

@ -62,6 +62,7 @@ public class MessageAdapter extends Adapter<ViewHolder> {
*/
@MainThread
public void setData(MessageList newData) {
disableLoading();
if (newData.isEmpty()) {
if (!data.isEmpty() && data.peekLast() == null) {
int end = data.size() - 1;
@ -85,7 +86,6 @@ public class MessageAdapter extends Adapter<ViewHolder> {
data.addAt(newData, end);
notifyItemRangeInserted(end, newData.size());
}
disableLoading();
}
/**
@ -219,7 +219,7 @@ public class MessageAdapter extends Adapter<ViewHolder> {
}
/**
* disable loading animation in footer
* disable footer loading animation
*/
public void disableLoading() {
if (loadingIndex != NO_LOADING) {
@ -234,6 +234,9 @@ public class MessageAdapter extends Adapter<ViewHolder> {
*/
public interface OnItemSelected extends OnTagClickListener {
/**
* Actions performed by clicking the buttons
*/
enum Action {
ANSWER,
DELETE,

2
app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java
View File

@ -78,6 +78,7 @@ public class UserAdapter extends Adapter<ViewHolder> {
*/
@MainThread
public void setData(@NonNull UserList newData) {
disableLoading();
if (newData.isEmpty()) {
if (!data.isEmpty() && data.peekLast() == null) {
// remove footer
@ -102,7 +103,6 @@ public class UserAdapter extends Adapter<ViewHolder> {
data.addAt(newData, end);
notifyItemRangeInserted(end, newData.size());
}
disableLoading();
}
/**

5
app/src/main/res/values-de-rDE/strings.xml
View File

@ -189,4 +189,9 @@
<string name="info_location_pending">Ortung läuft, bitte warten.</string>
<string name="app_info_twitter_rules">Twitter Regeln:</string>
<string name="error_twitter_search">Suchbegriff ist entweder zu lang oder enthält nicht erlaubte Zeichen!</string>
<string name="button_backward">Zurückspulen</string>
<string name="button_forward">Vorspulen</string>
<string name="button_play_pause">Pause/Abspielen</string>
<string name="button_share">Videolink teilen</string>
<string name="info_cant_add_gif">GIF konnte nicht hinzugefügt werden!</string>
</resources>

1
app/src/main/res/values/strings.xml
View File

@ -118,6 +118,7 @@
<string name="info_login_to_twitter">login to Twitter</string>
<string name="error_wrong_connection_settings">Wrong connection settings!</string>
<string name="info_cant_add_video">can\'t add video</string>
<string name="info_cant_add_gif">can\'t add GIF</string>
<string name="info_get_link">get Twitter PIN from browser first. Please press the first button!</string>
<string name="info_gps_attached">GPS position added</string>
<string name="info_tweet_retweeted">retweeted</string>