From 75158a3aa052394d2b526b8436e5819c1d07ee5c Mon Sep 17 00:00:00 2001 From: kyori19 Date: Tue, 15 Jan 2019 05:57:22 +0900 Subject: [PATCH] Fix typo (#987) * Optimize imports * Fix typo in 'replyingStatusAuthor' --- .../com/keylesspalace/tusky/ComposeActivity.java | 2 +- .../keylesspalace/tusky/SavedTootActivity.java | 16 ++++++++-------- .../keylesspalace/tusky/fragment/SFragment.java | 15 ++++++++------- .../receiver/SendStatusBroadcastReceiver.kt | 2 +- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java index 58a44ce7..20a1371a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java @@ -1739,7 +1739,7 @@ public final class ComposeActivity return this; } - public IntentBuilder repyingStatusAuthor(String username) { + public IntentBuilder replyingStatusAuthor(String username) { this.replyingStatusAuthor = username; return this; } diff --git a/app/src/main/java/com/keylesspalace/tusky/SavedTootActivity.java b/app/src/main/java/com/keylesspalace/tusky/SavedTootActivity.java index ca738a95..e5d26869 100644 --- a/app/src/main/java/com/keylesspalace/tusky/SavedTootActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/SavedTootActivity.java @@ -15,17 +15,10 @@ package com.keylesspalace.tusky; -import androidx.lifecycle.Lifecycle; import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.appcompat.app.ActionBar; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.widget.TextView; @@ -46,6 +39,13 @@ import java.util.List; import javax.inject.Inject; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.Toolbar; +import androidx.lifecycle.Lifecycle; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import io.reactivex.android.schedulers.AndroidSchedulers; import static com.uber.autodispose.AutoDispose.autoDisposable; @@ -165,7 +165,7 @@ public final class SavedTootActivity extends BaseActivity implements SavedTootAd .savedJsonUrls(item.getUrls()) .savedJsonDescriptions(item.getDescriptions()) .inReplyToId(item.getInReplyToId()) - .repyingStatusAuthor(item.getInReplyToUsername()) + .replyingStatusAuthor(item.getInReplyToUsername()) .replyingStatusContent(item.getInReplyToText()) .savedVisibility(item.getVisibility()) .build(this); diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java index e34e19ca..8a7c5606 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java @@ -19,12 +19,6 @@ import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.app.ActivityOptionsCompat; -import androidx.core.view.ViewCompat; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.widget.PopupMenu; import android.text.Spanned; import android.view.Menu; import android.view.View; @@ -50,6 +44,13 @@ import java.util.Set; import javax.inject.Inject; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.PopupMenu; +import androidx.core.app.ActivityOptionsCompat; +import androidx.core.view.ViewCompat; + /* Note from Andrew on Jan. 22, 2017: This class is a design problem for me, so I left it with an * awkward name. TimelineFragment and NotificationFragment have significant overlap but the nature * of that is complicated by how they're coupled with Status and Notification and the corresponding @@ -126,7 +127,7 @@ public abstract class SFragment extends BaseFragment { .replyVisibility(replyVisibility) .contentWarning(contentWarning) .mentionedUsernames(mentionedUsernames) - .repyingStatusAuthor(actionableStatus.getAccount().getLocalUsername()) + .replyingStatusAuthor(actionableStatus.getAccount().getLocalUsername()) .replyingStatusContent(actionableStatus.getContent().toString()) .build(getContext()); getActivity().startActivity(intent); diff --git a/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt b/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt index 73f00675..bb95d0ba 100644 --- a/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt +++ b/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt @@ -129,7 +129,7 @@ class SendStatusBroadcastReceiver : BroadcastReceiver() { .replyVisibility(visibility) .contentWarning(spoiler) .mentionedUsernames(Arrays.asList(*mentions)) - .repyingStatusAuthor(localAuthorId) + .replyingStatusAuthor(localAuthorId) .replyingStatusContent(citedText) .build(context)