From 7a6b7b8ba3207b6518515d37ccfca8c72afaa141 Mon Sep 17 00:00:00 2001 From: Gabriel Calero Date: Fri, 18 May 2018 12:26:41 -0300 Subject: [PATCH] Add Your Last Location in Android Home --- android/app/src/main/cpp/native.cpp | 2 +- .../hifiinterface/view/DomainAdapter.java | 11 ++++------- .../res/drawable/thumbnail_default_place.png | Bin 0 -> 5523 bytes android/app/src/main/res/values/strings.xml | 1 + interface/src/Application.cpp | 7 +++---- 5 files changed, 9 insertions(+), 12 deletions(-) create mode 100644 android/app/src/main/res/drawable/thumbnail_default_place.png diff --git a/android/app/src/main/cpp/native.cpp b/android/app/src/main/cpp/native.cpp index 3179534b34..2a82f3e3a2 100644 --- a/android/app/src/main/cpp/native.cpp +++ b/android/app/src/main/cpp/native.cpp @@ -172,7 +172,7 @@ JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnDest JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeGotoUrl(JNIEnv* env, jobject obj, jstring url) { QAndroidJniObject jniUrl("java/lang/String", "(Ljava/lang/String;)V", url); - DependencyManager::get()->handleLookupString(jniUrl.toString()); + DependencyManager::get()->loadSettings(jniUrl.toString()); } JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnPause(JNIEnv* env, jobject obj) { diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java b/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java index 461b71eb7c..907433d938 100644 --- a/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java +++ b/android/app/src/main/java/io/highfidelity/hifiinterface/view/DomainAdapter.java @@ -12,13 +12,6 @@ import android.widget.TextView; import com.squareup.picasso.Picasso; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; import java.util.List; import io.highfidelity.hifiinterface.R; @@ -31,6 +24,7 @@ import io.highfidelity.hifiinterface.provider.UserStoryDomainProvider; public class DomainAdapter extends RecyclerView.Adapter { private static final String TAG = "HiFi Interface"; + private static final String DEFAULT_THUMBNAIL_PLACE = "android.resource://io.highfidelity.hifiinterface/" + R.drawable.thumbnail_default_place; private Context mContext; private LayoutInflater mInflater; private ItemClickListener mClickListener; @@ -57,6 +51,9 @@ public class DomainAdapter extends RecyclerView.Adapter domain) { + if (filterText.length() == 0) { + domain.add(0, new Domain(mContext.getString(R.string.your_last_location), "", DEFAULT_THUMBNAIL_PLACE)); + } mDomains = new Domain[domain.size()]; mDomains = domain.toArray(mDomains); notifyDataSetChanged(); diff --git a/android/app/src/main/res/drawable/thumbnail_default_place.png b/android/app/src/main/res/drawable/thumbnail_default_place.png new file mode 100644 index 0000000000000000000000000000000000000000..1bd7d02ffb9aed2e70cfb03653ea2cf84777d858 GIT binary patch literal 5523 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 literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 9646fe0a7e..4f5f29e671 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -20,5 +20,6 @@ Loading places… No places exist with that name Privacy Policy + Your Last Location diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 9e21e970cf..c8ba306db4 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3310,19 +3310,18 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { // If this is a first run we short-circuit the address passed in if (firstRun.get()) { -#if defined(Q_OS_ANDROID) - qCDebug(interfaceapp) << "First run... going to" << qPrintable(addressLookupString.isEmpty() ? QString("default location") : addressLookupString); - DependencyManager::get()->loadSettings(addressLookupString); -#else +#if !defined(Q_OS_ANDROID) DependencyManager::get()->goToEntry(); sentTo = SENT_TO_ENTRY; #endif firstRun.set(false); } else { +#if !defined(Q_OS_ANDROID) qCDebug(interfaceapp) << "Not first run... going to" << qPrintable(addressLookupString.isEmpty() ? QString("previous location") : addressLookupString); DependencyManager::get()->loadSettings(addressLookupString); sentTo = SENT_TO_PREVIOUS_LOCATION; +#endif } UserActivityLogger::getInstance().logAction("startup_sent_to", {