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.

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

Chore: Update from ru.noties:markwon:2.0.1 to io.noties.markwon:core:4.6.2 #628

Merged
merged 2 commits into from
Nov 3, 2023
Merged

Chore: Update from ru.noties:markwon:2.0.1 to io.noties.markwon:core:4.6.2 #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09d2685
Update from `ru.noties:markwon:2.0.1` to `io.noties.markwon:core:4.6.2`
aanorbel Oct 25, 2023
9353e64
Change dependency naming
aanorbel Oct 25, 2023
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
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ dependencies {

implementation libs.xanscale.localhost.toolkit
implementation libs.lottie
implementation libs.markwon
implementation libs.markwon.core
implementation libs.commons.io
//arcview to fragment_dashboard
implementation libs.shapeofview
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/org/openobservatory/ooniprobe/activity/MeasurementDetailActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.openobservatory.ooniprobe.model.database.Network;
import org.openobservatory.ooniprobe.test.suite.PerformanceSuite;
import org.openobservatory.ooniprobe.test.test.*;
import ru.noties.markwon.Markwon;
import io.noties.markwon.Markwon;

import javax.inject.Inject;
import java.io.Serializable;
Expand Down Expand Up @@ -212,7 +212,9 @@ public void onError(String msg) {
binding.log.setVisibility(View.GONE);
if (!measurementsManager.hasReportId(measurement))
binding.explorer.setVisibility(View.GONE);
Markwon.setMarkdown(binding.methodology, getString(R.string.TestResults_Details_Methodology_Paragraph, getString(measurement.getTest().getUrlResId())));
Markwon.builder(this)
.build()
.setMarkdown(binding.methodology, getString(R.string.TestResults_Details_Methodology_Paragraph, getString(measurement.getTest().getUrlResId())));
load();
binding.log.setOnClickListener(v -> logClick());
binding.data.setOnClickListener(v -> dataClick());
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

import javax.inject.Inject;

import ru.noties.markwon.Markwon;
import io.noties.markwon.Markwon;

public class OverviewActivity extends AbstractActivity {
private static final String TEST = "test";
Expand Down Expand Up @@ -54,19 +54,20 @@ public static Intent newIntent(Context context, AbstractSuite testSuite) {
binding.run.setAlpha(0.5F);
binding.run.setEnabled(false);
}
Markwon markwon = Markwon.builder(this).build();
if (testSuite.getName().equals(ExperimentalSuite.NAME)) {
String experimentalLinks =
"\n\n* [STUN Reachability](https://github.com/ooni/spec/blob/master/nettests/ts-025-stun-reachability.md)" +
"\n\n* [DNS Check](https://github.com/ooni/spec/blob/master/nettests/ts-028-dnscheck.md)" +
"\n\n* [ECH Check](https://github.com/ooni/spec/blob/master/nettests/ts-039-echcheck.md)" +
"\n\n* [Tor Snowflake](https://ooni.org/nettest/tor-snowflake/) "+ String.format(" ( %s )",getString(R.string.Settings_TestOptions_LongRunningTest))+
"\n\n* [Vanilla Tor](https://github.com/ooni/spec/blob/master/nettests/ts-016-vanilla-tor.md) " + String.format(" ( %s )",getString(R.string.Settings_TestOptions_LongRunningTest));
Markwon.setMarkdown(binding.desc, getString(testSuite.getDesc1(), experimentalLinks));
markwon.setMarkdown(binding.desc, getString(testSuite.getDesc1(), experimentalLinks));
if (TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_RTL)
binding.desc.setTextDirection(View.TEXT_DIRECTION_RTL);
}
else
Markwon.setMarkdown(binding.desc, getString(testSuite.getDesc1()));
markwon.setMarkdown(binding.desc, getString(testSuite.getDesc1()));
Result lastResult = Result.getLastResult(testSuite.getName());
if (lastResult == null)
binding.lastTime.setText(R.string.Dashboard_Overview_LastRun_Never);
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/org/openobservatory/ooniprobe/activity/ProxyActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.openobservatory.ooniprobe.common.ProxyProtocol;
import org.openobservatory.ooniprobe.common.ProxySettings;
import org.openobservatory.ooniprobe.databinding.ActivityProxyBinding;
import ru.noties.markwon.Markwon;
import io.noties.markwon.Markwon;

import javax.inject.Inject;
import java.net.URISyntaxException;
Expand Down Expand Up @@ -119,7 +119,9 @@ public void onCreate(Bundle savedInstanceState) {
setContentView(binding.getRoot());

// We fill the footer that helps users to understand this settings screen.
Markwon.setMarkdown(binding.proxyFooter, getString(R.string.Settings_Proxy_Footer));
Markwon.builder(this)
.build()
.setMarkdown(binding.proxyFooter, getString(R.string.Settings_Proxy_Footer));

// We read settings and configure the initial view.
loadSettingsAndConfigureInitialView();
Expand Down
7 changes: 5 additions & 2 deletions app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/PsiphonFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
import org.openobservatory.ooniprobe.R;
import org.openobservatory.ooniprobe.databinding.FragmentMeasurementPsiphonBinding;
import org.openobservatory.ooniprobe.model.database.Measurement;
import ru.noties.markwon.Markwon;

import io.noties.markwon.Markwon;

public class PsiphonFragment extends Fragment {
private static final String MEASUREMENT = "measurement";
Expand All @@ -28,7 +29,9 @@ public static PsiphonFragment newInstance(Measurement measurement) {
Measurement measurement = (Measurement) getArguments().getSerializable(MEASUREMENT);
assert measurement != null;
FragmentMeasurementPsiphonBinding binding = FragmentMeasurementPsiphonBinding.inflate(inflater,container,false);
Markwon.setMarkdown(binding.desc,
Markwon.builder(getContext())
.build()
.setMarkdown(binding.desc,
measurement.is_anomaly ?
getString(R.string.TestResults_Details_Circumvention_Psiphon_Blocked_Content_Paragraph) :
getString(R.string.TestResults_Details_Circumvention_Psiphon_Reachable_Content_Paragraph)
Expand Down
7 changes: 5 additions & 2 deletions app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/RiseupVPNFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
import org.openobservatory.ooniprobe.R;
import org.openobservatory.ooniprobe.databinding.FragmentMeasurementRiseupvpnBinding;
import org.openobservatory.ooniprobe.model.database.Measurement;
import ru.noties.markwon.Markwon;

import io.noties.markwon.Markwon;

public class RiseupVPNFragment extends Fragment {
private static final String MEASUREMENT = "measurement";
Expand All @@ -28,7 +29,9 @@ public static RiseupVPNFragment newInstance(Measurement measurement) {
Measurement measurement = (Measurement) getArguments().getSerializable(MEASUREMENT);
assert measurement != null;
FragmentMeasurementRiseupvpnBinding binding = FragmentMeasurementRiseupvpnBinding.inflate(inflater,container,false);
Markwon.setMarkdown(binding.desc,
Markwon.builder(getContext())
.build()
.setMarkdown(binding.desc,
measurement.is_anomaly ?
getString(R.string.TestResults_Details_Circumvention_RiseupVPN_Blocked_Content_Paragraph) :
getString(R.string.TestResults_Details_Circumvention_RiseupVPN_Reachable_Content_Paragraph)
Expand Down
7 changes: 5 additions & 2 deletions app/src/main/java/org/openobservatory/ooniprobe/fragment/measurement/TorFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
import org.openobservatory.ooniprobe.R;
import org.openobservatory.ooniprobe.databinding.FragmentMeasurementTorBinding;
import org.openobservatory.ooniprobe.model.database.Measurement;
import ru.noties.markwon.Markwon;

import io.noties.markwon.Markwon;

public class TorFragment extends Fragment {
private static final String MEASUREMENT = "measurement";
Expand All @@ -30,7 +31,9 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
Measurement measurement = (Measurement) getArguments().getSerializable(MEASUREMENT);
assert measurement != null;
FragmentMeasurementTorBinding binding = FragmentMeasurementTorBinding.inflate(inflater,container,false);
Markwon.setMarkdown(binding.desc,
Markwon.builder(getContext())
.build()
.setMarkdown(binding.desc,
measurement.is_anomaly ?
getString(R.string.TestResults_Details_Circumvention_Tor_Blocked_Content_Paragraph) :
getString(R.string.TestResults_Details_Circumvention_Tor_Reachable_Content_Paragraph)
Expand Down
8 changes: 5 additions & 3 deletions ...main/java/org/openobservatory/ooniprobe/fragment/measurement/WebConnectivityFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
import org.openobservatory.ooniprobe.R;
import org.openobservatory.ooniprobe.databinding.FragmentMeasurementWebconnectivityBinding;
import org.openobservatory.ooniprobe.model.database.Measurement;
import ru.noties.markwon.Markwon;

import io.noties.markwon.Markwon;

public class WebConnectivityFragment extends Fragment {
private static final String MEASUREMENT = "measurement";
Expand All @@ -30,10 +31,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
Measurement measurement = (Measurement) getArguments().getSerializable(MEASUREMENT);
assert measurement != null;
FragmentMeasurementWebconnectivityBinding binding = FragmentMeasurementWebconnectivityBinding.inflate(inflater,container,false);
Markwon markwon = Markwon.builder(getContext()).build();
if (measurement.is_anomaly)
Markwon.setMarkdown(binding.desc, getString(R.string.TestResults_Details_Websites_LikelyBlocked_Content_Paragraph, measurement.url.url, getString(measurement.getTestKeys().getWebsiteBlocking())));
markwon.setMarkdown(binding.desc, getString(R.string.TestResults_Details_Websites_LikelyBlocked_Content_Paragraph, measurement.url.url, getString(measurement.getTestKeys().getWebsiteBlocking())));
else
Markwon.setMarkdown(binding.desc, getString(R.string.TestResults_Details_Websites_Reachable_Content_Paragraph, measurement.url.url));
markwon.setMarkdown(binding.desc, getString(R.string.TestResults_Details_Websites_Reachable_Content_Paragraph, measurement.url.url));
return binding.getRoot();
}
}
6 changes: 4 additions & 2 deletions app/src/main/java/org/openobservatory/ooniprobe/fragment/onboarding/Onboarding3Fragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.openobservatory.ooniprobe.common.ThirdPartyServices;
import org.openobservatory.ooniprobe.common.service.ServiceUtil;
import org.openobservatory.ooniprobe.databinding.FragmentOnboarding3Binding;
import ru.noties.markwon.Markwon;
import io.noties.markwon.Markwon;

import javax.inject.Inject;

Expand All @@ -31,7 +31,9 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
binding.bullet1.setText(getString(R.string.bullet, getString(R.string.Onboarding_DefaultSettings_Bullet_1)));
binding.bullet2.setText(getString(R.string.bullet, getString(R.string.Onboarding_DefaultSettings_Bullet_2)));
binding.bullet3.setText(getString(R.string.bullet, getString(R.string.Onboarding_DefaultSettings_Bullet_3)));
Markwon.setMarkdown(binding.paragraph, getString(R.string.Onboarding_DefaultSettings_Paragraph));
Markwon.builder(getContext())
.build()
.setMarkdown(binding.paragraph, getString(R.string.Onboarding_DefaultSettings_Paragraph));

binding.master.setOnClickListener(v -> masterClick());
binding.slave.setOnClickListener(v -> slaveClick());
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ googlePlaycore = "1.10.3"
# OONI
compileSdk = "34"
lottie = "3.0.7"
markwon = "2.0.1"
markwon = "4.6.2"
shapeofview = "1.3.2"
targetSdk = "33"
minSdk = "21"
Expand Down Expand Up @@ -69,7 +69,7 @@ mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoCore
mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockitoInline" }

lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" }
markwon = { module = "ru.noties:markwon", version.ref = "markwon" }
markwon-core = { module = "io.noties.markwon:core", version.ref = "markwon" }
retrofit-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofitCore" }
retrofit-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "retrofitLoggingInterceptor" }
retrofit-lib = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofitCore" }
Expand Down
Loading