GuidedStepFragment: add Context
Change-Id: Ic9cc0941e98994dc6cae51b70a7dca2d26946106
Reviewed-by: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/RingGuidedStepFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/RingGuidedStepFragment.java
index 3dceab4..9eb2e82 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/RingGuidedStepFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/RingGuidedStepFragment.java
@@ -17,6 +17,7 @@
*/
package cx.ring.tv.account;
+import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v17.leanback.app.GuidedStepFragment;
@@ -37,15 +38,15 @@
@Inject
protected T presenter;
- protected static void addAction(List<GuidedAction> actions, long id, String title, String desc) {
- actions.add(new GuidedAction.Builder()
+ protected static void addAction(Context context, List<GuidedAction> actions, long id, String title, String desc) {
+ actions.add(new GuidedAction.Builder(context)
.id(id)
.title(title)
.description(desc)
.build());
}
- protected static void addAction(List<GuidedAction> actions, long id, String title, String desc, boolean next) {
- actions.add(new GuidedAction.Builder()
+ protected static void addAction(Context context, List<GuidedAction> actions, long id, String title, String desc, boolean next) {
+ actions.add(new GuidedAction.Builder(context)
.id(id)
.title(title)
.description(desc)
@@ -53,8 +54,8 @@
.build());
}
- protected static void addDisabledAction(List<GuidedAction> actions, long id, String title, String desc) {
- actions.add(new GuidedAction.Builder()
+ protected static void addDisabledAction(Context context, List<GuidedAction> actions, long id, String title, String desc) {
+ actions.add(new GuidedAction.Builder(context)
.id(id)
.title(title)
.description(desc)
@@ -62,8 +63,8 @@
.build());
}
- protected static void addDisabledAction(List<GuidedAction> actions, long id, String title, String desc, Drawable icon) {
- actions.add(new GuidedAction.Builder()
+ protected static void addDisabledAction(Context context, List<GuidedAction> actions, long id, String title, String desc, Drawable icon) {
+ actions.add(new GuidedAction.Builder(context)
.id(id)
.title(title)
.description(desc)
@@ -71,8 +72,8 @@
.icon(icon)
.build());
}
- protected static void addDisabledAction(List<GuidedAction> actions, long id, String title, String desc, Drawable icon,boolean next) {
- actions.add(new GuidedAction.Builder()
+ protected static void addDisabledAction(Context context, List<GuidedAction> actions, long id, String title, String desc, Drawable icon,boolean next) {
+ actions.add(new GuidedAction.Builder(context)
.id(id)
.title(title)
.description(desc)
@@ -82,10 +83,10 @@
.build());
}
- protected static void addEditTextAction(List<GuidedAction> actions, long id,
+ protected static void addEditTextAction(Context context, List<GuidedAction> actions, long id,
String title, String desc, String editdesc) {
actions.add(
- new GuidedAction.Builder()
+ new GuidedAction.Builder(context)
.id(id)
.title(title)
.description(desc)
@@ -95,10 +96,10 @@
.build());
}
- protected static void addPasswordAction(List<GuidedAction> actions, long id,
+ protected static void addPasswordAction(Context context, List<GuidedAction> actions, long id,
String title, String desc, String editdesc) {
actions.add(
- new GuidedAction.Builder()
+ new GuidedAction.Builder(context)
.id(id)
.title(title)
.description(desc)
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java
index fd4f031..65bc09c 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVAccountExport.java
@@ -77,7 +77,7 @@
@Override
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
- addPasswordAction(actions, PASSWORD, getString(R.string.account_enter_password), "", "");
+ addPasswordAction(getActivity(), actions, PASSWORD, getString(R.string.account_enter_password), "", "");
}
@Override
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.java
index 2e06e1d..1e5277d 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.java
@@ -78,10 +78,10 @@
@Override
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
- addAction(actions, LINK_ACCOUNT,
+ addAction(getActivity(), actions, LINK_ACCOUNT,
getString(R.string.account_link_button),
"",true);
- addAction(actions, CREATE_ACCOUNT,
+ addAction(getActivity(), actions, CREATE_ACCOUNT,
getString(R.string.account_create_title),
"",true);
}
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java
index 9b429c0..e483e26 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileCreationFragment.java
@@ -129,10 +129,10 @@
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
String desc = getString(R.string.account_creation_profile);
String editdesc = getString(R.string.profile_name_hint);
- addEditTextAction(actions, USER_NAME, desc, editdesc, "");
- addAction(actions, CAMERA, getActivity().getResources().getString(R.string.take_a_photo), "");
- addAction(actions, GALLERY, getActivity().getResources().getString(R.string.open_the_gallery), "");
- addAction(actions, NEXT, getActivity().getResources().getString(R.string.wizard_next), "", true);
+ addEditTextAction(getActivity(), actions, USER_NAME, desc, editdesc, "");
+ addAction(getActivity(), actions, CAMERA, getActivity().getResources().getString(R.string.take_a_photo), "");
+ addAction(getActivity(), actions, GALLERY, getActivity().getResources().getString(R.string.open_the_gallery), "");
+ addAction(getActivity(), actions, NEXT, getActivity().getResources().getString(R.string.wizard_next), "", true);
}
@Override
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileEditingFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileEditingFragment.java
index 7542374..e40a171 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileEditingFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVProfileEditingFragment.java
@@ -129,9 +129,9 @@
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
String desc = getString(R.string.account_edit_profile);
String editdesc = getString(R.string.profile_name_hint);
- addEditTextAction(actions, USER_NAME, desc, editdesc, "");
- addAction(actions, CAMERA, getActivity().getResources().getString(R.string.take_a_photo), "");
- addAction(actions, GALLERY, getActivity().getResources().getString(R.string.open_the_gallery), "");
+ addEditTextAction(getActivity(), actions, USER_NAME, desc, editdesc, "");
+ addAction(getActivity(), actions, CAMERA, getActivity().getResources().getString(R.string.take_a_photo), "");
+ addAction(getActivity(), actions, GALLERY, getActivity().getResources().getString(R.string.open_the_gallery), "");
this.actions = actions;
}
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java
index 97af089..0f48824 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java
@@ -125,11 +125,11 @@
@Override
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
- addEditTextAction(actions, USERNAME, getString(R.string.register_username), getString(R.string.prompt_new_username), "");
- addDisabledAction(actions, CHECK, "", "", null);
- addPasswordAction(actions, PASSWORD, getString(R.string.prompt_new_password_optional), getString(R.string.enter_password), "");
- addPasswordAction(actions, PASSWORD_CONFIRMATION, getString(R.string.prompt_new_password_repeat), getString(R.string.enter_password), "");
- addDisabledAction(actions, CONTINUE, getString(R.string.action_create), "", null, true);
+ addEditTextAction(getActivity(), actions, USERNAME, getString(R.string.register_username), getString(R.string.prompt_new_username), "");
+ addDisabledAction(getActivity(), actions, CHECK, "", "", null);
+ addPasswordAction(getActivity(), actions, PASSWORD, getString(R.string.prompt_new_password_optional), getString(R.string.enter_password), "");
+ addPasswordAction(getActivity(), actions, PASSWORD_CONFIRMATION, getString(R.string.prompt_new_password_repeat), getString(R.string.enter_password), "");
+ addDisabledAction(getActivity(), actions, CONTINUE, getString(R.string.action_create), "", null, true);
}
@Override
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVRingLinkAccountFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVRingLinkAccountFragment.java
index 7649563..8df547f 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVRingLinkAccountFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVRingLinkAccountFragment.java
@@ -77,9 +77,9 @@
@Override
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
- addPasswordAction(actions, PASSWORD, getString(R.string.account_enter_password), "", "");
- addPasswordAction(actions, PIN, getString(R.string.account_link_prompt_pin), "", "");
- addDisabledAction(actions, LINK, getString(R.string.account_link_title), "", null, true);
+ addPasswordAction(getActivity(), actions, PASSWORD, getString(R.string.account_enter_password), "", "");
+ addPasswordAction(getActivity(), actions, PIN, getString(R.string.account_link_prompt_pin), "", "");
+ addDisabledAction(getActivity(), actions, LINK, getString(R.string.account_link_title), "", null, true);
}
@Override