diff --git a/res/drawable-hdpi/ic_attach_audio_holo_light.png b/res/drawable-hdpi/ic_attach_audio_holo_light.png new file mode 100644 index 0000000000..a7838f291c Binary files /dev/null and b/res/drawable-hdpi/ic_attach_audio_holo_light.png differ diff --git a/res/drawable-hdpi/ic_attach_picture_holo_light.png b/res/drawable-hdpi/ic_attach_picture_holo_light.png new file mode 100644 index 0000000000..43e87440f6 Binary files /dev/null and b/res/drawable-hdpi/ic_attach_picture_holo_light.png differ diff --git a/res/drawable-hdpi/ic_attach_video_holo_light.png b/res/drawable-hdpi/ic_attach_video_holo_light.png new file mode 100644 index 0000000000..fe31fe4a62 Binary files /dev/null and b/res/drawable-hdpi/ic_attach_video_holo_light.png differ diff --git a/res/drawable-hdpi/ic_missing_thumbnail_picture.png b/res/drawable-hdpi/ic_missing_thumbnail_picture.png new file mode 100644 index 0000000000..515f3bee65 Binary files /dev/null and b/res/drawable-hdpi/ic_missing_thumbnail_picture.png differ diff --git a/res/drawable-mdpi/ic_attach_audio_holo_light.png b/res/drawable-mdpi/ic_attach_audio_holo_light.png new file mode 100644 index 0000000000..90178f1340 Binary files /dev/null and b/res/drawable-mdpi/ic_attach_audio_holo_light.png differ diff --git a/res/drawable-mdpi/ic_attach_picture_holo_light.png b/res/drawable-mdpi/ic_attach_picture_holo_light.png new file mode 100644 index 0000000000..e66e04a933 Binary files /dev/null and b/res/drawable-mdpi/ic_attach_picture_holo_light.png differ diff --git a/res/drawable-mdpi/ic_attach_video_holo_light.png b/res/drawable-mdpi/ic_attach_video_holo_light.png new file mode 100644 index 0000000000..e2f96b0930 Binary files /dev/null and b/res/drawable-mdpi/ic_attach_video_holo_light.png differ diff --git a/res/drawable-mdpi/ic_missing_thumbnail_picture.png b/res/drawable-mdpi/ic_missing_thumbnail_picture.png new file mode 100644 index 0000000000..0ef796cbac Binary files /dev/null and b/res/drawable-mdpi/ic_missing_thumbnail_picture.png differ diff --git a/res/drawable-xhdpi/ic_attach_audio_holo_light.png b/res/drawable-xhdpi/ic_attach_audio_holo_light.png new file mode 100644 index 0000000000..7f0951b87e Binary files /dev/null and b/res/drawable-xhdpi/ic_attach_audio_holo_light.png differ diff --git a/res/drawable-xhdpi/ic_attach_picture_holo_light.png b/res/drawable-xhdpi/ic_attach_picture_holo_light.png new file mode 100644 index 0000000000..88118a8de5 Binary files /dev/null and b/res/drawable-xhdpi/ic_attach_picture_holo_light.png differ diff --git a/res/drawable-xhdpi/ic_attach_video_holo_light.png b/res/drawable-xhdpi/ic_attach_video_holo_light.png new file mode 100644 index 0000000000..9f70c46307 Binary files /dev/null and b/res/drawable-xhdpi/ic_attach_video_holo_light.png differ diff --git a/res/drawable-xhdpi/ic_missing_thumbnail_picture.png b/res/drawable-xhdpi/ic_missing_thumbnail_picture.png new file mode 100644 index 0000000000..965795b8ef Binary files /dev/null and b/res/drawable-xhdpi/ic_missing_thumbnail_picture.png differ diff --git a/res/drawable/ic_launcher_camera.png b/res/drawable/ic_launcher_camera.png deleted file mode 100644 index 9bb4c61d50..0000000000 Binary files a/res/drawable/ic_launcher_camera.png and /dev/null differ diff --git a/res/drawable/ic_launcher_camera_record.png b/res/drawable/ic_launcher_camera_record.png deleted file mode 100644 index 8f791acc6d..0000000000 Binary files a/res/drawable/ic_launcher_camera_record.png and /dev/null differ diff --git a/res/drawable/ic_launcher_gallery.png b/res/drawable/ic_launcher_gallery.png deleted file mode 100644 index 3e39baa380..0000000000 Binary files a/res/drawable/ic_launcher_gallery.png and /dev/null differ diff --git a/res/drawable/ic_launcher_musicplayer_2.png b/res/drawable/ic_launcher_musicplayer_2.png deleted file mode 100644 index 545f0e4e67..0000000000 Binary files a/res/drawable/ic_launcher_musicplayer_2.png and /dev/null differ diff --git a/res/drawable/ic_launcher_record_audio.png b/res/drawable/ic_launcher_record_audio.png deleted file mode 100644 index b4cafff02d..0000000000 Binary files a/res/drawable/ic_launcher_record_audio.png and /dev/null differ diff --git a/res/drawable/ic_missing_thumbnail_picture.png b/res/drawable/ic_missing_thumbnail_picture.png deleted file mode 100644 index ebab48794e..0000000000 Binary files a/res/drawable/ic_missing_thumbnail_picture.png and /dev/null differ diff --git a/res/drawable/ic_missing_thumbnail_video.png b/res/drawable/ic_missing_thumbnail_video.png deleted file mode 100644 index b44d8211b1..0000000000 Binary files a/res/drawable/ic_missing_thumbnail_video.png and /dev/null differ diff --git a/res/values/strings.xml b/res/values/strings.xml index 7518c9daef..9f1ebdfffb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -417,5 +417,8 @@ Verified + Picture + Video + Audio diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java b/src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java index 1e0c6a9d7c..e91b0f3ca7 100644 --- a/src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java +++ b/src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java @@ -17,11 +17,6 @@ package org.thoughtcrime.securesms.mms; -import java.util.ArrayList; -import java.util.List; - -import org.thoughtcrime.securesms.R; - import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -30,6 +25,11 @@ import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.TextView; +import org.thoughtcrime.securesms.R; + +import java.util.ArrayList; +import java.util.List; + public class AttachmentTypeSelectorAdapter extends ArrayAdapter { public static final int ADD_IMAGE = 1; @@ -38,78 +38,80 @@ public class AttachmentTypeSelectorAdapter extends ArrayAdapter getItemList() { - List data = new ArrayList(7); - addItem(data, "Pictures", R.drawable.ic_launcher_gallery, ADD_IMAGE); + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + TextView text; + ImageView image; + + View view; + if (convertView == null) { + LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + view = inflater.inflate(R.layout.icon_list_item, parent, false); + } else { + view = convertView; + } + + text = (TextView) view.findViewById(R.id.text1); + text.setText(getItem(position).getTitle()); + + image = (ImageView) view.findViewById(R.id.icon); + image.setImageResource(getItem(position).getResource()); + + return view; + } + + private static List getItemList(Context context) { + List data = new ArrayList(7); + addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_picture), + R.drawable.ic_attach_picture_holo_light, ADD_IMAGE); // addItem(data, "Capture picture", R.drawable.ic_launcher_camera, TAKE_PICTURE); - addItem(data, "Videos", R.drawable.ic_launcher_video_player, ADD_VIDEO); + addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_video), + R.drawable.ic_attach_video_holo_light, ADD_VIDEO); // addItem(data, "Capture video", R.drawable.ic_launcher_camera_record, RECORD_VIDEO); - addItem(data, "Audio", R.drawable.ic_launcher_musicplayer_2, ADD_SOUND); + addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_audio), + R.drawable.ic_attach_audio_holo_light, ADD_SOUND); // addItem(data, "Record audio", R.drawable.ic_launcher_record_audio, RECORD_SOUND); - return data; + return data; } - + private static void addItem(List list, String text, int resource, int id) { list.add(new IconListItem(text, resource, id)); } - - public static class IconListItem { - private final String mTitle; - private final int mResource; - private final int id; - - public IconListItem(String title, int resource, int id) { - mResource = resource; - mTitle = title; - this.id = id; - } - - public int getCommand() { - return id; - } - - public String getTitle() { - return mTitle; - } - - public int getResource() { - return mResource; - } - } + public static class IconListItem { + private final String mTitle; + private final int mResource; + private final int id; + + public IconListItem(String title, int resource, int id) { + mResource = resource; + mTitle = title; + this.id = id; + } + + public int getCommand() { + return id; + } + + public String getTitle() { + return mTitle; + } + + public int getResource() { + return mResource; + } + } }