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

bugfix

This commit is contained in:
Sufian 2018-05-27 14:35:02 +02:00
parent 256470be16
commit bf12ae189a
3 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/org/nuclearfog/twidda/backend/ImagePopup.java
View File

@ -27,7 +27,6 @@ public class ImagePopup extends AsyncTask<String, Void, Boolean> {
private Dialog popup; private Dialog popup;
private Bitmap imgArray[]; private Bitmap imgArray[];
private LayoutInflater inf; private LayoutInflater inf;
private int index = 0;
private int position = 0; private int position = 0;
public ImagePopup(Context c) { public ImagePopup(Context c) {
@ -60,15 +59,13 @@ public class ImagePopup extends AsyncTask<String, Void, Boolean> {
return false; return false;
imgArray = new Bitmap[size]; imgArray = new Bitmap[size];
if(links[0].startsWith("/")) { if(links[0].startsWith("/")) {
for(String link : links) { for(int index = 0 ; index < size ; index++) {
if(link != null) imgArray[index] = BitmapFactory.decodeFile(links[index]);
imgArray[index++] = BitmapFactory.decodeFile(link);
} }
} } else {
else { for(int index = 0 ; index < size ; index++) {
for(String link : links) { InputStream mediaStream = new URL(links[index]).openStream();
InputStream mediaStream = new URL(link).openStream(); imgArray[index] = BitmapFactory.decodeStream(mediaStream);
imgArray[index++] = BitmapFactory.decodeStream(mediaStream);
} }
} }
return true; return true;
@ -85,13 +82,14 @@ public class ImagePopup extends AsyncTask<String, Void, Boolean> {
protected void onPostExecute(Boolean result) { protected void onPostExecute(Boolean result) {
if(result) { if(result) {
View content = inf.inflate(R.layout.imagepreview,null,false); View content = inf.inflate(R.layout.imagepreview,null,false);
ImageView mImg = content.findViewById(R.id.fullSizeImage); final ImageView mImg = content.findViewById(R.id.fullSizeImage);
setImage(imgArray[position], mImg); setImage(imgArray[position], mImg);
popup.setContentView(content); popup.setContentView(content);
if(index > 0) { final int size = imgArray.length;
if(size > 0) {
final Button left = content.findViewById(R.id.image_left); final Button left = content.findViewById(R.id.image_left);
final Button right = content.findViewById(R.id.image_right); final Button right = content.findViewById(R.id.image_right);
if(index > 1) { if(size > 1) {
left.setVisibility(View.INVISIBLE); left.setVisibility(View.INVISIBLE);
right.setVisibility(View.VISIBLE); right.setVisibility(View.VISIBLE);
left.setOnClickListener(new View.OnClickListener() { left.setOnClickListener(new View.OnClickListener() {
@ -100,16 +98,16 @@ public class ImagePopup extends AsyncTask<String, Void, Boolean> {
if(position == 1) if(position == 1)
left.setVisibility(View.INVISIBLE); left.setVisibility(View.INVISIBLE);
right.setVisibility(View.VISIBLE); right.setVisibility(View.VISIBLE);
position--; setImage(imgArray[--position], mImg);
} }
}); });
right.setOnClickListener(new View.OnClickListener() { right.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if(position == index-2) if(position == size-2)
right.setVisibility(View.INVISIBLE); right.setVisibility(View.INVISIBLE);
left.setVisibility(View.VISIBLE); left.setVisibility(View.VISIBLE);
position++; setImage(imgArray[++position], mImg);
} }
}); });
} }

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

@ -38,7 +38,7 @@ import twitter4j.conf.ConfigurationBuilder;
public class TwitterEngine { public class TwitterEngine {
private final String TWITTER_CONSUMER_KEY = "0EKRHWYcakpCkl8Lr4OcBFMZb"; private final String TWITTER_CONSUMER_KEY = "0EKRHWYcakpCkl8Lr4OcBFMZb";
private final String TWITTER_CONSUMER_SECRET = "x x x"; private final String TWITTER_CONSUMER_SECRET = "RQrf0uQus5v7IMuYgdlVeBuLw1ApRJhxcAMM8MyUVRh1nKSxnR";
private static TwitterEngine mTwitter; private static TwitterEngine mTwitter;
private static long twitterID = -1L; private static long twitterID = -1L;

34
app/src/main/res/layout/tweetwindow.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/tweet_popup" android:id="@+id/tweet_popup"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -40,21 +39,10 @@
android:gravity="end" android:gravity="end"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <FrameLayout
android:layout_width="wrap_content" android:layout_width="36dp"
android:layout_height="wrap_content" android:layout_height="36dp"
android:layout_marginEnd="40dp" android:layout_marginEnd="20dp">
android:orientation="horizontal">
<TextView
android:id="@+id/imgcount"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginEnd="5dp"
android:layout_weight="1"
android:textColor="@android:color/holo_red_dark"
android:textSize="14sp" />
<Button <Button
android:id="@+id/img_preview" android:id="@+id/img_preview"
@ -64,14 +52,22 @@
android:background="@drawable/preview" android:background="@drawable/preview"
android:visibility="invisible" /> android:visibility="invisible" />
</LinearLayout> <TextView
android:id="@+id/imgcount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="@android:color/holo_red_dark"
android:textSize="24sp" />
</FrameLayout>
<Button <Button
android:id="@+id/image" android:id="@+id/image"
style="@style/Widget.AppCompat.Button" style="@style/Widget.AppCompat.Button"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginEnd="40dp" android:layout_marginEnd="20dp"
android:background="@drawable/image" /> android:background="@drawable/image" />
<Button <Button
@ -79,7 +75,7 @@
style="@style/Widget.AppCompat.Button.Borderless" style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginEnd="40dp" android:layout_marginEnd="20dp"
android:background="@drawable/tweet" /> android:background="@drawable/tweet" />
<Button <Button