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

- Information by upload fields

Browse source 
- Fixed conflicts
This commit is contained in:
mebr1416 2017-07-28 16:26:56 +03:00
parent 05bdfb588e
commit b32320b344
2 changed files with 25 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

54
app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
View file

@ -12,7 +12,6 @@ import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -25,10 +24,8 @@ import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
import java.util.ArrayList;
@ -207,42 +204,37 @@ public class SingleUploadFragment extends Fragment {
/**
* Copied from https://stackoverflow.com/a/26269435/8065933
* @param view
* @param motionEvent
* @return
*/
@OnTouch(R.id.titleEdit) boolean titleInfo(View view, MotionEvent motionEvent){
@OnTouch
(R.id.titleEdit) boolean titleInfo(View view, MotionEvent motionEvent) {
//Should replace right with end to support different right-to-left languages as well
final int value = titleEdit.getRight() - titleEdit.getCompoundDrawables()[2].getBounds().width();
final int DRAWABLE_RIGHT = 2;
if (motionEvent.getAction() == motionEvent.ACTION_UP && motionEvent.getRawX() >= value) {
if(motionEvent.getAction() == MotionEvent.ACTION_UP) {
if(motionEvent.getRawX() >= (titleEdit.getRight() - titleEdit.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width())) {
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
builder.setTitle(R.string.media_detail_title);
builder.setMessage(R.string.title_info);
builder.setCancelable(true);
builder.setNeutralButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
});
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
builder.setTitle(R.string.media_detail_title);
builder.setMessage(R.string.title_info);
builder.setCancelable(true);
builder.setNeutralButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
});
AlertDialog alert = builder.create();
alert.show();
return true;
}
AlertDialog alert = builder.create();
alert.show();
return true;
}
return false;
}
@OnTouch(R.id.descEdit) boolean descriptionInfo(View view, MotionEvent motionEvent){
@OnTouch
(R.id.descEdit) boolean descriptionInfo(View view, MotionEvent motionEvent) {
final int value = descEdit.getRight() - descEdit.getCompoundDrawables()[2].getBounds().width();
final int DRAWABLE_RIGHT = 2;
if(motionEvent.getAction() == MotionEvent.ACTION_UP) {
if(motionEvent.getRawX() >= (titleEdit.getRight() - titleEdit.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width())) {
if (motionEvent.getAction() == motionEvent.ACTION_UP && motionEvent.getRawX() >= value) {
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
builder.setTitle(R.string.media_detail_description);
@ -258,7 +250,7 @@ public class SingleUploadFragment extends Fragment {
AlertDialog alert = builder.create();
alert.show();
return true;
}
}
return false;
}