thedevstack/PiratX-NoCleanFork
2
0
Fork 0
forked from mirror/monocles_chat
Code Issues 5 Pull requests Wiki Activity

update gradle and gradle plugin

Browse source
This commit is contained in:
Arne 2023-11-02 12:08:00 +01:00
parent 7ddd118ddb
commit ac6b6105f6
8 changed files with 9 additions and 10 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 android.useAndroidX=true
org.gradle.gradle-args=--max-workers=32 org.gradle.gradle-args=--max-workers=32
android.defaults.buildfeatures.buildconfig=true android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false android.nonTransitiveRClass=true
android.nonFinalResIds=false android.nonFinalResIds=false

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Mon Mar 06 22:35:58 CET 2023 #Mon Mar 06 22:35:58 CET 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

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.trimExpandedText = getResources().getString(resourceIdTrimExpandedText);
this.trimLines = typedArray.getInt(R.styleable.ReadMoreTextView_trimLines, DEFAULT_TRIM_LINES); this.trimLines = typedArray.getInt(R.styleable.ReadMoreTextView_trimLines, DEFAULT_TRIM_LINES);
this.colorClickableText = typedArray.getColor(R.styleable.ReadMoreTextView_colorClickableText, 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 = this.showTrimExpandedText =
typedArray.getBoolean(R.styleable.ReadMoreTextView_showTrimExpandedText, DEFAULT_SHOW_TRIM_EXPANDED_TEXT); typedArray.getBoolean(R.styleable.ReadMoreTextView_showTrimExpandedText, DEFAULT_SHOW_TRIM_EXPANDED_TEXT);
this.readMore = typedArray.getBoolean(R.styleable.ReadMoreTextView_readMore, DEFAULT_READ_MORE); 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); color = account.getColor(false);
} else { } else {
TypedValue typedValue = new TypedValue(); 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; color = typedValue.data;
} }
mBuilder.setColor(color); 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 java.util.List;
import eu.siacs.conversations.R;
import eu.siacs.conversations.ui.util.StyledAttributes; import eu.siacs.conversations.ui.util.StyledAttributes;
import eu.siacs.conversations.xmpp.forms.Field; import eu.siacs.conversations.xmpp.forms.Field;
@ -58,7 +57,7 @@ public abstract class FormFieldWrapper {
int start = label.length(); int start = label.length();
int end = label.length() + 2; int end = label.length() + 2;
spannableString.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), start, end, 0); 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; 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.setShowTitle(true);
tabBuilder.setUrlBarHidingEnabled(false); tabBuilder.setUrlBarHidingEnabled(false);
tabBuilder.setDefaultColorSchemeParams(new CustomTabColorSchemeParams.Builder() tabBuilder.setDefaultColorSchemeParams(new CustomTabColorSchemeParams.Builder()
.setToolbarColor(StyledAttributes.getColor(context, R.attr.colorPrimary)) .setToolbarColor(StyledAttributes.getColor(context, androidx.appcompat.R.attr.colorPrimary))
.setSecondaryToolbarColor(StyledAttributes.getColor(context, R.attr.colorPrimaryDark)) .setSecondaryToolbarColor(StyledAttributes.getColor(context, androidx.appcompat.R.attr.colorPrimaryDark))
.build()); .build());
tabBuilder.setColorScheme(dark ? CustomTabsIntent.COLOR_SCHEME_DARK : CustomTabsIntent.COLOR_SCHEME_LIGHT); tabBuilder.setColorScheme(dark ? CustomTabsIntent.COLOR_SCHEME_DARK : CustomTabsIntent.COLOR_SCHEME_LIGHT);
tabBuilder.setShareState(CustomTabsIntent.SHARE_STATE_ON); 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.fragment.app.ListFragment;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import eu.siacs.conversations.R;
import eu.siacs.conversations.ui.util.StyledAttributes; import eu.siacs.conversations.ui.util.StyledAttributes;
/** /**
@ -57,7 +56,7 @@ public class SwipeRefreshListFragment extends ListFragment {
final Context context = getActivity(); final Context context = getActivity();
if (context != null) { if (context != null) {
mSwipeRefreshLayout.setColorSchemeColors(StyledAttributes.getColor(context, R.attr.colorAccent)); mSwipeRefreshLayout.setColorSchemeColors(StyledAttributes.getColor(context, androidx.appcompat.R.attr.colorAccent));
} }
if (onRefreshListener != null) { 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="hide_notification">Hide notification</string>
<string name="log_out">Log out</string> <string name="log_out">Log out</string>
<string name="log_in">Log in</string> <string name="log_in">Log in</string>
<string name="unknown">Unknown</string>
</resources> </resources>