diff --git a/app/build.gradle b/app/build.gradle index dbc3aad98..60ca554de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 15 targetSdkVersion 26 - versionCode 60 - versionName "1.5.0" + versionCode 61 + versionName "1.5.1" } buildTypes { release { @@ -41,6 +41,7 @@ dependencies { compile 'com.github.chrisbanes:PhotoView:2.0.0' compile 'com.google.code.gson:gson:2.8.0' compile 'org.jsoup:jsoup:1.10.3' + compile 'de.hdodenhof:circleimageview:2.2.0' safetynetCompile 'com.google.android.gms:play-services-safetynet:11.0.4' safetynetCompile 'io.github.kobakei:ratethisapp:1.2.0' } diff --git a/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java b/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java index 6b649c4db..cdaf7fd14 100644 --- a/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java +++ b/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java @@ -140,7 +140,7 @@ public class MainActivity extends AppCompatActivity private String userIdService; private Intent streamingIntent; public static String lastHomeId = null, lastNotificationId = null; - boolean notif_follow, notif_add, notif_mention, notif_share; + boolean notif_follow, notif_add, notif_mention, notif_share, show_boosts, show_replies; public MainActivity() { } @@ -310,6 +310,70 @@ public class MainActivity extends AppCompatActivity } }); + + tabStrip.getChildAt(0).setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + //Only shown if the tab has focus + if( homeFragment != null && homeFragment.getUserVisibleHint()){ + PopupMenu popup = new PopupMenu(MainActivity.this, tabStrip.getChildAt(0)); + popup.getMenuInflater() + .inflate(R.menu.option_filter_toots, popup.getMenu()); + Menu menu = popup.getMenu(); + final MenuItem itemShowBoosts = menu.findItem(R.id.action_show_boosts); + final MenuItem itemShowReplies = menu.findItem(R.id.action_show_replies); + + show_boosts = sharedpreferences.getBoolean(Helper.SET_SHOW_BOOSTS, true); + show_replies = sharedpreferences.getBoolean(Helper.SET_SHOW_REPLIES, true); + itemShowBoosts.setChecked(show_boosts); + itemShowReplies.setChecked(show_replies); + popup.setOnDismissListener(new PopupMenu.OnDismissListener() { + @Override + public void onDismiss(PopupMenu menu) { + if( homeFragment != null) + homeFragment.refreshFilter(); + } + }); + popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { + public boolean onMenuItemClick(MenuItem item) { + item.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW); + item.setActionView(new View(getApplicationContext())); + item.setOnActionExpandListener(new MenuItem.OnActionExpandListener() { + @Override + public boolean onMenuItemActionExpand(MenuItem item) { + return false; + } + + @Override + public boolean onMenuItemActionCollapse(MenuItem item) { + return false; + } + }); + switch (item.getItemId()) { + case R.id.action_show_boosts: + SharedPreferences.Editor editor = sharedpreferences.edit(); + show_boosts = !show_boosts; + editor.putBoolean(Helper.SET_SHOW_BOOSTS, show_boosts); + itemShowBoosts.setChecked(show_boosts); + editor.apply(); + break; + case R.id.action_show_replies: + editor = sharedpreferences.edit(); + show_replies = !show_replies; + editor.putBoolean(Helper.SET_SHOW_REPLIES, show_replies); + itemShowReplies.setChecked(show_replies); + editor.apply(); + break; + } + return false; + } + }); + popup.show(); + } + return true; + } + }); + viewPager = (ViewPager) findViewById(R.id.viewpager); int countPage = 2; if( sharedpreferences.getBoolean(Helper.SET_DISPLAY_LOCAL, true)) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index 32883d469..56f55fba8 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -14,11 +14,8 @@ * see . */ package fr.gouv.etalab.mastodon.activities; -import android.annotation.SuppressLint; -import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.content.SharedPreferences; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -29,11 +26,9 @@ import android.graphics.Matrix; import android.graphics.Paint; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.os.Handler; import android.support.annotation.RequiresApi; import android.support.design.widget.AppBarLayout; import android.support.design.widget.FloatingActionButton; @@ -42,14 +37,11 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentStatePagerAdapter; import android.support.v4.content.ContextCompat; -import android.support.v4.content.LocalBroadcastManager; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; -import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.text.SpannableString; import android.text.method.LinkMovementMethod; -import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -63,7 +55,6 @@ import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; 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.listener.SimpleImageLoadingListener; @@ -72,6 +63,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import de.hdodenhof.circleimageview.CircleImageView; import fr.gouv.etalab.mastodon.asynctasks.PostActionAsyncTask; import fr.gouv.etalab.mastodon.asynctasks.RetrieveAccountAsyncTask; import fr.gouv.etalab.mastodon.asynctasks.RetrieveAccountsAsyncTask; @@ -94,8 +86,6 @@ import fr.gouv.etalab.mastodon.interfaces.OnRetrieveFeedsInterface; import fr.gouv.etalab.mastodon.interfaces.OnRetrieveRelationshipInterface; import mastodon.etalab.gouv.fr.mastodon.R; 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; @@ -123,12 +113,12 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi private Relationship relationship; private boolean showMediaOnly, showPinned; private ImageView pp_actionBar; - private BroadcastReceiver hide_header; - private boolean isHiddingShowing = false; - private LinearLayout main_header_container; + private LinearLayout small_info; private ImageView header_edit_profile; private List pins; private String accountUrl; + private int maxScrollSize; + private boolean avatarShown = true; public enum action{ FOLLOW, UNFOLLOW, @@ -138,15 +128,16 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi private action doAction; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); if( theme == Helper.THEME_LIGHT){ - setTheme(R.style.AppTheme); + setTheme(R.style.AppTheme_NoActionBar); }else { - setTheme(R.style.AppThemeDark); + setTheme(R.style.AppThemeDark_NoActionBar); } setContentView(R.layout.activity_show_account); setTitle(""); @@ -155,7 +146,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi Bundle b = getIntent().getExtras(); account_follow = (FloatingActionButton) findViewById(R.id.account_follow); 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); account_follow.setEnabled(false); if(b != null){ @@ -186,13 +177,10 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi int positionSpinnerTrans = sharedpreferences.getInt(Helper.SET_TRANSLATOR, Helper.TRANS_YANDEX); statusListAdapter = new StatusListAdapter(getApplicationContext(), RetrieveFeedsAsyncTask.Type.USER, accountId, isOnWifi, behaviorWithAttachments, positionSpinnerTrans, this.statuses); - options = new DisplayImageOptions.Builder().displayer(new RoundedBitmapDisplayer(80)).cacheInMemory(false) + options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false) .cacheOnDisk(true).resetViewBeforeLoading(true).build(); - if( getSupportActionBar() != null) - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - tabLayout = (TabLayout) findViewById(R.id.account_tabLayout); tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.toots))); @@ -272,43 +260,6 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi } } }); - - if( Build.VERSION.SDK_INT < 21) { - //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) { - main_header_container.setVisibility(View.GONE); - if (pp_actionBar != null) - pp_actionBar.setVisibility(View.VISIBLE); - tabLayout.setVisibility(View.GONE); - } else { - manageButtonVisibility(); - tabLayout.setVisibility(View.VISIBLE); - main_header_container.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() { @Override @@ -393,7 +344,6 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi @Override public void onDestroy(){ super.onDestroy(); - LocalBroadcastManager.getInstance(this).unregisterReceiver(hide_header); } @Override @@ -407,7 +357,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi } accountUrl = account.getUrl(); - ImageView account_pp = (ImageView) findViewById(R.id.account_pp); + final CircleImageView account_pp = (CircleImageView) findViewById(R.id.account_pp); TextView account_dn = (TextView) findViewById(R.id.account_dn); TextView account_un = (TextView) findViewById(R.id.account_un); final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); @@ -431,23 +381,21 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi @Override public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) { super.onLoadingComplete(imageUri, view, loadedImage); - LinearLayout main_header_container = (LinearLayout) findViewById(R.id.main_header_container); + ImageView banner_pp = (ImageView) findViewById(R.id.banner_pp); Bitmap workingBitmap = Bitmap.createBitmap(loadedImage); Bitmap mutableBitmap = workingBitmap.copy(Bitmap.Config.ARGB_8888, true); Canvas canvas = new Canvas(mutableBitmap); Paint p = new Paint(Color.BLACK); ColorFilter filter = new LightingColorFilter(0xFF7F7F7F, 0x00000000); - p.setColorFilter(filter); canvas.drawBitmap(mutableBitmap, new Matrix(), p); BitmapDrawable background = new BitmapDrawable(getResources(), mutableBitmap); - main_header_container.setBackground(background); + banner_pp.setImageDrawable(background); } @Override 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); + } }); } @@ -462,16 +410,12 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi account_dn.setCompoundDrawables( null, null, null, null); } - final ActionBar actionBar = getSupportActionBar(); - LayoutInflater mInflater = LayoutInflater.from(ShowAccountActivity.this); - if( actionBar != null && account != null){ - @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 != null){ + TextView actionbar_title = (TextView) findViewById(R.id.show_account_title); if( account.getAcct() != null) actionbar_title.setText(account.getAcct()); - actionBar.setCustomView(show_account_actionbar); - actionBar.setDisplayShowCustomEnabled(true); - pp_actionBar = (ImageView) actionBar.getCustomView().findViewById(R.id.pp_actionBar); + pp_actionBar = (ImageView) findViewById(R.id.pp_actionBar); String url = account.getAvatar(); if( url.startsWith("/") ){ url = "https://" + Helper.getLiveInstance(getApplicationContext()) + account.getAvatar(); @@ -491,20 +435,41 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi public void onLoadingFailed(java.lang.String imageUri, android.view.View view, FailReason failReason){ }}); - if( Build.VERSION.SDK_INT >= 21) { - AppBarLayout appBar = (AppBarLayout) findViewById(R.id.appBar); - appBar.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() { - @Override - public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) { - if (verticalOffset > 10 ) { - pp_actionBar.setVisibility(View.GONE); - } else { - pp_actionBar.setVisibility(View.VISIBLE); - } + final AppBarLayout appBar = (AppBarLayout) findViewById(R.id.appBar); + maxScrollSize = appBar.getTotalScrollRange(); + + appBar.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() { + @Override + public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) { + if (Math.abs(verticalOffset)-appBar.getTotalScrollRange() == 0) { + if( small_info.getVisibility() == View.GONE) + small_info.setVisibility(View.VISIBLE); + }else { + if( small_info.getVisibility() == View.VISIBLE) + small_info.setVisibility(View.GONE); } - }); - } + 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 { if( account != null && account.getAcct() != null) setTitle(account.getAcct()); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java index 60439e2a6..6314b1b11 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java @@ -79,7 +79,6 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet private SwipeRefreshLayout swipeRefreshLayout; private ListView lv_status; private boolean isRefreshed; - private TextView title; private ImageView pp_actionBar; @Override @@ -101,7 +100,7 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet View view = inflater.inflate(R.layout.conversation_action_bar, null); actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); - title = (TextView) actionBar.getCustomView().findViewById(R.id.toolbar_title); + TextView title = (TextView) actionBar.getCustomView().findViewById(R.id.toolbar_title); pp_actionBar = (ImageView) actionBar.getCustomView().findViewById(R.id.pp_actionBar); title.setText(R.string.conversation); ImageView close_conversation = (ImageView) actionBar.getCustomView().findViewById(R.id.close_conversation); @@ -163,15 +162,9 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipeContainer); new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ONESTATUS, statusId,null, false,false, ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - if( theme == Helper.THEME_LIGHT) { - swipeRefreshLayout.setColorSchemeResources(R.color.colorAccent, - R.color.colorPrimary, - R.color.colorPrimaryDark); - }else { - swipeRefreshLayout.setColorSchemeResources(R.color.colorAccentD, - R.color.colorPrimaryD, - R.color.colorPrimaryDarkD); - } + swipeRefreshLayout.setColorSchemeResources(R.color.mastodonC4, + R.color.mastodonC2, + R.color.mastodonC3); swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override public void onRefresh() { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java index 70c97820d..531f1de92 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java @@ -1063,7 +1063,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc toot_content.setText(toot_content.getText().toString().replace(attachment.getText_url(), "")); toot_space_left.setText(String.valueOf(toot_content.length())); //Moves the cursor - if (selectionBefore >= 0) + if (selectionBefore >= 0 && selectionBefore < toot_content.length()) toot_content.setSelection(selectionBefore); } ((ViewGroup) namebar.getParent()).removeView(namebar); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index 8777c2206..9ceb7274c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -58,6 +58,7 @@ import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiskCache; import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; +import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer; import com.nostra13.universalimageloader.core.display.SimpleBitmapDisplayer; import org.json.JSONArray; @@ -111,7 +112,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf private List statuses; private LayoutInflater layoutInflater; private ImageLoader imageLoader; - private DisplayImageOptions options; + private DisplayImageOptions options, optionsAttachment; private ViewHolder holder; private boolean isOnWifi; private int translator; @@ -194,9 +195,10 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf .build(); if( !imageLoader.isInited()) imageLoader.init(configImg); - options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false) + options = new DisplayImageOptions.Builder().displayer(new RoundedBitmapDisplayer(10)).cacheInMemory(false) + .cacheOnDisk(true).resetViewBeforeLoading(true).build(); + optionsAttachment = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false) .cacheOnDisk(true).resetViewBeforeLoading(true).build(); - if (convertView == null) { convertView = layoutInflater.inflate(R.layout.drawer_status, parent, false); holder = new ViewHolder(); @@ -707,9 +709,9 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf } }else { if( position == ShowConversationActivity.position){ - holder.main_container.setBackgroundResource(R.color.mastodonC1_); + holder.main_container.setBackgroundResource(R.color.mastodonC1___); }else { - holder.main_container.setBackgroundResource(R.color.mastodonC1); + holder.main_container.setBackgroundResource(R.color.mastodonC1_); } } } @@ -1154,7 +1156,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf if( url == null || url.trim().equals("")) url = attachment.getUrl(); if( !url.trim().contains("missing.png")) - imageLoader.displayImage(url, imageView, options); + imageLoader.displayImage(url, imageView, optionsAttachment); final int finalPosition = position; imageView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index 6431b3b9d..888fd6856 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -828,7 +828,6 @@ public class Helper { if( currentSubmenu == null) continue; final MenuItem item = currentSubmenu.add("@" + account.getAcct()); - //final MenuItem item = mainMenu.addSubMenu("@" + account.getAcct()).add("@" + account.getAcct()); ImageLoader imageLoader; DisplayImageOptions options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false) .cacheOnDisk(true).resetViewBeforeLoading(true).build(); diff --git a/app/src/main/res/drawable-hdpi/ic_action_users_tl.png b/app/src/main/res/drawable-hdpi/ic_action_users_tl.png index ddb72f0dd..2eef401fd 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_action_users_tl.png and b/app/src/main/res/drawable-hdpi/ic_action_users_tl.png differ diff --git a/app/src/main/res/drawable-ldpi/ic_action_users_tl.png b/app/src/main/res/drawable-ldpi/ic_action_users_tl.png index 10ef04126..a673f0f29 100644 Binary files a/app/src/main/res/drawable-ldpi/ic_action_users_tl.png and b/app/src/main/res/drawable-ldpi/ic_action_users_tl.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_users_tl.png b/app/src/main/res/drawable-mdpi/ic_action_users_tl.png index b5440511f..f96ff97c4 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_action_users_tl.png and b/app/src/main/res/drawable-mdpi/ic_action_users_tl.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_users_tl.png b/app/src/main/res/drawable-xhdpi/ic_action_users_tl.png index 55c3a3d20..3c31252a0 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_users_tl.png and b/app/src/main/res/drawable-xhdpi/ic_action_users_tl.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_users_tl.png b/app/src/main/res/drawable-xxhdpi/ic_action_users_tl.png index 5ed578fca..178fb0f9f 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_users_tl.png and b/app/src/main/res/drawable-xxhdpi/ic_action_users_tl.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_users_tl.png b/app/src/main/res/drawable-xxxhdpi/ic_action_users_tl.png index d559a5a37..911c4b526 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_action_users_tl.png and b/app/src/main/res/drawable-xxxhdpi/ic_action_users_tl.png differ diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml index 2d2fa41f6..baa568bc7 100644 --- a/app/src/main/res/layout-sw600dp/activity_show_account.xml +++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml @@ -17,10 +17,10 @@ --> + + + + + android:minHeight="?attr/actionBarSize" + app:theme="@style/ThemeOverlay.AppCompat.Light" + app:layout_scrollFlags="scroll|enterAlways|snap" + /> + + android:gravity="center" + android:orientation="horizontal" + android:layout_height="wrap_content" + > - + 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"> + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> - - - - + /> + + - + + - - - + /> - - - - + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml index fa21bb090..442241a44 100644 --- a/app/src/main/res/layout-sw600dp/activity_toot.xml +++ b/app/src/main/res/layout-sw600dp/activity_toot.xml @@ -84,7 +84,8 @@