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

bug fix

This commit is contained in:
NudeDude 2018-09-21 19:05:40 +02:00
parent dd15da2255
commit 7bb4db9402
5 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java
View File

@ -4,6 +4,8 @@ import android.content.Intent;
import android.os.AsyncTask;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.RecyclerView;
import android.text.Spanned;
import android.text.method.LinkMovementMethod;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
@ -14,6 +16,7 @@ import com.squareup.picasso.Picasso;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.adapter.TimelineAdapter;
import org.nuclearfog.twidda.backend.clickable.Tagger;
import org.nuclearfog.twidda.backend.listitems.Tweet;
import org.nuclearfog.twidda.backend.listitems.TwitterUser;
import org.nuclearfog.twidda.database.DatabaseAdapter;
@ -53,6 +56,7 @@ public class ProfileLoader extends AsyncTask<Long, Long, Long> {
private TwitterUser user;
private List<Tweet> tweets, favors;
private long homeId;
private int highlight;
private boolean imgEnabled;
private boolean isHome = false;
@ -77,6 +81,7 @@ public class ProfileLoader extends AsyncTask<Long, Long, Long> {
sdf = settings.getDateFormatter();
imgEnabled = settings.loadImages();
homeId = settings.getUserId();
highlight = settings.getHighlightColor();
tweets = new ArrayList<>();
favors = new ArrayList<>();
@ -189,9 +194,11 @@ public class ProfileLoader extends AsyncTask<Long, Long, Long> {
String follower = Integer.toString(user.follower);
String following = Integer.toString(user.following);
String date = sdf.format(new Date(user.created));
Spanned bio = Tagger.makeText(user.bio, highlight, ui.get());
txtBio.setMovementMethod(LinkMovementMethod.getInstance());
txtBio.setText(bio);
txtUser.setText(user.username);
txtScrName.setText(user.screenname);
txtBio.setText(user.bio);
txtFollower.setText(follower);
txtFollowing.setText(following);
txtCreated.setText(date);

2
app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
View File

@ -5,6 +5,7 @@ import android.os.AsyncTask;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.RecyclerView;
import android.text.Spannable;
import android.text.method.LinkMovementMethod;
import android.util.Log;
import android.view.View;
import android.widget.Button;
@ -151,6 +152,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
View tweet_verify = ui.get().findViewById(R.id.tweet_verify);
Spannable sTweet = Tagger.makeText(tweet.tweet, highlight, ui.get());
tweetText.setMovementMethod(LinkMovementMethod.getInstance());
tweetText.setText(sTweet);
tweetText.setTextColor(font_color);
username.setText(tweet.user.username);

12
app/src/main/java/org/nuclearfog/twidda/window/DirectMessage.java
View File

@ -30,6 +30,7 @@ public class DirectMessage extends AppCompatActivity implements OnItemSelected,
private MessageLoader mLoader;
private SwipeRefreshLayout refresh;
private GlobalSettings settings;
private RecyclerView dmList;
@ -46,13 +47,9 @@ public class DirectMessage extends AppCompatActivity implements OnItemSelected,
dmList = findViewById(R.id.messagelist);
View root = findViewById(R.id.dm_layout);
GlobalSettings settings = GlobalSettings.getInstance(this);
settings = GlobalSettings.getInstance(this);
root.setBackgroundColor(settings.getBackgroundColor());
MessageAdapter mAdapter = new MessageAdapter(this);
mAdapter.setColor(settings.getFontColor());
mAdapter.setImageLoad(settings.loadImages());
dmList.setAdapter(mAdapter);
dmList.setLayoutManager(new LinearLayoutManager(this));
dmList.setHasFixedSize(true);
refresh.setOnRefreshListener(this);
@ -63,6 +60,11 @@ public class DirectMessage extends AppCompatActivity implements OnItemSelected,
protected void onStart() {
super.onStart();
if (mLoader == null) {
MessageAdapter mAdapter = new MessageAdapter(this);
mAdapter.setColor(settings.getFontColor());
mAdapter.setImageLoad(settings.loadImages());
dmList.setAdapter(mAdapter);
refresh.setRefreshing(true);
mLoader = new MessageLoader(this);
mLoader.execute();

15
app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java
View File

@ -23,6 +23,7 @@ import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.adapter.TimelineAdapter;
import org.nuclearfog.twidda.adapter.TimelineAdapter.OnItemClicked;
import org.nuclearfog.twidda.backend.ProfileLoader;
import org.nuclearfog.twidda.backend.clickable.Tagger;
import org.nuclearfog.twidda.backend.listitems.Tweet;
import org.nuclearfog.twidda.database.GlobalSettings;
@ -33,8 +34,8 @@ import static android.os.AsyncTask.Status.RUNNING;
*
* @see ProfileLoader
*/
public class UserProfile extends AppCompatActivity implements
OnRefreshListener, OnTabChangeListener, OnItemClicked {
public class UserProfile extends AppCompatActivity implements OnRefreshListener,
OnTabChangeListener, OnItemClicked, Tagger.OnTagClickListener {
private static final int TWEET = 1;
@ -322,6 +323,16 @@ public class UserProfile extends AppCompatActivity implements
}
@Override
public void onClick(String text) {
Intent intent = new Intent(this, SearchPage.class);
if (text.startsWith("#"))
intent.putExtra("Addition", text);
intent.putExtra("search", text);
startActivity(intent);
}
private void animate() {
final int ANIM_DUR = 300;
final int DIMENS = Animation.RELATIVE_TO_PARENT;

2
app/src/main/res/layout/popup_dm.xml
View File

@ -51,6 +51,6 @@
android:background="@android:color/transparent"
android:gravity="start"
android:hint="@string/dmessage"
android:inputType="text" />
android:inputType="textMultiLine" />
</LinearLayout>