Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ dependencies {
def room_version = "2.7.1"

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
annotationProcessor "androidx.room:room-compiler:$room_version"
androidTestImplementation "androidx.work:work-testing:$work_version"

Expand All @@ -152,8 +152,8 @@ dependencies {
implementation 'androidx.fragment:fragment:1.8.8'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
implementation 'androidx.navigation:navigation-fragment:2.9.2'
implementation 'androidx.navigation:navigation-ui:2.9.2'
implementation 'androidx.navigation:navigation-fragment:2.9.3'
implementation 'androidx.navigation:navigation-ui:2.9.3'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.recyclerview:recyclerview:1.4.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public class Iperf3Fragment extends Fragment {
private TextInputEditText duration;
private TextInputEditText interval;
private TextInputEditText bytes;
private TextInputEditText streams;
private TextInputEditText parallel;
private TextInputEditText cport;


Expand Down Expand Up @@ -151,7 +151,7 @@ private void setupTextWatchers() {
duration.addTextChangedListener(createTextWatcher(s -> iperf3Input.getParameter().setTime(Integer.parseInt("0"+s)), Iperf3Parameter.TIME));
interval.addTextChangedListener(createTextWatcher(s -> iperf3Input.getParameter().setInterval(Double.parseDouble("0"+s)), Iperf3Parameter.INTERVAL));
bytes.addTextChangedListener(createTextWatcher(s -> iperf3Input.getParameter().setBytes(s), Iperf3Parameter.BYTES));
streams.addTextChangedListener(createTextWatcher(s -> iperf3Input.getParameter().setParallel(Integer.parseInt("0"+s)), Iperf3Parameter.PARALLEL));
parallel.addTextChangedListener(createTextWatcher(s -> iperf3Input.getParameter().setParallel(Integer.parseInt("0"+s)), Iperf3Parameter.PARALLEL));
cport.addTextChangedListener(createTextWatcher(s -> iperf3Input.getParameter().setCport(Integer.parseInt("0"+s) ), Iperf3Parameter.CPORT));
}

Expand Down Expand Up @@ -256,7 +256,7 @@ private void setTextsFromSharedPreferences(){
setTextFromSharedPreferences(duration, Iperf3Parameter.TIME);
setTextFromSharedPreferences(interval, Iperf3Parameter.INTERVAL);
setTextFromSharedPreferences(bytes, Iperf3Parameter.BYTES);
setTextFromSharedPreferences(streams, Iperf3Parameter.STREAMS);
setTextFromSharedPreferences(parallel, Iperf3Parameter.PARALLEL);
setTextFromSharedPreferences(cport, Iperf3Parameter.CPORT);
}

Expand Down Expand Up @@ -347,7 +347,7 @@ public void onClick(View view) {
duration = view.findViewById(R.id.iperf3_duration);
interval = view.findViewById(R.id.iperf3_interval);
bytes = view.findViewById(R.id.iperf3_bytes);
streams = view.findViewById(R.id.iperf3_streams);
parallel = view.findViewById(R.id.iperf3_parallel);
cport = view.findViewById(R.id.iperf3_cport);


Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_iperf3_input.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<com.google.android.material.textfield.TextInputLayout style="@style/iperf3TextInputLayout">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/iperf3_streams"
android:id="@+id/iperf3_parallel"
style="@style/iperf3TextInputEditText"
android:hint="Streams"
android:inputType="number" />
Expand Down