From: Thad Hughes <thadh@google.com>
Date: Thu, 26 Dec 2013 22:38:45 +0000 (-0800)
Subject: New images.
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=9cdff5211c0ebb939eb622999be3a8b97ae4fbf8

New images.
---

diff --git a/images/dictionary_list.png b/images/dictionary_list.png
deleted file mode 100644
index c57b778..0000000
Binary files a/images/dictionary_list.png and /dev/null differ
diff --git a/images/play_store/nexus_5/DE_EN_train_station.png b/images/play_store/nexus_5/DE_EN_train_station.png
new file mode 100644
index 0000000..39ded9f
Binary files /dev/null and b/images/play_store/nexus_5/DE_EN_train_station.png differ
diff --git a/images/play_store/nexus_5/EN_IT_sogni_search_dream.png b/images/play_store/nexus_5/EN_IT_sogni_search_dream.png
new file mode 100644
index 0000000..9454653
Binary files /dev/null and b/images/play_store/nexus_5/EN_IT_sogni_search_dream.png differ
diff --git a/images/flags/dictionary_manager.png b/images/play_store/nexus_5/dictionary_manager.png
similarity index 100%
rename from images/flags/dictionary_manager.png
rename to images/play_store/nexus_5/dictionary_manager.png
diff --git a/images/play_store/nexus_5/dictionary_quick_switch.png b/images/play_store/nexus_5/dictionary_quick_switch.png
new file mode 100644
index 0000000..13b1be4
Binary files /dev/null and b/images/play_store/nexus_5/dictionary_quick_switch.png differ
diff --git a/images/german_love.png b/images/play_store/old/german_love.png
similarity index 100%
rename from images/german_love.png
rename to images/play_store/old/german_love.png
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 5d0c9c6..0a1ea9a 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -22,6 +22,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -37,12 +38,14 @@ import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
@@ -51,6 +54,7 @@ import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
 import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.ListView;
@@ -440,6 +444,8 @@ public class DictionaryActivity extends SherlockListActivity {
     private void onCreateSetupActionBarAndSearchView() {
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayShowTitleEnabled(false);
+        actionBar.setDisplayShowHomeEnabled(false);
+        actionBar.setDisplayHomeAsUpEnabled(false);
 
         searchView = new SearchView(getSupportActionBar().getThemedContext());
         searchView.setIconifiedByDefault(false);
@@ -478,6 +484,12 @@ public class DictionaryActivity extends SherlockListActivity {
         searchView.setFocusable(true);
 
         searchHintIcon = (ImageView) searchView.findViewById(R.id.abs__search_mag_icon);
+        // http://stackoverflow.com/questions/2521959/how-to-scale-an-image-in-imageview-to-keep-the-aspect-ratio
+        searchHintIcon.setLayoutParams(new LinearLayout.LayoutParams(
+                application.languageButtonPixels * 3 / 4, LayoutParams.WRAP_CONTENT));
+        searchHintIcon.setScaleType(ScaleType.FIT_CENTER);
+        searchHintIcon.setAdjustViewBounds(true);
+        searchHintIcon.setPadding(1, application.languageButtonPixels / 8, 1, 0);
         searchHintIcon.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View arg0) {
@@ -684,6 +696,7 @@ public class DictionaryActivity extends SherlockListActivity {
                 layoutParams.width = 0;
                 layoutParams.weight = 1.0f;
                 nameView.setLayoutParams(layoutParams);
+                nameView.setGravity(Gravity.CENTER_VERTICAL);
                 result.addView(nameView);
                 return result;
             }
diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index 9c068a8..9dcbf21 100644
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -77,7 +77,7 @@ public class DictionaryApplication extends Application {
 
     DictionaryConfig dictionaryConfig = null;
 
-    int languageButtonPixels = 22;
+    int languageButtonPixels = -1;
 
     // static final class DictionaryHistory implements Serializable {
     // private static final long serialVersionUID = -4842995032541390284L;