Skip to content
Snippets Groups Projects
Commit 68517f0e authored by Julian Catoni's avatar Julian Catoni
Browse files

Merge branch 'feature/url-preference' into feature/redesign-recognitions

parents 4a70e845 b1a6b908
No related branches found
No related tags found
No related merge requests found
......@@ -122,9 +122,6 @@ dependencies {
exclude group: 'com.intellij', module: 'annotations'
}
// MaterialDialogs
implementation 'com.afollestad.material-dialogs:core:2.0.0-beta4'
// Google Maps
fullImplementation 'com.google.android.gms:play-services-maps:12.0.1'
// GCM
......
......@@ -25,6 +25,8 @@ import android.preference.PreferenceScreen;
import android.text.TextUtils;
import android.util.Log;
import android.view.MenuItem;
import android.widget.EditText;
import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
......
......@@ -75,7 +75,7 @@ public class RecognitionsActivity extends AppCompatActivity implements WidgetAda
progressDialog.show();
// Interface for the RetrofitInstance
GetDataService service = RetrofitClientInstance.getRetrofitInstance().create(GetDataService.class);
GetDataService service = RetrofitClientInstance.getRetrofitInstance(this).create(GetDataService.class);
Call<List<Recognition>> call = service.getAllRecognitions();
call.enqueue(new Callback<List<Recognition>>() {
......
......@@ -1090,6 +1090,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
float[] initialColor = mBoundItem.stateAsHsv();
if (initialColor != null) {
colorPicker.setColor(Color.HSVToColor(initialColor));
}
new AlertDialog.Builder(contentView.getContext())
......@@ -1104,6 +1105,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
}
}
public static class MjpegVideoViewHolder extends ViewHolder {
private final ImageView mImageView;
private MjpegStreamer mStreamer;
......
......@@ -19,6 +19,7 @@ public class Constants {
public static final String PREFERENCE_SITEMAP_LABEL = "default_openhab_sitemap_label";
public static final String PREFERENCE_REMOTE_URL = "default_openhab_alturl";
public static final String PREFERENCE_LOCAL_URL = "default_openhab_url";
public static final String PREFERENCE_OPENLICHT_URL = "default_openlicht_url";
public static final String PREFERENCE_THEME = "default_openhab_theme";
public static final String PREFERENCE_ANIMATION = "default_openhab_animation";
public static final String PREFERENCE_DEMOMODE = "default_openhab_demomode";
......
package org.openhab.habdroid.util;
import android.app.Activity;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import retrofit2.Retrofit;
import retrofit2.converter.gson.GsonConverterFactory;
/*
* OpenLicht
* Use Retrofit to call the API
......@@ -12,12 +15,14 @@ import retrofit2.converter.gson.GsonConverterFactory;
public class RetrofitClientInstance {
private static Retrofit retrofit;
private static final String BASE_URL = "http://192.168.1.250:5000"; //"http://10.0.2.2:5000";
public static Retrofit getRetrofitInstance() {
public static Retrofit getRetrofitInstance(Activity activity) {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
String url = preferences.getString(Constants.PREFERENCE_OPENLICHT_URL, "");
if (retrofit == null) {
retrofit = new Retrofit.Builder()
.baseUrl(BASE_URL)
.baseUrl(url)
.addConverterFactory(GsonConverterFactory.create())
.build();
}
......
......@@ -58,6 +58,7 @@
<string name="settings_current_default_sitemap">Current default Sitemap: %1$s</string>
<string name="settings_openhab_alt_connection">Remote</string>
<string name="settings_openhab_connection">Local</string>
<string name="settings_openlicht_connection">OpenLicht REST URL</string>
<string name="settings_notification_vibration">Notification vibration</string>
<string name="settings_notification_vibration_off">Off</string>
<string name="settings_notification_vibration_short">Short</string>
......@@ -69,6 +70,7 @@
<string name="settings_notification_vibration_value_twice" translatable="false">twice</string>
<string name="settings_connection_summary">Connected to %s</string>
<string name="settings_insecure_connection_summary">Insecurely connected to %s</string>
<string name="settings_openlicht_connection_summary">Set your Openlicht URL here</string>
<!-- App messages strings -->
<string name="title_voice_widget">openHAB voice commands</string>
......
......@@ -20,6 +20,13 @@
android:title="@string/settings_openhab_alt_connection"
android:dependency="default_openhab_demomode"
android:icon="@drawable/ic_tree_grey_24dp" />
<EditTextPreference
android:defaultValue="@string/empty_string"
android:inputType="textUri"
android:key="default_openlicht_url"
android:summary="@string/settings_openlicht_connection_summary"
android:title="@string/settings_openlicht_connection"
android:icon="@drawable/ic_earth_grey_24dp" />
<org.openhab.habdroid.ui.widget.SslClientCertificatePreference
android:defaultValue="@string/settings_openhab_none"
android:key="default_openhab_sslclientcert"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment