Skip to content

Commit 075791a

Browse files
marcin-kozinskimarcin-kozinski
authored
Merge pull request #180 from Pocket/clean-up-quick-toast
refactor: migrate off of bespoke toast apis
2 parents d4899cd + f684985 commit 075791a

File tree

6 files changed

+28
-172
lines changed

6 files changed

+28
-172
lines changed

‎Pocket/src/main/java/com/pocket/app/PocketUiPlaygroundActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class PocketUiPlaygroundActivity extends AbsPocketActivity {
6565

6666
private ViewGroup fullscreenView;
6767

68-
private View.OnClickListener badgeClickListener = view -> {
68+
private final View.OnClickListener badgeClickListener = view -> {
6969
String message;
7070
if (view instanceof TextView) {
7171
message = ((TextView) view).getText().toString();
@@ -155,8 +155,8 @@ private void bindExamples() {
155155
}
156156

157157
PreviousNextButtons continuousReading = findViewById(com.pocket.ui.R.id.continuous_reading);
158-
continuousReading.onPreviousClick(v -> QuickToast.show("Previous"));
159-
continuousReading.onNextClick(v -> QuickToast.show("Next"));
158+
continuousReading.onPreviousClick(v -> Toast.makeText(this, "Previous", Toast.LENGTH_LONG).show());
159+
continuousReading.onNextClick(v -> Toast.makeText(this, "Next", Toast.LENGTH_LONG).show());
160160

161161
final String discTitle = "A Simple Way to Map Out your Career Ambitions";
162162
final String discDomain = "Ted Ideas";
@@ -327,7 +327,7 @@ public void onClick(View v1) {
327327
.bindGroup("Best Of", "Best Of", BadgeUtil.getGroupTextColor(this, 1), BadgeUtil.getGroupBadgeColor(this, 1), badgeClickListener)
328328
.bindTags(Collections.singletonList("Very long tag that doesn't quite exactly fit"), badgeClickListener);
329329

330-
View.OnClickListener onClick = v -> QuickToast.show("Tapped " + v);
330+
View.OnClickListener onClick = v -> Toast.makeText(this, "Tapped " + v, Toast.LENGTH_LONG).show();
331331

332332
ItemSnackbarView itemSnackbar = findViewById(com.pocket.ui.R.id.item_snackbar);
333333
itemSnackbar.bind().clear()

‎Pocket/src/main/java/com/pocket/app/PocketUrlHandlerActivity.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ private void onNoDeepLinkFound(final ArrayList<String> urls) {
136136
@Override
137137
public void onTimeout(Timeout timeout) {
138138
if (!isFinishing()) {
139-
mLoadingToast = QuickToast.show(R.string.dg_loading, mLoadingToast);
139+
if (mLoadingToast == null) {
140+
mLoadingToast = Toast.makeText(PocketUrlHandlerActivity.this, R.string.dg_loading, Toast.LENGTH_LONG);
141+
}
140142
mLoadingToast.show();
141143
}
142144
}

‎Pocket/src/main/java/com/pocket/app/QuickToast.java

Lines changed: 0 additions & 152 deletions
This file was deleted.

‎Pocket/src/main/java/com/pocket/app/listen/ListenView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import android.util.AttributeSet
88
import android.view.LayoutInflater
99
import android.view.View
1010
import android.widget.ImageView
11+
import android.widget.Toast
1112
import androidx.recyclerview.widget.RecyclerView
1213
import com.google.android.material.bottomsheet.BottomSheetBehavior
1314
import com.ideashower.readitlater.R
1415
import com.ideashower.readitlater.databinding.ViewListenBinding
1516
import com.pocket.analytics.ItemContent
1617
import com.pocket.app.App
1718
import com.pocket.app.PocketApp
18-
import com.pocket.app.QuickToast
1919
import com.pocket.sdk.api.generated.enums.CxtSection
2020
import com.pocket.sdk.api.generated.enums.CxtUi
2121
import com.pocket.sdk.api.generated.enums.CxtView
@@ -249,7 +249,7 @@ class ListenView @JvmOverloads constructor(context: Context?, attrs: AttributeSe
249249
errorControls.pause()
250250
}
251251
ListenError.EMPTY_LIST -> {
252-
QuickToast.show(R.string.tts_empty_list)
252+
Toast.makeText(context, R.string.tts_empty_list, Toast.LENGTH_LONG).show()
253253
errorControls.off()
254254
}
255255
ListenError.NETWORK_ERROR, ListenError.TIMED_OUT -> {

‎Pocket/src/main/java/com/pocket/app/settings/beta/BetaConfigFragment.java

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
import android.view.View;
99
import android.widget.EditText;
1010
import android.widget.LinearLayout;
11+
import android.widget.Toast;
1112

1213
import com.ideashower.readitlater.BuildConfig;
1314
import com.ideashower.readitlater.R;
1415
import com.pocket.app.PocketSingleton;
1516
import com.pocket.app.PocketUiPlaygroundActivity;
16-
import com.pocket.app.QuickToast;
1717
import com.pocket.app.settings.AbsPrefsFragment;
1818
import com.pocket.app.settings.view.preferences.ActionPreference;
1919
import com.pocket.app.settings.view.preferences.MultipleChoicePreference;
@@ -30,7 +30,6 @@
3030
import com.pocket.sdk.api.thing.AccountUtil;
3131
import com.pocket.sdk.api.value.Timestamp;
3232
import com.pocket.sdk.dev.AppTransplant;
33-
import com.pocket.sdk.http.HttpClientDelegate;
3433
import com.pocket.sdk.network.eclectic.EclecticHttp;
3534
import com.pocket.sdk.preferences.AppPrefs;
3635
import com.pocket.ui.view.edittext.LabeledEditText;
@@ -235,10 +234,10 @@ public void onItemSelectionChanged(int __) {
235234
.setOnItemSelectedListener(newValue -> {
236235
switch (newValue) {
237236
case 0:
238-
QuickToast.show("Retrieving your latest account info from server...");
237+
toast("Retrieving your latest account info from server...");
239238
pocket().syncRemote(AccountUtil.getuser(pocket().spec()))
240-
.onSuccess(r -> QuickToast.show("Premium Status reset back to Actual"))
241-
.onFailure(e -> QuickToast.show("Couldn't load actual status, make sure you are online and try again"));
239+
.onSuccess(r -> toast("Premium Status reset back to Actual"))
240+
.onFailure(e -> toast("Couldn't load actual status, make sure you are online and try again"));
242241
break;
243242
case 1:
244243
pocket().sync(null, pocket().spec().actions().fake_premium_status()
@@ -247,7 +246,7 @@ public void onItemSelectionChanged(int __) {
247246
.premium_alltime_status(PremiumAllTimeStatus.ACTIVE)
248247
.time(Timestamp.now())
249248
.build());
250-
QuickToast.show("Note: This does not effect your actual status. If the app syncs the latest account info, this fake status will be overridden back to the real one.");
249+
toast("Note: This does not effect your actual status. If the app syncs the latest account info, this fake status will be overridden back to the real one.");
251250
break;
252251
case 2:
253252
pocket().sync(null, pocket().spec().actions().fake_premium_status()
@@ -256,7 +255,7 @@ public void onItemSelectionChanged(int __) {
256255
.premium_alltime_status(PremiumAllTimeStatus.NEVER)
257256
.time(Timestamp.now())
258257
.build());
259-
QuickToast.show("Note: This does not effect your actual status. If the app syncs the latest account info, this fake status will be overridden back to the real one.");
258+
toast("Note: This does not effect your actual status. If the app syncs the latest account info, this fake status will be overridden back to the real one.");
260259
break;
261260
}
262261
})
@@ -272,7 +271,7 @@ public void onItemSelectionChanged(int __) {
272271

273272
prefs.add(PreferenceViews.newToggleSwitchBuilder(this, appPrefs.DEVCONFIG_SNACKBAR_ALWAYS_SHOW_URL_CR, "Always show Continue Reading and URL Save")
274273
.setSummaryDefaultUnchecked("Always show the Continue Reading and URL Clipboard save snackbars on app start")
275-
.setOnChangeListener(n -> QuickToast.show("Exit and restart the app to view."))
274+
.setOnChangeListener(n -> toast("Exit and restart the app to view."))
276275
.build());
277276

278277
prefs.add(PreferenceViews.newActionBuilder(this, "Edit Fake Device Info for Login")
@@ -441,16 +440,16 @@ public void setSelected(int index) {
441440
prefs.add(PreferenceViews.newActionBuilder(this, "App Transplant")
442441
.setOnClickListener(
443442
() -> {
444-
QuickToast.show("Copying...");
443+
toast("Copying...");
445444
new AppTransplant(getContext()).create();
446-
QuickToast.show("Copied. Be sure to tap Clear Transplant after sending it.");
445+
toast("Copied. Be sure to tap Clear Transplant after sending it.");
447446
})
448447
.build());
449448

450449
prefs.add(PreferenceViews.newActionBuilder(this, "Clear Transplant")
451450
.setOnClickListener(() -> {
452451
new AppTransplant(getContext()).clear();
453-
QuickToast.show("Cleared");
452+
toast("Cleared");
454453
})
455454
.build());
456455
}
@@ -467,6 +466,13 @@ private void requireRestart() {
467466
})
468467
.show();
469468
}
469+
470+
private void toast(CharSequence text) {
471+
var context = getContext();
472+
if (context != null) {
473+
Toast.makeText(context, text, Toast.LENGTH_LONG).show();
474+
}
475+
}
470476

471477
@Override
472478
protected int getTitle() {

‎Pocket/src/main/java/com/pocket/sdk/offline/cache/StorageErrorResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.pocket.sdk.offline.cache;
22

33
import android.app.AlertDialog;
4+
import android.widget.Toast;
45

56
import com.ideashower.readitlater.R;
67
import com.pocket.app.AppThreads;
7-
import com.pocket.app.QuickToast;
88
import com.pocket.sdk.util.AbsPocketActivity;
99
import com.pocket.sdk.util.dialog.ProgressDialogFragment;
1010
import com.pocket.sdk.util.file.AndroidStorageLocation;
@@ -145,7 +145,7 @@ private void showRetryOrResetCacheDialog(final AbsPocketActivity context, final
145145
final ProgressDialogFragment progress = ProgressDialogFragment.getNew(R.string.dg_changing_data_location, false);
146146
progress.showOnCurrentActivity();
147147
context.app().assets().clearOfflineContent(() -> {
148-
QuickToast.show(context.getString(R.string.storage_location_changed));
148+
Toast.makeText(context, R.string.storage_location_changed, Toast.LENGTH_LONG).show();
149149
callback(true, true);
150150
}, null);
151151
} catch (AssetDirectoryUnavailableException e) {

0 commit comments

Comments
 (0)