kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 18:56:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve code structure in Main Activity's onCreate() by Adding Functions

Browse Source
This commit is contained in:
Adeel Zafar 2019-02-06 19:11:36 +05:00 committed by Isaac Hutt
parent c518dd0724
commit cb026089d0
1 changed files with 92 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
View File

@ -231,6 +231,8 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
private AppCompatButton downloadBookButton; private AppCompatButton downloadBookButton;
private ActionBar actionBar; private ActionBar actionBar;
private TextView tabSwitcherIcon; private TextView tabSwitcherIcon;
private TableDrawerAdapter tableDrawerAdapter;
private RecyclerView tableDrawerRight;
private ItemTouchHelper.Callback tabCallback = new ItemTouchHelper.Callback() { private ItemTouchHelper.Callback tabCallback = new ItemTouchHelper.Callback() {
@Override @Override
public int getMovementFlags(@NonNull RecyclerView recyclerView, public int getMovementFlags(@NonNull RecyclerView recyclerView,
@ -330,81 +332,42 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
actionBar = getSupportActionBar(); actionBar = getSupportActionBar();
RecyclerView tableDrawerRight =
tableDrawerRight =
tableDrawerRightContainer.getHeaderView(0).findViewById(R.id.right_drawer_list); tableDrawerRightContainer.getHeaderView(0).findViewById(R.id.right_drawer_list);
checkForRateDialog(); checkForRateDialog();
initPlayStoreUri(); initPlayStoreUri();
isHideToolbar = sharedPreferenceUtil.getPrefHideToolbar(); isHideToolbar = sharedPreferenceUtil.getPrefHideToolbar();
FileReader fileReader = new FileReader(); addFileReader();
documentParserJs = fileReader.readFile("js/documentParser.js", this); setupTabsAdapter();
documentSections = new ArrayList<>(); setTableDrawerInfo();
tabsAdapter = new TabsAdapter(this, webViewList); setTabListener();
tabsAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
@Override
public void onChanged() {
updateTabSwitcherIcon();
}
});
tableDrawerRight.setLayoutManager(new LinearLayoutManager(this));
TableDrawerAdapter tableDrawerAdapter = setupTableDrawerAdapter();
tableDrawerRight.setAdapter(tableDrawerAdapter);
tableDrawerAdapter.notifyDataSetChanged();
tabsAdapter.setTabClickListener(new TabsAdapter.TabClickListener() {
@Override
public void onSelectTab(View view, int position) {
hideTabSwitcher();
selectTab(position);
/* Bug Fix
* Issue #592 in which the navigational history of the previously open tab (WebView) was
* carried forward to the newly selected/opened tab; causing erroneous enabling of
* navigational buttons.
*/
updateBottomToolbarArrowsAlpha();
}
@Override
public void onCloseTab(View view, int position) {
closeTab(position);
}
});
compatCallback = new CompatFindActionModeCallback(this); compatCallback = new CompatFindActionModeCallback(this);
setUpTTS(); setUpTTS();
documentParser = new DocumentParser(new DocumentParser.SectionsListener() {
@Override
public void sectionsLoaded(String title, List<DocumentSection> sections) {
for (DocumentSection section : sections) {
if (section.title.contains("REPLACE_")) {
section.title = getResourceString(getApplicationContext(), section.title);
}
}
documentSections.addAll(sections);
if (title.contains("REPLACE_")) {
tableDrawerAdapter.setTitle(getResourceString(getApplicationContext(), title));
} else {
tableDrawerAdapter.setTitle(title);
}
tableDrawerAdapter.setSections(documentSections);
tableDrawerAdapter.notifyDataSetChanged();
}
@Override setupDocumentParser();
public void clearSections() {
documentSections.clear();
tableDrawerAdapter.notifyDataSetChanged();
}
});
manageExternalLaunchAndRestoringViewState(); manageExternalLaunchAndRestoringViewState();
loadPrefs(); loadPrefs();
updateTitle(); updateTitle();
Intent i = getIntent(); setupIntent(getIntent());
wasHideToolbar = isHideToolbar;
booksAdapter = new BooksAdapter(books, this);
searchFiles();
tabRecyclerView.setAdapter(tabsAdapter);
new ItemTouchHelper(tabCallback).attachToRecyclerView(tabRecyclerView);
}
//End of onCreate
private void setupIntent(Intent i) {
if (i.getBooleanExtra(EXTRA_LIBRARY, false)) { if (i.getBooleanExtra(EXTRA_LIBRARY, false)) {
manageZimFiles(2); manageZimFiles(2);
} }
@ -430,13 +393,77 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
zimFile.setData(uri); zimFile.setData(uri);
startActivity(zimFile); startActivity(zimFile);
} }
}
wasHideToolbar = isHideToolbar; private void setupDocumentParser() {
booksAdapter = new BooksAdapter(books, this); documentParser = new DocumentParser(new DocumentParser.SectionsListener() {
@Override
public void sectionsLoaded(String title, List<DocumentSection> sections) {
for (DocumentSection section : sections) {
if (section.title.contains("REPLACE_")) {
section.title = getResourceString(getApplicationContext(), section.title);
}
}
documentSections.addAll(sections);
if (title.contains("REPLACE_")) {
tableDrawerAdapter.setTitle(getResourceString(getApplicationContext(), title));
} else {
tableDrawerAdapter.setTitle(title);
}
tableDrawerAdapter.setSections(documentSections);
tableDrawerAdapter.notifyDataSetChanged();
}
searchFiles(); @Override
tabRecyclerView.setAdapter(tabsAdapter); public void clearSections() {
new ItemTouchHelper(tabCallback).attachToRecyclerView(tabRecyclerView); documentSections.clear();
tableDrawerAdapter.notifyDataSetChanged();
}
});
}
private void setTabListener() {
tabsAdapter.setTabClickListener(new TabsAdapter.TabClickListener() {
@Override
public void onSelectTab(View view, int position) {
hideTabSwitcher();
selectTab(position);
/* Bug Fix
* Issue #592 in which the navigational history of the previously open tab (WebView) was
* carried forward to the newly selected/opened tab; causing erroneous enabling of
* navigational buttons.
*/
updateBottomToolbarArrowsAlpha();
}
@Override
public void onCloseTab(View view, int position) {
closeTab(position);
}
});
}
private void setTableDrawerInfo() {
tableDrawerRight.setLayoutManager(new LinearLayoutManager(this));
tableDrawerAdapter = setupTableDrawerAdapter();
tableDrawerRight.setAdapter(tableDrawerAdapter);
tableDrawerAdapter.notifyDataSetChanged();
}
private void setupTabsAdapter() {
tabsAdapter = new TabsAdapter(this, webViewList);
tabsAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
@Override
public void onChanged() {
updateTabSwitcherIcon();
}
});
}
private void addFileReader() {
documentParserJs = new FileReader().readFile("js/documentParser.js", this);
documentSections = new ArrayList<>();
} }
private TableDrawerAdapter setupTableDrawerAdapter() { private TableDrawerAdapter setupTableDrawerAdapter() {