Skip to content
This repository has been archived by the owner on Feb 26, 2020. It is now read-only.

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
@Koitharu
Koitharu committed Aug 12, 2016
1 parent f2efd1d commit 04294ac
Show file tree
Hide file tree
Showing 14 changed files with 74 additions and 78 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
/build
/captures
.navigation
.directory
14 changes: 7 additions & 7 deletions app/src/main/java/org/nv95/openmanga/activities/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,16 +373,16 @@ public boolean onNavigationItemSelected(MenuItem item) {
startActivityForResult(new Intent(this, SettingsActivity.class), REQUEST_SETTINGS);
return true;
case R.id.nav_local_storage:
mProvider = LocalMangaProvider.getInstacne(this);
mProvider = LocalMangaProvider.getInstance(this);
break;
case R.id.nav_action_recommendations:
mProvider = RecommendationsProvider.getInstacne(this);
mProvider = RecommendationsProvider.getInstance(this);
break;
case R.id.nav_action_favourites:
mProvider = FavouritesProvider.getInstacne(this);
mProvider = FavouritesProvider.getInstance(this);
break;
case R.id.nav_action_history:
mProvider = HistoryProvider.getInstacne(this);
mProvider = HistoryProvider.getInstance(this);
break;
default:
mProvider = mProviderManager.getProviderById(item.getItemId());
Expand Down Expand Up @@ -614,7 +614,7 @@ public void onClick(DialogInterface dialog, int which) {
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
FavouritesProvider.getInstacne(MainActivity.this).move(ids, selected[0]);
FavouritesProvider.getInstance(MainActivity.this).move(ids, selected[0]);
updateContent();
}
}).create().show();
Expand Down Expand Up @@ -701,7 +701,7 @@ protected void onPreExecute() {
protected Pair<Integer, Intent> doInBackground(Boolean... params) {
try {
Intent intent;
HistoryProvider historyProvider = HistoryProvider.getInstacne(MainActivity.this);
HistoryProvider historyProvider = HistoryProvider.getInstance(MainActivity.this);
MangaInfo info = historyProvider.getLast();
if (info == null) {
return new Pair<>(2, null);
Expand All @@ -713,7 +713,7 @@ protected Pair<Integer, Intent> doInBackground(Boolean... params) {
}
MangaProvider provider;
if (info.provider.equals(LocalMangaProvider.class)) {
provider = LocalMangaProvider.getInstacne(MainActivity.this);
provider = LocalMangaProvider.getInstance(MainActivity.this);
} else {
if (!checkConnection()) {
return new Pair<>(1, null);
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/java/org/nv95/openmanga/activities/MangaPreviewActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public boolean onLongClick(View v) {
case R.id.fab_read:
Intent intent = new Intent(this, ReadActivity.class);
intent.putExtras(mMangaSummary.toBundle());
HistoryProvider.HistorySummary hs = HistoryProvider.getInstacne(this).get(mMangaSummary);
HistoryProvider.HistorySummary hs = HistoryProvider.getInstance(this).get(mMangaSummary);
if (hs != null) {
int index = mMangaSummary.chapters.indexByNumber(hs.getChapter());
if (index != -1) {
Expand All @@ -165,7 +165,7 @@ private void showChaptersSheet() {
if (mMangaSummary.getChapters().size() == 0) {
return;
}
HistoryProvider.HistorySummary lastChapter = HistoryProvider.getInstacne(this).get(mMangaSummary);
HistoryProvider.HistorySummary lastChapter = HistoryProvider.getInstance(this).get(mMangaSummary);
BottomSheet sheet = new BottomSheet(this);
sheet.setItems(mMangaSummary.getChapters().getNames(), android.R.layout.simple_list_item_1);
if (lastChapter != null) {
Expand Down Expand Up @@ -203,7 +203,7 @@ public boolean onCreateOptionsMenu(Menu menu) {

@Override
public boolean onPrepareOptionsMenu(Menu menu) {
if (FavouritesProvider.getInstacne(this).has(mMangaSummary)) {
if (FavouritesProvider.getInstance(this).has(mMangaSummary)) {
menu.findItem(R.id.action_favourite).setIcon(R.drawable.ic_favorite_light);
menu.findItem(R.id.action_favourite).setTitle(R.string.action_unfavourite);
} else {
Expand All @@ -220,7 +220,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_favourite:
FavouritesProvider favouritesProvider = FavouritesProvider.getInstacne(this);
FavouritesProvider favouritesProvider = FavouritesProvider.getInstance(this);
if (favouritesProvider.has(mMangaSummary)) {
if (favouritesProvider.remove(mMangaSummary)) {
ChangesObserver.getInstance().emitOnFavouritesChanged(mMangaSummary, -1);
Expand Down Expand Up @@ -280,7 +280,7 @@ public void onClick(DialogInterface dialog, int which) {
}
if (idlist.size() == len) {
if (new MangaStore(MangaPreviewActivity.this).dropMangas(new long[]{mMangaSummary.id})) {
HistoryProvider.getInstacne(MangaPreviewActivity.this).remove(new long[]{mMangaSummary.id});
HistoryProvider.getInstance(MangaPreviewActivity.this).remove(new long[]{mMangaSummary.id});
ChangesObserver.getInstance().emitOnLocalChanged(mMangaSummary.id, null);
finish();
}
Expand Down Expand Up @@ -312,7 +312,7 @@ public void onClick(DialogInterface dialog, int which, boolean isChecked) {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
HistoryProvider.getInstacne(this).add(mMangaSummary, mMangaSummary.chapters.get(which).number, 0);
HistoryProvider.getInstance(this).add(mMangaSummary, mMangaSummary.chapters.get(which).number, 0);
startActivity(new Intent(this, ReadActivity.class).putExtra("chapter", which).putExtras(mMangaSummary.toBundle()));
}

Expand Down Expand Up @@ -378,7 +378,7 @@ protected Pair<MangaSummary, String> doInBackground(Void... params) {
try {
MangaProvider provider;
if (mMangaSummary.provider.equals(LocalMangaProvider.class)) {
provider = LocalMangaProvider.getInstacne(MangaPreviewActivity.this);
provider = LocalMangaProvider.getInstance(MangaPreviewActivity.this);
} else {
provider = (MangaProvider) mMangaSummary.provider.newInstance();
}
Expand Down Expand Up @@ -415,7 +415,7 @@ protected void onPreExecute() {

@Override
protected MangaSummary doInBackground(MangaInfo... params) {
return LocalMangaProvider.getInstacne(MangaPreviewActivity.this)
return LocalMangaProvider.getInstance(MangaPreviewActivity.this)
.getSource(params[0]);
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/nv95/openmanga/activities/NewChaptersActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ protected void onPreExecute() {

@Override
protected MangaList doInBackground(Void... params) {
final FavouritesProvider favs = FavouritesProvider.getInstacne(NewChaptersActivity.this);
final FavouritesProvider favs = FavouritesProvider.getInstance(NewChaptersActivity.this);
final NewChaptersProvider news = NewChaptersProvider.getInstance(NewChaptersActivity.this);
try {
news.checkForNewChapters();
Expand Down
76 changes: 38 additions & 38 deletions app/src/main/java/org/nv95/openmanga/activities/ReadActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public class ReadActivity extends BaseAppActivity implements View.OnClickListene
private ImageView mImageViewArrow;
private View[] mClickAreas;
//data
private MangaSummary mMangaSumary;
private MangaSummary mMangaSummary;
private MangaChapter mChapter;
private int mChapterId;
private int mPageId;
Expand Down Expand Up @@ -115,16 +115,16 @@ protected void onCreate(Bundle savedInstanceState) {
mPager.setOverScrollListener(this);
mPager.onConfigurationChange(this);
onOptionsChanged();
mMangaSumary = new MangaSummary(getIntent().getExtras());
if (mMangaSumary.getChapters().size() == 0) {
mMangaSummary = new MangaSummary(getIntent().getExtras());
if (mMangaSummary.getChapters().size() == 0) {
Snackbar.make(mPager, R.string.loading_error, Snackbar.LENGTH_SHORT).show();
finish();
return;
}

initParams(savedInstanceState != null ? savedInstanceState : getIntent().getExtras());
mOverscrollSize = getResources().getDimensionPixelSize(R.dimen.overscroll_size);
mChapter = mMangaSumary.getChapters().get(mChapterId);
mChapter = mMangaSummary.getChapters().get(mChapterId);
mPager.setOffscreenPageLimit(2);
new LoadPagesTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
Expand Down Expand Up @@ -152,13 +152,13 @@ protected void onPause() {

@Override
protected void onDestroy() {
ChangesObserver.getInstance().emitOnHistoryChanged(mMangaSumary);
ChangesObserver.getInstance().emitOnHistoryChanged(mMangaSummary);
super.onDestroy();
}

private void saveHistory() {
if (mChapterId >= 0 && mChapterId < mMangaSumary.chapters.size()) {
HistoryProvider.getInstacne(this).add(mMangaSumary, mMangaSumary.chapters.get(mChapterId).number, mPager.getCurrentPageIndex());
if (mChapterId >= 0 && mChapterId < mMangaSummary.chapters.size()) {
HistoryProvider.getInstance(this).add(mMangaSummary, mMangaSummary.chapters.get(mChapterId).number, mPager.getCurrentPageIndex());
}
}

Expand All @@ -184,8 +184,8 @@ public void onClick(View v) {
if (mLoader.getVisibility() == View.VISIBLE) {
return;
}
int favId = FavouritesProvider.getInstacne(this)
.getCategory(mMangaSumary);
int favId = FavouritesProvider.getInstance(this)
.getCategory(mMangaSummary);
String fav;
switch (favId) {
case -1:
Expand All @@ -195,7 +195,7 @@ public void onClick(View v) {
fav = getString(R.string.category_no);
break;
default:
String[] titles = FavouritesProvider.getInstacne(this)
String[] titles = FavouritesProvider.getInstance(this)
.getGenresTitles(this);
fav = (titles != null && favId < titles.length) ?
titles[favId] : getString(R.string.category_no);
Expand All @@ -214,13 +214,13 @@ public void settingsDialogDismiss() {
mPager.getCurrentPageIndex(),
mPager.getCount()
)
.chapter(mMangaSumary.getChapters().get(mChapterId).name)
.title(mMangaSumary.name)
.chapter(mMangaSummary.getChapters().get(mChapterId).name)
.title(mMangaSummary.name)
.show(isDarkTheme());
break;
case R.id.button_save:
if (!LocalMangaProvider.class.equals(mMangaSumary.provider)) {
DownloadService.start(this, mMangaSumary);
if (!LocalMangaProvider.class.equals(mMangaSummary.provider)) {
DownloadService.start(this, mMangaSummary);
} else {
Snackbar.make(mPager, R.string.already_saved, Snackbar.LENGTH_SHORT).show();
}
Expand All @@ -230,25 +230,25 @@ public void settingsDialogDismiss() {
.putExtra("section", SettingsActivity.SECTION_READER), REQUEST_SETTINGS);
break;
case R.id.button_fav:
FavouritesProvider favouritesProvider = FavouritesProvider.getInstacne(this);
if (favouritesProvider.has(mMangaSumary)) {
if (favouritesProvider.remove(mMangaSumary)) {
FavouritesProvider favouritesProvider = FavouritesProvider.getInstance(this);
if (favouritesProvider.has(mMangaSummary)) {
if (favouritesProvider.remove(mMangaSummary)) {
Snackbar.make(mPager, R.string.unfavourited, Snackbar.LENGTH_SHORT).show();
ChangesObserver.getInstance().emitOnFavouritesChanged(mMangaSumary, -1);
ChangesObserver.getInstance().emitOnFavouritesChanged(mMangaSummary, -1);
}
} else {
FavouritesProvider.dialog(this, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
NewChaptersProvider.getInstance(ReadActivity.this)
.storeChaptersCount(mMangaSumary.id, mMangaSumary.getChapters().size());
ChangesObserver.getInstance().emitOnFavouritesChanged(mMangaSumary, which);
.storeChaptersCount(mMangaSummary.id, mMangaSummary.getChapters().size());
ChangesObserver.getInstance().emitOnFavouritesChanged(mMangaSummary, which);
}
}, mMangaSumary);
}, mMangaSummary);
}
break;
case R.id.button_share:
new ContentShareHelper(this).share(mMangaSumary);
new ContentShareHelper(this).share(mMangaSummary);
break;
case R.id.button_img:
new SaveImageTask()
Expand All @@ -268,7 +268,7 @@ public void onClick(DialogInterface dialog, int which) {
case R.id.area_bottom_left:
if (mPager.getCurrentItem() > 0) {
mPager.setCurrentItem(mPager.getCurrentItem() - 1);
} else if (mPager.isReverse() ? mChapterId < mMangaSumary.chapters.size() - 1 : mChapterId > 0){
} else if (mPager.isReverse() ? mChapterId < mMangaSummary.chapters.size() - 1 : mChapterId > 0){
mChapterId += mPager.isReverse() ? 1 : -1;
mPageId = mPager.isReverse() ? 0 : -1;
loadChapter();
Expand All @@ -279,7 +279,7 @@ public void onClick(DialogInterface dialog, int which) {
case R.id.area_bottom_right:
if (mPager.getCurrentItem() < mPager.getCount() - 1) {
mPager.setCurrentItem(mPager.getCurrentItem() + 1);
} else if (mPager.isReverse() ? mChapterId > 0 : mChapterId < mMangaSumary.chapters.size() - 1) {
} else if (mPager.isReverse() ? mChapterId > 0 : mChapterId < mMangaSummary.chapters.size() - 1) {
mChapterId += mPager.isReverse() ? -1 : 1;
mPageId = mPager.isReverse() ? -1 : 0;
loadChapter();
Expand Down Expand Up @@ -330,7 +330,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
if (page < mPager.getCount() - 1) {
mPager.scrollToPage(page + 1);
} else if (mChapterId < mMangaSumary.chapters.size() - 1) {
} else if (mChapterId < mMangaSummary.chapters.size() - 1) {
mChapterId += 1;
mPageId = 0;
loadChapter();
Expand Down Expand Up @@ -425,13 +425,13 @@ private boolean hasNextChapter() {
if (mPager.isReverse()) {
return mChapterId > 0;
} else {
return mChapterId < mMangaSumary.getChapters().size() - 1;
return mChapterId < mMangaSummary.getChapters().size() - 1;
}
}

private boolean hasPrevChapter() {
if (mPager.isReverse()) {
return mChapterId < mMangaSumary.getChapters().size() - 1;
return mChapterId < mMangaSummary.getChapters().size() - 1;
} else {
return mChapterId > 0;
}
Expand All @@ -448,18 +448,18 @@ private void setArrowPosition(int gravity){
}

private void loadChapter(){
mChapter = mMangaSumary.getChapters().get(mChapterId);
mChapter = mMangaSummary.getChapters().get(mChapterId);
new LoadPagesTask().execute();
}

private void showChaptersList() {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setSingleChoiceItems(mMangaSumary.getChapters().getNames(), mChapterId, new DialogInterface.OnClickListener() {
builder.setSingleChoiceItems(mMangaSummary.getChapters().getNames(), mChapterId, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
mChapterId = which;
mPageId = 0;
mChapter = mMangaSumary.getChapters().get(mChapterId);
mChapter = mMangaSummary.getChapters().get(mChapterId);
new LoadPagesTask().execute();
dialog.dismiss();
}
Expand Down Expand Up @@ -563,13 +563,13 @@ public void onPreOverScroll(int direction) {
setArrowPosition(Gravity.LEFT);
mImageViewArrow.setRotation(-90);
mTextViewNext.setText(getString(mPager.isReverse() ? R.string.next_chapter : R.string.prev_chapter,
mMangaSumary.chapters.get(mChapterId + (mPager.isReverse() ? 1 : -1)).name));
mMangaSummary.chapters.get(mChapterId + (mPager.isReverse() ? 1 : -1)).name));
break;
case OverScrollDetector.DIRECTION_RIGHT:
setArrowPosition(Gravity.RIGHT);
mImageViewArrow.setRotation(90);
mTextViewNext.setText(getString(mPager.isReverse() ? R.string.prev_chapter : R.string.next_chapter,
mMangaSumary.chapters.get(mChapterId + (mPager.isReverse() ? -1 : 1)).name));
mMangaSummary.chapters.get(mChapterId + (mPager.isReverse() ? -1 : 1)).name));
break;
default:
return;
Expand Down Expand Up @@ -658,10 +658,10 @@ public void onClick(DialogInterface dialog, int which) {
protected ArrayList<MangaPage> doInBackground(Void... params) {
try {
MangaProvider provider;
if (mMangaSumary.provider.equals(LocalMangaProvider.class)) {
provider = LocalMangaProvider.getInstacne(ReadActivity.this);
if (mMangaSummary.provider.equals(LocalMangaProvider.class)) {
provider = LocalMangaProvider.getInstance(ReadActivity.this);
} else {
provider = (MangaProvider) mMangaSumary.provider.newInstance();
provider = (MangaProvider) mMangaSummary.provider.newInstance();
}
return provider.getPages(mChapter.readLink);
} catch (Exception ignored) {
Expand All @@ -688,10 +688,10 @@ protected void onPreExecute() {
protected File doInBackground(MangaPage... params) {
try {
MangaProvider provider;
if (mMangaSumary.provider.equals(LocalMangaProvider.class)) {
provider = LocalMangaProvider.getInstacne(ReadActivity.this);
if (mMangaSummary.provider.equals(LocalMangaProvider.class)) {
provider = LocalMangaProvider.getInstance(ReadActivity.this);
} else {
provider = (MangaProvider) mMangaSumary.provider.newInstance();
provider = (MangaProvider) mMangaSummary.provider.newInstance();
}
String url = provider.getPageImage(params[0]);
File dest;
Expand Down
Loading

0 comments on commit 04294ac

Please sign in to comment.