Updated attachment selection dialog.
1) Added nice-looking holo-themed graphics for each attachment type. 2) Removed old un-scaled graphics. 3) Stringified the attachment types.
BIN
res/drawable-hdpi/ic_attach_audio_holo_light.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
res/drawable-hdpi/ic_attach_picture_holo_light.png
Normal file
After Width: | Height: | Size: 858 B |
BIN
res/drawable-hdpi/ic_attach_video_holo_light.png
Normal file
After Width: | Height: | Size: 869 B |
BIN
res/drawable-hdpi/ic_missing_thumbnail_picture.png
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
res/drawable-mdpi/ic_attach_audio_holo_light.png
Normal file
After Width: | Height: | Size: 1.0 KiB |
BIN
res/drawable-mdpi/ic_attach_picture_holo_light.png
Normal file
After Width: | Height: | Size: 680 B |
BIN
res/drawable-mdpi/ic_attach_video_holo_light.png
Normal file
After Width: | Height: | Size: 723 B |
BIN
res/drawable-mdpi/ic_missing_thumbnail_picture.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
BIN
res/drawable-xhdpi/ic_attach_audio_holo_light.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
BIN
res/drawable-xhdpi/ic_attach_picture_holo_light.png
Normal file
After Width: | Height: | Size: 1.0 KiB |
BIN
res/drawable-xhdpi/ic_attach_video_holo_light.png
Normal file
After Width: | Height: | Size: 1.0 KiB |
BIN
res/drawable-xhdpi/ic_missing_thumbnail_picture.png
Normal file
After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 7.7 KiB |
Before Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.1 KiB |
@ -417,5 +417,8 @@
|
||||
<string name="verify_keys__menu_verified">Verified</string>
|
||||
|
||||
<!-- EOF -->
|
||||
<string name="AttachmentTypeSelectorAdapter_picture">Picture</string>
|
||||
<string name="AttachmentTypeSelectorAdapter_video">Video</string>
|
||||
<string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
|
||||
|
||||
</resources>
|
||||
|
@ -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<AttachmentTypeSelectorAdapter.IconListItem> {
|
||||
|
||||
public static final int ADD_IMAGE = 1;
|
||||
@ -38,78 +38,80 @@ public class AttachmentTypeSelectorAdapter extends ArrayAdapter<AttachmentTypeSe
|
||||
// public static final int RECORD_VIDEO = 4;
|
||||
public static final int ADD_SOUND = 5;
|
||||
// public static final int RECORD_SOUND = 6;
|
||||
|
||||
|
||||
private final Context context;
|
||||
|
||||
|
||||
public AttachmentTypeSelectorAdapter(Context context) {
|
||||
super(context, R.layout.icon_list_item, getItemList());
|
||||
super(context, R.layout.icon_list_item, getItemList(context));
|
||||
this.context = context;
|
||||
}
|
||||
|
||||
|
||||
public int buttonToCommand(int position) {
|
||||
return getItem(position).getCommand();
|
||||
}
|
||||
|
||||
@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;
|
||||
}
|
||||
@Override
|
||||
public View getView(int position, View convertView, ViewGroup parent) {
|
||||
TextView text;
|
||||
ImageView image;
|
||||
|
||||
text = (TextView) view.findViewById(R.id.text1);
|
||||
text.setText(getItem(position).getTitle());
|
||||
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;
|
||||
}
|
||||
|
||||
image = (ImageView) view.findViewById(R.id.icon);
|
||||
image.setImageResource(getItem(position).getResource());
|
||||
text = (TextView) view.findViewById(R.id.text1);
|
||||
text.setText(getItem(position).getTitle());
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
private static List<IconListItem> getItemList() {
|
||||
List<IconListItem> data = new ArrayList<IconListItem>(7);
|
||||
addItem(data, "Pictures", R.drawable.ic_launcher_gallery, ADD_IMAGE);
|
||||
image = (ImageView) view.findViewById(R.id.icon);
|
||||
image.setImageResource(getItem(position).getResource());
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
private static List<IconListItem> getItemList(Context context) {
|
||||
List<IconListItem> data = new ArrayList<IconListItem>(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<IconListItem> 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 static class IconListItem {
|
||||
private final String mTitle;
|
||||
private final int mResource;
|
||||
private final int id;
|
||||
|
||||
public int getCommand() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return mTitle;
|
||||
}
|
||||
public IconListItem(String title, int resource, int id) {
|
||||
mResource = resource;
|
||||
mTitle = title;
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public int getResource() {
|
||||
return mResource;
|
||||
}
|
||||
}
|
||||
public int getCommand() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return mTitle;
|
||||
}
|
||||
|
||||
public int getResource() {
|
||||
return mResource;
|
||||
}
|
||||
}
|
||||
}
|
||||
|