Skip to content
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.

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

fix: dependabot dep issues #2253

Merged
merged 3 commits into from
Oct 11, 2021
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
33 changes: 16 additions & 17 deletions app/src/main/java/io/pslab/activity/WaveGeneratorActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.content.ContextCompat;

import android.util.DisplayMetrics;
import android.util.Log;
import android.view.GestureDetector;
Expand All @@ -49,6 +50,8 @@
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.snackbar.Snackbar;
import com.warkiz.widget.IndicatorSeekBar;
import com.warkiz.widget.OnSeekChangeListener;
import com.warkiz.widget.SeekParams;

import java.util.ArrayList;
import java.util.Date;
Expand Down Expand Up @@ -438,16 +441,14 @@ public void onClick(View view) {

monitorLongClicks(imgBtnUp, imgBtnDown);

seekBar.setOnSeekChangeListener(new IndicatorSeekBar.OnSeekBarChangeListener() {
seekBar.setOnSeekChangeListener(new OnSeekChangeListener() {
@Override
public void onProgressChanged(IndicatorSeekBar seekBar, int progress, float progressFloat, boolean fromUserTouch) {
public void onSeeking(SeekParams seekParams) {
String valueText;
switch (unit) {
case "\u00b0":
valueText = progress + unit;
break;
default:
valueText = progress + " " + unit;
if ("\u00b0".equals(unit)) {
valueText = seekParams.progress + unit;
} else {
valueText = seekParams.progress + " " + unit;
}

if (waveMonSelected) {
Expand All @@ -459,18 +460,13 @@ public void onProgressChanged(IndicatorSeekBar seekBar, int progress, float prog
}

@Override
public void onSectionChanged(IndicatorSeekBar seekBar, int thumbPosOnTick, String textBelowTick, boolean fromUserTouch) {
//do nothing
}

@Override
public void onStartTrackingTouch(IndicatorSeekBar seekBar, int thumbPosOnTick) {
//do nothing
public void onStartTrackingTouch(IndicatorSeekBar seekBar) {
// Unused method override
}

@Override
public void onStopTrackingTouch(IndicatorSeekBar seekBar) {
//do nothing
// Unused method override
}
});

Expand Down Expand Up @@ -911,7 +907,10 @@ private void setSeekBar(IndicatorSeekBar seekBar) {
numTicks = 51;
leastCount = 1;
}
seekBar.getBuilder().setMin(seekMin).setMax(seekMax).setTickNum(numTicks).apply();

seekBar.setMin(seekMin);
seekBar.setMax(seekMax);
seekBar.setTickCount(numTicks);

if (!waveMonSelected) {
waveMonPropSelect.setText("");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.pslab.others;

import com.github.mikephil.charting.components.AxisBase;
import com.github.mikephil.charting.formatter.IAxisValueFormatter;
import com.github.mikephil.charting.formatter.ValueFormatter;

import java.util.ArrayList;

public class LogicAnalyzerAxisFormatter implements IAxisValueFormatter {
public class LogicAnalyzerAxisFormatter extends ValueFormatter {

private ArrayList<String> laChannelNames;

Expand Down
11 changes: 5 additions & 6 deletions app/src/main/res/layout/wave_generator_seekbar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,17 @@

<com.warkiz.widget.IndicatorSeekBar
android:id="@+id/seek_bar_wave_gen"
android:layout_width="@dimen/dimen_zero_dp"
android:layout_height="@dimen/seekbar_height_wave"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/seekbar_margin"
android:layout_marginBottom="@dimen/seekbar_margin"
android:layout_weight="1"
app:isb_max="5000"
app:isb_min="0"
app:isb_seek_bar_type="discrete_ticks"
app:isb_show_indicator="false"
app:isb_show_indicator="none"
app:isb_thumb_color="@color/colorPrimary"
app:isb_tick_color="@color/colorPrimary"
app:isb_tick_num="51" />
app:isb_tick_marks_color="@color/colorPrimary"
app:isb_ticks_count="51" />


<ImageButton
Expand Down
32 changes: 16 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,31 @@ ext {
compileSdkVersion = 28

// App dependencies
supportLibraryVersion = '28.0.0'
picassoVersion = '2.5.2'
androidAboutPageVersion = '1.2.5'
atvVersion = '1.2.9'
butterKnifeVersion = '10.2.3'
carouselPickerVersion = '1.2'
circleImageViewVersion = '3.1.0'
mpAndroidChartVersion = 'v3.0.3'
commonMathVersion = '3.6.1'
commonLangVersion = '3.5'
materialDialogsVersion = '0.9.6.0'
navTabStripVersion = '1.0.4'
commonMathVersion = '3.6.1'
constraintLayoutVersion = '2.0.4'
atvVersion = '1.2.9'
androidAboutPageVersion = '1.2.5'
markDownViewVersion = '0.19.0'
searchDialogVersion = '1.1'
crollerVersion = '1.0.7'
knobLibraryVersion = '1.9.0'
seekBarLibraryVersion = '1.2.9'
carouselPickerVersion = '1.2'
speedView = '1.2.0'
realmAdapter = '4.0.0'
markDownViewVersion = '0.19.0'
materialDialogsVersion = '0.9.6.0'
mpAndroidChartVersion = 'v3.1.0'
navTabStripVersion = '1.0.4'
okHttpVersion = '4.0.1'
picassoVersion = '2.5.2'
realmAdapter = '4.0.0'
searchDialogVersion = '1.2.4'
seekBarLibraryVersion = '2.1.2'
speedView = '1.5.52'
supportLibraryVersion = '28.0.0'

// Map related versions
osmVersion = '5.1'
mapsforgeVersion = '6.0.2'
osmVersion = '6.1.11'
mapsforgeVersion = '6.1.11'
geoPackageVersion = '6.1.11'
googleMapsVersion = '17.0.1'

Expand Down