From bb82830d582366ca5ebec4943cdb2520f06bb53e Mon Sep 17 00:00:00 2001 From: BrunoBarros21 Date: Mon, 12 Feb 2018 10:34:09 +0000 Subject: [PATCH 1/9] Sync ordered and SeaBioData tab removed --- app/app.iml | 33 +++++++------------ .../activities/FavoriteDetailsActivity.java | 6 ++-- .../beta/labtablet/database/daos/SyncDao.java | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- labtablet.iml | 2 +- 5 files changed, 17 insertions(+), 28 deletions(-) diff --git a/app/app.iml b/app/app.iml index c82865c..56d4ea1 100644 --- a/app/app.iml +++ b/app/app.iml @@ -49,13 +49,6 @@ - - - - - - - @@ -63,6 +56,13 @@ + + + + + + + @@ -84,31 +84,20 @@ - - - - - - - - - - - @@ -120,11 +109,11 @@ - + @@ -133,25 +122,25 @@ - + - + - + diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/activities/FavoriteDetailsActivity.java b/app/src/main/java/pt/up/fe/beta/labtablet/activities/FavoriteDetailsActivity.java index 26c3fc4..d3ab033 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/activities/FavoriteDetailsActivity.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/activities/FavoriteDetailsActivity.java @@ -405,8 +405,8 @@ public boolean onOptionsItemSelected(final MenuItem item) { finish(); break; case R.id.action_favorite_upload: - - final String options[] = {"SeaBioData", "Dendro"}; + dispatchDendroUpload(); + /*final String options[] = {"SeaBioData", "Dendro"}; android.support.v7.app.AlertDialog.Builder builder = new android.support.v7.app.AlertDialog.Builder(FavoriteDetailsActivity.this); builder.setTitle(getString(R.string.dialog_pick_context_title)); builder.setItems(options, new DialogInterface.OnClickListener() { @@ -429,7 +429,7 @@ public void onClick(DialogInterface dialog, int which) { } }); builder.show(); - + */ break; case R.id.action_favorite_delete: //remove this favorite diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/database/daos/SyncDao.java b/app/src/main/java/pt/up/fe/beta/labtablet/database/daos/SyncDao.java index cd428bf..04b82b5 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/database/daos/SyncDao.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/database/daos/SyncDao.java @@ -22,7 +22,7 @@ public interface SyncDao { @Query("SELECT * FROM Sync") List getAll(); - @Query("SELECT * FROM Sync WHERE folder_title LIKE :folderTitle") + @Query("SELECT * FROM Sync WHERE folder_title LIKE :folderTitle ORDER BY export_date DESC") List getAllWithFolderTitle(String folderTitle); @Query("SELECT * FROM Sync WHERE dendro_folder_uri LIKE :folderUri LIMIT 1") diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 9a99696..bde6a48 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -36,7 +36,7 @@ - Recpmendados + Recomendados Dendro Todos diff --git a/labtablet.iml b/labtablet.iml index 84fbe27..4e9e997 100644 --- a/labtablet.iml +++ b/labtablet.iml @@ -13,7 +13,7 @@ - + \ No newline at end of file From 0d8765383d2569e3ca6107f5ee2d04620f31cd4f Mon Sep 17 00:00:00 2001 From: BrunoBarros21 Date: Mon, 12 Feb 2018 15:16:47 +0000 Subject: [PATCH 2/9] Where there are no bookmarks, a message is displayed --- app/app.iml | 9 +++++++++ .../beta/labtablet/fragments/FavoriteViewFragment.java | 2 ++ 2 files changed, 11 insertions(+) diff --git a/app/app.iml b/app/app.iml index 56d4ea1..04f3cef 100644 --- a/app/app.iml +++ b/app/app.iml @@ -86,18 +86,27 @@ + + + + + + + + + diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/FavoriteViewFragment.java b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/FavoriteViewFragment.java index 5d6d137..5505881 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/FavoriteViewFragment.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/FavoriteViewFragment.java @@ -362,6 +362,8 @@ public void onItemClick(View view, int position) { } final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setTitle("Synchronize"); + if(options.length == 0) + builder.setMessage("No Bookmarks, please create one before Synchronize"); builder.setItems(options, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { // The 'which' argument contains the index position From e93ec9458a2634ce54d4f75657ed7727d8d2c084 Mon Sep 17 00:00:00 2001 From: BrunoBarros21 Date: Wed, 14 Feb 2018 11:09:28 +0000 Subject: [PATCH 3/9] refresh button on file browser working --- .../pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java index 776a46e..73d19c9 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java @@ -198,10 +198,11 @@ public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.action_dendro_search) { onSearchProjects(); } else if (item.getItemId() == R.id.action_dendro_refresh) { - if (!path.equals("/data")) { + /*if (!path.equals("/data")) { initDirectoryFetcher(); mDirectoryFetcher.execute(projectName + path, getActivity()); - } + }*/ + refreshFoldersList(); } else if (item.getItemId() == R.id.action_dendro_go_up) { if (path.equals("/data")) { Toast.makeText(getActivity(), getResources().getString(R.string.already_in_root_folder), Toast.LENGTH_LONG).show(); From 95835c1b920aa708980eb3b8b891e7e15bd1add5 Mon Sep 17 00:00:00 2001 From: BrunoBarros21 Date: Wed, 14 Feb 2018 11:45:40 +0000 Subject: [PATCH 4/9] back button kinda working --- .../pt/up/fe/beta/labtablet/fragments/SubmissionStep1.java | 2 ++ .../pt/up/fe/beta/labtablet/fragments/SubmissionStep2.java | 3 +++ .../pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java | 2 ++ 3 files changed, 7 insertions(+) diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep1.java b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep1.java index 2344c56..6cd617e 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep1.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep1.java @@ -175,6 +175,8 @@ public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.action_dendro_instructions_confirm) { mHandler.nextStep(1); + }else if (item.getItemId() == 16908332 /*backButton*/){ + getActivity().onBackPressed(); } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep2.java b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep2.java index a20b410..61aac86 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep2.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep2.java @@ -101,6 +101,9 @@ public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.action_dendro_metadata_confirm) { mHandler.nextStep(2); } + else if (item.getItemId() == 16908332){ + mHandler.nextStep(0); + } return super.onOptionsItemSelected(item); } diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java index 73d19c9..d10f1c6 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java @@ -217,6 +217,8 @@ public boolean onOptionsItemSelected(MenuItem item) { refreshFoldersList();*/ } + }else if (item.getItemId() == 16908332){ + mHandler.nextStep(1); } return super.onOptionsItemSelected(item); From a2f7a5e5e81697b99d9c73e5947e50573f1b1b0b Mon Sep 17 00:00:00 2001 From: BrunoBarros21 Date: Wed, 14 Feb 2018 14:26:29 +0000 Subject: [PATCH 5/9] Sync Long press handling --- .../adapters/DendroSyncListAdapter.java | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/adapters/DendroSyncListAdapter.java b/app/src/main/java/pt/up/fe/beta/labtablet/adapters/DendroSyncListAdapter.java index 14e904d..c896cb1 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/adapters/DendroSyncListAdapter.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/adapters/DendroSyncListAdapter.java @@ -103,24 +103,26 @@ public void onClick(View view) { @Override public boolean onLongClick(View view) { - mItemDeleteView.animate(); - mItemDeleteView.setVisibility(View.VISIBLE); - Button actionDelete = (Button) view.findViewById(R.id.action_metadata_item_delete); - Button actionCancel = (Button) view.findViewById(R.id.action_metadata_item_delete_cancel); - - actionCancel.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - mItemDeleteView.setVisibility(View.GONE); - } - }); - - actionDelete.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - listener.onDeleteRequested(view, getPosition()); - } - }); + if(!(mItemDeleteView==null)){ + mItemDeleteView.animate(); + mItemDeleteView.setVisibility(View.VISIBLE); + Button actionDelete = (Button) view.findViewById(R.id.action_metadata_item_delete); + Button actionCancel = (Button) view.findViewById(R.id.action_metadata_item_delete_cancel); + + actionCancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + mItemDeleteView.setVisibility(View.GONE); + } + }); + + actionDelete.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + listener.onDeleteRequested(view, getPosition()); + } + }); + } return true; } } From 3fb16c081fb842191c9e4009e4996f55f310ee07 Mon Sep 17 00:00:00 2001 From: BrunoBarros21 Date: Fri, 23 Feb 2018 12:01:02 +0000 Subject: [PATCH 6/9] Creating folder before sending to dendro --- .../up/fe/beta/labtablet/api/DendroAPI.java | 94 +++++++++++++++++++ .../labtablet/fragments/SubmissionStep3.java | 37 ++++++++ app/src/main/res/menu/submission_step3.xml | 6 ++ app/src/main/res/values/strings.xml | 1 + 4 files changed, 138 insertions(+) diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/api/DendroAPI.java b/app/src/main/java/pt/up/fe/beta/labtablet/api/DendroAPI.java index 6d59b06..34a9c36 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/api/DendroAPI.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/api/DendroAPI.java @@ -181,6 +181,100 @@ public static JsonArray getExportBookmarks(Context context) return resultAsJsonArray; } + private static class MkdirTask extends AsyncTask + { + private Context context; + private String folderName; + private String parentFolderUri; + + MkdirTask(Context context, String folderName, String parentFolderUri) + { + this.context = context; + this.folderName = folderName; + this.parentFolderUri = parentFolderUri; + } + + @Override + protected String doInBackground(Void... params) { + URL url; + HttpURLConnection conn; + String result = ""; + + String cookie = null; + try { + cookie = authenticate(context); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + + try { + DendroConfiguration conf = FileMgr.getDendroConf(context); + url = new URL(conf.getAddress() + parentFolderUri + "?mkdir=" + folderName); + conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod("POST"); + conn.setRequestProperty("Cookie", cookie); + conn.setRequestProperty("Content-Type", "application/json; charset=utf-8"); + conn.setRequestProperty("Accept","application/json"); + conn.setDoOutput(true); + BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream())); + + String inputLine; + StringBuffer response = new StringBuffer(); + + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); + + result = response.toString(); + + return result; + } catch (MalformedURLException e) { + e.printStackTrace(); + return null; + } catch (ProtocolException e) { + e.printStackTrace(); + return null; + } catch (IOException e) { + e.printStackTrace(); + return null; + } + } + + @Override + protected void onPostExecute(String results) + { + super.onPostExecute(results); + } + } + + public static boolean Mkdir(Context context, String folderName, String parentFolderUri) + { + String result = null; + JsonObject json = null; + try { + result = new MkdirTask(context, folderName, parentFolderUri).execute().get(); + } catch (Exception e) { + e.printStackTrace(); + return false; + } + + JsonParser parser = new JsonParser(); + try{ + JsonObject obj = parser.parse(result).getAsJsonObject(); + json = obj; + } + catch (Exception e) + { + return false; + } + + if (json.get("result").getAsString().equals("ok")) + return true; + return false; + } + public static String executeExportToRepositoryTaskSync(Context context, String folderUri, JsonObject object) { String result = null; diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java index d10f1c6..f4bfea3 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep3.java @@ -4,7 +4,10 @@ import android.app.Fragment; import android.content.DialogInterface; import android.content.Intent; +import android.os.Build; import android.os.Bundle; +import android.support.annotation.RequiresApi; +import android.text.InputType; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -14,6 +17,7 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.Button; +import android.widget.EditText; import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; @@ -48,6 +52,8 @@ import pt.up.fe.beta.labtablet.utils.FileMgr; import pt.up.fe.beta.labtablet.utils.Utils; +import static pt.up.fe.beta.labtablet.api.DendroAPI.Mkdir; + public class SubmissionStep3 extends Fragment { @@ -55,6 +61,7 @@ public class SubmissionStep3 extends Fragment { private static String projectName; private MenuItem actionRefresh; private MenuItem actionUp; + private MenuItem addFolder; private ListView dendroDirList; private DendroFolderAdapter mAdapter; private TextView tv_empty; @@ -187,11 +194,14 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { inflater.inflate(R.menu.submission_step3, menu); actionRefresh = menu.findItem(R.id.action_dendro_refresh); actionUp = menu.findItem(R.id.action_dendro_go_up); + addFolder = menu.findItem(R.id.action_dendro_addFolder); actionRefresh.setVisible(false); actionUp.setVisible(false); + addFolder.setVisible(false); } + @RequiresApi(api = Build.VERSION_CODES.M) @Override public boolean onOptionsItemSelected(MenuItem item) { @@ -219,6 +229,32 @@ public boolean onOptionsItemSelected(MenuItem item) { }else if (item.getItemId() == 16908332){ mHandler.nextStep(1); + }else if (item.getItemId() == R.id.action_dendro_addFolder){ + final android.support.v7.app.AlertDialog.Builder builder = new android.support.v7.app.AlertDialog.Builder(getActivity()); + builder.setTitle("Add Folder"); + + final EditText input = new EditText(getContext()); + + input.setInputType(InputType.TYPE_CLASS_TEXT); + builder.setView(input); + + builder.setPositiveButton("OK", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + if (Mkdir(getContext(), input.getText().toString(), selectedResourceUri)) + refreshFoldersList(); + else + Toast.makeText(getActivity(), "Error creating Folder", Toast.LENGTH_SHORT).show(); + } + }); + builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.cancel(); + } + }); + + builder.show(); } return super.onOptionsItemSelected(item); @@ -305,6 +341,7 @@ public void onSuccess(ArrayList result) { mAdapter.notifyDataSetChanged(); actionUp.setVisible(true); actionRefresh.setVisible(true); + addFolder.setVisible(true); dendroDirList.setVisibility(View.VISIBLE); } diff --git a/app/src/main/res/menu/submission_step3.xml b/app/src/main/res/menu/submission_step3.xml index 7b9c025..0548895 100644 --- a/app/src/main/res/menu/submission_step3.xml +++ b/app/src/main/res/menu/submission_step3.xml @@ -18,4 +18,10 @@ android:orderInCategory="100" app:showAsAction="ifRoom" /> + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9149b53..eea0248 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -373,6 +373,7 @@ Stations Use the buttons bellow to assist you with the form Default profile + addFolder From 962e6886ee9565bf1b607efa73749db7934bc2be Mon Sep 17 00:00:00 2001 From: BrunoBarros21 Date: Fri, 9 Mar 2018 11:05:26 +0000 Subject: [PATCH 7/9] creating folder before the sending to dendro and explorer with a better looking --- .../SubmissionValidationActivity.java | 4 +- .../labtablet/fragments/SubmissionStep4.java | 2 +- .../layout/activity_submission_validation.xml | 4 +- app/src/main/res/menu/submission_step3.xml | 45 ++++++++++--------- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/activities/SubmissionValidationActivity.java b/app/src/main/java/pt/up/fe/beta/labtablet/activities/SubmissionValidationActivity.java index 322af38..1c59c93 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/activities/SubmissionValidationActivity.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/activities/SubmissionValidationActivity.java @@ -37,7 +37,7 @@ public class SubmissionValidationActivity extends AppCompatActivity implements S * The {@link ViewPager} that will host the section contents. */ private ViewPager mViewPager; - private FloatingActionButton pb_submission_state; + //private FloatingActionButton pb_submission_state; public static String getProjectName() { return projectName; @@ -85,7 +85,7 @@ protected void onCreate(Bundle savedInstanceState) { getSupportActionBar().setHomeButtonEnabled(true); } - pb_submission_state = (FloatingActionButton) findViewById(R.id.pb_submission); + //pb_submission_state = (FloatingActionButton) findViewById(R.id.pb_submission); favoriteName = getIntent().getStringExtra("favorite_name"); diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep4.java b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep4.java index 5f0848c..576d24f 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep4.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep4.java @@ -72,7 +72,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_submission_step4, container, false); btStartUpload = (Button) rootView.findViewById(R.id.submission_start_upload); - pbStatus = (ProgressBar) rootView.findViewById(R.id.pb_submission_loading); + //pbStatus = (ProgressBar) rootView.findViewById(R.id.pb_submission_loading); tv_progress_status = (TextView) rootView.findViewById(R.id.submission_status_message); if (savedInstanceState == null) { diff --git a/app/src/main/res/layout/activity_submission_validation.xml b/app/src/main/res/layout/activity_submission_validation.xml index 85e886a..7d6f600 100644 --- a/app/src/main/res/layout/activity_submission_validation.xml +++ b/app/src/main/res/layout/activity_submission_validation.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" tools:context=".labtablet.activities.SubmissionValidationActivity" /> - + />--> \ No newline at end of file diff --git a/app/src/main/res/menu/submission_step3.xml b/app/src/main/res/menu/submission_step3.xml index 0548895..0241156 100644 --- a/app/src/main/res/menu/submission_step3.xml +++ b/app/src/main/res/menu/submission_step3.xml @@ -1,27 +1,28 @@ - - + - + - + android:orderInCategory="102" + android:title="@string/refresh" + app:showAsAction="always" /> + + From 4187d68ede27e4d63171232fa2c20053220864dd Mon Sep 17 00:00:00 2001 From: BrunoBarros21 Date: Fri, 20 Apr 2018 11:15:40 +0100 Subject: [PATCH 8/9] UI and export updated --- .gitignore | 1 + app/app.iml | 79 ++++++++++--------- app/build.gradle | 2 +- .../labtablet/fragments/SubmissionStep4.java | 9 ++- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- labtablet.iml | 2 +- 7 files changed, 52 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index 463fce8..e393ccb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /.idea/* .DS_Store /build +.idea/* diff --git a/app/app.iml b/app/app.iml index 04f3cef..d5b7af0 100644 --- a/app/app.iml +++ b/app/app.iml @@ -94,64 +94,65 @@ + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 642e392..cef6173 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { //compileSdkVersion 24 compileSdkVersion 26 - buildToolsVersion '26.0.2' + buildToolsVersion '27.0.3' useLibrary 'org.apache.http.legacy' packagingOptions { diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep4.java b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep4.java index 576d24f..26009f8 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep4.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/fragments/SubmissionStep4.java @@ -72,7 +72,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_submission_step4, container, false); btStartUpload = (Button) rootView.findViewById(R.id.submission_start_upload); - //pbStatus = (ProgressBar) rootView.findViewById(R.id.pb_submission_loading); + pbStatus = (ProgressBar) rootView.findViewById(R.id.pb_submission_loading); tv_progress_status = (TextView) rootView.findViewById(R.id.submission_status_message); if (savedInstanceState == null) { @@ -118,8 +118,11 @@ public void onSuccess(Void result) { getActivity().finish(); Toast.makeText(getActivity(), getResources().getString(R.string.uploaded_successfully), Toast.LENGTH_LONG).show(); - Intent intent = new Intent(getActivity(), MainActivity.class); - getActivity().startActivity(intent); + Intent intent = new Intent(getActivity(), FavoriteDetailsActivity.class); + intent.putExtra("favorite_name", getArguments().getString("favorite_name")); + startActivity(intent); + //Intent intent = new Intent(getActivity(), MainActivity.class); + //getActivity().startActivity(intent); } @Override diff --git a/build.gradle b/build.gradle index d692688..45629e1 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 866c328..8c4631e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Dec 14 19:40:58 WET 2017 +#Fri Apr 06 10:10:07 WEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/labtablet.iml b/labtablet.iml index 4e9e997..84fbe27 100644 --- a/labtablet.iml +++ b/labtablet.iml @@ -13,7 +13,7 @@ - + \ No newline at end of file From 9ac1574f3f40d97787c9506a0273e844da079ca7 Mon Sep 17 00:00:00 2001 From: BrunoBarros21 Date: Fri, 27 Apr 2018 12:31:08 +0100 Subject: [PATCH 9/9] Metadata can be canceled now --- .idea/.name | 1 - .idea/compiler.xml | 22 ------ .idea/copyright/profiles_settings.xml | 3 - .idea/gradle.xml | 3 +- .idea/misc.xml | 9 ++- .../activities/FieldModeActivity.java | 13 +++- .../activities/ValidateMetadataActivity.java | 73 ++++++++++++------- 7 files changed, 61 insertions(+), 63 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 760dc2d..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -labtablet \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index cfe4315..7ac24c7 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,9 +3,8 @@ - + diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/activities/FieldModeActivity.java b/app/src/main/java/pt/up/fe/beta/labtablet/activities/FieldModeActivity.java index 3f2c779..755e98e 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/activities/FieldModeActivity.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/activities/FieldModeActivity.java @@ -558,11 +558,16 @@ protected void onActivityResult(int requestCode, int resultCode, final Intent da if (!data.getExtras().containsKey("favorite")) { Toast.makeText(this, "No descriptors received", Toast.LENGTH_SHORT).show(); return; - } + } else if (data.getExtras().get("favorite").equals("cancelled")){ + Toast.makeText(this, "Recolha de Metadados cancelada", Toast.LENGTH_SHORT).show(); + finish(); + break; + } else { - Toast.makeText(this, getResources().getString(R.string.metadata_added_success), Toast.LENGTH_SHORT).show(); - finish(); - break; + Toast.makeText(this, getResources().getString(R.string.metadata_added_success), Toast.LENGTH_SHORT).show(); + finish(); + break; + } case Utils.SOLVE_FORM: if (data == null) { diff --git a/app/src/main/java/pt/up/fe/beta/labtablet/activities/ValidateMetadataActivity.java b/app/src/main/java/pt/up/fe/beta/labtablet/activities/ValidateMetadataActivity.java index 4daccfe..c677807 100644 --- a/app/src/main/java/pt/up/fe/beta/labtablet/activities/ValidateMetadataActivity.java +++ b/app/src/main/java/pt/up/fe/beta/labtablet/activities/ValidateMetadataActivity.java @@ -111,35 +111,54 @@ public boolean onOptionsItemSelected(MenuItem item) { } } - mProgressDialog = ProgressDialog.show(ValidateMetadataActivity.this, - getResources().getString(R.string.wait_queue_processing_title), - getResources().getString(R.string.wait_queue_processing), true); - mProgressDialog.show(); - - for (Descriptor desc : unvalidatedQueue) { - fItem.addMetadataItem(desc); - } - - new AsyncQueueProcessor(new AsyncTaskHandler() { - @Override - public void onSuccess(Void result) { - mProgressDialog.dismiss(); - Intent returnIntent = new Intent(); - returnIntent.putExtra("favorite", new Gson().toJson(fItem)); - setResult(RESULT_OK, returnIntent); - finish(); - } - - @Override - public void onFailure(Exception error) { - mProgressDialog.dismiss(); - } + String[] options = {"Não", "Sim"}; + + final android.support.v7.app.AlertDialog.Builder builder = new android.support.v7.app.AlertDialog.Builder(this); + builder.setTitle("Pretende confirmar a captação dos Metadados"); + builder.setItems(options, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + dialog.cancel(); + if(which == 0){ + Intent returnIntent = new Intent(); + returnIntent.putExtra("favorite", "cancelled"); + setResult(RESULT_OK, returnIntent); + finish(); + } + else if(which == 1){ + mProgressDialog = ProgressDialog.show(ValidateMetadataActivity.this, + getResources().getString(R.string.wait_queue_processing_title), + getResources().getString(R.string.wait_queue_processing), true); + mProgressDialog.show(); + + for (Descriptor desc : unvalidatedQueue) { + fItem.addMetadataItem(desc); + } + + new AsyncQueueProcessor(new AsyncTaskHandler() { + @Override + public void onSuccess(Void result) { + mProgressDialog.dismiss(); + Intent returnIntent = new Intent(); + returnIntent.putExtra("favorite", new Gson().toJson(fItem)); + setResult(RESULT_OK, returnIntent); + finish(); + } + + @Override + public void onFailure(Exception error) { + mProgressDialog.dismiss(); + } + + @Override + public void onProgressUpdate(int value) { + mProgressDialog.setProgress(value); + } + }).execute(fItem, ValidateMetadataActivity.this, deletionQueue, conversionQueue); - @Override - public void onProgressUpdate(int value) { - mProgressDialog.setProgress(value); + } } - }).execute(fItem, ValidateMetadataActivity.this, deletionQueue, conversionQueue); + }); + builder.show(); } else if (item.getItemId() == R.id.action_metadata_cancel) { deletionQueue.clear();