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 df113ebf..97867ffc 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,12 +20,10 @@ public class MainApplication extends Application { JSONObject json = PreferenceUtil.getCachedJson(getApplicationContext(), PreferenceUtil.PREF_CACHED_USER_INFO_JSON); ApplicationContext.getInstance().setUserInfo(getApplicationContext(), json); - // TODO Edit sharing - // TODO Tags loading feedback - // TODO Redraw flags // TODO Error feedback (all REST request, even login) // TODO Fullscreen preview // TODO Caching preferences + // TODO Edit sharing super.onCreate(); } diff --git a/docs-android/app/src/main/java/com/sismics/docs/activity/MainActivity.java b/docs-android/app/src/main/java/com/sismics/docs/activity/MainActivity.java index 28a5866c..e2721ca6 100644 --- a/docs-android/app/src/main/java/com/sismics/docs/activity/MainActivity.java +++ b/docs-android/app/src/main/java/com/sismics/docs/activity/MainActivity.java @@ -78,10 +78,14 @@ public class MainActivity extends ActionBarActivity { // Get tag list to fill the drawer final ListView tagListView = (ListView) findViewById(R.id.tagListView); + final View tagProgressView = findViewById(R.id.tagProgressView); + final View tagEmptyView = findViewById(R.id.tagEmptyView); + tagListView.setEmptyView(tagProgressView); TagResource.stats(this, new JsonHttpResponseHandler() { @Override public void onSuccess(int statusCode, Header[] headers, JSONObject response) { tagListView.setAdapter(new TagListAdapter(response.optJSONArray("stats"))); + tagListView.setEmptyView(tagEmptyView); } }); diff --git a/docs-android/app/src/main/res/drawable-xhdpi/eng.png b/docs-android/app/src/main/res/drawable-xhdpi/eng.png index ff701e19..bd7945c4 100644 Binary files a/docs-android/app/src/main/res/drawable-xhdpi/eng.png and b/docs-android/app/src/main/res/drawable-xhdpi/eng.png differ diff --git a/docs-android/app/src/main/res/drawable-xhdpi/fra.png b/docs-android/app/src/main/res/drawable-xhdpi/fra.png index 8332c4ec..545e07c7 100644 Binary files a/docs-android/app/src/main/res/drawable-xhdpi/fra.png and b/docs-android/app/src/main/res/drawable-xhdpi/fra.png differ diff --git a/docs-android/app/src/main/res/drawable-xhdpi/jpn.png b/docs-android/app/src/main/res/drawable-xhdpi/jpn.png index 325fbad3..b712c94d 100644 Binary files a/docs-android/app/src/main/res/drawable-xhdpi/jpn.png and b/docs-android/app/src/main/res/drawable-xhdpi/jpn.png differ diff --git a/docs-android/app/src/main/res/drawable-xxhdpi/eng.png b/docs-android/app/src/main/res/drawable-xxhdpi/eng.png new file mode 100644 index 00000000..662266e2 Binary files /dev/null and b/docs-android/app/src/main/res/drawable-xxhdpi/eng.png differ diff --git a/docs-android/app/src/main/res/drawable-xxhdpi/fra.png b/docs-android/app/src/main/res/drawable-xxhdpi/fra.png new file mode 100644 index 00000000..82330465 Binary files /dev/null and b/docs-android/app/src/main/res/drawable-xxhdpi/fra.png differ diff --git a/docs-android/app/src/main/res/drawable-xxhdpi/jpn.png b/docs-android/app/src/main/res/drawable-xxhdpi/jpn.png new file mode 100644 index 00000000..4846fda0 Binary files /dev/null and b/docs-android/app/src/main/res/drawable-xxhdpi/jpn.png differ diff --git a/docs-android/app/src/main/res/layout/main_activity.xml b/docs-android/app/src/main/res/layout/main_activity.xml index 6ac39265..cfc6a24e 100644 --- a/docs-android/app/src/main/res/layout/main_activity.xml +++ b/docs-android/app/src/main/res/layout/main_activity.xml @@ -18,6 +18,7 @@ android:layout_height="match_parent" android:layout_gravity="start" android:orientation="vertical" + android:clickable="true" android:background="#fff" android:elevation="5dp"> @@ -141,7 +142,33 @@ android:layout_height="0dp" android:choiceMode="singleChoice" android:divider="@android:color/transparent" - android:dividerHeight="0dp" /> + android:dividerHeight="0dp"/> + + + + + + + + diff --git a/docs-android/app/src/main/res/values/strings.xml b/docs-android/app/src/main/res/values/strings.xml index 6b045b8d..c002cc1c 100644 --- a/docs-android/app/src/main/res/values/strings.xml +++ b/docs-android/app/src/main/res/values/strings.xml @@ -25,7 +25,9 @@ Downloading document Search documents All documents + Shared documents All tags + No tags Invalid email @@ -33,6 +35,5 @@ Too long (max. %d) Required Only letters and numbers - Shared documents