Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#58 Add a pause between each paragraph #89

Merged
merged 3 commits into from
Sep 15, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#58 Rename variables
  • Loading branch information
gscdev committed Sep 9, 2021
commit f70bb565b1d941e21b21be082e03f4e72915c978
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ public class ChapterFragment extends Fragment implements AudioListener {

private StoryBookChapterGson storyBookChapter;

protected String[] chapterText = {};
protected String[] chapterParagraph = {};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And perhaps make the name plural, since it's an array?

Suggested change
protected String[] chapterParagraph = {};
protected String[] chapterParagraphs = {};


private RecyclerView chapterRecyclerView;

@@ -160,7 +160,7 @@ public void onItemClick(WordGson wordWithAudio, View view, int position) {
chapterRecyclerView.setAdapter(wordViewAdapter);
}

chapterText = new String[storyBookParagraphGsons.size()];
chapterParagraph = new String[storyBookParagraphGsons.size()];
for (int paragraphIndex = 0; paragraphIndex < storyBookParagraphGsons.size(); paragraphIndex++) {
Log.i(getClass().getName(), "storyBookParagraphGson.getOriginalText(): \"" + storyBookParagraphGsons.get(paragraphIndex).getOriginalText() + "\"");

@@ -169,7 +169,7 @@ public void onItemClick(WordGson wordWithAudio, View view, int position) {
Log.i(getClass().getName(), "wordsInOriginalText.length: " + wordsInOriginalText.length);
Log.i(getClass().getName(), "Arrays.toString(wordsInOriginalText): " + Arrays.toString(wordsInOriginalText));

chapterText[paragraphIndex] = originalText;
chapterParagraph[paragraphIndex] = originalText;

List<WordGson> wordAudios = storyBookParagraphGsons.get(paragraphIndex).getWords();
Log.i(getClass().getName(), "words: " + wordAudios);
@@ -188,13 +188,13 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
super.onViewCreated(view, savedInstanceState);

// Add button for initializing Text-to-Speech (TTS)
final String[] finalChapterText = chapterText;
final String[] chapterText = chapterParagraph;
FloatingActionButton fab = view.findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Log.i(getClass().getName(), "onClick");
playAudio(finalChapterText, ChapterFragment.this);
playAudio(chapterText, ChapterFragment.this);
}
});
}
Original file line number Diff line number Diff line change
@@ -54,19 +54,19 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
int[] titleFontSize = getResources().getIntArray(R.array.cover_title_font_size);
int[] descriptionFontSize = getResources().getIntArray(R.array.chapter_text_font_size);

for (int i=0; i<chapterText.length; i++) {
chapterText[i] = setWordSpacing(chapterText[i]);
for (int i=0; i<chapterParagraph.length; i++) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for (int i=0; i<chapterParagraph.length; i++) {
for (int i = 0; i < chapterParagraph.length; i++) {

chapterParagraph[i] = setWordSpacing(chapterParagraph[i]);
}

titleTextView = root.findViewById(R.id.storybook_title);
titleTextView.setText(chapterText[0]);
titleTextView.setText(chapterParagraph[0]);

setTextSizeByLevel(titleTextView, titleFontSize);

// Initialize audio parameters with the storybook title
audioTextView = titleTextView;

audioText = TextUtils.join("", chapterText);
audioText = TextUtils.join("", chapterParagraph);
description[0] = setWordSpacing((String) getArguments().get(ARG_DESCRIPTION));
descriptionTextView = root.findViewById(R.id.storybook_description);
descriptionTextView.setText(description[0]);
@@ -150,10 +150,10 @@ public void onError(String utteranceId) {
public void onStop(String utteranceId, boolean interrupted) {
super.onStop(utteranceId, interrupted);
requireActivity().runOnUiThread(() -> {
titleTextView.setText(TextUtils.join("", chapterText));
titleTextView.setText(TextUtils.join("", chapterParagraph));
descriptionTextView.setText(description[0]);
});
audioText = TextUtils.join("", chapterText);
audioText = TextUtils.join("", chapterParagraph);
audioTextView = titleTextView;
}
};