Bugfix
This commit is contained in:
parent
e4865ec9ea
commit
1efcdda713
|
@ -33,7 +33,7 @@ public class ProfileAction extends AsyncTask<Long,Void,Long>
|
|||
|
||||
private String screenName, username, description, location, follower, following;
|
||||
private TextView txtUser,txtScrName,txtBio,txtLocation,txtLink,txtFollowing,txtFollower,txtCreated;
|
||||
private ImageView profile, banner, linkIcon, locationIcon;
|
||||
private ImageView profile, banner, linkIcon, locationIcon, verifier;
|
||||
private SwipeRefreshLayout tweetsReload, favoritsReload;
|
||||
private ListView profileTweets, profileFavorits;
|
||||
private String imageLink, bannerLink, link, dateString;
|
||||
|
@ -43,7 +43,8 @@ public class ProfileAction extends AsyncTask<Long,Void,Long>
|
|||
private boolean isHome = false;
|
||||
private boolean imgEnabled = false;
|
||||
private boolean isFollowing = false;
|
||||
private boolean isFollowed = false;
|
||||
private boolean isFollowed = false;
|
||||
private boolean isVerified = false;
|
||||
private boolean muted = false;
|
||||
|
||||
/**
|
||||
|
@ -71,6 +72,7 @@ public class ProfileAction extends AsyncTask<Long,Void,Long>
|
|||
profile = (ImageView)((UserProfile)context).findViewById(R.id.profile_img);
|
||||
banner = (ImageView)((UserProfile)context).findViewById(R.id.banner);
|
||||
linkIcon = (ImageView)((UserProfile)context).findViewById(R.id.link_img);
|
||||
verifier = (ImageView)((UserProfile)context).findViewById(R.id.profile_verify);
|
||||
locationIcon = (ImageView)((UserProfile)context).findViewById(R.id.location_img);
|
||||
tweetsReload = (SwipeRefreshLayout)((UserProfile)context).findViewById(R.id.hometweets);
|
||||
favoritsReload = (SwipeRefreshLayout)((UserProfile)context).findViewById(R.id.homefavorits);
|
||||
|
@ -99,6 +101,7 @@ public class ProfileAction extends AsyncTask<Long,Void,Long>
|
|||
username = user.getName();
|
||||
description = user.getDescription();
|
||||
location = user.getLocation();
|
||||
isVerified = user.isVerified();
|
||||
link = user.getURL();
|
||||
follower = "Follower: "+user.getFollowersCount();
|
||||
following = "Following: "+user.getFriendsCount();
|
||||
|
@ -167,11 +170,12 @@ public class ProfileAction extends AsyncTask<Long,Void,Long>
|
|||
txtLink.setText(link);
|
||||
linkIcon.setVisibility(View.VISIBLE);
|
||||
}
|
||||
if(isVerified){
|
||||
verifier.setVisibility(View.VISIBLE);
|
||||
}
|
||||
if(imgEnabled) {
|
||||
Picasso.with(context).load(imageLink).into(profile);
|
||||
// Picasso.with(context).load(bannerLink).into(banner); TODO
|
||||
} else {
|
||||
profile.setImageResource(R.mipmap.pb);
|
||||
}
|
||||
}
|
||||
else if(mode == GET_TWEETS)
|
||||
|
|
|
@ -40,12 +40,12 @@ public class ShowStatus extends AsyncTask<Long, Void, Boolean> {
|
|||
private TextView username,scrName,replyName,tweet;
|
||||
private TextView used_api,txtAns,txtRet,txtFav,date;
|
||||
private Button retweetButton,favoriteButton;
|
||||
private ImageView profile_img,tweet_img;
|
||||
private ImageView profile_img,tweet_img,tweet_verify;
|
||||
private List<twitter4j.Status> answers;
|
||||
private String usernameStr, scrNameStr, tweetStr, dateString;
|
||||
private String ansStr, rtStr, favStr, repliedUsername, apiName;
|
||||
private TwitterEngine mTwitter;
|
||||
private boolean retweeted, favorited, toggleImg;
|
||||
private boolean retweeted, favorited, toggleImg, verified;
|
||||
private int ansNo = 0;
|
||||
private int highlight;
|
||||
private long userReply, tweetReplyID;
|
||||
|
@ -75,6 +75,7 @@ public class ShowStatus extends AsyncTask<Long, Void, Boolean> {
|
|||
|
||||
profile_img = (ImageView) ((TweetDetail)c).findViewById(R.id.profileimage_detail);
|
||||
tweet_img = (ImageView) ((TweetDetail)c).findViewById(R.id.tweet_image);
|
||||
tweet_verify =(ImageView)((TweetDetail)c).findViewById(R.id.tweet_verify);
|
||||
|
||||
retweetButton = (Button) ((TweetDetail)c).findViewById(R.id.rt_button_detail);
|
||||
favoriteButton = (Button) ((TweetDetail)c).findViewById(R.id.fav_button_detail);
|
||||
|
@ -93,7 +94,7 @@ public class ShowStatus extends AsyncTask<Long, Void, Boolean> {
|
|||
favStr = Integer.toString(currentTweet.getFavoriteCount());
|
||||
userReply = currentTweet.getInReplyToUserId();
|
||||
tweetReplyID = currentTweet.getInReplyToStatusId();
|
||||
|
||||
verified = currentTweet.getUser().isVerified();
|
||||
retweeted = currentTweet.isRetweetedByMe();
|
||||
favorited = currentTweet.isFavorited();
|
||||
if(id.length == 1) {
|
||||
|
@ -154,6 +155,9 @@ public class ShowStatus extends AsyncTask<Long, Void, Boolean> {
|
|||
replyName.setText(repliedUsername);
|
||||
replyName.setVisibility(View.VISIBLE);
|
||||
}
|
||||
if(verified) {
|
||||
tweet_verify.setVisibility(View.VISIBLE);
|
||||
}
|
||||
TweetDatabase tweetDatabase = new TweetDatabase(answers,c);
|
||||
TimelineAdapter tlAdp = new TimelineAdapter(c, tweetDatabase);
|
||||
replyList.setAdapter(tlAdp);
|
||||
|
|
|
@ -9,7 +9,7 @@ public class AppDatabase extends SQLiteOpenHelper
|
|||
private static final String uQuery = "CREATE TABLE IF NOT EXISTS user ("+
|
||||
"userID INTEGER PRIMARY KEY, username TEXT," +
|
||||
"scrname TEXT, pbLink TEXT, banner TEXT, bio TEXT,"+
|
||||
"location TEXT, link TEXT);";
|
||||
"location TEXT, link TEXT, verify INTEGER);";
|
||||
|
||||
private static final String tQuery = "CREATE TABLE IF NOT EXISTS tweet (" +
|
||||
"tweetID INTEGER PRIMARY KEY, userID INTEGER," +
|
||||
|
|
|
@ -24,7 +24,7 @@ public class TweetDatabase {
|
|||
private AppDatabase dataHelper;
|
||||
private List<String> user,scrname,tweet,pbLink;
|
||||
private List<Long> userId,tweetId,timeMillis;
|
||||
private List<Integer> noRT,noFav,noAns;
|
||||
private List<Integer> noRT,noFav,noAns, verify;
|
||||
private SharedPreferences settings;
|
||||
private boolean toggleImg;
|
||||
private int size = 0;
|
||||
|
@ -108,7 +108,7 @@ public class TweetDatabase {
|
|||
user.put("bio",usr.getDescription());
|
||||
user.put("location",usr.getLocation());
|
||||
user.put("link",usr.getURL());
|
||||
|
||||
user.put("verify", usr.isVerified() ? 1 : 0);
|
||||
tweet.put("userID", usr.getId());
|
||||
tweet.put("tweetID", stat.getId());
|
||||
tweet.put("time", stat.getCreatedAt().getTime());
|
||||
|
@ -185,6 +185,8 @@ public class TweetDatabase {
|
|||
user.add(cursor.getString(index) );
|
||||
index = cursor.getColumnIndex("scrname"); // username
|
||||
scrname.add(cursor.getString(index) );
|
||||
index = cursor.getColumnIndex("verify"); // VERIFIED
|
||||
verify.add(cursor.getInt(index));
|
||||
index = cursor.getColumnIndex("pbLink"); // image
|
||||
pbLink.add(cursor.getString(index) );
|
||||
index = cursor.getColumnIndex("userID"); // UserID
|
||||
|
@ -213,6 +215,7 @@ public class TweetDatabase {
|
|||
public String getDate(int pos){return timeToString(getTime(pos));}
|
||||
public String getPbLink (int pos){return pbLink.get(pos);}
|
||||
public boolean loadImages(){return toggleImg;}
|
||||
public boolean isVerified(int pos){return verify.get(pos) == 1;}
|
||||
|
||||
/**
|
||||
* Convert Time to String
|
||||
|
@ -264,6 +267,7 @@ public class TweetDatabase {
|
|||
userId.add(usr.getId());
|
||||
pbLink.add(usr.getMiniProfileImageURL());
|
||||
tweetId.add(stat.getId());
|
||||
verify.add(usr.isVerified() ? 1 : 0);
|
||||
timeMillis.add(stat.getCreatedAt().getTime());
|
||||
size++;
|
||||
}
|
||||
|
@ -282,6 +286,7 @@ public class TweetDatabase {
|
|||
userId.add(0,usr.getId());
|
||||
pbLink.add(0,usr.getMiniProfileImageURL());
|
||||
tweetId.add(0,stat.getId());
|
||||
verify.add(0,usr.isVerified() ? 1 : 0);
|
||||
timeMillis.add(0,stat.getCreatedAt().getTime());
|
||||
size++;
|
||||
}
|
||||
|
@ -297,6 +302,7 @@ public class TweetDatabase {
|
|||
userId = new ArrayList<>();
|
||||
pbLink = new ArrayList<>();
|
||||
tweetId = new ArrayList<>();
|
||||
verify = new ArrayList<>();
|
||||
timeMillis = new ArrayList<>();
|
||||
}
|
||||
}
|
|
@ -2,28 +2,49 @@ package org.nuclearfog.twidda.database;
|
|||
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.graphics.Bitmap;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import twitter4j.User;
|
||||
|
||||
public class UserDatabase {
|
||||
|
||||
private List<User> user;
|
||||
private List<Long> uID;
|
||||
private List<String> uName, scrName, imgUrl;
|
||||
private List<Boolean> verified;
|
||||
|
||||
private boolean toggleImg;
|
||||
private int size = 0;
|
||||
|
||||
public UserDatabase(Context context, List<User> user) {
|
||||
this.user = user;
|
||||
uID = new ArrayList<>();
|
||||
uName = new ArrayList<>();
|
||||
scrName = new ArrayList<>();
|
||||
imgUrl = new ArrayList<>();
|
||||
verified = new ArrayList<>();
|
||||
|
||||
SharedPreferences s = context.getSharedPreferences("settings", 0);
|
||||
toggleImg = s.getBoolean("image_load", false);
|
||||
|
||||
init(user);
|
||||
}
|
||||
|
||||
public UserDatabase(Context context, List<User> user, List<Bitmap> pbImg){}
|
||||
|
||||
public long getUserID(int pos){ return user.get(pos).getId();}
|
||||
public String getUsername(int pos){ return user.get(pos).getName();}
|
||||
public String getScreenname(int pos){ return '@' + user.get(pos).getScreenName();}
|
||||
public String getImageUrl(int pos){ return user.get(pos).getMiniProfileImageURL();}
|
||||
public int getSize(){ return user.size(); }
|
||||
public long getUserID(int pos){ return uID.get(pos);}
|
||||
public String getUsername(int pos){ return uName.get(pos);}
|
||||
public String getScreenname(int pos){ return scrName.get(pos);}
|
||||
public String getImageUrl(int pos){ return imgUrl.get(pos);}
|
||||
public boolean isVerified(int pos){ return verified.get(pos);}
|
||||
public int getSize(){ return size; }
|
||||
public boolean loadImages(){ return toggleImg; }
|
||||
|
||||
private void init(List<User> user) {
|
||||
for(User usr : user) {
|
||||
uID.add(usr.getId());
|
||||
uName.add(usr.getName());
|
||||
scrName.add('@'+usr.getScreenName());
|
||||
imgUrl.add(usr.getMiniProfileImageURLHttps());
|
||||
verified.add(usr.isVerified());
|
||||
size++;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -14,7 +14,6 @@ import android.widget.ListView;
|
|||
import android.widget.TextView;
|
||||
|
||||
import com.squareup.picasso.Picasso;
|
||||
|
||||
import org.nuclearfog.twidda.R;
|
||||
import org.nuclearfog.twidda.window.ColorPreferences;
|
||||
import org.nuclearfog.twidda.database.TweetDatabase;
|
||||
|
@ -77,6 +76,11 @@ public class TimelineAdapter extends ArrayAdapter implements View.OnClickListene
|
|||
((TextView) v.findViewById(R.id.time)).setText(mTweets.getDate(position));
|
||||
((TextView) v.findViewById(R.id.tweettext)).setTextColor(textColor);
|
||||
ImageView pb = v.findViewById(R.id.tweetPb);
|
||||
if(mTweets.isVerified(position)) {
|
||||
v.findViewById(R.id.list_verify).setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
v.findViewById(R.id.list_verify).setVisibility(View.INVISIBLE);
|
||||
}
|
||||
if(mTweets.loadImages()) {
|
||||
Picasso.with(context).load(mTweets.getPbLink(position)).into(pb);
|
||||
}
|
||||
|
|
|
@ -11,7 +11,6 @@ import android.widget.ListView;
|
|||
import android.widget.TextView;
|
||||
|
||||
import com.squareup.picasso.Picasso;
|
||||
|
||||
import org.nuclearfog.twidda.window.ColorPreferences;
|
||||
import org.nuclearfog.twidda.database.UserDatabase;
|
||||
import org.nuclearfog.twidda.R;
|
||||
|
@ -58,6 +57,11 @@ public class UserAdapter extends ArrayAdapter implements View.OnClickListener {
|
|||
if(userDatabase.loadImages()) {
|
||||
Picasso.with(context).load(userDatabase.getImageUrl(position)).into(pb);
|
||||
}
|
||||
if(userDatabase.isVerified(position)) {
|
||||
v.findViewById(R.id.verified).setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
v.findViewById(R.id.verified).setVisibility(View.INVISIBLE);
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package org.nuclearfog.twidda.window;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.ClipboardManager;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.EditText;
|
||||
|
@ -21,6 +22,7 @@ public class LoginPage extends Activity implements View.OnClickListener {
|
|||
pin = findViewById(R.id.pin);
|
||||
findViewById(R.id.linkButton).setOnClickListener(this);
|
||||
findViewById(R.id.get).setOnClickListener(this);
|
||||
findViewById(R.id.clipboard).setOnClickListener(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -46,6 +48,19 @@ public class LoginPage extends Activity implements View.OnClickListener {
|
|||
Toast.makeText(getApplicationContext(),"PIN eingeben!",Toast.LENGTH_LONG).show();
|
||||
}
|
||||
break;
|
||||
|
||||
case R.id.clipboard:
|
||||
ClipboardManager clip = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
|
||||
if(clip != null && clip.hasPrimaryClip()) {
|
||||
String text = clip.getPrimaryClip().getItemAt(0).getText().toString();
|
||||
if(text.matches("\\d++\n?")) {
|
||||
pin.setText(text);
|
||||
Toast.makeText(getApplicationContext(),"Eingefügt!",Toast.LENGTH_LONG).show();
|
||||
} else {
|
||||
Toast.makeText(getApplicationContext(),"Falsches Format!",Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,4 @@
|
|||
<vector android:height="24dp" android:viewportHeight="20.0"
|
||||
android:viewportWidth="20.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#FFFFFF" android:pathData="M11,0H3C2.447,0 2,0.447 2,1v12c0,0.552 0.447,1 1,1h5v2h2v-2H8.001v-2H10v-2H8v2H4V2h6v4h2V1C12,0.448 11.553,0 11,0zM8,7v1h2V6H9C8.447,6 8,6.447 8,7zM12,20h2v-2h-2V20zM12,8h2V6h-2V8zM8,19c0,0.552 0.447,1 1,1h1v-2H8V19zM17,6h-1v2h2V7C18,6.448 17.553,6 17,6zM16,20h1c0.553,0 1,-0.448 1,-1v-1h-2V20zM16,12h2v-2h-2V12zM16,16h2v-2h-2V16z"/>
|
||||
</vector>
|
|
@ -0,0 +1,4 @@
|
|||
<vector android:height="24dp" android:viewportHeight="536.541"
|
||||
android:viewportWidth="536.541" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#FFFFFFFF" android:pathData="M496.8,152.8c-3.3,-25.1 -16.5,-51.9 -38.8,-74.2c-22.3,-22.3 -49.1,-35.5 -74.2,-38.8c-11.3,-1.5 -26.5,-7.8 -35.6,-14.7C328.1,9.6 299.8,0 268.3,0s-59.8,9.6 -79.9,25c-9.1,7 -24.2,13.2 -35.6,14.7c-25.1,3.3 -51.9,16.5 -74.2,38.8c-22.3,22.3 -35.5,49.1 -38.8,74.2c-1.5,11.3 -7.8,26.5 -14.7,35.6C9.6,208.4 0,236.8 0,268.3s9.6,59.8 25,79.9c7,9.1 13.2,24.2 14.7,35.6c3.3,25.1 16.5,51.9 38.8,74.2c22.3,22.3 49.1,35.5 74.2,38.8c11.3,1.5 26.5,7.8 35.6,14.7c20.1,15.4 48.4,25 79.9,25s59.8,-9.6 79.9,-25c9.1,-7 24.2,-13.2 35.6,-14.7c25.1,-3.3 51.9,-16.5 74.2,-38.8c22.3,-22.3 35.5,-49.1 38.8,-74.2c1.5,-11.3 7.8,-26.5 14.7,-35.6c15.4,-20.1 25,-48.4 25,-79.9c0,-31.5 -9.6,-59.8 -25,-79.9C504.5,179.3 498.3,164.1 496.8,152.8zM439.3,180.4L246.5,373.2l-30.8,30.8c-8.5,8.5 -22.3,8.5 -30.8,0l-30.8,-30.8l-56.7,-56.7c-8.5,-8.5 -8.5,-22.3 0,-30.8l30.8,-30.8c8.5,-8.5 22.3,-8.5 30.8,0l41.2,41.2L377.6,118.7c8.5,-8.5 22.3,-8.5 30.8,0l30.8,30.8C447.8,158.1 447.8,171.9 439.3,180.4z"/>
|
||||
</vector>
|
|
@ -2,7 +2,7 @@
|
|||
android:layout_width="200dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:gravity="center_horizontal"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical"
|
||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||
|
@ -11,24 +11,37 @@
|
|||
|
||||
<Button
|
||||
android:id="@+id/linkButton"
|
||||
android:layout_width="180dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="30dip"
|
||||
android:layout_marginBottom="40dp"
|
||||
android:background="@android:color/darker_gray"
|
||||
android:text="@string/register_link" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/pin"
|
||||
android:layout_width="match_parent"
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="30dip"
|
||||
android:hint="@string/pin"
|
||||
android:inputType="numberPassword"
|
||||
android:singleLine="true" />
|
||||
android:orientation="horizontal">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/pin"
|
||||
android:layout_width="96dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/pin"
|
||||
android:inputType="numberPassword"
|
||||
android:singleLine="true" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/clipboard"
|
||||
android:layout_width="32dp"
|
||||
android:layout_height="32dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:background="@drawable/copy" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<Button
|
||||
android:id="@+id/get"
|
||||
android:layout_width="180dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="30dp"
|
||||
android:background="@android:color/darker_gray"
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
|
@ -47,6 +48,15 @@
|
|||
android:layout_margin="5dp"
|
||||
android:contentDescription="@string/profile_image" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/profile_verify"
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:contentDescription="@string/verify"
|
||||
android:visibility="invisible"
|
||||
app:srcCompat="@drawable/verify" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/twitterBlau"
|
||||
|
@ -12,7 +13,6 @@
|
|||
android:layout_marginLeft="5dp"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
|
@ -22,6 +22,15 @@
|
|||
android:layout_margin="5dp"
|
||||
android:contentDescription="@string/profile_image" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/list_verify"
|
||||
android:layout_width="12dp"
|
||||
android:layout_height="12dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:contentDescription="@string/verify"
|
||||
android:visibility="invisible"
|
||||
app:srcCompat="@drawable/verify" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
|
@ -33,7 +33,6 @@
|
|||
android:layout_marginLeft="10dp"
|
||||
android:layout_marginRight="10dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
|
@ -43,10 +42,21 @@
|
|||
android:layout_margin="5dp"
|
||||
android:contentDescription="@string/profile_image" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/tweet_verify"
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:contentDescription="@string/verify"
|
||||
android:visibility="invisible"
|
||||
app:srcCompat="@drawable/verify" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical">
|
||||
|
||||
|
@ -107,70 +117,6 @@
|
|||
android:contentDescription="@string/tweet_image"
|
||||
app:srcCompat="@android:color/black" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/tweetbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:addStatesFromChildren="false"
|
||||
android:gravity="center_vertical|center_horizontal"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
<Button
|
||||
android:id="@+id/answer_button"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:background="@drawable/chat" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/no_ans_detail"
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:layout_marginStart="5dp"
|
||||
android:ems="10" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/rt_button_detail"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:background="@drawable/retweet" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/no_rt_detail"
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:layout_marginStart="5dp"
|
||||
android:ems="10" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/fav_button_detail"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:background="@drawable/favorite" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/no_fav_detail"
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginStart="5dp"
|
||||
android:ems="10" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<ListView
|
||||
android:id="@+id/answer_list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:nestedScrollingEnabled="true" />
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</android.support.design.widget.CollapsingToolbarLayout>
|
||||
|
@ -183,6 +129,69 @@
|
|||
android:fillViewport="true"
|
||||
app:layout_behavior="android.support.design.widget.AppBarLayout$ScrollingViewBehavior">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/tweetbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:addStatesFromChildren="false"
|
||||
android:gravity="center_vertical|center_horizontal"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
<Button
|
||||
android:id="@+id/answer_button"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:background="@drawable/chat" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/no_ans_detail"
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:layout_marginStart="5dp"
|
||||
android:ems="10" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/rt_button_detail"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:background="@drawable/retweet" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/no_rt_detail"
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:layout_marginStart="5dp"
|
||||
android:ems="10" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/fav_button_detail"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:background="@drawable/favorite" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/no_fav_detail"
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginStart="5dp"
|
||||
android:ems="10" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<ListView
|
||||
android:id="@+id/answer_list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:nestedScrollingEnabled="true" />
|
||||
</LinearLayout>
|
||||
</android.support.v4.widget.NestedScrollView>
|
||||
|
||||
</android.support.design.widget.CoordinatorLayout>
|
|
@ -1,6 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="@string/profile_image"
|
||||
|
@ -8,27 +9,36 @@
|
|||
|
||||
<ImageView
|
||||
android:id="@+id/user_profileimg"
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:contentDescription="@string/profile_image"
|
||||
android:padding="5dp" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/verified"
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_margin="2dp"
|
||||
android:contentDescription="@string/verify"
|
||||
android:visibility="invisible"
|
||||
app:srcCompat="@drawable/verify" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/username_detail"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:ems="10" />
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/screenname_detail"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:ems="10" />
|
||||
android:layout_marginBottom="5dp" />
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
Binary file not shown.
Before Width: | Height: | Size: 12 KiB |
|
@ -2,7 +2,7 @@
|
|||
<resources>
|
||||
<color name="colorPrimary">#3F51B5</color>
|
||||
<color name="colorPrimaryDark">#303F9F</color>
|
||||
<color name="colorAccent">#FF4081</color>
|
||||
<color name="colorAccent">#ff4081</color>
|
||||
<color name="twitterBlau">#034059</color>
|
||||
<color name="soylentgreen">#76b900</color>
|
||||
<color name="tweetwindow">#19aae8</color>
|
||||
|
|
|
@ -36,4 +36,5 @@
|
|||
<string name="delete_tweet">Löschen</string>
|
||||
<string name="refresh_dummy">Aktualisieren</string>
|
||||
<string name="highlight">Highlight</string>
|
||||
<string name="verify">Verifiziert</string>
|
||||
</resources>
|
Loading…
Reference in New Issue