Skip to content

Commit

Permalink
Updated version, changelog, minor layout changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@trife
trife committed Sep 27, 2021
1 parent d38810a commit 355307b
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 68 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ android {
//link square api has minimum requirement of 21
minSdkVersion 21
targetSdkVersion 30
versionCode 4
versionName "1.0.1"
versionCode 5
versionName "1.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/list_item_sample.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/sampleName"
app:layout_constraintBottom_toTopOf="@id/sampleDate"/>
app:layout_constraintBottom_toBottomOf="parent"/>

<TextView style="@style/Text.ExperimentTitle"
android:id="@+id/sampleName"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/list_item_scan.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_margin="4dp"
android:background="@drawable/cell">

<TextView
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/raw/changelog.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
<changelog>
<release versionCode="5" versionName="v1.1.0" date="2021-09-27">
<new>Updated experiment and sample sort options</new>
<new>Updated UI and optimized graphing</new>
<new>Added notification sounds</new>
<new>New option to set target number of scans</new>
<new>New option to create sample directly from barcode</new>
<bugfix>Minor bug fixes</bugfix>
</release>

<release versionCode="4" versionName="v1.0.1" date="2021-06-24">
<new>App intro added</new>
<bugfix>Minor bug fixes</bugfix>
Expand Down
133 changes: 69 additions & 64 deletions app/src/main/res/xml/preferences.xml
View file
Original file line number Diff line number Diff line change
@@ -1,134 +1,139 @@
<?xml version="1.0" encoding="utf-8"?>

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" >
xmlns:app="http://schemas.android.com/apk/res-auto">

<PreferenceCategory
android:title="@string/preferences_profile_title"
app:iconSpaceReserved="false">

<EditTextPreference
android:icon="@drawable/ic_setting_person"
android:key="org.phenoapps.prospector.OPERATOR"
android:title="@string/pref_operator_title"
android:key="org.phenoapps.prospector.OPERATOR" />
app:useSimpleSummaryProvider="true" />

<!-- <ListPreference-->
<!-- android:icon="@drawable/ic_nv_export"-->
<!-- android:title="@string/pref_export_type"-->
<!-- android:defaultValue="0"-->
<!-- android:key="org.phenoapps.prospector.EXPORT_TYPE"-->
<!-- android:entryValues="@array/export_indices_array"-->
<!-- android:entries="@array/export_types_array"/>-->
<!-- <ListPreference-->
<!-- android:icon="@drawable/ic_nv_export"-->
<!-- android:title="@string/pref_export_type"-->
<!-- android:defaultValue="0"-->
<!-- android:key="org.phenoapps.prospector.EXPORT_TYPE"-->
<!-- android:entryValues="@array/export_indices_array"-->
<!-- android:entries="@array/export_types_array"/>-->

</PreferenceCategory>

<PreferenceCategory android:title="@string/pref_cat_workflow_title"
<PreferenceCategory
android:title="@string/pref_cat_workflow_title"
app:iconSpaceReserved="false">

<CheckBoxPreference android:defaultValue="false"
android:key="@string/key_pref_workflow_new_sample_by_scan"
<CheckBoxPreference
android:defaultValue="false"
android:icon="@drawable/ic_barcode_scan"
android:title="@string/pref_workflow_new_sample_by_scan_title"
android:summary="@string/pref_workflow_new_sample_by_scan_summary"/>
android:key="@string/key_pref_workflow_new_sample_by_scan"
android:summary="@string/pref_workflow_new_sample_by_scan_summary"
android:title="@string/pref_workflow_new_sample_by_scan_title" />

<EditTextPreference android:defaultValue=""
android:key="@string/key_pref_target_scan"
<EditTextPreference
android:defaultValue=""
android:icon="@drawable/ic_bullseye_arrow"
android:title="@string/pref_workflow_target_title"
android:summary="@string/pref_workflow_target_summary"/>
android:key="@string/key_pref_target_scan"
android:summary="@string/pref_workflow_target_summary"
android:title="@string/pref_workflow_target_title" />

<CheckBoxPreference android:defaultValue="true"
android:key="@string/key_pref_audio_enabled"
<CheckBoxPreference
android:defaultValue="true"
android:icon="@drawable/ic_bell"
android:title="@string/pref_workflow_audio_title"
android:summary="@string/pref_workflow_audio_summary"/>
android:key="@string/key_pref_audio_enabled"
android:summary="@string/pref_workflow_audio_summary"
android:title="@string/pref_workflow_audio_title" />

</PreferenceCategory>

<PreferenceCategory
android:key="org.phenoapps.prospector.DEVICE_INFO"
android:title="@string/pref_scanning_title"
android:summary=""
android:title="@string/pref_scanning_title"
app:iconSpaceReserved="false">

<Preference
android:title="@string/pref_device_type"
android:key="org.phenoapps.prospector.DEVICE_TYPE"/>
android:key="org.phenoapps.prospector.DEVICE_TYPE"
android:title="@string/pref_device_type" />

<!-- <ListPreference-->
<!-- android:title="@string/pref_wifi_mode"-->
<!-- android:key="org.phenoapps.prospector.DEVICE_WIFI_MODE"-->
<!-- android:entries="@array/device_wifi_mode_indices"-->
<!-- android:entryValues="@array/device_wifi_mode"-->
<!-- android:defaultValue="0"/>-->
<!-- <ListPreference-->
<!-- android:title="@string/pref_wifi_mode"-->
<!-- android:key="org.phenoapps.prospector.DEVICE_WIFI_MODE"-->
<!-- android:entries="@array/device_wifi_mode_indices"-->
<!-- android:entryValues="@array/device_wifi_mode"-->
<!-- android:defaultValue="0"/>-->

<!-- <EditTextPreference-->
<!-- android:key="org.phenoapps.prospector.DEVICE_ALIAS"-->
<!-- android:title="@string/pref_device_alias"-->
<!-- android:summary="@string/pref_device_alias_summary" />-->
<!-- <EditTextPreference-->
<!-- android:key="org.phenoapps.prospector.DEVICE_ALIAS"-->
<!-- android:title="@string/pref_device_alias"-->
<!-- android:summary="@string/pref_device_alias_summary" />-->

<EditTextPreference
android:defaultValue="@string/pref_device_default_ip"
android:icon="@drawable/ic_settings_input_antenna_black_18dp"
android:key="org.phenoapps.prospector.DEVICE_IP"
android:title="@string/pref_device_ip"
android:defaultValue="@string/pref_device_default_ip"
android:summary="@string/pref_device_ip_summary" />
android:summary="@string/pref_device_ip_summary"
android:title="@string/pref_device_ip" />

<!-- <EditTextPreference-->
<!-- android:icon="@drawable/ic_settings_input_svideo_black_18dp"-->
<!-- android:key="org.phenoapps.prospector.DEVICE_PORT"-->
<!-- android:title="@string/pref_device_port"-->
<!-- android:defaultValue="@string/pref_device_default_port"-->
<!-- android:summary="@string/pref_device_port_summary" />-->
<!-- <EditTextPreference-->
<!-- android:icon="@drawable/ic_settings_input_svideo_black_18dp"-->
<!-- android:key="org.phenoapps.prospector.DEVICE_PORT"-->
<!-- android:title="@string/pref_device_port"-->
<!-- android:defaultValue="@string/pref_device_default_port"-->
<!-- android:summary="@string/pref_device_port_summary" />-->

<SeekBarPreference
android:defaultValue="1"
android:icon="@drawable/ic_wb_iridescent_24px"
android:key="org.phenoapps.prospector.LED_FRAMES"
android:title="@string/pref_led_frames_title"
android:max="8"
android:defaultValue="1"
app:showSeekBarValue="true"
android:summary="@string/pref_led_frames_summary"/>
android:summary="@string/pref_led_frames_summary"
android:title="@string/pref_led_frames_title"
app:showSeekBarValue="true" />

<SeekBarPreference
android:defaultValue="1"
android:icon="@drawable/ic_wb_incandescent_24px"
android:key="org.phenoapps.prospector.BULB_FRAMES"
android:title="@string/pref_bulb_frames_title"
android:max="8"
android:defaultValue="1"
app:showSeekBarValue="true"
android:summary="@string/pref_led_frames_summary"/>
android:summary="@string/pref_led_frames_summary"
android:title="@string/pref_bulb_frames_title"
app:showSeekBarValue="true" />

<SwitchPreference
android:defaultValue="true"
android:key="org.phenoapps.prospector.CONVERT_TO_WAVELENGTHS"
android:title="@string/pref_convert_wavelengths_title"
android:summary="@string/pref_convert_wavelengths_summary"/>
android:summary="@string/pref_convert_wavelengths_summary"
android:title="@string/pref_convert_wavelengths_title" />
</PreferenceCategory>

<PreferenceCategory
android:key="org.phenoapps.prospector.DEVICE_IOT"
android:enabled="true"
android:title="@string/pref_iot_title"
android:key="org.phenoapps.prospector.DEVICE_IOT"
android:summary="@string/pref_iot_summary"
android:title="@string/pref_iot_title"
app:iconSpaceReserved="false">

<EditTextPreference
android:key="org.phenoapps.prospector.DEVICE_SSID"
android:title="@string/pref_device_ssid"
android:icon="@drawable/ic_wifi"
android:summary="@string/pref_device_ssid_summary" />
android:key="org.phenoapps.prospector.DEVICE_SSID"
android:summary="@string/pref_device_ssid_summary"
android:title="@string/pref_device_ssid" />

<EditTextPreference
android:key="org.phenoapps.prospector.DEVICE_PASSWORD"
android:inputType="textPassword"
android:icon="@drawable/ic_lock"
android:title="@string/pref_device_password"/>
android:inputType="textPassword"
android:key="org.phenoapps.prospector.DEVICE_PASSWORD"
android:title="@string/pref_device_password" />

<Preference
android:key="org.phenoapps.prospector.DEVICE_IOT_LIST"
android:icon="@drawable/ic_connection"
android:title="@string/pref_device_iot_list"/>
android:key="org.phenoapps.prospector.DEVICE_IOT_LIST"
android:title="@string/pref_device_iot_list" />

</PreferenceCategory>

Expand Down

0 comments on commit 355307b

Please sign in to comment.