]> gitweb.fperrin.net Git - Dictionary.git/commitdiff
Split lang switch buttons.
authorthadh <thadh@localhost>
Tue, 18 Sep 2012 17:44:38 +0000 (10:44 -0700)
committerthadh <thadh@localhost>
Tue, 18 Sep 2012 17:44:38 +0000 (10:44 -0700)
src/com/hughes/android/dictionary/DictionaryActivity.java

index 279451b1dc40b03065d3a93ad4c4896ad610caf9..beed7aeb00bd4066ae0f594a3e50b46669544432 100644 (file)
@@ -48,7 +48,6 @@ import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.LinearLayout.LayoutParams;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
@@ -508,26 +507,29 @@ public class DictionaryActivity extends ListActivity {
                 final LinearLayout result = new LinearLayout(parent.getContext());
 
                 final DictionaryInfo dictionaryInfo = getItem(position);
-                final Button button = new Button(parent.getContext());
-                final String name = application
-                        .getDictionaryName(dictionaryInfo.uncompressedFilename);
-                button.setText(name);
-                final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(),
-                        getLaunchIntent(application.getPath(dictionaryInfo.uncompressedFilename),
-                                0, searchText.getText().toString())) {
-                    @Override
-                    protected void onGo() {
-                        dialog.dismiss();
-                        DictionaryActivity.this.finish();
+                for (int i = 0; i < dictionaryInfo.indexInfos.size(); ++i) {
+                    final IndexInfo indexInfo = dictionaryInfo.indexInfos.get(i);
+                    final Button button = new Button(parent.getContext());
+//                    final String name = application
+//                            .getDictionaryName(dictionaryInfo.uncompressedFilename);
+                    button.setText(indexInfo.shortName);
+                    final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(),
+                            getLaunchIntent(application.getPath(dictionaryInfo.uncompressedFilename),
+                                    i, searchText.getText().toString())) {
+                        @Override
+                        protected void onGo() {
+                            dialog.dismiss();
+                            DictionaryActivity.this.finish();
+                        };
                     };
-                };
-                button.setOnClickListener(intentLauncher);
-                final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
-                        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-                layoutParams.width = 0;
-                layoutParams.weight = 1.0f;
-                button.setLayoutParams(layoutParams);
-                result.addView(button);
+                    button.setOnClickListener(intentLauncher);
+                    final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                            ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+                    layoutParams.width = 0;
+                    layoutParams.weight = 1.0f;
+                    button.setLayoutParams(layoutParams);
+                    result.addView(button);
+                }
                 return result;
             }