diff --git a/app/build.gradle b/app/build.gradle index a7a46ca9c..4ad8776b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,12 +17,11 @@ android { buildToolsVersion '27.0.3' defaultConfig { applicationId "com.keylesspalace.tusky" - minSdkVersion 19 + minSdkVersion 21 targetSdkVersion 27 versionCode 49 versionName "3.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - vectorDrawables.useSupportLibrary true } buildTypes { release { diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt index 56bc8ae0e..6dac78b20 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt @@ -135,9 +135,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasSupportF val decorView = window.decorView decorView.systemUiVisibility = decorView.systemUiVisibility or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - window.statusBarColor = Color.TRANSPARENT - } + window.statusBarColor = Color.TRANSPARENT setContentView(R.layout.activity_account) @@ -218,9 +216,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasSupportF var transparencyPercent = Math.abs(verticalOffset) / titleVisibleHeight.toFloat() if (transparencyPercent > 1) transparencyPercent = 1f - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - window.statusBarColor = argbEvaluator.evaluate(transparencyPercent, statusBarColorTransparent, statusBarColorOpaque) as Int - } + window.statusBarColor = argbEvaluator.evaluate(transparencyPercent, statusBarColorTransparent, statusBarColorOpaque) as Int val evaluatedToolbarColor = argbEvaluator.evaluate(transparencyPercent, Color.TRANSPARENT, toolbarColor) as Int val evaluatedTabBarColor = argbEvaluator.evaluate(transparencyPercent, backgroundColor, toolbarColor) as Int diff --git a/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.java b/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.java index 1e723114b..105e098e2 100644 --- a/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.java +++ b/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.java @@ -24,7 +24,6 @@ import android.content.Context; import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.text.emoji.EmojiCompat; -import android.support.v7.app.AppCompatDelegate; import com.evernote.android.job.JobManager; import com.jakewharton.picasso.OkHttp3Downloader; @@ -95,8 +94,6 @@ public class TuskyApplication extends Application implements HasActivityInjector JobManager.create(this).addJobCreator(notificationPullJobCreator); - //necessary for Android < API 21 - AppCompatDelegate.setCompatVectorFromResourcesEnabled(true); } /** diff --git a/app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.java b/app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.java index ef9882b3a..11cbcedb8 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ViewMediaActivity.java @@ -179,9 +179,8 @@ public final class ViewMediaActivity extends BaseActivity View decorView = getWindow().getDecorView(); int uiOptions = View.SYSTEM_UI_FLAG_LOW_PROFILE; decorView.setSystemUiVisibility(uiOptions); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - getWindow().setStatusBarColor(Color.BLACK); - } + getWindow().setStatusBarColor(Color.BLACK); + } @Override diff --git a/app/src/main/java/com/keylesspalace/tusky/ViewVideoActivity.java b/app/src/main/java/com/keylesspalace/tusky/ViewVideoActivity.java index 539995a5b..1e182ef93 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ViewVideoActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ViewVideoActivity.java @@ -19,7 +19,6 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.graphics.Color; import android.media.MediaPlayer; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -85,9 +84,8 @@ public class ViewVideoActivity extends BaseActivity { } }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - getWindow().setStatusBarColor(Color.BLACK); - } + getWindow().setStatusBarColor(Color.BLACK); + } @Override diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java index 3ceaf8b4e..6cbd7bec4 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java @@ -257,9 +257,6 @@ public class NotificationsAdapter extends RecyclerView.Adapter { usernameView = itemView.findViewById(R.id.notification_username); displayNameView = itemView.findViewById(R.id.notification_display_name); avatar = itemView.findViewById(R.id.notification_avatar); - //workaround because Android < API 21 does not support setting drawableLeft from xml when it is a vector image - Drawable followIcon = ContextCompat.getDrawable(message.getContext(), R.drawable.ic_person_add_24dp); - message.setCompoundDrawablesWithIntrinsicBounds(followIcon, null, null, null); } void setMessage(Account account, BidiFormatter bidiFormatter) { diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java index d0ab5b8ae..0cc40a7cd 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java @@ -3,7 +3,6 @@ package com.keylesspalace.tusky.adapter; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; -import android.os.Build; import android.support.annotation.Nullable; import android.text.SpannableStringBuilder; import android.text.Spanned; @@ -137,9 +136,7 @@ class StatusDetailedViewHolder extends StatusBaseViewHolder { cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT; } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - cardView.setClipToOutline(true); - } + cardView.setClipToOutline(true); Picasso.with(cardImage.getContext()) .load(card.getImage()) diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java index a1c940363..d4250e1f5 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java @@ -16,7 +16,6 @@ package com.keylesspalace.tusky.adapter; import android.content.Context; -import android.graphics.drawable.Drawable; import android.support.annotation.Nullable; import android.view.View; import android.widget.ImageView; @@ -24,7 +23,6 @@ import android.widget.TextView; import com.keylesspalace.tusky.R; import com.keylesspalace.tusky.interfaces.StatusActionListener; -import com.keylesspalace.tusky.util.ThemeUtils; import com.keylesspalace.tusky.viewdata.StatusViewData; import com.squareup.picasso.Picasso; @@ -38,10 +36,6 @@ public class StatusViewHolder extends StatusBaseViewHolder { super(itemView, useAbsoluteTime); avatarReblog = itemView.findViewById(R.id.status_avatar_reblog); rebloggedBar = itemView.findViewById(R.id.status_reblogged); - //workaround because Android < API 21 does not support setting drawableLeft from xml when it is a vector image - Drawable rebloggedIcon = ThemeUtils.getDrawable(rebloggedBar.getContext(), - R.attr.status_reblog_small_drawable, R.drawable.ic_reblog_dark_18dp); - rebloggedBar.setCompoundDrawablesWithIntrinsicBounds(rebloggedIcon, null, null, null); } @Override diff --git a/app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java b/app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java index 2a9500d9e..91212c8f4 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java @@ -24,11 +24,8 @@ import android.util.Log; import com.keylesspalace.tusky.BuildConfig; -import java.io.IOException; -import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Proxy; -import java.net.Socket; import java.security.KeyManagementException; import java.security.KeyStore; import java.security.KeyStoreException; @@ -39,7 +36,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; @@ -106,7 +102,7 @@ public class OkHttpUtils { builder.proxy(new Proxy(Proxy.Type.HTTP, address)); } - return enableHigherTlsOnPreLollipop(builder); + return builder; } /** @@ -168,98 +164,4 @@ public class OkHttpUtils { specList.add(spec); } - private static OkHttpClient.Builder enableHigherTlsOnPreLollipop(OkHttpClient.Builder builder) { - if (Build.VERSION.SDK_INT < 22) { - try { - TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance( - TrustManagerFactory.getDefaultAlgorithm()); - trustManagerFactory.init((KeyStore) null); - TrustManager[] trustManagers = trustManagerFactory.getTrustManagers(); - if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) { - throw new IllegalStateException("Unexpected default trust managers:" - + Arrays.toString(trustManagers)); - } - - X509TrustManager trustManager = (X509TrustManager) trustManagers[0]; - - SSLContext sslContext = SSLContext.getInstance("TLS"); - sslContext.init(null, new TrustManager[] { trustManager }, null); - SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory(); - - builder.sslSocketFactory(new SSLSocketFactoryCompat(sslSocketFactory), - trustManager); - } catch (NoSuchAlgorithmException|KeyStoreException|KeyManagementException e) { - Log.e(TAG, "Failed enabling TLS 1.1 & 1.2. " + e.getMessage()); - } - } - - return builder; - } - - private static class SSLSocketFactoryCompat extends SSLSocketFactory { - private static final String[] DESIRED_TLS_VERSIONS = { "TLSv1", "TLSv1.1", "TLSv1.2", - "TLSv1.3" }; - - final SSLSocketFactory delegate; - - SSLSocketFactoryCompat(SSLSocketFactory base) { - this.delegate = base; - } - - @Override - public String[] getDefaultCipherSuites() { - return delegate.getDefaultCipherSuites(); - } - - @Override - public String[] getSupportedCipherSuites() { - return delegate.getSupportedCipherSuites(); - } - - @Override - public Socket createSocket(Socket s, String host, int port, boolean autoClose) - throws IOException { - return patch(delegate.createSocket(s, host, port, autoClose)); - } - - @Override - public Socket createSocket(String host, int port) throws IOException { - return patch(delegate.createSocket(host, port)); - } - - @Override - public Socket createSocket(String host, int port, InetAddress localHost, int localPort) - throws IOException { - return patch(delegate.createSocket(host, port, localHost, localPort)); - } - - @Override - public Socket createSocket(InetAddress host, int port) throws IOException { - return patch(delegate.createSocket(host, port)); - } - - @Override - public Socket createSocket(InetAddress address, int port, InetAddress localAddress, - int localPort) throws IOException { - return patch(delegate.createSocket(address, port, localAddress, localPort)); - } - - @NonNull - private static String[] getMatches(String[] wanted, String[] have) { - List a = new ArrayList<>(Arrays.asList(wanted)); - List b = Arrays.asList(have); - a.retainAll(b); - return a.toArray(new String[0]); - } - - private Socket patch(Socket socket) { - if (socket instanceof SSLSocket) { - SSLSocket sslSocket = (SSLSocket) socket; - String[] protocols = getMatches(DESIRED_TLS_VERSIONS, - sslSocket.getSupportedProtocols()); - sslSocket.setEnabledProtocols(protocols); - } - return socket; - } - } } diff --git a/app/src/main/java/com/keylesspalace/tusky/view/ComposeOptionsView.kt b/app/src/main/java/com/keylesspalace/tusky/view/ComposeOptionsView.kt index 3202a5dfa..b7f2518a9 100644 --- a/app/src/main/java/com/keylesspalace/tusky/view/ComposeOptionsView.kt +++ b/app/src/main/java/com/keylesspalace/tusky/view/ComposeOptionsView.kt @@ -31,12 +31,10 @@ class ComposeOptionsView @JvmOverloads constructor(context: Context, attrs: Attr init { inflate(context, R.layout.view_compose_options, this) - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - publicRadioButton.setButtonDrawable(R.drawable.ic_public_24dp) - unlistedRadioButton.setButtonDrawable(R.drawable.ic_lock_open_24dp) - privateRadioButton.setButtonDrawable(R.drawable.ic_lock_outline_24dp) - directRadioButton.setButtonDrawable(R.drawable.ic_email_24dp) - } + publicRadioButton.setButtonDrawable(R.drawable.ic_public_24dp) + unlistedRadioButton.setButtonDrawable(R.drawable.ic_lock_open_24dp) + privateRadioButton.setButtonDrawable(R.drawable.ic_lock_outline_24dp) + directRadioButton.setButtonDrawable(R.drawable.ic_email_24dp) visibilityRadioGroup.setOnCheckedChangeListener { _, checkedId -> val visibility = when (checkedId) { diff --git a/app/src/main/java/com/keylesspalace/tusky/view/RoundedImageView.java b/app/src/main/java/com/keylesspalace/tusky/view/RoundedImageView.java index dc07d27d7..b5f0733b8 100644 --- a/app/src/main/java/com/keylesspalace/tusky/view/RoundedImageView.java +++ b/app/src/main/java/com/keylesspalace/tusky/view/RoundedImageView.java @@ -33,9 +33,7 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.os.Build; import android.support.annotation.DrawableRes; -import android.support.annotation.RequiresApi; import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.View; @@ -96,9 +94,7 @@ public class RoundedImageView extends AppCompatImageView { super.setScaleType(SCALE_TYPE); mReady = true; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - setOutlineProvider(new OutlineProvider()); - } + setOutlineProvider(new OutlineProvider()); if (mSetupPending) { setup(); @@ -317,7 +313,6 @@ public class RoundedImageView extends AppCompatImageView { mBitmapShader.setLocalMatrix(mShaderMatrix); } - @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) private class OutlineProvider extends ViewOutlineProvider { @Override diff --git a/app/src/main/res/drawable-hdpi/avatar_default.png b/app/src/main/res/drawable-hdpi/avatar_default.png deleted file mode 100644 index fe84271ad..000000000 Binary files a/app/src/main/res/drawable-hdpi/avatar_default.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/avatar_default.png b/app/src/main/res/drawable-mdpi/avatar_default.png deleted file mode 100644 index 20665406e..000000000 Binary files a/app/src/main/res/drawable-mdpi/avatar_default.png and /dev/null differ diff --git a/app/src/main/res/drawable-v21/toggle_small.xml b/app/src/main/res/drawable-v21/toggle_small.xml deleted file mode 100644 index bf55fff06..000000000 --- a/app/src/main/res/drawable-v21/toggle_small.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/toggle_small_light.xml b/app/src/main/res/drawable-v21/toggle_small_light.xml deleted file mode 100644 index 5f27f87a2..000000000 --- a/app/src/main/res/drawable-v21/toggle_small_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/avatar_default.png b/app/src/main/res/drawable-xhdpi/avatar_default.png deleted file mode 100644 index 1baf777c2..000000000 Binary files a/app/src/main/res/drawable-xhdpi/avatar_default.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/avatar_default.png b/app/src/main/res/drawable-xxhdpi/avatar_default.png deleted file mode 100644 index 14e97fe73..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/avatar_default.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/avatar_default.png b/app/src/main/res/drawable-xxxhdpi/avatar_default.png deleted file mode 100644 index 59f56039d..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/avatar_default.png and /dev/null differ diff --git a/app/src/main/res/drawable-anydpi-v21/avatar_default.xml b/app/src/main/res/drawable/avatar_default.xml similarity index 100% rename from app/src/main/res/drawable-anydpi-v21/avatar_default.xml rename to app/src/main/res/drawable/avatar_default.xml diff --git a/app/src/main/res/drawable/toggle_small.xml b/app/src/main/res/drawable/toggle_small.xml index 5fdb9950a..bf55fff06 100644 --- a/app/src/main/res/drawable/toggle_small.xml +++ b/app/src/main/res/drawable/toggle_small.xml @@ -1,21 +1,6 @@ - - - - - - - - - - - - - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/toggle_small_light.xml b/app/src/main/res/drawable/toggle_small_light.xml index 4e2c89fa7..5f27f87a2 100644 --- a/app/src/main/res/drawable/toggle_small_light.xml +++ b/app/src/main/res/drawable/toggle_small_light.xml @@ -1,21 +1,6 @@ - - - - - - - - - - - - - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index d8e9b2b29..1e608f899 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -109,8 +109,6 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_account_list.xml b/app/src/main/res/layout/activity_account_list.xml index 1187604d2..477e569ba 100644 --- a/app/src/main/res/layout/activity_account_list.xml +++ b/app/src/main/res/layout/activity_account_list.xml @@ -15,6 +15,4 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml index b87b1e5ac..3d401abdf 100644 --- a/app/src/main/res/layout/activity_edit_profile.xml +++ b/app/src/main/res/layout/activity_edit_profile.xml @@ -173,8 +173,6 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml index bf9eb6adb..c1cf08a51 100644 --- a/app/src/main/res/layout/activity_license.xml +++ b/app/src/main/res/layout/activity_license.xml @@ -205,8 +205,6 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_lists.xml b/app/src/main/res/layout/activity_lists.xml index 4eaccefca..31ba374eb 100644 --- a/app/src/main/res/layout/activity_lists.xml +++ b/app/src/main/res/layout/activity_lists.xml @@ -7,14 +7,6 @@ - - + app:layout_constraintTop_toBottomOf="parent" /> + android:layout_height="match_parent" + android:clipChildren="false"> @@ -32,6 +34,7 @@ android:layout_alignParentTop="true" android:layout_toEndOf="@id/drawer_toggle" android:background="?android:colorBackground" + android:elevation="@dimen/actionbar_elevation" app:tabGravity="fill" app:tabIndicatorHeight="3dp" app:tabMaxWidth="0dp" @@ -71,15 +74,6 @@ - - - + diff --git a/app/src/main/res/layout/activity_modal_timeline.xml b/app/src/main/res/layout/activity_modal_timeline.xml index 64274efce..4c1a58619 100644 --- a/app/src/main/res/layout/activity_modal_timeline.xml +++ b/app/src/main/res/layout/activity_modal_timeline.xml @@ -15,8 +15,6 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - - diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml index 65804ed66..2c579849f 100644 --- a/app/src/main/res/layout/activity_preferences.xml +++ b/app/src/main/res/layout/activity_preferences.xml @@ -15,6 +15,4 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_report.xml b/app/src/main/res/layout/activity_report.xml index 0bf981b67..cdf6b9332 100644 --- a/app/src/main/res/layout/activity_report.xml +++ b/app/src/main/res/layout/activity_report.xml @@ -37,6 +37,4 @@ android:hint="@string/report_comment_hint" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_saved_toot.xml b/app/src/main/res/layout/activity_saved_toot.xml index 05a048705..2b5502590 100644 --- a/app/src/main/res/layout/activity_saved_toot.xml +++ b/app/src/main/res/layout/activity_saved_toot.xml @@ -29,6 +29,4 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index c9f1a1ee5..3068489e0 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -29,8 +29,6 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_tag.xml b/app/src/main/res/layout/activity_view_tag.xml index 474264fa5..abd0aaca8 100644 --- a/app/src/main/res/layout/activity_view_tag.xml +++ b/app/src/main/res/layout/activity_view_tag.xml @@ -15,8 +15,6 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_view_thread.xml b/app/src/main/res/layout/activity_view_thread.xml index 65d3838b0..7acbc8c59 100644 --- a/app/src/main/res/layout/activity_view_thread.xml +++ b/app/src/main/res/layout/activity_view_thread.xml @@ -15,8 +15,6 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_follow.xml b/app/src/main/res/layout/item_follow.xml index fd1c935f7..899b6d376 100644 --- a/app/src/main/res/layout/item_follow.xml +++ b/app/src/main/res/layout/item_follow.xml @@ -18,6 +18,7 @@ android:layout_marginBottom="4dp" android:layout_marginTop="8dp" android:drawablePadding="10dp" + android:drawableStart="@drawable/ic_person_add_24dp" android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml index 252011882..61cd1ee02 100644 --- a/app/src/main/res/layout/item_status.xml +++ b/app/src/main/res/layout/item_status.xml @@ -13,6 +13,7 @@ - \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 1f2321c55..94c6abb6b 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -26,4 +26,6 @@ -1px -1px + 4dp +