Skip to content

Commit 4b6bef1

Browse files
committed
lint fixes; upd SharedModules
1 parent 60577c0 commit 4b6bef1

File tree

15 files changed

+81
-67
lines changed

15 files changed

+81
-67
lines changed

common/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ android {
3434
}
3535
}
3636

37+
lintOptions {
38+
abortOnError true
39+
disable 'MissingTranslation'
40+
disable 'MissingQuantity'
41+
}
42+
3743
// gradle 4.6 migration: disable dimensions mechanism
3844
// more: https://proandroiddev.com/advanced-android-flavors-part-4-a-new-version-fc2ad80c01bb
3945
flavorDimensions "default"

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/utils/Utils.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,21 @@
3636
import android.telephony.TelephonyManager;
3737
import android.text.Spannable;
3838
import android.text.SpannableString;
39+
import android.text.SpannableStringBuilder;
3940
import android.text.Spanned;
4041
import android.text.style.AbsoluteSizeSpan;
42+
import android.text.style.ClickableSpan;
4143
import android.text.style.ForegroundColorSpan;
4244
import android.text.style.ImageSpan;
4345
import android.text.style.StyleSpan;
46+
import android.text.style.URLSpan;
4447
import android.view.KeyEvent;
48+
import android.view.View;
4549
import android.view.Window;
4650
import android.view.WindowManager;
4751
import android.view.inputmethod.BaseInputConnection;
4852

53+
import androidx.annotation.NonNull;
4954
import androidx.browser.customtabs.CustomTabsIntent;
5055
import androidx.core.app.NotificationCompat;
5156
import androidx.core.content.ContextCompat;
@@ -1239,6 +1244,30 @@ public static boolean isSystemGestureArrowEnabled(Context context) {
12391244
return false;
12401245
}
12411246

1247+
/**
1248+
* Make link open in browser. Not working.
1249+
*/
1250+
public static CharSequence toBrowserLink(Context context, CharSequence message) {
1251+
SpannableStringBuilder builder = SpannableStringBuilder.valueOf(message);
1252+
URLSpan[] spans = builder.getSpans(0, builder.length(), URLSpan.class);
1253+
1254+
for (URLSpan span : spans) {
1255+
builder.setSpan(new ClickableSpan() {
1256+
@Override
1257+
public void onClick(@NonNull View widget) {
1258+
MessageHelpers.showMessage(context, "On link clicked " + span.getURL());
1259+
}
1260+
},
1261+
builder.getSpanStart(span),
1262+
builder.getSpanEnd(span),
1263+
Spanned.SPAN_INCLUSIVE_EXCLUSIVE
1264+
);
1265+
builder.removeSpan(span);
1266+
}
1267+
1268+
return builder;
1269+
}
1270+
12421271
private static void persistData(Context context) {
12431272
VideoStateService.instance(context).persistNow();
12441273
PlayerData.instance(context).persistNow();

common/src/main/res/values-az/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@
714714
<string name="action_debug_info">Debuq məlumatı</string>
715715
<string name="dialog_block_channel">Kanalə bloklayın</string>
716716
<string name="dialog_unblock_channel">Kanalı blokdan çıxarın</string>
717-
<string name="confirm_block_channel">Bütün məzmun %-dən gizlədilsin?</string>
717+
<string name="confirm_block_channel">Bütün məzmun %s-dən gizlədilsin?</string>
718718
<string name="channel_blocked">Kanal bloklanıb</string>
719719
<string name="channel_unblocked">Kanal blokdan çıxarıldı</string>
720720
<string name="header_blocked_channels">Bloklanmış Kanallar</string>

common/src/main/res/values-da/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<string name="category_background_playback">Afspil i baggrunden</string>
2828
<string name="not_implemented">Ikke implementeret</string>
2929
<string name="option_background_playback_off">Deaktiveret</string>
30-
<string name="option_background_playback_all">Video og lyd</string>
3130
<string name="option_background_playback_only_audio">Kun lyd</string>
3231
<string name="playback_settings">Indstillinger for afspilningskvalitet</string>
3332
<string name="video_speed">Videohastighed</string>

leanbackassistant/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ android {
2525
}
2626
}
2727

28+
lintOptions {
29+
abortOnError true
30+
disable 'MissingTranslation'
31+
}
32+
2833
// gradle 4.6 migration: disable dimensions mechanism
2934
// more: https://proandroiddev.com/advanced-android-flavors-part-4-a-new-version-fc2ad80c01bb
3035
flavorDimensions "default"

smarttubetv/build.gradle

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -119,27 +119,6 @@ android {
119119
}
120120
}
121121

122-
// gradle 4.6 migration: disable dimensions mechanism
123-
// more: https://proandroiddev.com/advanced-android-flavors-part-4-a-new-version-fc2ad80c01bb
124-
flavorDimensions "default"
125-
126-
// NOTE: The main goal of prefixing a flavor is to group flavors' folders together
127-
productFlavors {
128-
stbeta {
129-
applicationId "org.smarttube.beta"
130-
targetSdkVersion project.properties.compileSdkVersion
131-
}
132-
ststable {
133-
applicationId "org.smarttube.stable"
134-
targetSdkVersion project.properties.compileSdkVersion
135-
}
136-
stfdroid {
137-
applicationId "app.smarttube.fdroid"
138-
minSdkVersion 21
139-
targetSdkVersion project.properties.compileSdkVersion
140-
}
141-
}
142-
143122
// naming example: SmartYouTubeTV_Xwalk_v6.8.12_r.apk
144123
// https://stackoverflow.com/questions/18332474/how-to-set-versionname-in-apk-filename-using-gradle
145124
applicationVariants.all { variant ->
@@ -170,7 +149,29 @@ android {
170149
}
171150

172151
lintOptions {
173-
checkReleaseBuilds false // fix for ClassNotFoundException: com.android.tools.lint.client.api.Vendor
152+
abortOnError true
153+
//checkReleaseBuilds false // fix for ClassNotFoundException: com.android.tools.lint.client.api.Vendor
154+
}
155+
156+
// gradle 4.6 migration: disable dimensions mechanism
157+
// more: https://proandroiddev.com/advanced-android-flavors-part-4-a-new-version-fc2ad80c01bb
158+
flavorDimensions "default"
159+
160+
// NOTE: The main goal of prefixing a flavor is to group flavors' folders together
161+
productFlavors {
162+
stbeta {
163+
applicationId "org.smarttube.beta"
164+
targetSdkVersion project.properties.compileSdkVersion
165+
}
166+
ststable {
167+
applicationId "org.smarttube.stable"
168+
targetSdkVersion project.properties.compileSdkVersion
169+
}
170+
stfdroid {
171+
applicationId "app.smarttube.fdroid"
172+
minSdkVersion 21
173+
targetSdkVersion project.properties.compileSdkVersion
174+
}
174175
}
175176
}
176177

smarttubetv/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<uses-permission android:name="${applicationId}.ACCESS_VIDEO_DATA" />
1919
<uses-permission android:name="android.permission.INTERNET" />
2020
<uses-permission android:name="android.permission.RECORD_AUDIO" />
21+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
2122

2223
<uses-sdk tools:overrideLibrary="
2324
androidx.leanback.preference,

smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/mod/leanback/misc/SeekBar.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import android.graphics.Rect;
2424
import android.graphics.RectF;
2525
import android.graphics.drawable.Drawable;
26+
import android.os.Build.VERSION;
2627
import android.os.Bundle;
2728
import android.util.AttributeSet;
2829
import android.view.MotionEvent;
@@ -398,6 +399,10 @@ private void startDrag(MotionEvent event) {
398399
}
399400

400401
private void setHotspot(float x, float y) {
402+
if (VERSION.SDK_INT < 21) {
403+
return;
404+
}
405+
401406
final Drawable bg = getBackground();
402407
if (bg != null) {
403408
bg.setHotspot(x, y);

0 commit comments

Comments
 (0)