mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-28 13:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Lint error: use of restricted API

Browse source
This commit is contained in:
Paul Hawke 2017-09-03 17:00:16 -05:00
parent f74de55b60
commit d59a526f7f
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
View file

@ -276,13 +276,13 @@ public class MediaDetailFragment extends Fragment {
categoryContainer.removeAllViews(); categoryContainer.removeAllViews();
// @fixme add the category items // @fixme add the category items
for (String cat : categoryNames) { for (String cat : categoryNames) {
View catLabel = buildCatLabel(cat); View catLabel = buildCatLabel(cat, categoryContainer);
categoryContainer.addView(catLabel); categoryContainer.addView(catLabel);
} }
} }
private View buildCatLabel(final String catName) { private View buildCatLabel(final String catName, ViewGroup categoryContainer) {
final View item = getLayoutInflater(null).inflate(R.layout.detail_category_item, null, false); final View item = LayoutInflater.from(getContext()).inflate(R.layout.detail_category_item, categoryContainer, false);
final CompatTextView textView = (CompatTextView)item.findViewById(R.id.mediaDetailCategoryItemText); final CompatTextView textView = (CompatTextView)item.findViewById(R.id.mediaDetailCategoryItemText);
textView.setText(catName); textView.setText(catName);

42
app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java
View file

@ -77,8 +77,8 @@ public class MultipleUploadListFragment extends Fragment {
public View getView(int i, View view, ViewGroup viewGroup) { public View getView(int i, View view, ViewGroup viewGroup) {
UploadHolderView holder; UploadHolderView holder;
if(view == null) { if (view == null) {
view = getLayoutInflater(null).inflate(R.layout.layout_upload_item, null); view = LayoutInflater.from(getContext()).inflate(R.layout.layout_upload_item, viewGroup, false);
holder = new UploadHolderView(); holder = new UploadHolderView();
holder.image = (SimpleDraweeView) view.findViewById(R.id.uploadImage); holder.image = (SimpleDraweeView) view.findViewById(R.id.uploadImage);
holder.title = (TextView) view.findViewById(R.id.uploadTitle); holder.title = (TextView) view.findViewById(R.id.uploadTitle);
@ -94,17 +94,17 @@ public class MultipleUploadListFragment extends Fragment {
.build()); .build());
view.setTag(holder); view.setTag(holder);
} else { } else {
holder = (UploadHolderView)view.getTag(); holder = (UploadHolderView) view.getTag();
} }
Contribution up = (Contribution)this.getItem(i); Contribution up = (Contribution) this.getItem(i);
if(holder.imageUri == null || !holder.imageUri.equals(up.getLocalUri())) { if (holder.imageUri == null || !holder.imageUri.equals(up.getLocalUri())) {
holder.image.setImageURI(up.getLocalUri().toString()); holder.image.setImageURI(up.getLocalUri().toString());
holder.imageUri = up.getLocalUri(); holder.imageUri = up.getLocalUri();
} }
if(!imageOnlyMode) { if (!imageOnlyMode) {
holder.overlay.setVisibility(View.VISIBLE); holder.overlay.setVisibility(View.VISIBLE);
holder.title.setText(up.getFilename()); holder.title.setText(up.getFilename());
} else { } else {
@ -134,21 +134,21 @@ public class MultipleUploadListFragment extends Fragment {
int screenHeight = screenMetrics.heightPixels; int screenHeight = screenMetrics.heightPixels;
int picWidth = Math.min((int) Math.sqrt(screenWidth * screenHeight / count), screenWidth); int picWidth = Math.min((int) Math.sqrt(screenWidth * screenHeight / count), screenWidth);
picWidth = Math.min((int)(192 * screenMetrics.density), Math.max((int) (120 * screenMetrics.density), picWidth / 48 * 48)); picWidth = Math.min((int) (192 * screenMetrics.density), Math.max((int) (120 * screenMetrics.density), picWidth / 48 * 48));
int picHeight = Math.min(picWidth, (int)(192 * screenMetrics.density)); // Max Height is same as Contributions list int picHeight = Math.min(picWidth, (int) (192 * screenMetrics.density)); // Max Height is same as Contributions list
return new Point(picWidth, picHeight); return new Point(picWidth, picHeight);
} }
public void notifyDatasetChanged() { public void notifyDatasetChanged() {
if(photosAdapter != null) { if (photosAdapter != null) {
photosAdapter.notifyDataSetChanged(); photosAdapter.notifyDataSetChanged();
} }
} }
public void setImageOnlyMode(boolean mode) { public void setImageOnlyMode(boolean mode) {
imageOnlyMode = mode; imageOnlyMode = mode;
if(imageOnlyMode) { if (imageOnlyMode) {
baseTitle.setVisibility(View.GONE); baseTitle.setVisibility(View.GONE);
} else { } else {
baseTitle.setVisibility(View.VISIBLE); baseTitle.setVisibility(View.VISIBLE);
@ -159,13 +159,13 @@ public class MultipleUploadListFragment extends Fragment {
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_multiple_uploads_list, null); View view = inflater.inflate(R.layout.fragment_multiple_uploads_list, container, false);
photosGrid = (GridView)view.findViewById(R.id.multipleShareBackground); photosGrid = (GridView) view.findViewById(R.id.multipleShareBackground);
baseTitle = (EditText)view.findViewById(R.id.multipleBaseTitle); baseTitle = (EditText) view.findViewById(R.id.multipleBaseTitle);
photosAdapter = new PhotoDisplayAdapter(); photosAdapter = new PhotoDisplayAdapter();
photosGrid.setAdapter(photosAdapter); photosGrid.setAdapter(photosAdapter);
photosGrid.setOnItemClickListener((AdapterView.OnItemClickListener)getActivity()); photosGrid.setOnItemClickListener((AdapterView.OnItemClickListener) getActivity());
photoSize = calculatePicDimension(detailProvider.getTotalMediaCount()); photoSize = calculatePicDimension(detailProvider.getTotalMediaCount());
photosGrid.setColumnWidth(photoSize.x); photosGrid.setColumnWidth(photoSize.x);
@ -188,7 +188,7 @@ public class MultipleUploadListFragment extends Fragment {
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch(item.getItemId()) { switch (item.getItemId()) {
case R.id.menu_upload_multiple: case R.id.menu_upload_multiple:
multipleUploadInitiatedHandler.OnMultipleUploadInitiated(); multipleUploadInitiatedHandler.OnMultipleUploadInitiated();
return true; return true;
@ -200,7 +200,7 @@ public class MultipleUploadListFragment extends Fragment {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
detailProvider = (MediaDetailPagerFragment.MediaDetailProvider)getActivity(); detailProvider = (MediaDetailPagerFragment.MediaDetailProvider) getActivity();
multipleUploadInitiatedHandler = (OnMultipleUploadInitiatedHandler) getActivity(); multipleUploadInitiatedHandler = (OnMultipleUploadInitiatedHandler) getActivity();
setHasOptionsMenu(true); setHasOptionsMenu(true);
@ -213,12 +213,12 @@ public class MultipleUploadListFragment extends Fragment {
@Override @Override
public void onTextChanged(CharSequence charSequence, int i1, int i2, int i3) { public void onTextChanged(CharSequence charSequence, int i1, int i2, int i3) {
for(int i = 0; i < detailProvider.getTotalMediaCount(); i++) { for (int i = 0; i < detailProvider.getTotalMediaCount(); i++) {
Contribution up = (Contribution) detailProvider.getMediaAtPosition(i); Contribution up = (Contribution) detailProvider.getMediaAtPosition(i);
Boolean isDirty = (Boolean)up.getTag("isDirty"); Boolean isDirty = (Boolean) up.getTag("isDirty");
if(isDirty == null || !isDirty) { if (isDirty == null || !isDirty) {
if(!TextUtils.isEmpty(charSequence)) { if (!TextUtils.isEmpty(charSequence)) {
up.setFilename(charSequence.toString() + " - " + ((Integer)up.getTag("sequence") + 1)); up.setFilename(charSequence.toString() + " - " + ((Integer) up.getTag("sequence") + 1));
} else { } else {
up.setFilename(""); up.setFilename("");
} }