From 305d28a5c1a652f568e6816f668111f6698f4b3a Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Tue, 7 Nov 2017 15:31:44 +0100 Subject: [PATCH] fix some lint warnings, remove unused code --- .../keylesspalace/tusky/AccountActivity.java | 19 ---------- .../tusky/AccountListActivity.java | 1 - .../com/keylesspalace/tusky/BaseActivity.java | 2 ++ .../keylesspalace/tusky/ComposeActivity.java | 1 - .../tusky/ViewThreadActivity.java | 2 -- .../com/keylesspalace/tusky/entity/Card.java | 4 --- .../tusky/fragment/AccountListFragment.java | 5 --- .../tusky/fragment/AccountMediaFragment.kt | 2 +- .../tusky/receiver/TimelineReceiver.java | 4 +-- .../tusky/util/NotificationMaker.java | 2 +- .../tusky/view/SquareImageView.kt | 4 +-- app/src/main/res/layout/tab_account.xml | 36 ------------------- app/src/main/res/values-de/array.xml | 4 --- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values/styles.xml | 5 --- app/src/main/res/xml/file_paths.xml | 4 +-- 16 files changed, 11 insertions(+), 86 deletions(-) delete mode 100644 app/src/main/res/layout/tab_account.xml diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java index e815fcd66..a7756baaa 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java @@ -58,7 +58,6 @@ import com.keylesspalace.tusky.util.ThemeUtils; import com.pkmmte.view.CircularImageView; import com.squareup.picasso.Picasso; -import java.text.NumberFormat; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -346,14 +345,6 @@ public final class AccountActivity extends BaseActivity implements ActionButtonA .placeholder(R.drawable.account_header_default) .into(header); - NumberFormat nf = NumberFormat.getInstance(); - - // Add counts to the tabs in the TabLayout. - String[] counts = { - nf.format(Integer.parseInt(account.statusesCount)), - "" - }; - long followersCount = Long.parseLong(account.followersCount); long followingCount = Long.parseLong(account.followingCount); long statusesCount = Long.parseLong(account.statusesCount); @@ -361,16 +352,6 @@ public final class AccountActivity extends BaseActivity implements ActionButtonA followingTextView.setText(getString(R.string.title_x_following, followingCount)); statusesTextView.setText(getString(R.string.title_x_statuses, statusesCount)); - for (int i = 0; i < tabLayout.getTabCount(); i++) { - TabLayout.Tab tab = tabLayout.getTabAt(i); - if (tab != null) { - View view = tab.getCustomView(); - if (view != null) { - TextView total = view.findViewById(R.id.total); - total.setText(counts[i]); - } - } - } } private void onObtainAccountFailure() { diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountListActivity.java b/app/src/main/java/com/keylesspalace/tusky/AccountListActivity.java index c9ad79d4e..c0720dc62 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountListActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/AccountListActivity.java @@ -20,7 +20,6 @@ import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; diff --git a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java index bad05e18b..011a3b0d0 100644 --- a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java @@ -15,6 +15,7 @@ package com.keylesspalace.tusky; +import android.annotation.SuppressLint; import android.app.NotificationManager; import android.content.Context; import android.content.Intent; @@ -45,6 +46,7 @@ import okhttp3.logging.HttpLoggingInterceptor; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; +@SuppressLint("Registered") public class BaseActivity extends AppCompatActivity { protected static final int SERVICE_REQUEST_CODE = 8574603; // This number is arbitrary. diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java index 9e62c3010..aa209c4b3 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java @@ -109,7 +109,6 @@ import java.io.IOException; import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.Iterator; diff --git a/app/src/main/java/com/keylesspalace/tusky/ViewThreadActivity.java b/app/src/main/java/com/keylesspalace/tusky/ViewThreadActivity.java index 55545509a..f020f6679 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ViewThreadActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ViewThreadActivity.java @@ -15,8 +15,6 @@ package com.keylesspalace.tusky; -import android.content.Intent; -import android.net.Uri; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Card.java b/app/src/main/java/com/keylesspalace/tusky/entity/Card.java index 1582be0a5..414301ae8 100644 --- a/app/src/main/java/com/keylesspalace/tusky/entity/Card.java +++ b/app/src/main/java/com/keylesspalace/tusky/entity/Card.java @@ -17,10 +17,6 @@ package com.keylesspalace.tusky.entity; import android.os.Parcel; import android.os.Parcelable; -import android.text.Spanned; - -import com.google.gson.annotations.SerializedName; -import com.keylesspalace.tusky.util.HtmlUtils; public class Card implements Parcelable { diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java index 9bd5aa3c6..679ab67f6 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java @@ -17,14 +17,10 @@ package com.keylesspalace.tusky.fragment; import android.content.Context; import android.content.Intent; -import android.content.SharedPreferences; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.preference.PreferenceManager; import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; -import android.support.design.widget.TabLayout; import android.support.v7.widget.DividerItemDecoration; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -45,7 +41,6 @@ import com.keylesspalace.tusky.BaseActivity; import com.keylesspalace.tusky.entity.Account; import com.keylesspalace.tusky.entity.Relationship; import com.keylesspalace.tusky.interfaces.AccountActionListener; -import com.keylesspalace.tusky.interfaces.ActionButtonActivity; import com.keylesspalace.tusky.network.MastodonApi; import com.keylesspalace.tusky.R; import com.keylesspalace.tusky.util.HttpHeaderLink; diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt index ebcdab985..be1f45c60 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt @@ -144,7 +144,7 @@ class AccountMediaFragment : BaseFragment() { val accountId = arguments.getString(ACCOUNT_ID_ARG) - swipeLayout = view.findViewById(R.id.swipe_refresh_layout) + swipeLayout = view.findViewById(R.id.swipe_refresh_layout) swipeLayout.setOnRefreshListener { if (fetchingStatus != FetchingStatus.NOT_FETCHING) return@setOnRefreshListener currentCall = if (statuses.isEmpty()) { diff --git a/app/src/main/java/com/keylesspalace/tusky/receiver/TimelineReceiver.java b/app/src/main/java/com/keylesspalace/tusky/receiver/TimelineReceiver.java index 2ab5901c7..bb783cbb1 100644 --- a/app/src/main/java/com/keylesspalace/tusky/receiver/TimelineReceiver.java +++ b/app/src/main/java/com/keylesspalace/tusky/receiver/TimelineReceiver.java @@ -18,8 +18,8 @@ public class TimelineReceiver extends BroadcastReceiver { public static final String STATUS_COMPOSED = "STATUS_COMPOSED"; } - AdapterItemRemover adapter; - SwipeRefreshLayout.OnRefreshListener refreshListener; + private AdapterItemRemover adapter; + private SwipeRefreshLayout.OnRefreshListener refreshListener; public TimelineReceiver(AdapterItemRemover adapter) { super(); diff --git a/app/src/main/java/com/keylesspalace/tusky/util/NotificationMaker.java b/app/src/main/java/com/keylesspalace/tusky/util/NotificationMaker.java index 74ba7ff51..396da2a26 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/NotificationMaker.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/NotificationMaker.java @@ -47,7 +47,7 @@ import java.util.ArrayList; import java.util.List; public class NotificationMaker { - public static final String TAG = "NotificationMaker"; + private static final String TAG = "NotificationMaker"; /** notification channels used on Android O+ **/ private static final String CHANNEL_MENTION = "CHANNEL_MENTION"; diff --git a/app/src/main/java/com/keylesspalace/tusky/view/SquareImageView.kt b/app/src/main/java/com/keylesspalace/tusky/view/SquareImageView.kt index 5e2330efb..19a12b5fb 100644 --- a/app/src/main/java/com/keylesspalace/tusky/view/SquareImageView.kt +++ b/app/src/main/java/com/keylesspalace/tusky/view/SquareImageView.kt @@ -1,14 +1,14 @@ package com.keylesspalace.tusky.view import android.content.Context +import android.support.v7.widget.AppCompatImageView import android.util.AttributeSet -import android.widget.ImageView /** * Created by charlag on 26/10/2017. */ -class SquareImageView : ImageView { +class SquareImageView : AppCompatImageView { constructor(context: Context) : super(context) constructor(context: Context, attributes: AttributeSet) : super(context, attributes) diff --git a/app/src/main/res/layout/tab_account.xml b/app/src/main/res/layout/tab_account.xml deleted file mode 100644 index 0bd9633d0..000000000 --- a/app/src/main/res/layout/tab_account.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-de/array.xml b/app/src/main/res/values-de/array.xml index 8950e41ad..da7139255 100644 --- a/app/src/main/res/values-de/array.xml +++ b/app/src/main/res/values-de/array.xml @@ -1,8 +1,6 @@ - 5 Minuten - 10 Minuten 15 Minuten 20 Minuten 25 Minuten @@ -13,8 +11,6 @@ - 5 - 10 15 20 25 diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index bd732b114..f54727214 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -22,7 +22,7 @@ Értesítések Helyi Egyesített - Tülköléslánc + Tülköléslánc #%s Posztok Követ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 930c82c1f..c2f3ce63f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -9,11 +9,6 @@ @color/text_color_secondary_dark @color/text_color_tertiary_dark - -