Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix typo (#987) 

* Optimize imports

* Fix typo in 'replyingStatusAuthor'
This commit is contained in:
kyori19 2019-01-15 05:57:22 +09:00 committed by Konrad Pozniak
parent fb83d086d1
commit 75158a3aa0
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
View File

@ -1739,7 +1739,7 @@ public final class ComposeActivity
return this; return this;
} }
public IntentBuilder repyingStatusAuthor(String username) { public IntentBuilder replyingStatusAuthor(String username) {
this.replyingStatusAuthor = username; this.replyingStatusAuthor = username;
return this; return this;
} }

16
app/src/main/java/com/keylesspalace/tusky/SavedTootActivity.java
View File

@ -15,17 +15,10 @@
package com.keylesspalace.tusky; package com.keylesspalace.tusky;
import androidx.lifecycle.Lifecycle;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; 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.MenuItem;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
@ -46,6 +39,13 @@ import java.util.List;
import javax.inject.Inject; 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 io.reactivex.android.schedulers.AndroidSchedulers;
import static com.uber.autodispose.AutoDispose.autoDisposable; import static com.uber.autodispose.AutoDispose.autoDisposable;
@ -165,7 +165,7 @@ public final class SavedTootActivity extends BaseActivity implements SavedTootAd
.savedJsonUrls(item.getUrls()) .savedJsonUrls(item.getUrls())
.savedJsonDescriptions(item.getDescriptions()) .savedJsonDescriptions(item.getDescriptions())
.inReplyToId(item.getInReplyToId()) .inReplyToId(item.getInReplyToId())
.repyingStatusAuthor(item.getInReplyToUsername()) .replyingStatusAuthor(item.getInReplyToUsername())
.replyingStatusContent(item.getInReplyToText()) .replyingStatusContent(item.getInReplyToText())
.savedVisibility(item.getVisibility()) .savedVisibility(item.getVisibility())
.build(this); .build(this);

15
app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
View File

@ -19,12 +19,6 @@ import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; 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.text.Spanned;
import android.view.Menu; import android.view.Menu;
import android.view.View; import android.view.View;
@ -50,6 +44,13 @@ import java.util.Set;
import javax.inject.Inject; 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 /* 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 * 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 * 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) .replyVisibility(replyVisibility)
.contentWarning(contentWarning) .contentWarning(contentWarning)
.mentionedUsernames(mentionedUsernames) .mentionedUsernames(mentionedUsernames)
.repyingStatusAuthor(actionableStatus.getAccount().getLocalUsername()) .replyingStatusAuthor(actionableStatus.getAccount().getLocalUsername())
.replyingStatusContent(actionableStatus.getContent().toString()) .replyingStatusContent(actionableStatus.getContent().toString())
.build(getContext()); .build(getContext());
getActivity().startActivity(intent); getActivity().startActivity(intent);

2
app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt
View File

@ -129,7 +129,7 @@ class SendStatusBroadcastReceiver : BroadcastReceiver() {
.replyVisibility(visibility) .replyVisibility(visibility)
.contentWarning(spoiler) .contentWarning(spoiler)
.mentionedUsernames(Arrays.asList(*mentions)) .mentionedUsernames(Arrays.asList(*mentions))
.repyingStatusAuthor(localAuthorId) .replyingStatusAuthor(localAuthorId)
.replyingStatusContent(citedText) .replyingStatusContent(citedText)
.build(context) .build(context)