Skip to content

Commit 6b672df

Browse files
author
Jacob Mansfield
committed
Extract more strings and remove strings no longer used
1 parent 10490ff commit 6b672df

File tree

4 files changed

+87
-110
lines changed

4 files changed

+87
-110
lines changed

‎app/src/main/java/ie/macinnes/tvheadend/account/Authenticator.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import android.os.Handler;
2727
import android.widget.Toast;
2828

29+
import ie.macinnes.tvheadend.R;
30+
2931
public class Authenticator extends AbstractAccountAuthenticator {
3032
private static final String TAG = Authenticator.class.getName();
3133

@@ -51,7 +53,7 @@ public Bundle addAccount(AccountAuthenticatorResponse response, String accountTy
5153
final Bundle bundle = new Bundle();
5254

5355
if (account != null) {
54-
final String message = "Only one Tvheadend account is currently supported";
56+
final String message = mContext.getString(R.string.setup_only_one_account);
5557

5658
bundle.putInt(AccountManager.KEY_ERROR_CODE, 1);
5759
bundle.putString(AccountManager.KEY_ERROR_MESSAGE, message);

‎app/src/main/java/ie/macinnes/tvheadend/account/AuthenticatorActivity.java‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,8 @@ public static class AccountFragment extends BaseGuidedStepFragment {
215215
@Override
216216
public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
217217
GuidanceStylist.Guidance guidance = new GuidanceStylist.Guidance(
218-
<<<<<<< HEAD
219218
getString(R.string.account_name),
220219
getString(R.string.account_name_body), null, null);
221-
=======
222-
"Tvheadend Account",
223-
"Enter your Tvheadend username and password", null, null);
224-
>>>>>>> origin
225-
226220
return guidance;
227221
}
228222

@@ -330,14 +324,8 @@ public int onProvideTheme() {
330324
@Override
331325
public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
332326
GuidanceStylist.Guidance guidance = new GuidanceStylist.Guidance(
333-
<<<<<<< HEAD
334327
getString(R.string.account_name),
335328
getString(R.string.setup_progress_title), null, null);
336-
=======
337-
"Tvheadend Account",
338-
"Checking your HTSP account", null, null);
339-
>>>>>>> origin
340-
341329
return guidance;
342330
}
343331

@@ -436,7 +424,7 @@ public void onAuthenticationStateChange(@NonNull Authenticator.State state) {
436424
Log.w(TAG, "Failed to validate credentials");
437425

438426
Bundle args = getArguments();
439-
args.putString(Constants.KEY_ERROR_MESSAGE, "Failed to validate HTSP Credentials");
427+
args.putString(Constants.KEY_ERROR_MESSAGE, getString(R.string.setup_failed_htsp));
440428

441429
// Move to the failed step
442430
GuidedStepFragment fragment = new FailedFragment();
@@ -451,8 +439,8 @@ public static class CompletedFragment extends BaseGuidedStepFragment {
451439
@Override
452440
public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
453441
GuidanceStylist.Guidance guidance = new GuidanceStylist.Guidance(
454-
"Tvheadend Account",
455-
"Successfully Added Account",
442+
getString(R.string.account_name),
443+
getString(R.string.account_add_successful),
456444
null,
457445
null);
458446

@@ -462,8 +450,8 @@ public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
462450
@Override
463451
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
464452
GuidedAction action = new GuidedAction.Builder(getActivity())
465-
.title("Complete")
466-
.description("You're all set!")
453+
.title(R.string.setup_complete_action_title)
454+
.description(R.string.setup_account_complete_body)
467455
.editable(false)
468456
.build();
469457

@@ -481,8 +469,8 @@ public static class FailedFragment extends BaseGuidedStepFragment {
481469
@Override
482470
public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
483471
GuidanceStylist.Guidance guidance = new GuidanceStylist.Guidance(
484-
"Tvheadend Account",
485-
"Failed to add account",
472+
getString(R.string.account_name),
473+
getString(R.string.setup_complete_failed),
486474
null,
487475
null);
488476

@@ -495,13 +483,13 @@ public void onResume() {
495483

496484
Bundle args = getArguments();
497485
String errorMessage = args.getString(Constants.KEY_ERROR_MESSAGE);
498-
getGuidanceStylist().getDescriptionView().setText("Failed to add account: " + errorMessage);
486+
getGuidanceStylist().getDescriptionView().setText(getString(R.string.account_failed_error, errorMessage));
499487
}
500488

501489
@Override
502490
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
503491
GuidedAction action = new GuidedAction.Builder(getActivity())
504-
.title("Complete")
492+
.title(R.string.setup_complete_action_title)
505493
.editable(false)
506494
.build();
507495

‎app/src/main/java/ie/macinnes/tvheadend/setup/TvInputSetupActivity.java‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,9 @@ public void onCreate(Bundle savedInstanceState) {
124124
@Override
125125
public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
126126
GuidanceStylist.Guidance guidance = new GuidanceStylist.Guidance(
127-
"Introduction",
128-
"Welcome to the Tvhheadend Live Channel, we'll guide you through the setup " +
129-
"process now, once done you will be ready to watch TV",
130-
"TVHeadend",
127+
getString(R.string.setup_intro_title),
128+
getString(R.string.setup_intro_body),
129+
getString(R.string.account_label),
131130
null);
132131

133132
return guidance;
@@ -136,8 +135,8 @@ public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
136135
@Override
137136
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
138137
GuidedAction action = new GuidedAction.Builder(getActivity())
139-
.title("Begin")
140-
.description("Start Tvheadend Live Channel Setup")
138+
.title(R.string.setup_begin_title)
139+
.description(R.string.setup_begin_body)
141140
.editable(false)
142141
.build();
143142

@@ -162,9 +161,9 @@ public static class AccountSelectorFragment extends BaseGuidedStepFragment {
162161
@Override
163162
public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
164163
GuidanceStylist.Guidance guidance = new GuidanceStylist.Guidance(
165-
"Select An Account",
166-
"Please choose an existing, or create a new TVHeadend account to use",
167-
"TVHeadend",
164+
getString(R.string.setup_account_title),
165+
getString(R.string.setup_account_body),
166+
getString(R.string.account_label),
168167
null);
169168

170169
return guidance;
@@ -176,18 +175,18 @@ public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedIns
176175

177176
GuidedAction action = new GuidedAction.Builder(getActivity())
178177
.id(ACTION_ID_SELECT_ACCOUNT)
179-
.title("Account Selection")
178+
.title(R.string.setup_account_action_title)
180179
.editTitle("")
181-
.description("Select Account")
180+
.description(R.string.setup_account_title)
182181
.subActions(subActions)
183182
.build();
184183

185184
actions.add(action);
186185

187186
action = new GuidedAction.Builder(getActivity())
188187
.id(ACTION_ID_CONFIRM)
189-
.title("Confirm")
190-
.description("Confirm This Selection")
188+
.title(R.string.setup_confirm)
189+
.description(R.string.setup_confirm_body)
191190
.editable(false)
192191
.build();
193192
action.setEnabled(false);
@@ -218,7 +217,7 @@ public void onResume() {
218217

219218
accountSubActions.add(new GuidedAction.Builder(getActivity())
220219
.id(ACTION_ID_NEW_ACCOUNT)
221-
.title("Add New Account")
220+
.title(R.string.setup_account_create)
222221
.description("")
223222
.editable(false)
224223
.build()
@@ -280,9 +279,9 @@ public static class SessionSelectorFragment extends BaseGuidedStepFragment {
280279
@Override
281280
public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
282281
GuidanceStylist.Guidance guidance = new GuidanceStylist.Guidance(
283-
"Session Selector",
284-
"There are several Session implementatioms, please choose one",
285-
"TVHeadend",
282+
getString(R.string.setup_session_title),
283+
getString(R.string.setup_session_body),
284+
getString(R.string.account_label),
286285
null);
287286

288287
return guidance;
@@ -292,26 +291,26 @@ public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
292291
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
293292
GuidedAction action = new GuidedAction.Builder(getActivity())
294293
.id(ACTION_ID_EXO_PLAYER)
295-
.title("ExoPlayer")
296-
.description("Google ExoPlayer (Recommended)")
294+
.title(R.string.ExoPlayer_title)
295+
.description(R.string.ExoPlayer_body)
297296
.editable(false)
298297
.build();
299298

300299
actions.add(action);
301300

302301
action = new GuidedAction.Builder(getActivity())
303302
.id(ACTION_ID_VLC)
304-
.title("LibVLC")
305-
.description("VideoLAN LibVLC (Deprecated)")
303+
.title(R.string.VLC_title)
304+
.description(R.string.VLC_body)
306305
.editable(false)
307306
.build();
308307

309308
actions.add(action);
310309

311310
action = new GuidedAction.Builder(getActivity())
312311
.id(ACTION_ID_MEDIA_PLAYER)
313-
.title("Media Player")
314-
.description("Android Media Player (Deprecated)")
312+
.title(R.string.mediaplayer_title)
313+
.description(R.string.mediaplayer_body)
315314
.editable(false)
316315
.build();
317316

@@ -419,9 +418,9 @@ public int onProvideTheme() {
419418
@Override
420419
public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
421420
GuidanceStylist.Guidance guidance = new GuidanceStylist.Guidance(
422-
"Syncing Channels and Program data",
423-
"Just a few seconds please :)",
424-
"TVHeadend",
421+
getString(R.string.setup_sync_title),
422+
getString(R.string.setup_sync_body),
423+
getString(R.string.account_label),
425424
null);
426425

427426
return guidance;
@@ -430,7 +429,7 @@ public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
430429
@Override
431430
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
432431
GuidedAction action = new GuidedAction.Builder(getActivity())
433-
.title("Processing")
432+
.title(R.string.setup_progress_body)
434433
.infoOnly(true)
435434
.build();
436435
actions.add(action);
@@ -445,9 +444,9 @@ public static class CompletedFragment extends BaseGuidedStepFragment {
445444
@Override
446445
public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
447446
GuidanceStylist.Guidance guidance = new GuidanceStylist.Guidance(
448-
"Setup Complete",
449-
"More EPG data, channel logs, etc are downloading in the background",
450-
"TVHeadend",
447+
getString(R.string.setup_complete_title),
448+
getString(R.string.setup_complete_body),
449+
getString(R.string.account_label),
451450
null);
452451

453452
return guidance;
@@ -457,17 +456,17 @@ public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
457456
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
458457
GuidedAction action = new GuidedAction.Builder(getActivity())
459458
.id(ACTION_ID_SETTINGS)
460-
.title("Settings")
461-
.description("Advanced Settings")
459+
.title(R.string.setup_settings_title)
460+
.description(R.string.setup_settings_body)
462461
.editable(false)
463462
.build();
464463

465464
actions.add(action);
466465

467466
action = new GuidedAction.Builder(getActivity())
468467
.id(ACTION_ID_COMPLETE)
469-
.title("Complete")
470-
.description("You're all set!")
468+
.title(R.string.setup_complete_action_title)
469+
.description(R.string.setup_account_complete_body)
471470
.editable(false)
472471
.build();
473472

0 commit comments

Comments
 (0)