mirror of
https://github.com/f-droid/fdroidclient.git
synced 2026-04-22 16:01:37 -04:00
Merge branch 'feature/adultContentAntifeature' into 'master'
Add NSFW antifeature See merge request fdroid/fdroidclient!1047
This commit is contained in:
@@ -133,6 +133,8 @@ public class AntiFeaturesListingView extends RecyclerView {
|
||||
return context.getString(R.string.antiknownvulnlist);
|
||||
} else if (antiFeatureName.equals(context.getString(R.string.antinosource_key))) {
|
||||
return context.getString(R.string.antinosourcesince);
|
||||
} else if (antiFeatureName.equals(context.getString(R.string.antinsfw_key))) {
|
||||
return context.getString(R.string.antinsfw);
|
||||
} else {
|
||||
return antiFeatureName;
|
||||
}
|
||||
@@ -159,8 +161,10 @@ public class AntiFeaturesListingView extends RecyclerView {
|
||||
return R.drawable.ic_antifeature_knownvuln;
|
||||
} else if (antiFeatureName.equals(context.getString(R.string.antinosource_key))) {
|
||||
return R.drawable.ic_antifeature_nosourcesince;
|
||||
} else if (antiFeatureName.equals(context.getString(R.string.antinsfw_key))) {
|
||||
return R.drawable.ic_antifeature_nsfw;
|
||||
} else {
|
||||
return R.drawable.ic_cancel;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
4
app/src/main/res/drawable/ic_antifeature_nsfw.xml
Normal file
4
app/src/main/res/drawable/ic_antifeature_nsfw.xml
Normal file
@@ -0,0 +1,4 @@
|
||||
<vector android:height="24dp" android:viewportHeight="48"
|
||||
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#FF000000" android:pathData="M21.99,12.34C22,12.23 22,12.11 22,12c0,-5.52 -4.48,-10 -10,-10S2,6.48 2,12c0,5.17 3.93,9.43 8.96,9.95c-0.93,-0.73 -1.72,-1.64 -2.32,-2.68C5.9,18 4,15.22 4,12c0,-1.85 0.63,-3.55 1.69,-4.9l5.66,5.66c0.56,-0.4 1.17,-0.73 1.82,-1L7.1,5.69C8.45,4.63 10.15,4 12,4c4.24,0 7.7,3.29 7.98,7.45C20.69,11.67 21.37,11.97 21.99,12.34zM17,13c-3.18,0 -5.9,1.87 -7,4.5c1.1,2.63 3.82,4.5 7,4.5s5.9,-1.87 7,-4.5C22.9,14.87 20.18,13 17,13zM17,20c-1.38,0 -2.5,-1.12 -2.5,-2.5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5C19.5,18.88 18.38,20 17,20zM18.5,17.5c0,0.83 -0.67,1.5 -1.5,1.5s-1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5S18.5,16.67 18.5,17.5z"/>
|
||||
</vector>
|
||||
@@ -289,6 +289,7 @@ This often occurs with apps installed via Google Play or other sources, if they
|
||||
<string name="antidisabledalgorithm_key" translatable="false">DisabledAlgorithm</string>
|
||||
<string name="antiknownvuln_key" translatable="false">KnownVuln</string>
|
||||
<string name="antinosource_key" translatable="false">NoSourceSince</string>
|
||||
<string name="antinsfw_key" translatable="false">NSFW</string>
|
||||
<string name="antiothers_key" translatable="false">_anti_others_</string>
|
||||
<string name="antifeatures">Anti-features</string>
|
||||
<string name="antiads">Ads</string>
|
||||
@@ -312,6 +313,7 @@ This often occurs with apps installed via Google Play or other sources, if they
|
||||
<string name="antidisabledalgorithmlist">This app has a weak security signature</string>
|
||||
<string name="antiknownvulnlist">This app contains a known security vulnerability</string>
|
||||
<string name="antinosourcesince">The source code is no longer available, no updates possible.</string>
|
||||
<string name="antinsfw">This app contains content that should not be publicized or visible everywhere</string>
|
||||
<string name="display">Display</string>
|
||||
|
||||
<string name="expert">Expert mode</string>
|
||||
|
||||
Reference in New Issue
Block a user