Skip to content

Commit 65b71bc

Browse files
committed
temp commit
Signed-off-by: Andrey Parfenov <a1994ndrey@gmail.com>
1 parent 8c731c5 commit 65b71bc

8 files changed

Lines changed: 8 additions & 74 deletions

File tree

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/example/brainflowplot/SettingsActivity.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,7 @@ public void prepareSession(View view) {
6262
// do nothing
6363
}
6464
String dataType = prefs.getString(getString(R.string.data_type_key), "");
65-
boolean use_timeseries = prefs.getBoolean(getString(R.string.plot_timeseries_key), true);
66-
boolean use_psd = prefs.getBoolean(getString(R.string.plot_psd_key), true);
67-
boolean use_bandpower = prefs.getBoolean(getString(R.string.plot_bandpower_key), true);
6865

69-
if ((!use_bandpower) && (!use_psd) && (!use_timeseries)) {
70-
text = "No widgets selected";
71-
duration = Toast.LENGTH_LONG;
72-
toast = Toast.makeText(context, text, duration);
73-
toast.show();
74-
isTryingToConnect = false;
75-
return;
76-
}
7766
try {
7867
BrainFlowInputParams params = new BrainFlowInputParams();
7968
params.ip_address = ipAddr;

app/src/main/res/values-w820dp/dimens.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

app/src/main/res/values/colors.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<color name="colorPrimary">#6200EE</color>
44
<color name="colorPrimaryDark">#3700B3</color>
55
<color name="colorAccent">#03DAC5</color>
6-
<color name="white">#000000</color>
6+
<color name="black">#000000</color>
77
</resources>

app/src/main/res/values/dimens.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

app/src/main/res/values/strings.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,9 @@
2727
<string name="data_type_title">Signal Type</string>
2828
<string name="data_type_key">data_type_key</string>
2929

30-
<string name="plot_timeseries_title">Plot Signal</string>
31-
<string name="plot_timeseries_key">time_series_key</string>
32-
<string name="plot_timeseries_on">Plot EXG data in realtime</string>
33-
<string name="plot_timeseries_off">Don\'t plot EXG data</string>
34-
35-
<string name="plot_psd_title">Plot PSD</string>
36-
<string name="plot_psd_key">plot_psd_key</string>
37-
<string name="plot_psd_on">Plot PSD in realtime</string>
38-
<string name="plot_psd_off">Don\'t plot PSD</string>
39-
40-
<string name="plot_bandpower_title">Plot BandPowers</string>
41-
<string name="plot_bandpower_key">plot_bandpower_key</string>
42-
<string name="plot_bandpower_on">Plot BandPowers in realtime</string>
43-
<string name="plot_bandpower_off">Don\'t plot BandPowers</string>
44-
4530
<string name="submit_button">SUBMIT</string>
4631
<string name="submit_summary">Configure parameters above and submit settings to start</string>
4732
<string name="submit_key">submit_key</string>
4833
<string name="title_activity_data">DataActivity</string>
49-
<string name="tab_text_1">Tab 1</string>
50-
<string name="tab_text_2">Tab 2</string>
5134

5235
</resources>

app/src/main/res/values/styles.xml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,7 @@
1010
<style name="PreferenceStartTheme" parent="Widget.AppCompat.Button.Colored">
1111
<!-- Customize your theme here. -->
1212
<item name="colorButtonNormal">@color/colorAccent</item>
13-
<item name="android:textColor">@color/white</item>
13+
<item name="android:textColor">@color/black</item>
1414
</style>
1515

16-
<style name="AppTheme.NoActionBar">
17-
<item name="windowActionBar">false</item>
18-
<item name="windowNoTitle">true</item>
19-
</style>
20-
21-
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
22-
23-
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
24-
2516
</resources>

app/src/main/res/xml/root_preferences.xml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,6 @@
3535
app:defaultValue="EEG"
3636
app:useSimpleSummaryProvider="true"/>
3737

38-
<SwitchPreferenceCompat
39-
app:key="@string/plot_timeseries_key"
40-
app:defaultValue="true"
41-
app:title="@string/plot_timeseries_title"
42-
app:summaryOn="@string/plot_timeseries_on"
43-
app:summaryOff="@string/plot_timeseries_off"/>
44-
45-
<SwitchPreferenceCompat
46-
app:key="@string/plot_psd_key"
47-
app:defaultValue="true"
48-
app:title="@string/plot_psd_title"
49-
app:summaryOn="@string/plot_psd_on"
50-
app:summaryOff="@string/plot_psd_off"/>
51-
52-
<SwitchPreferenceCompat
53-
app:key="@string/plot_bandpower_key"
54-
app:defaultValue="false"
55-
app:title="@string/plot_bandpower_title"
56-
app:summaryOn="@string/plot_bandpower_on"
57-
app:summaryOff="@string/plot_bandpower_off"/>
58-
5938
</PreferenceCategory>
6039

6140
</PreferenceScreen>

0 commit comments

Comments
 (0)