thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 5 Pull requests Wiki Activity Actions

update gradle and gradle plugin

Browse source
This commit is contained in:
Arne 2023-11-02 12:08:00 +01:00
parent 68a90e86d0
commit 8b7d140b94
7 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -18,5 +18,5 @@ android.enableJetifier=true
android.useAndroidX=true
org.gradle.gradle-args=--max-workers=32
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonTransitiveRClass=true
android.nonFinalResIds=false

2
src/main/java/de/monocles/chat/ReadMoreTextView.java
View file

@ -76,7 +76,7 @@ public class ReadMoreTextView extends AppCompatTextView {
this.trimExpandedText = getResources().getString(resourceIdTrimExpandedText);
this.trimLines = typedArray.getInt(R.styleable.ReadMoreTextView_trimLines, DEFAULT_TRIM_LINES);
this.colorClickableText = typedArray.getColor(R.styleable.ReadMoreTextView_colorClickableText,
ContextCompat.getColor(context, R.color.colorAccent));
ContextCompat.getColor(context, androidx.appcompat.R.color.abc_btn_colored_borderless_text_material));
this.showTrimExpandedText =
typedArray.getBoolean(R.styleable.ReadMoreTextView_showTrimExpandedText, DEFAULT_SHOW_TRIM_EXPANDED_TEXT);
this.readMore = typedArray.getBoolean(R.styleable.ReadMoreTextView_readMore, DEFAULT_READ_MORE);

2
src/main/java/eu/siacs/conversations/services/NotificationService.java
View file

@ -1115,7 +1115,7 @@ public class NotificationService {
color = account.getColor(false);
} else {
TypedValue typedValue = new TypedValue();
mXmppConnectionService.getTheme().resolveAttribute(R.attr.colorPrimary, typedValue, true);
mXmppConnectionService.getTheme().resolveAttribute(androidx.appcompat.R.attr.colorPrimary, typedValue, true);
color = typedValue.data;
}
mBuilder.setColor(color);

3
src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java
View file

@ -9,7 +9,6 @@ import android.view.View;
import java.util.List;
import eu.siacs.conversations.R;
import eu.siacs.conversations.ui.util.StyledAttributes;
import eu.siacs.conversations.xmpp.forms.Field;
@ -58,7 +57,7 @@ public abstract class FormFieldWrapper {
int start = label.length();
int end = label.length() + 2;
spannableString.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), start, end, 0);
spannableString.setSpan(new ForegroundColorSpan(StyledAttributes.getColor(context, R.attr.colorAccent)), start, end, 0);
spannableString.setSpan(new ForegroundColorSpan(StyledAttributes.getColor(context, androidx.appcompat.R.attr.colorAccent)), start, end, 0);
}
return spannableString;
}

4
src/main/java/eu/siacs/conversations/ui/util/CustomTab.java
View file

@ -17,8 +17,8 @@ public class CustomTab {
tabBuilder.setShowTitle(true);
tabBuilder.setUrlBarHidingEnabled(false);
tabBuilder.setDefaultColorSchemeParams(new CustomTabColorSchemeParams.Builder()
.setToolbarColor(StyledAttributes.getColor(context, R.attr.colorPrimary))
.setSecondaryToolbarColor(StyledAttributes.getColor(context, R.attr.colorPrimaryDark))
.setToolbarColor(StyledAttributes.getColor(context, androidx.appcompat.R.attr.colorPrimary))
.setSecondaryToolbarColor(StyledAttributes.getColor(context, androidx.appcompat.R.attr.colorPrimaryDark))
.build());
tabBuilder.setColorScheme(dark ? CustomTabsIntent.COLOR_SCHEME_DARK : CustomTabsIntent.COLOR_SCHEME_LIGHT);
tabBuilder.setShareState(CustomTabsIntent.SHARE_STATE_ON);

3
src/main/java/eu/siacs/conversations/ui/widget/SwipeRefreshListFragment.java
View file

@ -26,7 +26,6 @@ import android.widget.ListView;
import androidx.fragment.app.ListFragment;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import eu.siacs.conversations.R;
import eu.siacs.conversations.ui.util.StyledAttributes;
/**
@ -57,7 +56,7 @@ public class SwipeRefreshListFragment extends ListFragment {
final Context context = getActivity();
if (context != null) {
mSwipeRefreshLayout.setColorSchemeColors(StyledAttributes.getColor(context, R.attr.colorAccent));
mSwipeRefreshLayout.setColorSchemeColors(StyledAttributes.getColor(context, androidx.appcompat.R.attr.colorAccent));
}
if (onRefreshListener != null) {

1
src/main/res/values/strings.xml
View file

@ -1351,4 +1351,5 @@
<string name="hide_notification">Hide notification</string>
<string name="log_out">Log out</string>
<string name="log_in">Log in</string>
<string name="unknown">Unknown</string>
</resources>