Skip to content

Commit e4f4fac

Browse files
trifetrife
authored
Merge pull request #1162 from PhenoApps/preferences-sharing
Share preferences using nearby share
2 parents 78d556c + d9b8bc1 commit e4f4fac

File tree

80 files changed

+1316
-449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1316
-449
lines changed

‎app/build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ dependencies {
148148

149149
implementation 'com.google.zxing:core:3.4.1'
150150

151-
implementation('com.github.phenoapps:phenolib:v0.9.52')
151+
implementation('com.github.phenoapps:phenolib:v0.9.53')
152152

153153
implementation 'com.google.android.exoplayer:exoplayer:2.19.1'
154154
implementation 'androidx.media3:media3-exoplayer:1.3.0'
@@ -242,6 +242,8 @@ dependencies {
242242
// Calendar date range picker library
243243
implementation 'io.github.architshah248.calendar:awesome-calendar:2.0.0'
244244

245+
implementation 'com.google.android.gms:play-services-nearby:19.3.0'
246+
245247
//AppIntro
246248
implementation 'com.github.AppIntro:AppIntro:6.3.1'
247249

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@
293293
<uses-permission android:name="android.permission.BLUETOOTH" />
294294
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
295295
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
296+
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
296297
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
297298
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
298299
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

‎app/src/main/java/com/fieldbook/tracker/activities/AboutActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.fieldbook.tracker.dialogs.CitationDialog;
2727
import com.fieldbook.tracker.R;
2828
import com.fieldbook.tracker.preferences.GeneralKeys;
29+
import com.fieldbook.tracker.preferences.PreferenceKeys;
2930
import com.mikepenz.aboutlibraries.LibsBuilder;
3031

3132
import org.json.JSONException;
@@ -63,7 +64,7 @@ public MaterialAboutList getMaterialAboutList(@NonNull Context c) {
6364
MaterialAboutCard.Builder appCardBuilder = new MaterialAboutCard.Builder();
6465

6566
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
66-
if (prefs.getString(GeneralKeys.THEME, "0").equals(String.valueOf(ThemedActivity.HIGH_CONTRAST))) {
67+
if (prefs.getString(PreferenceKeys.THEME, "0").equals(String.valueOf(ThemedActivity.HIGH_CONTRAST))) {
6768
appCardBuilder.addItem(new MaterialAboutTitleItem.Builder()
6869
.text(getString(R.string.field_book))
6970
.icon(R.mipmap.ic_launcher_monochrome)
@@ -155,7 +156,7 @@ public void onClick() {
155156
.build());
156157

157158
String theme = PreferenceManager.getDefaultSharedPreferences(this)
158-
.getString(GeneralKeys.THEME, "0");
159+
.getString(PreferenceKeys.THEME, "0");
159160

160161
int styleId = R.style.AboutLibrariesCustom;
161162
switch (theme) {

‎app/src/main/java/com/fieldbook/tracker/activities/CollectActivity.java‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
import com.fieldbook.tracker.objects.InfoBarModel;
6363
import com.fieldbook.tracker.objects.RangeObject;
6464
import com.fieldbook.tracker.objects.TraitObject;
65+
import com.fieldbook.tracker.preferences.PreferenceKeys;
6566
import com.fieldbook.tracker.traits.AbstractCameraTrait;
6667
import com.fieldbook.tracker.traits.formats.Formats;
6768
import com.fieldbook.tracker.preferences.GeneralKeys;
@@ -341,7 +342,7 @@ public void handleMessage(Message msg) {
341342
geoNavHelper = new GeoNavHelper(this);
342343

343344
ttsHelper = new TextToSpeechHelper(this, () -> {
344-
String lang = mPrefs.getString(GeneralKeys.TTS_LANGUAGE, "-1");
345+
String lang = mPrefs.getString(PreferenceKeys.TTS_LANGUAGE, "-1");
345346
if (!lang.equals("-1")) {
346347
Set<Locale> locales = TextToSpeechHelper.Companion.getAvailableLocales();
347348
for (Locale l : locales) {
@@ -356,7 +357,7 @@ public void handleMessage(Message msg) {
356357

357358
sensorHelper.register();
358359

359-
mlkitEnabled = mPrefs.getBoolean(GeneralKeys.MLKIT_PREFERENCE_KEY, false);
360+
mlkitEnabled = mPrefs.getBoolean(PreferenceKeys.MLKIT_PREFERENCE_KEY, false);
360361

361362
loadScreen();
362363

@@ -379,7 +380,7 @@ protected void onStop() {
379380
}
380381

381382
public void triggerTts(String text) {
382-
if (preferences.getBoolean(GeneralKeys.TTS_LANGUAGE_ENABLED, false)) {
383+
if (preferences.getBoolean(PreferenceKeys.TTS_LANGUAGE_ENABLED, false)) {
383384
ttsHelper.speak(text);
384385
}
385386
}
@@ -581,7 +582,7 @@ private void handleFlipFlopPreferences() {
581582
ConstraintSet constraintSet = new ConstraintSet();
582583
constraintSet.clone(layout);
583584

584-
if (preferences.getBoolean(GeneralKeys.FLIP_FLOP_ARROWS, false)) {
585+
if (preferences.getBoolean(PreferenceKeys.FLIP_FLOP_ARROWS, false)) {
585586
constraintSet.connect(R.id.act_collect_range_box, ConstraintSet.TOP,
586587
R.id.act_collect_infobar_rv, ConstraintSet.BOTTOM, 0);
587588
constraintSet.connect(R.id.act_collect_range_box, ConstraintSet.BOTTOM,
@@ -1226,10 +1227,10 @@ public void onResume() {
12261227

12271228
// Update menu item visibility
12281229
if (systemMenu != null) {
1229-
systemMenu.findItem(R.id.help).setVisible(preferences.getBoolean(GeneralKeys.TIPS, false));
1230-
systemMenu.findItem(R.id.nextEmptyPlot).setVisible(!preferences.getString(GeneralKeys.HIDE_ENTRIES_WITH_DATA_TOOLBAR, "0").equals("0"));
1231-
systemMenu.findItem(R.id.jumpToPlot).setVisible(!preferences.getString(GeneralKeys.MOVE_TO_UNIQUE_ID, "0").equals("0"));
1232-
systemMenu.findItem(R.id.datagrid).setVisible(preferences.getBoolean(GeneralKeys.DATAGRID_SETTING, false));
1230+
systemMenu.findItem(R.id.help).setVisible(preferences.getBoolean(PreferenceKeys.TIPS, false));
1231+
systemMenu.findItem(R.id.nextEmptyPlot).setVisible(!preferences.getString(PreferenceKeys.HIDE_ENTRIES_WITH_DATA_TOOLBAR, "0").equals("0"));
1232+
systemMenu.findItem(R.id.jumpToPlot).setVisible(!preferences.getString(PreferenceKeys.MOVE_TO_UNIQUE_ID, "0").equals("0"));
1233+
systemMenu.findItem(R.id.datagrid).setVisible(preferences.getBoolean(PreferenceKeys.DATAGRID_SETTING, false));
12331234
}
12341235

12351236
refreshInfoBarAdapter();
@@ -1276,7 +1277,7 @@ public void onResume() {
12761277

12771278
mPrefs.edit().putBoolean(GeneralKeys.GEONAV_AUTO, false).apply(); //turn off auto nav
12781279

1279-
if (mPrefs.getBoolean(GeneralKeys.ENABLE_GEONAV, false)) {
1280+
if (mPrefs.getBoolean(PreferenceKeys.ENABLE_GEONAV, false)) {
12801281

12811282
//setup logger whenever activity resumes
12821283
geoNavHelper.setupGeoNavLogger();
@@ -1481,7 +1482,7 @@ public void removeTrait() {
14811482
}
14821483

14831484
private void customizeToolbarIcons() {
1484-
Set<String> entries = preferences.getStringSet(GeneralKeys.TOOLBAR_CUSTOMIZE, new HashSet<>());
1485+
Set<String> entries = preferences.getStringSet(PreferenceKeys.TOOLBAR_CUSTOMIZE, new HashSet<>());
14851486

14861487
if (systemMenu != null) {
14871488
systemMenu.findItem(R.id.search).setVisible(entries.contains("search"));
@@ -1497,22 +1498,22 @@ public boolean onCreateOptionsMenu(Menu menu) {
14971498

14981499
systemMenu = menu;
14991500

1500-
systemMenu.findItem(R.id.help).setVisible(preferences.getBoolean(GeneralKeys.TIPS, false));
1501-
systemMenu.findItem(R.id.nextEmptyPlot).setVisible(!preferences.getString(GeneralKeys.HIDE_ENTRIES_WITH_DATA_TOOLBAR, "0").equals("0"));
1502-
systemMenu.findItem(R.id.jumpToPlot).setVisible(!preferences.getString(GeneralKeys.MOVE_TO_UNIQUE_ID, "0").equals("0"));
1503-
systemMenu.findItem(R.id.datagrid).setVisible(preferences.getBoolean(GeneralKeys.DATAGRID_SETTING, false));
1501+
systemMenu.findItem(R.id.help).setVisible(preferences.getBoolean(PreferenceKeys.TIPS, false));
1502+
systemMenu.findItem(R.id.nextEmptyPlot).setVisible(!preferences.getString(PreferenceKeys.HIDE_ENTRIES_WITH_DATA_TOOLBAR, "0").equals("0"));
1503+
systemMenu.findItem(R.id.jumpToPlot).setVisible(!preferences.getString(PreferenceKeys.MOVE_TO_UNIQUE_ID, "0").equals("0"));
1504+
systemMenu.findItem(R.id.datagrid).setVisible(preferences.getBoolean(PreferenceKeys.DATAGRID_SETTING, false));
15041505

15051506
//toggle repeated values indicator
15061507
systemMenu.findItem(R.id.action_act_collect_repeated_values_indicator).setVisible(collectInputView.isRepeatEnabled());
15071508

15081509
//added in geonav 310 only make goenav switch visible if preference is set
15091510
MenuItem geoNavEnable = systemMenu.findItem(R.id.action_act_collect_geonav_sw);
1510-
geoNavEnable.setVisible(mPrefs.getBoolean(GeneralKeys.ENABLE_GEONAV, false));
1511+
geoNavEnable.setVisible(mPrefs.getBoolean(PreferenceKeys.ENABLE_GEONAV, false));
15111512
// View actionView = MenuItemCompat.getActionView(geoNavEnable);
15121513
// actionView.setOnClickListener((View) -> onOptionsItemSelected(geoNavEnable));
15131514

15141515
MenuItem fieldAudioMic = systemMenu.findItem(R.id.field_audio_mic);
1515-
fieldAudioMic.setVisible(mPrefs.getBoolean(GeneralKeys.ENABLE_FIELD_AUDIO, false));
1516+
fieldAudioMic.setVisible(mPrefs.getBoolean(PreferenceKeys.ENABLE_FIELD_AUDIO, false));
15161517

15171518
customizeToolbarIcons();
15181519

@@ -1641,7 +1642,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
16411642
rangeBox.setPaging(rangeBox.movePaging(rangeBox.getPaging(), 1, true));
16421643
refreshMain();
16431644
} else if (itemId == jumpToPlotId) {
1644-
String moveToUniqueIdValue = preferences.getString(GeneralKeys.MOVE_TO_UNIQUE_ID, "");
1645+
String moveToUniqueIdValue = preferences.getString(PreferenceKeys.MOVE_TO_UNIQUE_ID, "");
16451646
if (moveToUniqueIdValue.equals("1")) {
16461647
moveToPlotID();
16471648
} else if (moveToUniqueIdValue.equals("2")) {
@@ -2506,11 +2507,11 @@ public SharedPreferences getPreference() {
25062507

25072508
@Override
25082509
public boolean isCyclingTraitsAdvances() {
2509-
return preferences.getBoolean(GeneralKeys.CYCLING_TRAITS_ADVANCES, false);
2510+
return preferences.getBoolean(PreferenceKeys.CYCLING_TRAITS_ADVANCES, false);
25102511
}
25112512

25122513
public boolean isReturnFirstTrait() {
2513-
return preferences.getBoolean(GeneralKeys.RETURN_FIRST_TRAIT, false);
2514+
return preferences.getBoolean(PreferenceKeys.RETURN_FIRST_TRAIT, false);
25142515
}
25152516

25162517
/**
@@ -2668,7 +2669,7 @@ public String queryForLabelValue(
26682669
try {
26692670

26702671
String labelValPref = ((CollectActivity) context).getPreferences()
2671-
.getString(GeneralKeys.LABELVAL_CUSTOMIZE, "value");
2672+
.getString(PreferenceKeys.LABELVAL_CUSTOMIZE, "value");
26722673
if (labelValPref == null) {
26732674
labelValPref = "value";
26742675
}

‎app/src/main/java/com/fieldbook/tracker/activities/ConfigActivity.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.fieldbook.tracker.fragments.ImportDBFragment;
3636
import com.fieldbook.tracker.objects.FieldObject;
3737
import com.fieldbook.tracker.preferences.GeneralKeys;
38+
import com.fieldbook.tracker.preferences.PreferenceKeys;
3839
import com.fieldbook.tracker.utilities.AppLanguageUtil;
3940
import com.fieldbook.tracker.utilities.ExportUtil;
4041
import com.fieldbook.tracker.utilities.FieldSwitchImpl;
@@ -122,7 +123,7 @@ public void onResume() {
122123
super.onResume();
123124

124125
if (systemMenu != null) {
125-
systemMenu.findItem(R.id.help).setVisible(preferences.getBoolean(GeneralKeys.TIPS, false));
126+
systemMenu.findItem(R.id.help).setVisible(preferences.getBoolean(PreferenceKeys.TIPS, false));
126127
}
127128

128129
invalidateOptionsMenu();
@@ -141,9 +142,9 @@ private void setCrashlyticsUserId() {
141142
*
142143
*/
143144
private void checkBrapiToken() {
144-
String token = preferences.getString(GeneralKeys.BRAPI_TOKEN, "");
145+
String token = preferences.getString(PreferenceKeys.BRAPI_TOKEN, "");
145146
if (!token.isEmpty()) {
146-
preferences.edit().putBoolean(GeneralKeys.BRAPI_ENABLED, true).apply();
147+
preferences.edit().putBoolean(PreferenceKeys.BRAPI_ENABLED, true).apply();
147148
}
148149
}
149150

@@ -201,13 +202,13 @@ private void firstRunSetup() {
201202

202203
SharedPreferences.Editor ed = preferences.edit();
203204

204-
Set<String> entries = preferences.getStringSet(GeneralKeys.TOOLBAR_CUSTOMIZE, new HashSet<>());
205+
Set<String> entries = preferences.getStringSet(PreferenceKeys.TOOLBAR_CUSTOMIZE, new HashSet<>());
205206
entries.add("search");
206207
entries.add("resources");
207208
entries.add("summary");
208209
entries.add("lockData");
209210

210-
ed.putStringSet(GeneralKeys.TOOLBAR_CUSTOMIZE, entries);
211+
ed.putStringSet(PreferenceKeys.TOOLBAR_CUSTOMIZE, entries);
211212
ed.apply();
212213

213214
// to disable App Intro for debug mode
@@ -350,7 +351,7 @@ private void loadScreen() {
350351
ImageListAdapter adapterImg = new ImageListAdapter(this, image_id, configList);
351352
settingsList.setAdapter(adapterImg);
352353

353-
mlkitEnabled = PreferenceManager.getDefaultSharedPreferences(this).getBoolean(GeneralKeys.MLKIT_PREFERENCE_KEY, false);
354+
mlkitEnabled = PreferenceManager.getDefaultSharedPreferences(this).getBoolean(PreferenceKeys.MLKIT_PREFERENCE_KEY, false);
354355

355356
barcodeSearchFab = findViewById(R.id.act_config_search_fab);
356357
barcodeSearchFab.setOnClickListener(v -> {
@@ -547,13 +548,13 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
547548

548549
if (highContrastThemeEnabled) {
549550
preferences.edit()
550-
.putString(GeneralKeys.THEME, String.valueOf(ThemedActivity.HIGH_CONTRAST))
551-
.putString(GeneralKeys.TEXT_THEME, String.valueOf(ThemedActivity.MEDIUM))
551+
.putString(PreferenceKeys.THEME, String.valueOf(ThemedActivity.HIGH_CONTRAST))
552+
.putString(PreferenceKeys.TEXT_THEME, String.valueOf(ThemedActivity.MEDIUM))
552553
.apply();
553554
} else {
554555
preferences.edit()
555-
.putString(GeneralKeys.THEME, String.valueOf(ThemedActivity.DEFAULT))
556-
.putString(GeneralKeys.TEXT_THEME, String.valueOf(ThemedActivity.MEDIUM))
556+
.putString(PreferenceKeys.THEME, String.valueOf(ThemedActivity.DEFAULT))
557+
.putString(PreferenceKeys.TEXT_THEME, String.valueOf(ThemedActivity.MEDIUM))
557558
.apply();
558559
}
559560

@@ -613,7 +614,7 @@ public void collectDataFilePermission() {
613614
public boolean onCreateOptionsMenu(Menu menu) {
614615
new MenuInflater(ConfigActivity.this).inflate(R.menu.menu_settings, menu);
615616
systemMenu = menu;
616-
systemMenu.findItem(R.id.help).setVisible(preferences.getBoolean(GeneralKeys.TIPS, false));
617+
systemMenu.findItem(R.id.help).setVisible(preferences.getBoolean(PreferenceKeys.TIPS, false));
617618
return true;
618619
}
619620

‎app/src/main/java/com/fieldbook/tracker/activities/DataGridActivity.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import com.fieldbook.tracker.database.models.ObservationModel
2323
import com.fieldbook.tracker.databinding.ActivityDataGridBinding
2424
import com.fieldbook.tracker.objects.TraitObject
2525
import com.fieldbook.tracker.preferences.GeneralKeys
26+
import com.fieldbook.tracker.preferences.PreferenceKeys
2627
import com.fieldbook.tracker.utilities.CategoryJsonUtil
2728
import com.fieldbook.tracker.utilities.CategoryJsonUtil.Companion.decode
2829
import com.fieldbook.tracker.utilities.Utils
@@ -201,7 +202,7 @@ class DataGridActivity : ThemedActivity(), CoroutineScope by MainScope(), ITable
201202

202203
val studyId = preferences.getInt(GeneralKeys.SELECTED_FIELD_ID, 0)
203204

204-
val showLabel = preferences.getString(GeneralKeys.LABELVAL_CUSTOMIZE, "value") == "value"
205+
val showLabel = preferences.getString(PreferenceKeys.LABELVAL_CUSTOMIZE, "value") == "value"
205206

206207
val uniqueHeader = preferences.getString(GeneralKeys.UNIQUE_NAME, "") ?: ""
207208

@@ -437,7 +438,7 @@ class DataGridActivity : ThemedActivity(), CoroutineScope by MainScope(), ITable
437438
private fun decodeValue(value: String): String {
438439

439440
val labelValPref: String =
440-
preferences.getString(GeneralKeys.LABELVAL_CUSTOMIZE, "value") ?: "value"
441+
preferences.getString(PreferenceKeys.LABELVAL_CUSTOMIZE, "value") ?: "value"
441442
val scale = decode(
442443
value
443444
)

‎app/src/main/java/com/fieldbook/tracker/activities/FieldDetailFragment.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import com.fieldbook.tracker.interfaces.FieldSyncController
3737
import com.fieldbook.tracker.objects.FieldObject
3838
import com.fieldbook.tracker.objects.ImportFormat
3939
import com.fieldbook.tracker.preferences.GeneralKeys
40+
import com.fieldbook.tracker.preferences.PreferenceKeys
4041
import com.fieldbook.tracker.traits.formats.Formats
4142
import com.fieldbook.tracker.utilities.ExportUtil
4243
import com.fieldbook.tracker.utilities.FileUtil
@@ -293,7 +294,7 @@ class FieldDetailFragment : Fragment(), FieldSyncController {
293294
if (importFormat == ImportFormat.BRAPI) {
294295
cardViewSync.visibility = View.VISIBLE
295296
cardViewSync.setOnClickListener {
296-
if (preferences.getBoolean(GeneralKeys.BRAPI_ENABLED, false)) {
297+
if (preferences.getBoolean(PreferenceKeys.BRAPI_ENABLED, false)) {
297298
if (BrAPIService.checkMatchBrapiUrl(requireContext(), field.exp_source)) {
298299
startSync(field)
299300
} else {

‎app/src/main/java/com/fieldbook/tracker/activities/FieldEditorActivity.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
import com.fieldbook.tracker.objects.FieldFileObject;
6565
import com.fieldbook.tracker.objects.FieldObject;
6666
import com.fieldbook.tracker.preferences.GeneralKeys;
67+
import com.fieldbook.tracker.preferences.PreferenceKeys;
6768
import com.fieldbook.tracker.utilities.ExportUtil;
6869
import com.fieldbook.tracker.utilities.FieldSwitchImpl;
6970
import com.fieldbook.tracker.utilities.SnackbarUtils;
@@ -195,7 +196,7 @@ public void onResume() {
195196
super.onResume();
196197

197198
if (systemMenu != null) {
198-
systemMenu.findItem(R.id.help).setVisible(preferences.getBoolean(GeneralKeys.TIPS, false));
199+
systemMenu.findItem(R.id.help).setVisible(preferences.getBoolean(PreferenceKeys.TIPS, false));
199200
}
200201

201202
queryAndLoadFields();
@@ -384,8 +385,8 @@ private void showFileDialog() {
384385
importArray[0] = getString(R.string.import_source_local);
385386
importArray[1] = getString(R.string.import_source_cloud);
386387
importArray[2] = getString(R.string.fields_new_create_field);
387-
if (preferences.getBoolean(GeneralKeys.BRAPI_ENABLED, false)) {
388-
String displayName = preferences.getString(GeneralKeys.BRAPI_DISPLAY_NAME, getString(R.string.brapi_edit_display_name_default));
388+
if (preferences.getBoolean(PreferenceKeys.BRAPI_ENABLED, false)) {
389+
String displayName = preferences.getString(PreferenceKeys.BRAPI_DISPLAY_NAME, getString(R.string.brapi_edit_display_name_default));
389390
importArray = Arrays.copyOf(importArray, importArray.length + 1);
390391
importArray[3] = displayName;
391392
}
@@ -430,7 +431,7 @@ public void onFieldCreated(int studyDbId) {
430431
}
431432
};
432433

433-
ListAddDialog dialog = new ListAddDialog(this, importArray, icons, onItemClickListener);
434+
ListAddDialog dialog = new ListAddDialog(this, R.string.fields_new_dialog_title, importArray, icons, onItemClickListener);
434435
dialog.show(getSupportFragmentManager(), "ListAddDialog");
435436
}
436437

@@ -454,7 +455,7 @@ public void loadLocal() {
454455
public void loadBrAPI() {
455456

456457
if (Utils.isConnected(this)) {
457-
if (prefs.getBoolean(GeneralKeys.EXPERIMENTAL_NEW_BRAPI_UI, true)) {
458+
if (prefs.getBoolean(PreferenceKeys.EXPERIMENTAL_NEW_BRAPI_UI, true)) {
458459
Intent intent = new Intent(this, BrapiStudyFilterActivity.class);
459460
BrapiFilterCache.Companion.checkClearCache(this);
460461
startActivityForResult(intent, REQUEST_BRAPI_IMPORT_ACTIVITY);
@@ -510,7 +511,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
510511
new MenuInflater(FieldEditorActivity.this).inflate(R.menu.menu_fields, menu);
511512

512513
systemMenu = menu;
513-
systemMenu.findItem(R.id.help).setVisible(preferences.getBoolean(GeneralKeys.TIPS, false));
514+
systemMenu.findItem(R.id.help).setVisible(preferences.getBoolean(PreferenceKeys.TIPS, false));
514515

515516
return true;
516517
}

0 commit comments

Comments
 (0)