Mastodon/Shitter-android-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

layout fix!

Browse Source 
moved to srcCompat
This commit is contained in:
NudeDude 2018-10-08 22:43:52 +02:00
parent 9b9519ed60
commit ca68f7399b
16 changed files with 276 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,6 +189,12 @@ public class ProfileLoader extends AsyncTask<Long, Long, Long> {
TextView txtFollower = ui.get().findViewById(R.id.follower);
ImageView profile = ui.get().findViewById(R.id.profile_img);
View following_ico = ui.get().findViewById(R.id.following_ico);
View follower_ico = ui.get().findViewById(R.id.follower_ico);
View location_ico = ui.get().findViewById(R.id.loction_ico);
View link_ico = ui.get().findViewById(R.id.links_ico);
View date_ico = ui.get().findViewById(R.id.date_ico);
String follower = Integer.toString(user.follower);
String following = Integer.toString(user.following);
String date = sdf.format(new Date(user.created));
@ -200,16 +206,18 @@ public class ProfileLoader extends AsyncTask<Long, Long, Long> {
txtFollower.setText(follower);
txtFollowing.setText(following);
txtCreated.setText(date);
txtFollower.setVisibility(View.VISIBLE);
txtFollowing.setVisibility(View.VISIBLE);
txtCreated.setVisibility(View.VISIBLE);
follower_ico.setVisibility(View.VISIBLE);
following_ico.setVisibility(View.VISIBLE);
date_ico.setVisibility(View.VISIBLE);
if (user.location != null && !user.location.isEmpty()) {
txtLocation.setText(user.location);
txtLocation.setVisibility(View.VISIBLE);
location_ico.setVisibility(View.VISIBLE);
}
if (user.link != null && !user.link.isEmpty()) {
txtLink.setText(user.link);
txtLink.setVisibility(View.VISIBLE);
link_ico.setVisibility(View.VISIBLE);
}
if (user.isVerified) {
ui.get().findViewById(R.id.profile_verify).setVisibility(View.VISIBLE);

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

@ -8,7 +8,6 @@ import android.text.Spannable;
import android.text.method.LinkMovementMethod;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
@ -146,8 +145,8 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
TextView txtFav = ui.get().findViewById(R.id.no_fav_detail);
TextView txtAns = ui.get().findViewById(R.id.no_ans_detail);
ImageView profile_img = ui.get().findViewById(R.id.profileimage_detail);
Button retweetButton = ui.get().findViewById(R.id.rt_button_detail);
Button favoriteButton = ui.get().findViewById(R.id.fav_button_detail);
ImageView retweetButton = ui.get().findViewById(R.id.rt_button_detail);
ImageView favoriteButton = ui.get().findViewById(R.id.fav_button_detail);
View mediaButton = ui.get().findViewById(R.id.image_attach);
View tweet_verify = ui.get().findViewById(R.id.tweet_verify);
@ -204,14 +203,14 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
Picasso.get().load(tweet.user.profileImg + "_bigger").into(profile_img);
}
if (tweet.retweeted) {
retweetButton.setBackgroundResource(R.drawable.retweet_enabled);
retweetButton.setImageResource(R.drawable.retweet_enabled);
} else {
retweetButton.setBackgroundResource(R.drawable.retweet);
retweetButton.setImageResource(R.drawable.retweet);
}
if (tweet.favorized) {
favoriteButton.setBackgroundResource(R.drawable.favorite_enabled);
favoriteButton.setImageResource(R.drawable.favorite_enabled);
} else {
favoriteButton.setBackgroundResource(R.drawable.favorite);
favoriteButton.setImageResource(R.drawable.favorite);
}
answerAdapter.setData(answers);
answerAdapter.notifyDataSetChanged();

5
app/src/main/java/org/nuclearfog/twidda/window/MessagePopup.java
View File

@ -12,7 +12,6 @@ import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
@ -45,8 +44,8 @@ public class MessagePopup extends AppCompatActivity implements View.OnClickListe
username = b.getString("username");
View root = findViewById(R.id.dm_popup);
Button send = findViewById(R.id.dm_send);
Button media = findViewById(R.id.dm_media);
View send = findViewById(R.id.dm_send);
View media = findViewById(R.id.dm_media);
receiver = findViewById(R.id.dm_receiver);
text = findViewById(R.id.dm_text);

25
app/src/main/res/layout/item_dm.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/CardViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -8,7 +7,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_margin="@dimen/layout_margin"
android:orientation="vertical">
<LinearLayout
@ -20,8 +19,7 @@
<android.support.v7.widget.CardView
style="@style/ProfileImageCardView"
android:layout_width="@dimen/profile_small"
android:layout_height="@dimen/profile_small"
app:cardCornerRadius="5dp">
android:layout_height="@dimen/profile_small">
<ImageView
android:id="@+id/dm_profileImg"
@ -34,7 +32,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginStart="@dimen/layout_margin"
android:orientation="vertical">
<LinearLayout
@ -44,7 +42,7 @@
<TextView
android:id="@+id/dm_username"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="wrap_content"
android:layout_weight="2"
android:singleLine="true"
@ -52,7 +50,7 @@
<TextView
android:id="@+id/dm_time"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end"
@ -76,8 +74,8 @@
android:id="@+id/dm_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginTop="@dimen/layout_margin"
android:layout_marginBottom="@dimen/layout_margin"
android:autoLink="web"
android:linksClickable="true" />
@ -88,20 +86,21 @@
<TextView
android:id="@+id/dm_answer"
android:layout_width="wrap_content"
android:layout_width="@dimen/null_size"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:layout_weight="1"
android:text="@string/answer"
android:textSize="12sp" />
<TextView
android:id="@+id/dm_delete"
android:layout_width="wrap_content"
android:layout_width="@dimen/null_size"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/delete_dm"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

6
app/src/main/res/layout/item_load.xml
View File

@ -13,11 +13,11 @@
<ImageButton
android:id="@+id/kill_button"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="@dimen/load_button"
android:layout_height="@dimen/load_button"
android:layout_gravity="center"
android:contentDescription="@string/progress_kill"
style="@style/Widget.AppCompat.Button.Borderless"
android:background="@android:color/transparent"
app:srcCompat="@drawable/cross" />
</FrameLayout>

11
app/src/main/res/layout/item_trend.xml
View File

@ -9,21 +9,22 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:padding="5dp">
android:padding="@dimen/layout_margin">
<TextView
android:id="@+id/trendpos"
android:layout_width="32dp"
android:layout_width="@dimen/null_size"
android:layout_height="match_parent"
android:layout_marginEnd="4dp"
android:layout_marginEnd="@dimen/layout_margin"
android:layout_weight="1"
android:gravity="center_vertical|end"
android:textAlignment="gravity" />
<TextView
android:id="@+id/trendname"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight="8"
android:singleLine="true"
android:textSize="20sp" />

51
app/src/main/res/layout/item_tweet.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/CardViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -8,12 +9,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="8dp">
android:padding="@dimen/layout_margin">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginBottom="@dimen/layout_margin"
android:orientation="horizontal">
<android.support.v7.widget.CardView
@ -34,7 +36,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginStart="@dimen/layout_margin"
android:orientation="vertical">
<LinearLayout
@ -44,17 +46,17 @@
<ImageView
android:id="@+id/list_verify"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_gravity="center_vertical"
android:layout_margin="2dp"
android:background="@drawable/verify"
android:layout_marginEnd="@dimen/icon_margin"
android:contentDescription="@string/verify"
android:visibility="gone" />
android:visibility="gone"
app:srcCompat="@drawable/verify" />
<TextView
android:id="@+id/username"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_weight="2"
@ -63,7 +65,7 @@
<TextView
android:id="@+id/time"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end"
@ -85,44 +87,49 @@
<TextView
android:id="@+id/tweettext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp" />
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:addStatesFromChildren="false"
android:layout_marginTop="@dimen/layout_margin"
android:gravity="center_horizontal"
android:orientation="horizontal">
<TextView
android:id="@+id/retweeter"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="match_parent"
android:layout_weight="3"
android:singleLine="true"
android:textSize="12sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/icon_margin"
app:srcCompat="@drawable/retweet" />
<TextView
android:id="@+id/retweet_number"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="match_parent"
android:layout_marginStart="5dp"
android:layout_weight="2"
android:drawableStart="@drawable/retweet"
android:drawablePadding="4dp"
android:singleLine="true"
android:textSize="12sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/icon_margin"
app:srcCompat="@drawable/favorite_tweet" />
<TextView
android:id="@+id/favorite_number"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="match_parent"
android:layout_marginStart="5dp"
android:layout_weight="2"
android:drawableStart="@drawable/favorite_tweet"
android:drawablePadding="4dp"
android:singleLine="true"
android:textSize="12sp" />

37
app/src/main/res/layout/item_user.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/CardViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -9,18 +10,17 @@
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="5dp">
android:padding="@dimen/layout_margin">
<android.support.v7.widget.CardView
style="@style/ProfileImageCardView"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginEnd="10dp">
android:layout_width="@dimen/profile_middle"
android:layout_height="@dimen/profile_middle">
<ImageView
android:id="@+id/user_profileimg"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="@dimen/profile_middle"
android:layout_height="@dimen/profile_middle"
android:contentDescription="@string/profile_image" />
</android.support.v7.widget.CardView>
@ -28,6 +28,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_margin"
android:orientation="vertical">
<LinearLayout
@ -38,17 +39,17 @@
<ImageView
android:id="@+id/verified"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginEnd="3dp"
android:background="@drawable/verify"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:contentDescription="@string/verify"
app:srcCompat="@drawable/verify"
android:visibility="gone" />
<TextView
android:id="@+id/username_detail"
android:layout_width="0dp"
android:layout_height="20dp"
android:layout_width="@dimen/null_size"
android:layout_height="wrap_content"
android:layout_weight="1"
android:singleLine="true" />
@ -62,17 +63,17 @@
<ImageView
android:id="@+id/locked_profile"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginEnd="3dp"
android:background="@drawable/lock"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:contentDescription="@string/profile_locked"
app:srcCompat="@drawable/lock"
android:visibility="gone" />
<TextView
android:id="@+id/screenname_detail"
android:layout_width="0dp"
android:layout_height="20dp"
android:layout_width="@dimen/null_size"
android:layout_height="wrap_content"
android:layout_weight="1"
android:singleLine="true" />

8
app/src/main/res/layout/page_image.xml
View File

@ -11,14 +11,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginLeft="@dimen/side_padding"
android:layout_marginRight="@dimen/side_padding"
android:gravity="center_vertical"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="300dp">
android:layout_height="@dimen/image_height">
<org.nuclearfog.zoomview.ZoomView
android:id="@+id/image_full"
@ -38,7 +38,7 @@
android:id="@+id/image_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
android:layout_marginTop="@dimen/layout_margin" />
</LinearLayout>

27
app/src/main/res/layout/page_login.xml
View File

@ -1,8 +1,8 @@
<?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="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_gravity="center_horizontal"
android:background="@color/DarkBlue"
android:gravity="center"
@ -13,9 +13,8 @@
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="40dp"
android:layout_marginBottom="@dimen/button_padding"
android:background="@android:color/darker_gray"
android:padding="10dp"
android:text="@string/register_link"
android:textSize="12sp" />
@ -25,36 +24,38 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/button_size"
android:layout_height="@dimen/button_size"
android:layout_marginEnd="@dimen/layout_margin"
app:srcCompat="@drawable/key" />
<EditText
android:id="@+id/pin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:background="@android:color/transparent"
android:drawableStart="@drawable/key"
android:drawablePadding="4dp"
android:hint="@string/pin"
android:inputType="numberPassword"
android:padding="5dp"
android:singleLine="true" />
<ImageButton
android:id="@+id/clipboard"
android:layout_width="24dp"
android:layout_height="24dp"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="@dimen/button_size"
android:layout_height="@dimen/button_size"
android:layout_marginStart="@dimen/layout_margin"
android:background="@android:color/transparent"
app:srcCompat="@drawable/copy" />
</LinearLayout>
<Button
android:id="@+id/get"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="30dp"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_margin="@dimen/button_padding"
android:background="@android:color/darker_gray"
android:padding="10dp"
android:text="@string/verifierbutton"
android:textSize="12sp" />

158
app/src/main/res/layout/page_profile.xml
View File

@ -30,13 +30,13 @@
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp">
android:paddingLeft="@dimen/side_padding"
android:paddingRight="@dimen/side_padding">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="10dp"
android:layout_marginBottom="@dimen/layout_margin"
android:orientation="horizontal">
<android.support.v7.widget.CardView
@ -48,7 +48,6 @@
android:id="@+id/profile_img"
android:layout_width="@dimen/profile_image"
android:layout_height="@dimen/profile_image"
android:layout_marginEnd="5dp"
android:contentDescription="@string/profile_image" />
</android.support.v7.widget.CardView>
@ -56,20 +55,20 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginStart="@dimen/layout_margin"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/profile_verify"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="2dp"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:contentDescription="@string/verify"
android:visibility="gone"
app:srcCompat="@drawable/verify" />
@ -78,7 +77,6 @@
android:id="@+id/profile_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:singleLine="true" />
</LinearLayout>
@ -86,14 +84,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/profile_locked"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="2dp"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:contentDescription="@string/profile_locked"
android:visibility="gone"
app:srcCompat="@drawable/lock" />
@ -102,7 +100,6 @@
android:id="@+id/profile_screenname"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:singleLine="true" />
</LinearLayout>
@ -110,36 +107,46 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/followback"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="2dp"
android:background="@drawable/followback"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:contentDescription="@string/followback"
android:visibility="gone" />
android:visibility="gone"
app:srcCompat="@drawable/followback" />
<ImageView
android:id="@+id/following_ico"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:visibility="invisible"
app:srcCompat="@drawable/following" />
<TextView
android:id="@+id/following"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableStart="@drawable/following"
android:drawablePadding="4dp"
android:visibility="invisible" />
android:layout_weight="1" />
<ImageView
android:id="@+id/follower_ico"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:visibility="invisible"
app:srcCompat="@drawable/follower" />
<TextView
android:id="@+id/follower"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableStart="@drawable/follower"
android:drawablePadding="4dp"
android:visibility="invisible" />
android:layout_weight="1" />
</LinearLayout>
@ -151,42 +158,81 @@
android:id="@+id/bio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginBottom="@dimen/layout_margin"
android:linksClickable="true" />
<TextView
android:id="@+id/location"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/location"
android:drawablePadding="4dp"
android:singleLine="true"
android:textSize="12sp"
android:visibility="gone" />
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/links"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoLink="web"
android:drawableStart="@drawable/link"
android:drawablePadding="4dp"
android:linksClickable="true"
android:singleLine="true"
android:textSize="12sp"
android:visibility="gone" />
<ImageView
android:id="@+id/loction_ico"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:visibility="gone"
app:srcCompat="@drawable/location" />
<TextView
android:id="@+id/profile_date"
<TextView
android:id="@+id/location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/calendar"
android:drawablePadding="4dp"
android:singleLine="true"
android:textSize="12sp"
android:visibility="invisible" />
android:orientation="horizontal">
<ImageView
android:id="@+id/links_ico"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:visibility="gone"
app:srcCompat="@drawable/link" />
<TextView
android:id="@+id/links"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoLink="web"
android:linksClickable="true"
android:singleLine="true"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/date_ico"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_marginEnd="@dimen/icon_margin"
android:visibility="gone"
app:srcCompat="@drawable/calendar" />
<TextView
android:id="@+id/profile_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.design.widget.CollapsingToolbarLayout>

61
app/src/main/res/layout/page_settings.xml
View File

@ -15,8 +15,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp">
android:paddingLeft="@dimen/side_padding"
android:paddingRight="@dimen/side_padding">
<TextView
android:layout_width="match_parent"
@ -26,7 +26,7 @@
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_height="@dimen/divider"
android:background="?android:attr/listDivider" />
<LinearLayout
@ -38,18 +38,18 @@
<Button
android:id="@+id/color_background"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_margin="@dimen/button_margin"
android:layout_weight="1"
android:text="@string/background" />
<Button
android:id="@+id/color_font"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_margin="@dimen/button_margin"
android:layout_weight="1"
android:includeFontPadding="false"
android:text="@string/font"
@ -66,18 +66,18 @@
<Button
android:id="@+id/color_tweet"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_margin="@dimen/button_margin"
android:layout_weight="1"
android:text="@string/popup" />
<Button
android:id="@+id/highlight_color"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_margin="@dimen/button_margin"
android:layout_weight="1"
android:text="@string/highlight" />
@ -86,13 +86,12 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="@string/data_load"
android:textSize="18sp" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_height="@dimen/divider"
android:background="?android:attr/listDivider" />
<LinearLayout
@ -104,16 +103,17 @@
<Button
android:id="@+id/load_dialog"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/button_height"
android:layout_width="@dimen/null_size"
android:layout_margin="@dimen/button_margin"
android:layout_weight="1"
android:text="@string/load_factor" />
<CheckBox
android:id="@+id/toggleImg"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="@dimen/button_height"
android:layout_marginStart="10dp"
android:layout_marginStart="@dimen/side_padding"
android:layout_weight="1"
android:text="@string/image" />
@ -122,35 +122,34 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginTop="@dimen/settings_textview"
android:text="@string/trend_setting"
android:textSize="18sp" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_height="@dimen/divider"
android:background="?android:attr/listDivider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp">
android:padding="@dimen/layout_margin">
<Spinner
android:id="@+id/woeid"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="wrap_content"
android:layout_weight="1" />
<EditText
android:id="@+id/woe_id"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginStart="@dimen/side_padding"
android:layout_weight="1"
android:background="@android:color/transparent"
android:drawablePadding="4dp"
android:hint="@string/woeid"
android:inputType="number"
android:singleLine="true"
@ -161,13 +160,13 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginTop="@dimen/button_margin"
android:text="@string/database"
android:textSize="18sp" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_height="@dimen/divider"
android:background="?android:attr/listDivider" />
<LinearLayout
@ -175,14 +174,14 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:padding="5dp">
android:padding="@dimen/layout_margin">
<Button
android:id="@+id/delete_db"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_margin="@dimen/button_margin"
android:layout_weight="1"
android:background="@android:color/holo_red_dark"
android:text="@string/delete_database" />
@ -190,9 +189,9 @@
<Button
android:id="@+id/logout"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="0dp"
android:layout_width="@dimen/null_size"
android:layout_height="@dimen/button_height"
android:layout_margin="5dp"
android:layout_margin="@dimen/button_margin"
android:layout_weight="1"
android:background="@android:color/holo_red_dark"
android:text="@string/logout" />
@ -201,4 +200,4 @@
</LinearLayout>
</LinearLayout>
</LinearLayout>

16
app/src/main/res/layout/page_tweet.xml
View File

@ -121,11 +121,11 @@
android:singleLine="true"
android:textSize="12sp" />
<Button
<ImageView
android:id="@+id/image_attach"
android:layout_width="24dp"
android:layout_height="24dp"
android:background="@drawable/preview"
app:srcCompat="@drawable/preview"
android:visibility="gone" />
</LinearLayout>
@ -156,11 +156,11 @@
android:paddingRight="20dp"
android:paddingBottom="5dp">
<Button
<ImageView
android:id="@+id/answer_button"
android:layout_width="@dimen/tweet_icon_size"
android:layout_height="@dimen/tweet_icon_size"
android:background="@drawable/chat" />
app:srcCompat="@drawable/chat" />
<TextView
android:id="@+id/no_ans_detail"
@ -173,11 +173,11 @@
android:singleLine="true"
android:textSize="12sp" />
<Button
<ImageView
android:id="@+id/rt_button_detail"
android:layout_width="@dimen/tweet_icon_size"
android:layout_height="@dimen/tweet_icon_size"
android:background="@drawable/retweet" />
app:srcCompat="@drawable/retweet" />
<TextView
android:id="@+id/no_rt_detail"
@ -190,11 +190,11 @@
android:singleLine="true"
android:textSize="12sp" />
<Button
<ImageView
android:id="@+id/fav_button_detail"
android:layout_width="@dimen/tweet_icon_size"
android:layout_height="@dimen/tweet_icon_size"
android:background="@drawable/favorite" />
app:srcCompat="@drawable/favorite" />
<TextView
android:id="@+id/no_fav_detail"

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

@ -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:id="@+id/dm_popup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -25,22 +26,20 @@
android:inputType="text"
android:singleLine="true" />
<Button
<ImageView
android:id="@+id/dm_media"
style="@style/Widget.AppCompat.Button"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginEnd="5dp"
android:layout_marginBottom="5dp"
android:background="@drawable/image" />
app:srcCompat="@drawable/image" />
<Button
android:id="@+id/dm_send"
style="@style/Widget.AppCompat.Button"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginBottom="5dp"
android:background="@drawable/right" />
app:srcCompat="@drawable/right" />
</LinearLayout>

21
app/src/main/res/layout/popup_tweet.xml
View File

@ -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:id="@+id/tweet_popup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -34,37 +35,33 @@
android:textColor="@android:color/holo_red_dark"
android:textSize="18sp" />
<Button
<ImageView
android:id="@+id/img_preview"
style="@style/Widget.AppCompat.Button"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="20dp"
android:background="@drawable/preview"
app:srcCompat="@drawable/preview"
android:visibility="invisible" />
<Button
<ImageView
android:id="@+id/image"
style="@style/Widget.AppCompat.Button"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="20dp"
android:background="@drawable/image" />
app:srcCompat="@drawable/image" />
<Button
<ImageView
android:id="@+id/sendTweet"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="20dp"
android:background="@drawable/tweet" />
app:srcCompat="@drawable/tweet" />
<Button
<ImageView
android:id="@+id/close"
style="@style/Widget.AppCompat.Button"
android:layout_width="36dp"
android:layout_height="36dp"
android:background="@drawable/cross" />
app:srcCompat="@drawable/cross" />
</LinearLayout>

15
app/src/main/res/values/dimens.xml
View File

@ -1,11 +1,26 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="null_size">0dp</dimen>
<dimen name="bar_wide">45dp</dimen>
<dimen name="button_height">40dp</dimen>
<dimen name="profile_image">64dp</dimen>
<dimen name="profile_middle">40dp</dimen>
<dimen name="profile_small">32dp</dimen>
<dimen name="text_input_width">300dp</dimen>
<dimen name="text_input_height">200dp</dimen>
<dimen name="image_height">300dp</dimen>
<dimen name="name_input_height">32dp</dimen>
<dimen name="tweet_icon_size">20dp</dimen>
<dimen name="load_button">48dp</dimen>
<dimen name="button_padding">40dp</dimen>
<dimen name="button_size">24dp</dimen>
<dimen name="icon_size">14dp</dimen>
<dimen name="layout_margin">5dp</dimen>
<dimen name="side_padding">10dp</dimen>
<dimen name="icon_margin">5dp</dimen>
<dimen name="divider">2dp</dimen>
<dimen name="button_margin">5dp</dimen>
<dimen name="settings_textview">5dp</dimen>
</resources>