Skip to content

fix: osc main screen ui changes #1955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2019
Merged

fix: osc main screen ui changes #1955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/src/main/java/io/pslab/activity/OscilloscopeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,17 +764,17 @@ public void onWindowFocusChanged() {
RelativeLayout.LayoutParams frameLayoutParams = (RelativeLayout.LayoutParams) frameLayout.getLayoutParams();
if (getResources().getBoolean(R.bool.isTablet)) {
lineChartParams.height = height * 3 / 4;
lineChartParams.width = width * 7 / 8;
lineChartParams.width = width * 9 / 10;
mChartLayout.setLayoutParams(lineChartParams);
frameLayoutParams.height = height / 4;
frameLayoutParams.width = width * 7 / 8;
frameLayoutParams.width = width * 9 / 10;
frameLayout.setLayoutParams(frameLayoutParams);
} else {
lineChartParams.height = height * 3 / 5;
lineChartParams.width = width * 5 / 6;
lineChartParams.width = width * 7 / 8;
mChartLayout.setLayoutParams(lineChartParams);
frameLayoutParams.height = height * 2 / 5;
frameLayoutParams.width = width * 5 / 6;
frameLayoutParams.width = width * 7 / 8;
frameLayout.setLayoutParams(frameLayoutParams);
}
}
Expand Down
85 changes: 31 additions & 54 deletions app/src/main/java/io/pslab/fragment/ChannelParametersFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import io.pslab.DataFormatter;
import io.pslab.R;
import io.pslab.activity.OscilloscopeActivity;
import io.pslab.others.NothingSelectedSpinnerAdapter;

public class ChannelParametersFragment extends Fragment {

Expand All @@ -30,13 +29,11 @@ public class ChannelParametersFragment extends Fragment {
private CheckBox checkBoxCH1;
private CheckBox checkBoxCH2;
private CheckBox checkBoxCH3;
private CheckBox checkBoxMIC;
private Spinner spinnerRangeCh1;
private Spinner spinnerRangeCh2;
private Spinner spinnerChannelSelect;
private Spinner spinnerMICSelect;
private int micSelectedPosition;

private CheckBox builtInMicCheckBox;
private CheckBox pslabMicCheckBox;

public static ChannelParametersFragment newInstance() {
return new ChannelParametersFragment();
Expand All @@ -56,15 +53,15 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
spinnerRangeCh1 = v.findViewById(R.id.spinner_range_ch1_cp);
spinnerRangeCh2 = v.findViewById(R.id.spinner_range_ch2_cp);
spinnerChannelSelect = v.findViewById(R.id.spinner_channel_select_cp);
spinnerMICSelect = v.findViewById(R.id.spinner_mic_select_cp);

boolean tabletSize = getResources().getBoolean(R.bool.isTablet);
checkBoxCH1 = v.findViewById(R.id.checkBox_ch1_cp);
checkBoxCH2 = v.findViewById(R.id.checkBox_ch2_cp);
checkBoxCH3 = v.findViewById(R.id.checkBox_ch3_cp);
checkBoxCH3.setText(getString(R.string.ch3_value, 3.3));
checkBoxMIC = v.findViewById(R.id.checkBox_mic_cp);

builtInMicCheckBox = v.findViewById(R.id.built_in_mic_cb);
pslabMicCheckBox = v.findViewById(R.id.pslab_mic_cb);
ArrayAdapter<String> rangesAdapter;
ArrayAdapter<String> channelsAdapter;
ArrayAdapter<String> micsAdapter;
Expand All @@ -88,9 +85,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
spinnerRangeCh2.setSelection(rangesAdapter.getPosition("+/-16V"), true);
spinnerChannelSelect.setAdapter(channelsAdapter);
spinnerChannelSelect.setSelection(channelsAdapter.getPosition("CH1"), true);
spinnerMICSelect.setAdapter(new NothingSelectedSpinnerAdapter(micsAdapter,
R.layout.nothing_selected_spinner_row,
getActivity()));

spinnerRangeCh1.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
Expand Down Expand Up @@ -220,31 +214,6 @@ public void onNothingSelected(AdapterView<?> parent) {
}
});

spinnerMICSelect.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
micSelectedPosition = position;
if (position == 1) {
((OscilloscopeActivity) getActivity()).isInBuiltMicSelected = false;
if (checkBoxMIC.isChecked()) {
((OscilloscopeActivity) getActivity()).isMICSelected = true;
((OscilloscopeActivity) getActivity()).isAudioInputSelected = true;
}
} else {
((OscilloscopeActivity) getActivity()).isMICSelected = false;
if (checkBoxMIC.isChecked()) {
((OscilloscopeActivity) getActivity()).isInBuiltMicSelected = true;
((OscilloscopeActivity) getActivity()).isAudioInputSelected = true;
}
}
}

@Override
public void onNothingSelected(AdapterView<?> parent) {

}
});

checkBoxCH1.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
Expand All @@ -265,29 +234,37 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
((OscilloscopeActivity) getActivity()).isCH3Selected = isChecked;
}
});
checkBoxMIC.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
builtInMicCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (micSelectedPosition == 1) {
((OscilloscopeActivity) getActivity()).isAudioInputSelected = isChecked;
((OscilloscopeActivity) getActivity()).isMICSelected = isChecked;
} else if (micSelectedPosition == 2) {
((OscilloscopeActivity) getActivity()).isAudioInputSelected = isChecked;
// check for RECORD_AUDIO permission if has then change boolean
if (isChecked)
if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
requestPermissions(new String[]{Manifest.permission.RECORD_AUDIO}, RECORD_AUDIO_REQUEST_CODE);
} else {
((OscilloscopeActivity) getActivity()).isInBuiltMicSelected = true;
}
else
((OscilloscopeActivity) getActivity()).isInBuiltMicSelected = false;
} else {
((OscilloscopeActivity) getActivity()).isAudioInputSelected = false;
((OscilloscopeActivity) getActivity()).isInBuiltMicSelected = isChecked;
((OscilloscopeActivity) getActivity()).isAudioInputSelected = isChecked;
((OscilloscopeActivity) getActivity()).isMICSelected = !isChecked;
if (isChecked) {
pslabMicCheckBox.setChecked(false);
if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
requestPermissions(new String[]{Manifest.permission.RECORD_AUDIO}, RECORD_AUDIO_REQUEST_CODE);
((OscilloscopeActivity) getActivity()).isAudioInputSelected = false;
}
}
}
});

pslabMicCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
((OscilloscopeActivity) getActivity()).isMICSelected = isChecked;
((OscilloscopeActivity) getActivity()).isAudioInputSelected = isChecked;
((OscilloscopeActivity) getActivity()).isInBuiltMicSelected = !isChecked;
if (isChecked) {
builtInMicCheckBox.setChecked(false);
if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
requestPermissions(new String[]{Manifest.permission.RECORD_AUDIO}, RECORD_AUDIO_REQUEST_CODE);
((OscilloscopeActivity) getActivity()).isAudioInputSelected = false;
}
}
}
});
return v;
}

Expand All @@ -298,8 +275,8 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
((OscilloscopeActivity) getActivity()).isInBuiltMicSelected = true;
} else {
Toast.makeText(getActivity(), "This feature won't work.", Toast.LENGTH_SHORT).show();
if (checkBoxMIC.isChecked())
checkBoxMIC.toggle();
if (builtInMicCheckBox.isChecked())
builtInMicCheckBox.toggle();
}
}
}
Expand Down
113 changes: 60 additions & 53 deletions app/src/main/res/layout-sw600dp/fragment_channel_parameters.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
Expand All @@ -10,11 +9,10 @@
android:id="@+id/checkBox_ch1_cp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginStart="@dimen/osc_cb_margin2"
android:layout_marginTop="@dimen/osc_cb_margin2"
android:text="@string/label_ch1"
android:textSize="18sp"
android:textSize="@dimen/osc_text_size_large"
android:textStyle="normal|bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand All @@ -23,11 +21,10 @@
android:id="@+id/checkBox_ch2_cp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginBottom="@dimen/osc_cb_margin2"
android:layout_marginStart="@dimen/osc_cb_margin2"
android:text="@string/label_ch2"
android:textSize="18sp"
android:textSize="@dimen/osc_text_size_large"
android:textStyle="normal|bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
Expand All @@ -36,103 +33,113 @@
android:id="@+id/checkBox_ch3_cp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="@dimen/osc_cb_margin2"
android:layout_marginTop="@dimen/osc_cb_margin2"
android:text="@string/ch3_value"
android:textSize="18sp"
android:textSize="@dimen/osc_text_size_large"
android:textStyle="normal|bold"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintEnd_toStartOf="@id/mic_radio_group"
app:layout_constraintStart_toEndOf="@id/spinner_channel_select_cp"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_range1_cp"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_height="@dimen/osc_tv_height"
android:layout_marginStart="@dimen/osc_cb_margin2"
android:layout_marginTop="@dimen/osc_cb_margin2"
android:gravity="center_vertical"
android:text="@string/range"
android:textColor="@color/cardview_dark_background"
android:textSize="18sp"
android:textSize="@dimen/osc_text_size_large"
app:layout_constraintLeft_toRightOf="@+id/checkBox_ch1_cp"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_range2_cp"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginBottom="16dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_height="@dimen/osc_tv_height"
android:layout_marginBottom="@dimen/osc_cb_margin2"
android:layout_marginStart="@dimen/osc_cb_margin2"
android:gravity="fill_vertical"
android:text="@string/range"
android:textColor="@color/cardview_dark_background"
android:textSize="18sp"
android:textSize="@dimen/osc_text_size_large"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/checkBox_ch2_cp" />

<Spinner
android:id="@+id/spinner_range_ch2_cp"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_height="@dimen/osc_spinner_height"
android:layout_marginBottom="@dimen/osc_cb_margin"
android:layout_marginStart="@dimen/osc_cb_margin2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/tv_range2_cp" />

<Spinner
android:id="@+id/spinner_channel_select_cp"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_height="@dimen/osc_spinner_height"
android:layout_marginStart="@dimen/osc_cb_margin2"
android:layout_marginTop="@dimen/osc_cb_margin"
app:layout_constraintLeft_toRightOf="@+id/spinner_range_ch1_cp"
app:layout_constraintTop_toTopOf="parent" />

<Spinner
android:id="@+id/spinner_range_ch1_cp"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_height="@dimen/osc_spinner_height"
android:layout_marginStart="@dimen/osc_cb_margin2"
android:layout_marginTop="@dimen/osc_cb_margin"
app:layout_constraintLeft_toRightOf="@+id/tv_range1_cp"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_ch2_cp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginBottom="@dimen/text_elevation"
android:layout_marginStart="@dimen/osc_cb_margin2"
android:clickable="true"
android:text="@string/label_ch2"
android:textColor="@android:color/background_dark"
android:textSize="18sp"
android:textSize="@dimen/osc_text_size_large"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/spinner_range_ch2_cp" />

<CheckBox
<RadioGroup
android:id="@+id/mic_radio_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/checkBox_mic_cp"
app:layout_constraintLeft_toLeftOf="@+id/checkBox_ch3_cp"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="16dp" />

<Spinner
android:layout_width="0dp"
android:layout_height="48dp"
android:id="@+id/spinner_mic_select_cp"
app:layout_constraintLeft_toRightOf="@+id/checkBox_mic_cp"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="8dp" />
android:layout_marginTop="@dimen/osc_cb_margin2"
android:layout_marginEnd="@dimen/osc_cb_margin2"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">

<CheckBox
android:id="@+id/built_in_mic_cb"
style="@style/Base.Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/osc_tv_margin"
android:text="@string/built_in_mic_option"
android:textSize="@dimen/osc_text_size_large"
android:textStyle="normal|bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toLeftOf="@id/pslab_mic_cb" />

<CheckBox
android:id="@+id/pslab_mic_cb"
style="@style/Base.Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pslab_mic_option"
android:textSize="@dimen/osc_text_size_large"
android:textStyle="normal|bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />

</RadioGroup>
</android.support.constraint.ConstraintLayout>
Loading