Browse Source

Upload UI minor change

pull/50/head
Apostolos Fanakis 6 years ago
parent
commit
a5ee4d5b27
  1. 13
      app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java
  2. 3
      app/src/main/res/layout/activity_upload.xml

13
app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java

@ -88,7 +88,6 @@ public class UploadActivity extends BaseActivity {
private EditText uploadDescription; private EditText uploadDescription;
private AppCompatButton titleDescriptionBuilderButton; private AppCompatButton titleDescriptionBuilderButton;
private AppCompatTextView filenameHolder; private AppCompatTextView filenameHolder;
private FloatingActionButton uploadFAB;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -231,7 +230,7 @@ public class UploadActivity extends BaseActivity {
startActivityForResult(takePhotoIntent, REQUEST_CODE_CAMERA); startActivityForResult(takePhotoIntent, REQUEST_CODE_CAMERA);
}); });
uploadFAB = findViewById(R.id.upload_fab); FloatingActionButton uploadFAB = findViewById(R.id.upload_fab);
uploadFAB.setOnClickListener(view -> { uploadFAB.setOnClickListener(view -> {
String uploadTitleText = uploadTitle.getText().toString(); String uploadTitleText = uploadTitle.getText().toString();
String uploadDescriptionText = uploadDescription.getText().toString(); String uploadDescriptionText = uploadDescription.getText().toString();
@ -240,7 +239,7 @@ public class UploadActivity extends BaseActivity {
uploadTitle.setError("Required"); uploadTitle.setError("Required");
} }
if (fileUri == null) { if (fileUri == null) {
filenameHolder.setError("Required"); Toast.makeText(view.getContext(), "Please choose a file to upload or take a photo", Toast.LENGTH_LONG).show();
} }
if (categorySelected.equals("-1")) { if (categorySelected.equals("-1")) {
Toast.makeText(view.getContext(), "Please choose category first", Toast.LENGTH_SHORT).show(); Toast.makeText(view.getContext(), "Please choose category first", Toast.LENGTH_SHORT).show();
@ -299,6 +298,8 @@ public class UploadActivity extends BaseActivity {
@Override @Override
public void onCompleted(Context context, UploadInfo uploadInfo, ServerResponse serverResponse) { public void onCompleted(Context context, UploadInfo uploadInfo, ServerResponse serverResponse) {
Toast.makeText(context, "Upload completed successfully", Toast.LENGTH_SHORT).show();
if (finalTempFilePath != null) { if (finalTempFilePath != null) {
if (!UploadsHelper.deleteTempFile(finalTempFilePath)) { if (!UploadsHelper.deleteTempFile(finalTempFilePath)) {
Toast.makeText(context, "Failed to delete temporary file", Toast.LENGTH_SHORT).show(); Toast.makeText(context, "Failed to delete temporary file", Toast.LENGTH_SHORT).show();
@ -307,11 +308,15 @@ public class UploadActivity extends BaseActivity {
uploadTitle.setText(null); uploadTitle.setText(null);
uploadDescription.setText(null); uploadDescription.setText(null);
fileUri = null;
filenameHolder.setText(null); filenameHolder.setText(null);
filenameHolder.setVisibility(View.GONE);
} }
@Override @Override
public void onCancelled(Context context, UploadInfo uploadInfo) { public void onCancelled(Context context, UploadInfo uploadInfo) {
Toast.makeText(context, "Upload canceled", Toast.LENGTH_SHORT).show();
if (finalTempFilePath != null) { if (finalTempFilePath != null) {
if (!UploadsHelper.deleteTempFile(finalTempFilePath)) { if (!UploadsHelper.deleteTempFile(finalTempFilePath)) {
Toast.makeText(context, "Failed to delete temporary file", Toast.LENGTH_SHORT).show(); Toast.makeText(context, "Failed to delete temporary file", Toast.LENGTH_SHORT).show();
@ -393,6 +398,7 @@ public class UploadActivity extends BaseActivity {
if (fileUri != null) { if (fileUri != null) {
String filename = UploadsHelper.filenameFromUri(this, fileUri); String filename = UploadsHelper.filenameFromUri(this, fileUri);
filenameHolder.setText(filename); filenameHolder.setText(filename);
filenameHolder.setVisibility(View.VISIBLE);
filename = filename.toLowerCase(); filename = filename.toLowerCase();
if (filename.endsWith(".jpg")) { if (filename.endsWith(".jpg")) {
@ -444,6 +450,7 @@ public class UploadActivity extends BaseActivity {
newFilename += ".jpg"; newFilename += ".jpg";
filenameHolder.setText(newFilename); filenameHolder.setText(newFilename);
filenameHolder.setVisibility(View.VISIBLE);
} }
} else if (requestCode == REQUEST_CODE_FIELDS_BUILDER) { } else if (requestCode == REQUEST_CODE_FIELDS_BUILDER) {
if (resultCode == Activity.RESULT_CANCELED) { if (resultCode == Activity.RESULT_CANCELED) {

3
app/src/main/res/layout/activity_upload.xml

@ -106,7 +106,8 @@
android:drawablePadding="5dp" android:drawablePadding="5dp"
android:ellipsize="marquee" android:ellipsize="marquee"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/primary_text" /> android:textColor="@color/primary_text"
android:visibility="gone" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

Loading…
Cancel
Save