kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-07 22:31:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removed the second ProgressBar. We only have one ProgressBar.

Browse Source 
Fixed ProgressBar Message.
This commit is contained in:
Rashiq Ahmad 2013-12-07 19:10:10 +01:00
parent 7d62a96a98
commit 1e013e1086
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java
View File

@ -59,12 +59,16 @@ public class ZimFileSelectActivity extends FragmentActivity
private ProgressBar mProgressBar; private ProgressBar mProgressBar;
private TextView mProgressBarMessage;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.zimfilelist); setContentView(R.layout.zimfilelist);
mProgressBar = (ProgressBar) findViewById(R.id.progressBar); mProgressBar = (ProgressBar) findViewById(R.id.progressBar);
mProgressBarMessage = (TextView) findViewById(R.id.progressbar_message);
mProgressBar.setVisibility(View.VISIBLE); mProgressBar.setVisibility(View.VISIBLE);
mZimFileList = (ListView) findViewById(R.id.zimfilelist); mZimFileList = (ListView) findViewById(R.id.zimfilelist);
@ -152,7 +156,11 @@ public class ZimFileSelectActivity extends FragmentActivity
// Done here to avoid that shown while loading. // Done here to avoid that shown while loading.
mZimFileList.setEmptyView(findViewById(R.id.zimfilelist_nozimfilesfound_view)); mZimFileList.setEmptyView(findViewById(R.id.zimfilelist_nozimfilesfound_view));
mProgressBar.setVisibility(View.GONE);
if (mProgressBarMessage.getVisibility() == View.GONE) {
mProgressBar.setVisibility(View.GONE);
}
mCursorAdapter.notifyDataSetChanged(); mCursorAdapter.notifyDataSetChanged();
} }
@ -279,17 +287,11 @@ public class ZimFileSelectActivity extends FragmentActivity
// This AsyncTask will scan the file system for files with the Extension ".zim" or ".zimaa" // This AsyncTask will scan the file system for files with the Extension ".zim" or ".zimaa"
private class RescanFileSystem extends AsyncTask<Void, Void, Void> { private class RescanFileSystem extends AsyncTask<Void, Void, Void> {
ProgressBar mProgressBar;
TextView mProgressBarMessage;
@Override @Override
protected void onPreExecute() { protected void onPreExecute() {
mProgressBar = (ProgressBar) findViewById(R.id.progressBar);
mProgressBarMessage = (TextView) findViewById(R.id.progressbar_message);
mProgressBar.setVisibility(View.VISIBLE);
mProgressBarMessage.setVisibility(View.VISIBLE); mProgressBarMessage.setVisibility(View.VISIBLE);
mProgressBar.setVisibility(View.VISIBLE);
super.onPreExecute(); super.onPreExecute();
} }
@ -307,8 +309,8 @@ public class ZimFileSelectActivity extends FragmentActivity
mZimFileList.setAdapter(mRescanAdapter); mZimFileList.setAdapter(mRescanAdapter);
mProgressBar.setVisibility(View.GONE);
mProgressBarMessage.setVisibility(View.GONE); mProgressBarMessage.setVisibility(View.GONE);
mProgressBar.setVisibility(View.GONE);
super.onPostExecute(result); super.onPostExecute(result);
} }