diff options
| author | Kasun <k-a-s-u-n@tuta.io> | 2019-04-21 14:21:37 +0530 |
|---|---|---|
| committer | Kasun <k-a-s-u-n@tuta.io> | 2019-04-21 14:21:37 +0530 |
| commit | b6deaf7212ce3deb61f5bf5a863d685f73fffdfd (patch) | |
| tree | b0676d59bc4be65258cbd7fc4461e96833190cb4 /app/src | |
| parent | 22a1c12159a686ba8080581c0781212499f9b085 (diff) | |
move locked account icon to the end of username
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java | 10 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_show_account.xml | 4 |
2 files changed, 7 insertions, 7 deletions
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 b39d7c129..5f8c91239 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 @@ -262,9 +262,9 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); accountUrl = account.getUrl(); if( theme == Helper.THEME_BLACK){ - changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.black); }else { - changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.mastodonC4); + changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.mastodonC3); } String accountIdRelation = accountId; if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE) { @@ -309,10 +309,10 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt if(account.isLocked()){ Drawable img = ContextCompat.getDrawable(getApplicationContext(), R.drawable.ic_lock_outline); assert img != null; - img.setBounds(0,0,(int) (20 * scale + 0.5f),(int) (20 * scale + 0.5f)); - account_dn.setCompoundDrawables( img, null, null, null); + img.setBounds(0,0,(int) (16 * scale + 0.5f),(int) (16 * scale + 0.5f)); + account_un.setCompoundDrawables( null, null, img, null); }else{ - account_dn.setCompoundDrawables( null, null, null, null); + account_un.setCompoundDrawables( null, null, null, null); } //Peertube account watched by a Mastodon account diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml index 18fd8cf5c..6177ced9b 100644 --- a/app/src/main/res/layout/activity_show_account.xml +++ b/app/src/main/res/layout/activity_show_account.xml @@ -135,14 +135,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" - android:textSize="16sp" + android:textSize="18sp" android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> <TextView android:textColor="?attr/color_in_account_header" android:id="@+id/account_un" android:maxLines="1" android:layout_width="wrap_content" - android:textSize="14sp" + android:textSize="16sp" android:layout_height="wrap_content" /> <TextView |