import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
+import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockListActivity;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.widget.SearchView;
-import com.actionbarsherlock.widget.SearchView.OnQueryTextListener;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.SearchView;
+import android.support.v7.widget.SearchView.OnQueryTextListener;
+import android.view.Menu;
+import android.widget.ListAdapter;
import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
import com.hughes.android.util.IntentLauncher;
// Right-click:
// Delete, move to top.
-public class DictionaryManagerActivity extends SherlockListActivity {
+public class DictionaryManagerActivity extends ActionBarActivity {
static final String LOG = "QuickDic";
static boolean blockAutoLaunch = false;
+ private ListView listView;
+ private ListView getListView() {
+ if (listView == null) {
+ listView = (ListView)findViewById(android.R.id.list);
+ }
+ return listView;
+ }
+ private void setListAdapter(ListAdapter adapter) {
+ getListView().setAdapter(adapter);
+ }
+ private ListAdapter getListAdapter() {
+ return getListView().getAdapter();
+ }
+
DictionaryApplication application;
SearchView filterSearchView;
uiHandler.post(new Runnable() {
@Override
public void run() {
- setListAdapater();
+ setMyListAdapater();
}
});
}
final InputStream zipIn = zipFile.getInputStream(zipEntry);
File targetFile = new File(application.getDictDir(), zipEntry.getName());
if (targetFile.exists()) {
- targetFile.renameTo(new File(targetFile.getAbsolutePath().replace(".quickdic", "bak.quickdic")));
+ targetFile.renameTo(new File(targetFile.getAbsolutePath().replace(".quickdic", ".bak.quickdic")));
targetFile = new File(application.getDictDir(), zipEntry.getName());
}
final OutputStream zipOut = new FileOutputStream(targetFile);
@Override
public void onCreate(Bundle savedInstanceState) {
+ // This must be first, otherwise the actiona bar doesn't get
+ // styled properly.
setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
super.onCreate(savedInstanceState);
showDownloadable.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- onShowLocalChanged();
+ onShowDownloadableChanged();
}
});
registerReceiver(broadcastReceiver, new IntentFilter(
DownloadManager.ACTION_DOWNLOAD_COMPLETE));
- setListAdapater();
+ setMyListAdapater();
registerForContextMenu(getListView());
final File dictDir = application.getDictDir();
@Override
public boolean onQueryTextChange(String filterText) {
- setListAdapater();
+ setMyListAdapater();
return true;
}
});
}
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
- showDownloadable.setChecked(prefs.getBoolean(C.SHOW_DOWNLOADABLE, false));
+ showDownloadable.setChecked(prefs.getBoolean(C.SHOW_DOWNLOADABLE, true));
if (!blockAutoLaunch &&
getIntent().getBooleanExtra(C.CAN_AUTO_LAUNCH_DICT, true) &&
application.backgroundUpdateDictionaries(dictionaryUpdater);
- setListAdapater();
+ setMyListAdapater();
}
@Override
@Override
public boolean onMenuItemClick(android.view.MenuItem item) {
application.moveDictionaryToTop(row.dictionaryInfo);
- setListAdapater();
+ setMyListAdapater();
return true;
}
});
@Override
public boolean onMenuItemClick(android.view.MenuItem item) {
application.deleteDictionary(row.dictionaryInfo);
- setListAdapater();
+ setMyListAdapater();
return true;
}
});
}
}
- private void onShowLocalChanged() {
- setListAdapater();
+ private void onShowDownloadableChanged() {
+ setMyListAdapater();
Editor prefs = PreferenceManager.getDefaultSharedPreferences(this).edit();
prefs.putBoolean(C.SHOW_DOWNLOADABLE, showDownloadable.isChecked());
prefs.commit();
}
- private void setListAdapater() {
+ private void setMyListAdapater() {
final String filter = filterSearchView == null ? "" : filterSearchView.getQuery()
.toString();
final String[] filters = filter.trim().toLowerCase().split("(\\s|-)+");
final boolean updateAvailable = application.updateAvailable(dictionaryInfo);
final Button downloadButton = (Button) row.findViewById(R.id.downloadButton);
if (!canLaunch || updateAvailable) {
+ final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename);
downloadButton
.setText(getString(
R.string.downloadButton,
- application.getDownloadable(dictionaryInfo.uncompressedFilename).zipBytes / 1024.0 / 1024.0));
+ downloadable.zipBytes / 1024.0 / 1024.0));
downloadButton.setMinWidth(application.languageButtonPixels * 3 / 2);
downloadButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
- downloadDictionary(dictionaryInfo);
+ downloadDictionary(downloadable.downloadUrl);
}
});
} else {
.sortedIndexInfos(dictionaryInfo.indexInfos);
final StringBuilder builder = new StringBuilder();
if (updateAvailable) {
- builder.append(getString(R.string.updateButton));
+ builder.append(getString(R.string.updateAvailable));
}
for (IndexInfo indexInfo : sortedIndexInfos) {
final View button = application.createButton(buttons.getContext(), dictionaryInfo,
return row;
}
- private void downloadDictionary(final DictionaryInfo dictionaryInfo) {
+ private void downloadDictionary(final String downloadUrl) {
DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
Request request = new Request(
- Uri.parse(dictionaryInfo.downloadUrl));
+ Uri.parse(downloadUrl));
try {
- final String destFile = new File(new URL(dictionaryInfo.downloadUrl).getFile())
+ final String destFile = new File(new URL(downloadUrl).getFile())
.getName();
Log.d(LOG, "Downloading to: " + destFile);