For tablets
This commit is contained in:
parent
513513046d
commit
67bd790a9e
|
@ -14,11 +14,8 @@
|
||||||
* see <http://www.gnu.org/licenses>. */
|
* see <http://www.gnu.org/licenses>. */
|
||||||
package fr.gouv.etalab.mastodon.activities;
|
package fr.gouv.etalab.mastodon.activities;
|
||||||
|
|
||||||
import android.annotation.SuppressLint;
|
|
||||||
import android.content.BroadcastReceiver;
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.IntentFilter;
|
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
import android.graphics.Canvas;
|
import android.graphics.Canvas;
|
||||||
|
@ -29,30 +26,22 @@ import android.graphics.Matrix;
|
||||||
import android.graphics.Paint;
|
import android.graphics.Paint;
|
||||||
import android.graphics.drawable.BitmapDrawable;
|
import android.graphics.drawable.BitmapDrawable;
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
import android.net.Uri;
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Handler;
|
|
||||||
import android.support.annotation.RequiresApi;
|
import android.support.annotation.RequiresApi;
|
||||||
import android.support.design.widget.AppBarLayout;
|
import android.support.design.widget.AppBarLayout;
|
||||||
import android.support.design.widget.CollapsingToolbarLayout;
|
|
||||||
import android.support.design.widget.FloatingActionButton;
|
import android.support.design.widget.FloatingActionButton;
|
||||||
import android.support.design.widget.TabLayout;
|
import android.support.design.widget.TabLayout;
|
||||||
import android.support.v4.app.Fragment;
|
import android.support.v4.app.Fragment;
|
||||||
import android.support.v4.app.FragmentManager;
|
import android.support.v4.app.FragmentManager;
|
||||||
import android.support.v4.app.FragmentStatePagerAdapter;
|
import android.support.v4.app.FragmentStatePagerAdapter;
|
||||||
import android.support.v4.content.ContextCompat;
|
import android.support.v4.content.ContextCompat;
|
||||||
import android.support.v4.content.LocalBroadcastManager;
|
|
||||||
import android.support.v4.view.PagerAdapter;
|
import android.support.v4.view.PagerAdapter;
|
||||||
import android.support.v4.view.ViewPager;
|
import android.support.v4.view.ViewPager;
|
||||||
import android.support.v7.app.ActionBar;
|
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.support.v7.widget.Toolbar;
|
|
||||||
import android.text.SpannableString;
|
import android.text.SpannableString;
|
||||||
import android.text.method.LinkMovementMethod;
|
import android.text.method.LinkMovementMethod;
|
||||||
import android.util.Log;
|
|
||||||
import android.view.LayoutInflater;
|
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
@ -66,7 +55,6 @@ import com.nostra13.universalimageloader.core.DisplayImageOptions;
|
||||||
import com.nostra13.universalimageloader.core.ImageLoader;
|
import com.nostra13.universalimageloader.core.ImageLoader;
|
||||||
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
|
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
|
||||||
import com.nostra13.universalimageloader.core.assist.FailReason;
|
import com.nostra13.universalimageloader.core.assist.FailReason;
|
||||||
import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
|
|
||||||
import com.nostra13.universalimageloader.core.display.SimpleBitmapDisplayer;
|
import com.nostra13.universalimageloader.core.display.SimpleBitmapDisplayer;
|
||||||
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
|
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
|
||||||
|
|
||||||
|
@ -98,8 +86,6 @@ import fr.gouv.etalab.mastodon.interfaces.OnRetrieveFeedsInterface;
|
||||||
import fr.gouv.etalab.mastodon.interfaces.OnRetrieveRelationshipInterface;
|
import fr.gouv.etalab.mastodon.interfaces.OnRetrieveRelationshipInterface;
|
||||||
import mastodon.etalab.gouv.fr.mastodon.R;
|
import mastodon.etalab.gouv.fr.mastodon.R;
|
||||||
import fr.gouv.etalab.mastodon.client.Entities.Relationship;
|
import fr.gouv.etalab.mastodon.client.Entities.Relationship;
|
||||||
|
|
||||||
import static fr.gouv.etalab.mastodon.helper.Helper.canPin;
|
|
||||||
import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor;
|
import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor;
|
||||||
|
|
||||||
|
|
||||||
|
@ -127,9 +113,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
|
||||||
private Relationship relationship;
|
private Relationship relationship;
|
||||||
private boolean showMediaOnly, showPinned;
|
private boolean showMediaOnly, showPinned;
|
||||||
private ImageView pp_actionBar;
|
private ImageView pp_actionBar;
|
||||||
private BroadcastReceiver hide_header;
|
private LinearLayout small_info;
|
||||||
private boolean isHiddingShowing = false;
|
|
||||||
private LinearLayout main_header_container;
|
|
||||||
private ImageView header_edit_profile;
|
private ImageView header_edit_profile;
|
||||||
private List<Status> pins;
|
private List<Status> pins;
|
||||||
private String accountUrl;
|
private String accountUrl;
|
||||||
|
@ -162,7 +146,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
|
||||||
Bundle b = getIntent().getExtras();
|
Bundle b = getIntent().getExtras();
|
||||||
account_follow = (FloatingActionButton) findViewById(R.id.account_follow);
|
account_follow = (FloatingActionButton) findViewById(R.id.account_follow);
|
||||||
account_follow_request = (TextView) findViewById(R.id.account_follow_request);
|
account_follow_request = (TextView) findViewById(R.id.account_follow_request);
|
||||||
main_header_container = (LinearLayout) findViewById(R.id.main_header_container);
|
small_info = (LinearLayout) findViewById(R.id.small_info);
|
||||||
header_edit_profile = (ImageView) findViewById(R.id.header_edit_profile);
|
header_edit_profile = (ImageView) findViewById(R.id.header_edit_profile);
|
||||||
account_follow.setEnabled(false);
|
account_follow.setEnabled(false);
|
||||||
if(b != null){
|
if(b != null){
|
||||||
|
@ -276,44 +260,6 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if( Build.VERSION.SDK_INT < 21) {
|
|
||||||
final CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) findViewById(R.id.collapsingToolbarLayout);
|
|
||||||
//Register LocalBroadcast to receive selected accounts after search
|
|
||||||
hide_header = new BroadcastReceiver() {
|
|
||||||
@Override
|
|
||||||
public void onReceive(Context context, Intent intent) {
|
|
||||||
if (!isHiddingShowing) {
|
|
||||||
isHiddingShowing = true;
|
|
||||||
ImageView account_pp = (ImageView) findViewById(R.id.account_pp);
|
|
||||||
boolean hide = intent.getBooleanExtra("hide", false);
|
|
||||||
if (hide) {
|
|
||||||
collapsingToolbarLayout.setVisibility(View.GONE);
|
|
||||||
if (pp_actionBar != null)
|
|
||||||
pp_actionBar.setVisibility(View.VISIBLE);
|
|
||||||
tabLayout.setVisibility(View.GONE);
|
|
||||||
} else {
|
|
||||||
manageButtonVisibility();
|
|
||||||
tabLayout.setVisibility(View.VISIBLE);
|
|
||||||
collapsingToolbarLayout.setVisibility(View.VISIBLE);
|
|
||||||
if (pp_actionBar != null)
|
|
||||||
pp_actionBar.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
account_pp.requestLayout();
|
|
||||||
Handler handler = new Handler();
|
|
||||||
handler.postDelayed(new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
isHiddingShowing = false;
|
|
||||||
}
|
|
||||||
}, 700);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
LocalBroadcastManager.getInstance(this).registerReceiver(hide_header, new IntentFilter(Helper.HEADER_ACCOUNT + String.valueOf(instanceValue)));
|
|
||||||
}
|
|
||||||
|
|
||||||
header_edit_profile.setOnClickListener(new View.OnClickListener() {
|
header_edit_profile.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
|
@ -398,7 +344,6 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
|
||||||
@Override
|
@Override
|
||||||
public void onDestroy(){
|
public void onDestroy(){
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
LocalBroadcastManager.getInstance(this).unregisterReceiver(hide_header);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -450,8 +395,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onLoadingFailed(java.lang.String imageUri, android.view.View view, FailReason failReason) {
|
public void onLoadingFailed(java.lang.String imageUri, android.view.View view, FailReason failReason) {
|
||||||
LinearLayout main_header_container = (LinearLayout) findViewById(R.id.main_header_container);
|
|
||||||
main_header_container.setBackgroundResource(R.drawable.side_nav_bar);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -466,14 +410,12 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
|
||||||
account_dn.setCompoundDrawables( null, null, null, null);
|
account_dn.setCompoundDrawables( null, null, null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
Toolbar actionBar = (Toolbar) findViewById(R.id.toolbar);
|
|
||||||
LayoutInflater mInflater = LayoutInflater.from(ShowAccountActivity.this);
|
if( account != null){
|
||||||
if( actionBar != null && account != null){
|
TextView actionbar_title = (TextView) findViewById(R.id.show_account_title);
|
||||||
@SuppressLint("InflateParams") View show_account_actionbar = mInflater.inflate(R.layout.showaccount_actionbar, null);
|
|
||||||
TextView actionbar_title = (TextView) show_account_actionbar.findViewById(R.id.show_account_title);
|
|
||||||
if( account.getAcct() != null)
|
if( account.getAcct() != null)
|
||||||
actionbar_title.setText(account.getAcct());
|
actionbar_title.setText(account.getAcct());
|
||||||
pp_actionBar = (ImageView) actionBar.findViewById(R.id.pp_actionBar);
|
pp_actionBar = (ImageView) findViewById(R.id.pp_actionBar);
|
||||||
String url = account.getAvatar();
|
String url = account.getAvatar();
|
||||||
if( url.startsWith("/") ){
|
if( url.startsWith("/") ){
|
||||||
url = "https://" + Helper.getLiveInstance(getApplicationContext()) + account.getAvatar();
|
url = "https://" + Helper.getLiveInstance(getApplicationContext()) + account.getAvatar();
|
||||||
|
@ -493,35 +435,41 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
|
||||||
public void onLoadingFailed(java.lang.String imageUri, android.view.View view, FailReason failReason){
|
public void onLoadingFailed(java.lang.String imageUri, android.view.View view, FailReason failReason){
|
||||||
|
|
||||||
}});
|
}});
|
||||||
if( Build.VERSION.SDK_INT >= 21) {
|
final AppBarLayout appBar = (AppBarLayout) findViewById(R.id.appBar);
|
||||||
|
maxScrollSize = appBar.getTotalScrollRange();
|
||||||
|
|
||||||
AppBarLayout appBar = (AppBarLayout) findViewById(R.id.appBar);
|
|
||||||
maxScrollSize = appBar.getTotalScrollRange();
|
|
||||||
appBar.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
|
|
||||||
@Override
|
|
||||||
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
|
|
||||||
if (maxScrollSize == 0)
|
|
||||||
maxScrollSize = appBarLayout.getTotalScrollRange();
|
|
||||||
|
|
||||||
int percentage = (Math.abs(verticalOffset)) * 100 / maxScrollSize;
|
appBar.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
|
||||||
|
@Override
|
||||||
if (percentage >= 20 && avatarShown) {
|
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
|
||||||
avatarShown = false;
|
if (Math.abs(verticalOffset)-appBar.getTotalScrollRange() == 0) {
|
||||||
|
if( small_info.getVisibility() == View.GONE)
|
||||||
account_pp.animate()
|
small_info.setVisibility(View.VISIBLE);
|
||||||
.scaleY(0).scaleX(0)
|
}else {
|
||||||
.setDuration(200)
|
if( small_info.getVisibility() == View.VISIBLE)
|
||||||
.start();
|
small_info.setVisibility(View.GONE);
|
||||||
}
|
|
||||||
if (percentage <= 20 && !avatarShown) {
|
|
||||||
avatarShown = true;
|
|
||||||
account_pp.animate()
|
|
||||||
.scaleY(1).scaleX(1)
|
|
||||||
.start();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
if (maxScrollSize == 0)
|
||||||
}
|
maxScrollSize = appBarLayout.getTotalScrollRange();
|
||||||
|
|
||||||
|
int percentage = (Math.abs(verticalOffset)) * 100 / maxScrollSize;
|
||||||
|
|
||||||
|
if (percentage >= 20 && avatarShown) {
|
||||||
|
avatarShown = false;
|
||||||
|
|
||||||
|
account_pp.animate()
|
||||||
|
.scaleY(0).scaleX(0)
|
||||||
|
.setDuration(200)
|
||||||
|
.start();
|
||||||
|
}
|
||||||
|
if (percentage <= 20 && !avatarShown) {
|
||||||
|
avatarShown = true;
|
||||||
|
account_pp.animate()
|
||||||
|
.scaleY(1).scaleX(1)
|
||||||
|
.start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
}else {
|
}else {
|
||||||
if( account != null && account.getAcct() != null)
|
if( account != null && account.getAcct() != null)
|
||||||
setTitle(account.getAcct());
|
setTitle(account.getAcct());
|
||||||
|
|
|
@ -17,10 +17,10 @@
|
||||||
-->
|
-->
|
||||||
<android.support.design.widget.CoordinatorLayout
|
<android.support.design.widget.CoordinatorLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
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"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:fitsSystemWindows="true"
|
android:fitsSystemWindows="true"
|
||||||
tools:context="fr.gouv.etalab.mastodon.activities.ShowAccountActivity">
|
tools:context="fr.gouv.etalab.mastodon.activities.ShowAccountActivity">
|
||||||
<android.support.design.widget.AppBarLayout
|
<android.support.design.widget.AppBarLayout
|
||||||
|
@ -30,132 +30,173 @@
|
||||||
android:fitsSystemWindows="true"
|
android:fitsSystemWindows="true"
|
||||||
android:theme="@style/AppTheme.AppBarOverlay">
|
android:theme="@style/AppTheme.AppBarOverlay">
|
||||||
<android.support.design.widget.CollapsingToolbarLayout
|
<android.support.design.widget.CollapsingToolbarLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="500dp"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:id="@+id/collapsingToolbarLayout"
|
||||||
android:layout_height="@dimen/layout_height_header"
|
android:layout_height="@dimen/layout_height_header"
|
||||||
android:fitsSystemWindows="true"
|
android:fitsSystemWindows="true"
|
||||||
app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
|
app:expandedTitleMarginStart="48dp"
|
||||||
<LinearLayout
|
app:expandedTitleMarginEnd="64dp"
|
||||||
android:id="@+id/main_header_container"
|
app:layout_scrollFlags="scroll|snap">
|
||||||
android:background="@color/mastodonC1"
|
<ImageView
|
||||||
|
android:id="@+id/banner_pp"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:gravity="center_horizontal"
|
android:layout_height="match_parent"
|
||||||
android:layout_height="@dimen/layout_height_header"
|
android:scaleType="centerCrop"
|
||||||
android:orientation="vertical">
|
app:layout_collapseMode="parallax"
|
||||||
<LinearLayout
|
/>
|
||||||
android:id="@+id/header_container"
|
<android.support.design.widget.FloatingActionButton
|
||||||
android:layout_marginTop="5dp"
|
android:layout_gravity="end|bottom"
|
||||||
android:layout_width="500dp"
|
android:visibility="gone"
|
||||||
android:gravity="center"
|
app:fabSize="mini"
|
||||||
android:orientation="horizontal"
|
android:id="@+id/account_follow"
|
||||||
android:layout_height="wrap_content"
|
android:textAllCaps="false"
|
||||||
>
|
android:gravity="end|bottom"
|
||||||
<ImageView
|
android:layout_marginRight="10dp"
|
||||||
android:padding="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:id="@+id/account_pp"
|
android:layout_width="40dp"
|
||||||
android:layout_width="80dp"
|
android:layout_height="40dp"
|
||||||
android:layout_height="80dp"
|
/>
|
||||||
tools:ignore="ContentDescription" />
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/account_dn"
|
|
||||||
android:textColor="@color/mastodonC4"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:textSize="16sp"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
<TextView
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:layout_marginStart="10dp"
|
|
||||||
android:textColor="?attr/color_in_account_header"
|
|
||||||
android:id="@+id/account_un"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:textSize="14sp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
/>
|
|
||||||
<ImageView
|
|
||||||
android:visibility="gone"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:layout_marginStart="10dp"
|
|
||||||
android:gravity="center_horizontal|bottom"
|
|
||||||
android:src="@drawable/ic_edit"
|
|
||||||
android:id="@+id/header_edit_profile"
|
|
||||||
android:layout_width="20dp"
|
|
||||||
android:layout_height="20dp"
|
|
||||||
tools:ignore="ContentDescription" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
<TextView
|
|
||||||
android:layout_marginStart="10dp"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:id="@+id/account_followed_by"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:textColor="?attr/colorAccent"
|
|
||||||
android:text="@string/followed_by"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/account_follow_request"
|
|
||||||
android:layout_marginStart="10dp"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:textColor="?attr/colorAccent"
|
|
||||||
android:text="@string/request_sent"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
/>
|
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
|
||||||
<android.support.design.widget.FloatingActionButton
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:visibility="gone"
|
|
||||||
app:fabSize="mini"
|
|
||||||
android:id="@+id/account_follow"
|
|
||||||
android:textAllCaps="false"
|
|
||||||
android:gravity="center"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:layout_marginEnd="10dp"
|
|
||||||
android:layout_width="40dp"
|
|
||||||
android:layout_height="40dp"
|
|
||||||
/>
|
|
||||||
</LinearLayout>
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/account_note"
|
|
||||||
android:padding="10dp"
|
|
||||||
android:gravity="center"
|
|
||||||
android:textColor="?attr/color_in_account_header"
|
|
||||||
android:layout_width="500dp"
|
|
||||||
android:autoLink="web"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
</LinearLayout>
|
|
||||||
</android.support.design.widget.CollapsingToolbarLayout>
|
</android.support.design.widget.CollapsingToolbarLayout>
|
||||||
<android.support.v7.widget.Toolbar
|
<android.support.v7.widget.Toolbar
|
||||||
android:id="@+id/materialup.toolbar"
|
android:id="@+id/toolbar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:minHeight="?attr/actionBarSize"
|
android:minHeight="?attr/actionBarSize"
|
||||||
app:theme="@style/ThemeOverlay.AppCompat.Light"
|
app:theme="@style/ThemeOverlay.AppCompat.Light"
|
||||||
app:layout_scrollFlags="scroll|enterAlways|snap"
|
app:layout_scrollFlags="scroll|enterAlways|snap"
|
||||||
/>
|
/>
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/main_header_container"
|
||||||
|
android:layout_width="500dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingTop="8dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
app:layout_scrollFlags="scroll|enterAlways|snap"
|
||||||
|
android:orientation="vertical">
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/header_container"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:gravity="center"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
>
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/account_dn"
|
||||||
|
android:textColor="@color/mastodonC4"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
<TextView
|
||||||
|
android:layout_marginLeft="10dp"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
|
android:textColor="?attr/color_in_account_header"
|
||||||
|
android:id="@+id/account_un"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
/>
|
||||||
|
<ImageView
|
||||||
|
android:visibility="gone"
|
||||||
|
android:layout_marginLeft="20dp"
|
||||||
|
android:layout_marginStart="20dp"
|
||||||
|
android:gravity="center_horizontal|bottom"
|
||||||
|
android:src="@drawable/ic_edit"
|
||||||
|
android:id="@+id/header_edit_profile"
|
||||||
|
android:layout_width="20dp"
|
||||||
|
android:layout_height="20dp"
|
||||||
|
tools:ignore="ContentDescription" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
<TextView
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
|
android:layout_marginLeft="10dp"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:id="@+id/account_followed_by"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:textColor="?attr/colorAccent"
|
||||||
|
android:text="@string/followed_by"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/account_follow_request"
|
||||||
|
android:layout_marginStart="10dp"
|
||||||
|
android:layout_marginLeft="10dp"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:textColor="?attr/colorAccent"
|
||||||
|
android:text="@string/request_sent"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
/>
|
||||||
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/account_note"
|
||||||
|
android:padding="10dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:textColor="?attr/color_in_account_header"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:maxLines="4"
|
||||||
|
android:autoLink="web"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
</LinearLayout>
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/small_info"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:padding="5dp"
|
||||||
|
tools:ignore="UseCompoundDrawables">
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/pp_actionBar"
|
||||||
|
android:layout_width="30dp"
|
||||||
|
android:layout_height="30dp"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:layout_marginEnd="10dp"
|
||||||
|
android:layout_marginRight="10dp"
|
||||||
|
tools:ignore="ContentDescription" />
|
||||||
|
<TextView
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginStart="5dp"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:id="@+id/show_account_title"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:textColor="?attr/actionBarTextColor"
|
||||||
|
/>
|
||||||
|
</LinearLayout>
|
||||||
<android.support.design.widget.TabLayout
|
<android.support.design.widget.TabLayout
|
||||||
android:id="@+id/account_tabLayout"
|
android:id="@+id/account_tabLayout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -165,6 +206,7 @@
|
||||||
app:tabGravity="fill"
|
app:tabGravity="fill"
|
||||||
/>
|
/>
|
||||||
</android.support.design.widget.AppBarLayout>
|
</android.support.design.widget.AppBarLayout>
|
||||||
|
|
||||||
<android.support.v4.view.ViewPager
|
<android.support.v4.view.ViewPager
|
||||||
android:id="@+id/account_viewpager"
|
android:id="@+id/account_viewpager"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -172,4 +214,17 @@
|
||||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<de.hdodenhof.circleimageview.CircleImageView
|
||||||
|
android:padding="10dp"
|
||||||
|
android:id="@+id/account_pp"
|
||||||
|
android:layout_width="150dp"
|
||||||
|
android:layout_height="150dp"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
app:layout_anchor="@id/main_header_container"
|
||||||
|
android:elevation="8dp"
|
||||||
|
app:civ_border_width="2dp"
|
||||||
|
app:civ_border_color="#FFF"
|
||||||
|
app:layout_scrollFlags="scroll"
|
||||||
|
app:layout_anchorGravity="top|center_horizontal"
|
||||||
|
/>
|
||||||
</android.support.design.widget.CoordinatorLayout>
|
</android.support.design.widget.CoordinatorLayout>
|
|
@ -64,35 +64,7 @@
|
||||||
android:minHeight="?attr/actionBarSize"
|
android:minHeight="?attr/actionBarSize"
|
||||||
app:theme="@style/ThemeOverlay.AppCompat.Light"
|
app:theme="@style/ThemeOverlay.AppCompat.Light"
|
||||||
app:layout_scrollFlags="scroll|enterAlways|snap"
|
app:layout_scrollFlags="scroll|enterAlways|snap"
|
||||||
>
|
/>
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
tools:ignore="UseCompoundDrawables">
|
|
||||||
<ImageView
|
|
||||||
android:visibility="gone"
|
|
||||||
android:id="@+id/pp_actionBar"
|
|
||||||
android:layout_width="30dp"
|
|
||||||
android:layout_height="30dp"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:layout_marginEnd="10dp"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
tools:ignore="ContentDescription" />
|
|
||||||
<TextView
|
|
||||||
android:layout_marginLeft="5dp"
|
|
||||||
android:layout_marginStart="5dp"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:id="@+id/show_account_title"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:textSize="14sp"
|
|
||||||
android:textColor="?attr/actionBarTextColor"
|
|
||||||
/>
|
|
||||||
</LinearLayout>
|
|
||||||
</android.support.v7.widget.Toolbar>
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/main_header_container"
|
android:id="@+id/main_header_container"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -194,6 +166,35 @@
|
||||||
android:autoLink="web"
|
android:autoLink="web"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/small_info"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:padding="5dp"
|
||||||
|
tools:ignore="UseCompoundDrawables">
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/pp_actionBar"
|
||||||
|
android:layout_width="30dp"
|
||||||
|
android:layout_height="30dp"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:layout_marginEnd="10dp"
|
||||||
|
android:layout_marginRight="10dp"
|
||||||
|
tools:ignore="ContentDescription" />
|
||||||
|
<TextView
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginStart="5dp"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:id="@+id/show_account_title"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:textColor="?attr/actionBarTextColor"
|
||||||
|
/>
|
||||||
|
</LinearLayout>
|
||||||
<android.support.design.widget.TabLayout
|
<android.support.design.widget.TabLayout
|
||||||
android:id="@+id/account_tabLayout"
|
android:id="@+id/account_tabLayout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -203,6 +204,7 @@
|
||||||
app:tabGravity="fill"
|
app:tabGravity="fill"
|
||||||
/>
|
/>
|
||||||
</android.support.design.widget.AppBarLayout>
|
</android.support.design.widget.AppBarLayout>
|
||||||
|
|
||||||
<android.support.v4.view.ViewPager
|
<android.support.v4.view.ViewPager
|
||||||
android:id="@+id/account_viewpager"
|
android:id="@+id/account_viewpager"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
Loading…
Reference in New Issue