I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Upgrade Android dependencies

Browse Source
This commit is contained in:
str4d
2017-03-27 00:40:05 +00:00
parent 8230769191
commit 0fb1ef881c
3 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/build.gradle
View File

@ -65,15 +65,13 @@ dependencies {
compile "com.android.support:recyclerview-v7:$supportVersion" compile "com.android.support:recyclerview-v7:$supportVersion"
// Remote dependencies // Remote dependencies
compile 'com.androidplot:androidplot-core:0.9.8' compile 'com.androidplot:androidplot-core:1.4.1'
compile 'com.eowise:recyclerview-stickyheaders:0.5.2@aar' compile 'com.eowise:recyclerview-stickyheaders:0.5.2@aar'
compile ('com.mcxiaoke.viewpagerindicator:library:2.4.1') { compile 'com.inkapplications.viewpageindicator:library:2.4.4'
exclude group: 'com.android.support', module: 'support-v4'
}
compile 'com.pnikosis:materialish-progress:1.7' compile 'com.pnikosis:materialish-progress:1.7'
compile 'net.i2p:router:0.9.28' compile 'net.i2p:router:0.9.28'
compile 'net.i2p.android.ext:floatingactionbutton:1.10.1' compile 'net.i2p.android.ext:floatingactionbutton:1.10.1'
compile 'org.sufficientlysecure:html-textview:1.6' compile 'org.sufficientlysecure:html-textview:3.1'
// Testing-only dependencies // Testing-only dependencies
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2' androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
@ -86,13 +84,13 @@ dependencyVerification {
'com.android.support:preference-v7:0eede78cace2404e107886a4eaf11c4b895df949a4f1deee58e2e60e25c73dd2', 'com.android.support:preference-v7:0eede78cace2404e107886a4eaf11c4b895df949a4f1deee58e2e60e25c73dd2',
'com.android.support:preference-v14:19d384a0476cf6e03fc857a29c3d7f2055c701f828b502c78e80b66b2bfe5ef4', 'com.android.support:preference-v14:19d384a0476cf6e03fc857a29c3d7f2055c701f828b502c78e80b66b2bfe5ef4',
'com.android.support:recyclerview-v7:423b183809ef75051c150f5f401c4077ddedac26b2c515b6ee231c4c5724f5bf', 'com.android.support:recyclerview-v7:423b183809ef75051c150f5f401c4077ddedac26b2c515b6ee231c4c5724f5bf',
'com.androidplot:androidplot-core:e44d9e59e06f025330831f7d3c987d2778a3302025184cf0cef05714b5171212', 'com.androidplot:androidplot-core:7670da5838ce2ae2b0b5faabeb9d6a1f2787d30d3fe9f0952adc5611910d18c0',
'com.eowise:recyclerview-stickyheaders:7b236da49b33b840e9ba6e7e4182218d1a2d9047236fdbc3ca947352f9b0883b', 'com.eowise:recyclerview-stickyheaders:7b236da49b33b840e9ba6e7e4182218d1a2d9047236fdbc3ca947352f9b0883b',
'com.mcxiaoke.viewpagerindicator:library:1e8aad664137f68abdfee94889f6da3dc98be652a235176a403965a07a25de62', 'com.inkapplications.viewpageindicator:library:77b26a7723cd10fa5e29480be239e8d68f431f4bc20d9144169c9ce06ebac2bf',
'com.pnikosis:materialish-progress:da089a90d1dab61e9b50038c09081019398f81190d12b0b567ce94b83ef8cf93', 'com.pnikosis:materialish-progress:da089a90d1dab61e9b50038c09081019398f81190d12b0b567ce94b83ef8cf93',
'net.i2p:router:de3cf0a0e99823662c938d6a1083f201f8feba7d0ebebaf3179fed7040863b7c', 'net.i2p:router:de3cf0a0e99823662c938d6a1083f201f8feba7d0ebebaf3179fed7040863b7c',
'net.i2p.android.ext:floatingactionbutton:09d43e2d4ac04a91bf7a37e1ec48a8d220204e3a55dca72cd36cd9fa27461ade', 'net.i2p.android.ext:floatingactionbutton:09d43e2d4ac04a91bf7a37e1ec48a8d220204e3a55dca72cd36cd9fa27461ade',
'org.sufficientlysecure:html-textview:c409b471618b675e3d2a8588f883c5fe8f3369d00df61ec84b29f29c648370ae', 'org.sufficientlysecure:html-textview:ed740adf05cae2373999c7a3047c803183d9807b2cf66162902090d7c112a832',
] ]
} }

2
app/src/main/java/net/i2p/android/help/HelpHtmlFragment.java
View File

@ -30,7 +30,7 @@ public class HelpHtmlFragment extends Fragment {
int padH = getResources().getDimensionPixelOffset(R.dimen.activity_horizontal_margin); int padH = getResources().getDimensionPixelOffset(R.dimen.activity_horizontal_margin);
int padV = getResources().getDimensionPixelOffset(R.dimen.activity_vertical_margin); int padV = getResources().getDimensionPixelOffset(R.dimen.activity_vertical_margin);
text.setPadding(padH, padV, padH, padV); text.setPadding(padH, padV, padH, padV);
text.setHtmlFromRawResource(getActivity(), getArguments().getInt(ARG_HTML_FILE), true); text.setHtml(getArguments().getInt(ARG_HTML_FILE));
return scroller; return scroller;
} }
} }

28
app/src/main/java/net/i2p/android/router/stats/RateGraphFragment.java
View File

@ -11,9 +11,10 @@ import android.view.ViewGroup;
import com.androidplot.xy.BarFormatter; import com.androidplot.xy.BarFormatter;
import com.androidplot.xy.BarRenderer; import com.androidplot.xy.BarRenderer;
import com.androidplot.xy.BoundaryMode; import com.androidplot.xy.BoundaryMode;
import com.androidplot.xy.StepMode;
import com.androidplot.xy.XYGraphWidget;
import com.androidplot.xy.XYPlot; import com.androidplot.xy.XYPlot;
import com.androidplot.xy.XYSeries; import com.androidplot.xy.XYSeries;
import com.androidplot.xy.XYStepMode;
import net.i2p.android.router.I2PFragmentBase; import net.i2p.android.router.I2PFragmentBase;
import net.i2p.android.router.R; import net.i2p.android.router.R;
@ -120,26 +121,25 @@ public class RateGraphFragment extends I2PFragmentBase {
_ratePlot.addSeries(rateSeries, new BarFormatter(Color.argb(200, 0, 80, 0), Color.argb(200, 0, 80, 0))); _ratePlot.addSeries(rateSeries, new BarFormatter(Color.argb(200, 0, 80, 0), Color.argb(200, 0, 80, 0)));
_ratePlot.calculateMinMaxVals(); _ratePlot.calculateMinMaxVals();
long maxX = _ratePlot.getCalculatedMaxX().longValue(); long maxX = _ratePlot.getBounds().getMaxX().longValue();
Util.d("Adding plot updater to listener"); Util.d("Adding plot updater to listener");
_listener.addObserver(_plotUpdater); _listener.addObserver(_plotUpdater);
// Only one line, so hide the legend // Only one line, so hide the legend
_ratePlot.getLegendWidget().setVisible(false); _ratePlot.getLegend().setVisible(false);
BarRenderer renderer = (BarRenderer) _ratePlot.getRenderer(BarRenderer.class); BarRenderer renderer = _ratePlot.getRenderer(BarRenderer.class);
renderer.setBarWidthStyle(BarRenderer.BarWidthStyle.VARIABLE_WIDTH); renderer.setBarGroupWidth(BarRenderer.BarGroupWidthMode.FIXED_GAP, 0);
renderer.setBarGap(0);
_ratePlot.setDomainUpperBoundary(maxX, BoundaryMode.GROW); _ratePlot.setDomainUpperBoundary(maxX, BoundaryMode.GROW);
_ratePlot.setDomainStep(XYStepMode.INCREMENT_BY_VAL, 15 * 60 * 1000); _ratePlot.setDomainStep(StepMode.INCREMENT_BY_VAL, 15 * 60 * 1000);
_ratePlot.setTicksPerDomainLabel(4); _ratePlot.setLinesPerDomainLabel(4);
_ratePlot.setRangeLowerBoundary(0, BoundaryMode.FIXED); _ratePlot.setRangeLowerBoundary(0, BoundaryMode.FIXED);
_ratePlot.setTicksPerRangeLabel(5); _ratePlot.setLinesPerRangeLabel(5);
_ratePlot.setDomainValueFormat(new Format() { _ratePlot.getGraph().getLineLabelStyle(XYGraphWidget.Edge.BOTTOM).setFormat(new Format() {
private DateFormat dateFormat = SimpleDateFormat.getTimeInstance(DateFormat.SHORT); private DateFormat dateFormat = SimpleDateFormat.getTimeInstance(DateFormat.SHORT);
@Override @Override
@ -157,13 +157,13 @@ public class RateGraphFragment extends I2PFragmentBase {
}); });
final int finalK = _k; final int finalK = _k;
_ratePlot.setRangeValueFormat(new Format() { _ratePlot.getGraph().getLineLabelStyle(XYGraphWidget.Edge.LEFT).setFormat(new Format() {
@Override @Override
public StringBuffer format(Object obj, @NonNull StringBuffer toAppendTo, public StringBuffer format(Object obj, @NonNull StringBuffer toAppendTo,
@NonNull FieldPosition pos) { @NonNull FieldPosition pos) {
double val = ((Number) obj).doubleValue(); double val = ((Number) obj).doubleValue();
double maxY = _ratePlot.getCalculatedMaxY().doubleValue(); double maxY = _ratePlot.getBounds().getMaxY().doubleValue();
if (val == 0 || maxY < finalK) { if (val == 0 || maxY < finalK) {
return new DecimalFormat("0").format(val, toAppendTo, pos); return new DecimalFormat("0").format(val, toAppendTo, pos);
@ -194,8 +194,8 @@ public class RateGraphFragment extends I2PFragmentBase {
private void updatePlot() { private void updatePlot() {
_ratePlot.calculateMinMaxVals(); _ratePlot.calculateMinMaxVals();
double maxY = _ratePlot.getCalculatedMaxY().doubleValue(); double maxY = _ratePlot.getBounds().getMaxY().doubleValue();
_ratePlot.setRangeStep(XYStepMode.INCREMENT_BY_VAL, getRangeStep(maxY, _k)); _ratePlot.setRangeStep(StepMode.INCREMENT_BY_VAL, getRangeStep(maxY, _k));
_ratePlot.redraw(); _ratePlot.redraw();
} }