From 551c10e7a3de1957e24b51087f121f6997846c01 Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 30 Nov 2014 16:11:35 +0100 Subject: [PATCH] Android: file upload (in progress), title marquee --- .../com/sismics/docs/MainApplication.java | 1 + .../docs/activity/DocumentActivity.java | 25 +++++++++++++++++- .../ic_file_upload_white_24dp.png | Bin 0 -> 271 bytes .../ic_file_upload_white_24dp.png | Bin 0 -> 325 bytes .../res/layout/document_edit_activity.xml | 7 ++++- .../src/main/res/menu/document_activity.xml | 7 +++++ .../app/src/main/res/values/strings.xml | 2 ++ 7 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 docs-android/app/src/main/res/drawable-xhdpi/ic_file_upload_white_24dp.png create mode 100644 docs-android/app/src/main/res/drawable-xxhdpi/ic_file_upload_white_24dp.png diff --git a/docs-android/app/src/main/java/com/sismics/docs/MainApplication.java b/docs-android/app/src/main/java/com/sismics/docs/MainApplication.java index 17f3fe9d..268a84c6 100644 --- a/docs-android/app/src/main/java/com/sismics/docs/MainApplication.java +++ b/docs-android/app/src/main/java/com/sismics/docs/MainApplication.java @@ -20,6 +20,7 @@ public class MainApplication extends Application { JSONObject json = PreferenceUtil.getCachedJson(getApplicationContext(), PreferenceUtil.PREF_CACHED_USER_INFO_JSON); ApplicationContext.getInstance().setUserInfo(getApplicationContext(), json); + // TODO Catch view intents pointing to a share and display it // TODO Fullscreen preview // TODO Caching preferences // TODO Documents adding/editing diff --git a/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentActivity.java b/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentActivity.java index 9650bdd9..35dfa8d1 100644 --- a/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentActivity.java +++ b/docs-android/app/src/main/java/com/sismics/docs/activity/DocumentActivity.java @@ -9,6 +9,8 @@ import android.os.Environment; import android.support.v4.app.DialogFragment; import android.support.v4.view.ViewPager; import android.support.v7.app.ActionBarActivity; +import android.support.v7.widget.Toolbar; +import android.text.TextUtils; import android.text.format.DateFormat; import android.view.Menu; import android.view.MenuInflater; @@ -115,8 +117,18 @@ public class DocumentActivity extends ActionBarActivity { String language = document.optString("language"); JSONArray tags = document.optJSONArray("tags"); - // Fill the layout + // Setup the title setTitle(title); + Toolbar toolbar = (Toolbar) findViewById(R.id.action_bar); + TextView titleTextView = (TextView) toolbar.getChildAt(1); + if (titleTextView != null) { + titleTextView.setEllipsize(TextUtils.TruncateAt.MARQUEE); + titleTextView.setMarqueeRepeatLimit(-1); + titleTextView.setFocusable(true); + titleTextView.setFocusableInTouchMode(true); + } + + // Fill the layout TextView createdDateTextView = (TextView) findViewById(R.id.createdDateTextView); createdDateTextView.setText(date); @@ -189,6 +201,13 @@ public class DocumentActivity extends ActionBarActivity { dialog.show(getSupportFragmentManager(), "DocShareFragment"); return true; + case R.id.upload_file: + Intent intent = new Intent(Intent.ACTION_GET_CONTENT) + .setType("*/*") + .putExtra("android.intent.extra.ALLOW_MULTIPLE", true); + startActivityForResult(Intent.createChooser(intent, getText(R.string.upload_from)), 1); + return true; + case android.R.id.home: finish(); return true; @@ -198,6 +217,10 @@ public class DocumentActivity extends ActionBarActivity { } } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + } + /** * Download the current displayed file. */ diff --git a/docs-android/app/src/main/res/drawable-xhdpi/ic_file_upload_white_24dp.png b/docs-android/app/src/main/res/drawable-xhdpi/ic_file_upload_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ffecb517d1e04cc7e9769309659c91b509f53c77 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq z+dW+zLn02py&BEepupo2XrQ;pTHgG?;>%*mz8}w@uys@}*|Pbu)g65WMFrmzk_mc@ z3>?Po=O?$Q`U`Heag6w!b!c9=(7ZieAD)V~nD1Bp^OIL_V!V*yPgcRH^Mztd)y~Vk z`gq&amP=zngFVBpy)RB{pWwf9c=t7aV+;9D`xpJ<=hAq<`hYR6*WBaM@}HA{PGazM L^>bP0l+XkKB|ced literal 0 HcmV?d00001 diff --git a/docs-android/app/src/main/res/drawable-xxhdpi/ic_file_upload_white_24dp.png b/docs-android/app/src/main/res/drawable-xxhdpi/ic_file_upload_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a6c31e93228dadd8e1c5eea2b0152272e961ce6e GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6x{3S;uw-~@9m91K4wJ@*NYoxw(c(8)vS4l`Rx-s``#x30r=I;Yj4$Mn|Go8b8Hd1voE@hb7@4+MH!!4rX07In=m-fjp9b^@ NgQu&X%Q~loCIGyWaJ2vc literal 0 HcmV?d00001 diff --git a/docs-android/app/src/main/res/layout/document_edit_activity.xml b/docs-android/app/src/main/res/layout/document_edit_activity.xml index 9dab2320..f4b70933 100644 --- a/docs-android/app/src/main/res/layout/document_edit_activity.xml +++ b/docs-android/app/src/main/res/layout/document_edit_activity.xml @@ -10,6 +10,7 @@ android:layout_height="wrap_content" android:layout_margin="8dp" android:padding="16dp" + android:textSize="24dp" android:hint="Title"/> @@ -59,5 +62,7 @@ android:id="@+id/tagsEditText" android:layout_width="match_parent" android:layout_height="wrap_content" + android:textSize="18sp" + android:hint="Add tags" android:layout_margin="8dp"/> \ No newline at end of file diff --git a/docs-android/app/src/main/res/menu/document_activity.xml b/docs-android/app/src/main/res/menu/document_activity.xml index e24d60af..46a3be04 100644 --- a/docs-android/app/src/main/res/menu/document_activity.xml +++ b/docs-android/app/src/main/res/menu/document_activity.xml @@ -2,6 +2,13 @@ + + + Share link Error deleting the share Send share link to + Upload a file + Upload a file from