me/Fedilab
1
0
Fork 0
forked from mirrors/Fedilab
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some changes

Browse source
This commit is contained in:
Thomas 2022-11-28 11:46:48 +01:00
parent ccf7ac5cff
commit 4ea542c1f8
35 changed files with 181 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -116,7 +116,7 @@ dependencies {
implementation "ch.acra:acra-mail:5.9.6"
implementation "ch.acra:acra-limiter:5.9.3"
implementation "ch.acra:acra-dialog:5.9.6"
implementation 'com.github.Dhaval2404:ColorPicker:2.3'
implementation "com.madgag.spongycastle:bctls-jdk15on:1.58.0.0"
implementation 'com.github.UnifiedPush:android-connector:2.0.1'
// implementation 'com.github.UnifiedPush:android-foss_embedded_fcm_distributor:1.0.0-beta1'

2
app/src/main/java/app/fedilab/android/activities/AboutActivity.java
View file

@ -80,7 +80,7 @@ public class AboutActivity extends BaseActivity {
} else {
binding.aboutSupportPaypal.setVisibility(View.GONE);
}
binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);
binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);
binding.aboutWebsite.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://fedilab.app"));
CrossActionHelper.fetchRemoteAccount(AboutActivity.this, "@apps@toot.fedilab.app", new CrossActionHelper.Callback() {
@Override

2
app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java
View file

@ -64,7 +64,7 @@ public class PartnerShipActivity extends BaseActivity {
});
binding.accountFollow.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(PartnerShipActivity.this));
setTitle(R.string.action_partnership);
binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);
binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);
CrossActionHelper.fetchRemoteAccount(PartnerShipActivity.this, "@mastohost@mastodon.social", new CrossActionHelper.Callback() {
@Override
public void federatedStatus(Status status) {

14
app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
View file

@ -527,7 +527,7 @@ public class ProfileActivity extends BaseActivity {
//Visibility depending of the relationship
if (relationship != null) {
if (relationship.blocked_by) {
binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);
binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);
binding.accountFollow.setVisibility(View.VISIBLE);
binding.accountFollow.setEnabled(false);
binding.accountFollow.setContentDescription(getString(R.string.action_disabled));
@ -535,7 +535,7 @@ public class ProfileActivity extends BaseActivity {
if (relationship.requested) {
binding.accountFollowRequest.setVisibility(View.VISIBLE);
binding.accountFollow.setImageResource(R.drawable.ic_baseline_hourglass_full_24);
binding.accountFollow.setIconResource(R.drawable.ic_baseline_hourglass_full_24);
binding.accountFollow.setVisibility(View.VISIBLE);
binding.accountFollow.setContentDescription(getString(R.string.follow_request));
doAction = action.UNFOLLOW;
@ -546,19 +546,19 @@ public class ProfileActivity extends BaseActivity {
binding.accountFollowedBy.setVisibility(View.GONE);
}
if (relationship.following) {
binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_remove_24);
binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_remove_24);
binding.accountFollow.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(ProfileActivity.this, R.color.red_1)));
doAction = action.UNFOLLOW;
binding.accountFollow.setContentDescription(getString(R.string.action_unfollow));
binding.accountFollow.setVisibility(View.VISIBLE);
} else if (relationship.blocking) {
binding.accountFollow.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(ProfileActivity.this, R.color.red_1)));
binding.accountFollow.setImageResource(R.drawable.ic_baseline_lock_open_24);
binding.accountFollow.setIconResource(R.drawable.ic_baseline_lock_open_24);
doAction = action.UNBLOCK;
binding.accountFollow.setVisibility(View.VISIBLE);
binding.accountFollow.setContentDescription(getString(R.string.action_unblock));
} else {
binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);
binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);
doAction = action.FOLLOW;
binding.accountFollow.setVisibility(View.VISIBLE);
binding.accountFollow.setContentDescription(getString(R.string.action_follow));
@ -577,9 +577,9 @@ public class ProfileActivity extends BaseActivity {
binding.accountNotification.setVisibility(View.VISIBLE);
}
if (relationship.notifying) {
binding.accountNotification.setImageResource(R.drawable.ic_baseline_notifications_active_24);
binding.accountNotification.setIconResource(R.drawable.ic_baseline_notifications_active_24);
} else {
binding.accountNotification.setImageResource(R.drawable.ic_baseline_notifications_off_24);
binding.accountNotification.setIconResource(R.drawable.ic_baseline_notifications_off_24);
}
binding.accountNotification.setOnClickListener(v -> {
if (relationship != null && relationship.following) {

53
app/src/main/java/app/fedilab/android/activities/ThemeSettingsActivity.java Normal file
View file

@ -0,0 +1,53 @@
package app.fedilab.android.activities;
/* Copyright 2022 Thomas Schneider
*
* This file is a part of Fedilab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
* see <http://www.gnu.org/licenses>. */
import android.os.Bundle;
import android.view.MenuItem;
import app.fedilab.android.databinding.ActivityAboutBinding;
public class ThemeSettingsActivity extends BaseActivity {
private ActivityAboutBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = ActivityAboutBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
if (getSupportActionBar() != null) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) {
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
}

2
app/src/main/res/layout/account_field_item.xml
View file

@ -39,7 +39,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/remove"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_margin="6dp"

10
app/src/main/res/layout/activity_about.xml
View file

@ -98,9 +98,9 @@
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatImageButton
<com.google.android.material.button.MaterialButton
android:id="@+id/account_follow"
style="@style/Widget.AppCompat.Button.Colored"
style="@style/Widget.Material3.Button.Icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_margin="10dp"
@ -110,7 +110,7 @@
android:visibility="gone"
app:layout_constraintStart_toEndOf="@id/avatar_container"
app:layout_constraintTop_toBottomOf="@id/banner_container"
tools:src="@drawable/ic_baseline_person_add_24"
tools:icon="@drawable/ic_baseline_person_add_24"
tools:visibility="visible" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -126,7 +126,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/about_support"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -136,7 +136,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/about_support_paypal"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

10
app/src/main/res/layout/activity_actions.xml
View file

@ -14,7 +14,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/muted"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="12dp"
@ -28,7 +28,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/blocked"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
@ -43,7 +43,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/bookmarks"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
@ -58,7 +58,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/favourites"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
@ -74,7 +74,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/domain_block"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"

8
app/src/main/res/layout/activity_admin_account.xml
View file

@ -388,7 +388,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/approve_action"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
@ -416,7 +416,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/disable_action"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
@ -444,7 +444,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/silence_action"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
@ -472,7 +472,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/suspend_action"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"

6
app/src/main/res/layout/activity_admin_actions.xml
View file

@ -14,7 +14,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/reports"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="12dp"
@ -25,7 +25,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/accounts"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
@ -37,7 +37,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/domains"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"

2
app/src/main/res/layout/activity_admin_domainblock.xml
View file

@ -142,7 +142,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/save_changes"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="end"

16
app/src/main/res/layout/activity_admin_report.xml
View file

@ -27,7 +27,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/assign"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
@ -37,7 +37,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/status"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
@ -211,7 +211,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/reject"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
@ -223,7 +223,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/allow"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
@ -249,7 +249,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/warn"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
@ -261,7 +261,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/disable"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
@ -281,7 +281,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/silence"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
@ -293,7 +293,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/suspend"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"

10
app/src/main/res/layout/activity_edit_profile.xml
View file

@ -63,7 +63,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/header_select"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/select"
@ -113,7 +113,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/avatar_select"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
@ -176,7 +176,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/add_field"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
@ -193,7 +193,7 @@
android:layout_marginHorizontal="12dp"
android:layout_marginTop="12dp"
android:text="@string/toots_visibility_title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintTop_toBottomOf="@id/fields" />
<com.google.android.material.button.MaterialButtonToggleGroup
@ -278,7 +278,7 @@
android:layout_marginHorizontal="12dp"
android:layout_marginTop="12dp"
android:text="@string/set_lock_account"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintTop_toBottomOf="@id/discoverable" />
<com.google.android.material.button.MaterialButtonToggleGroup

2
app/src/main/res/layout/activity_instance.xml
View file

@ -167,7 +167,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/close"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"

6
app/src/main/res/layout/activity_partnership.xml
View file

@ -89,9 +89,9 @@
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatImageButton
<com.google.android.material.button.MaterialButton
android:id="@+id/account_follow"
style="@style/Widget.AppCompat.Button.Colored"
style="@style/Widget.Material3.Button.Icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_margin="10dp"
@ -101,7 +101,7 @@
android:visibility="gone"
app:layout_constraintStart_toEndOf="@id/avatar_container"
app:layout_constraintTop_toBottomOf="@id/banner_container"
tools:src="@drawable/ic_baseline_person_add_24"
tools:icon="@drawable/ic_baseline_person_add_24"
tools:visibility="visible" />
</androidx.appcompat.widget.LinearLayoutCompat>

24
app/src/main/res/layout/activity_profile.xml
View file

@ -86,9 +86,9 @@
</com.google.android.material.card.MaterialCardView>
<androidx.appcompat.widget.AppCompatImageButton
<com.google.android.material.button.MaterialButton
android:id="@+id/account_follow"
style="@style/Widget.AppCompat.Button.Colored"
style="@style/Widget.Material3.Button.Icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="6dp"
@ -98,34 +98,34 @@
android:visibility="gone"
app:layout_constraintStart_toEndOf="@id/avatar_container"
app:layout_constraintTop_toBottomOf="@id/banner_container"
tools:src="@drawable/ic_baseline_person_add_24"
tools:icon="@drawable/ic_baseline_person_add_24"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageButton
<com.google.android.material.button.MaterialButton
android:id="@+id/account_notification"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
style="@style/Widget.Material3.Button.Icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/set_notify"
android:scaleType="fitCenter"
android:src="@drawable/ic_baseline_notifications_off_24"
android:icon="@drawable/ic_baseline_notifications_off_24"
android:visibility="gone"
app:layout_constraintEnd_toStartOf="@id/avatar_container"
app:layout_constraintTop_toBottomOf="@id/banner_container"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageButton
<com.google.android.material.button.MaterialButton
android:id="@+id/header_edit_profile"
style="@style/Widget.AppCompat.Button.Colored"
style="@style/Widget.Material3.Button.Icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:contentDescription="@string/edit_profile"
android:scaleType="fitCenter"
android:src="@drawable/ic_baseline_edit_24"
android:icon="@drawable/ic_baseline_edit_24"
android:visibility="gone"
app:layout_constraintStart_toEndOf="@id/avatar_container"
app:layout_constraintTop_toBottomOf="@id/banner_container"
@ -344,16 +344,16 @@
android:text="@string/disclaimer_full"
android:textColor="@color/dark_text" />
<androidx.appcompat.widget.AppCompatImageButton
<com.google.android.material.button.MaterialButton
android:id="@+id/open_remote_profile"
style="@style/Widget.AppCompat.Button.Colored"
style="@style/Widget.Material3.Button.Icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:contentDescription="@string/display_remote_profile"
android:scaleType="fitCenter"
android:src="@drawable/ic_baseline_manage_search_24" />
android:icon="@drawable/ic_baseline_manage_search_24" />
</androidx.appcompat.widget.LinearLayoutCompat>

8
app/src/main/res/layout/activity_proxy.xml
View file

@ -45,7 +45,7 @@
<com.google.android.material.textfield.MaterialAutoCompleteTextView
android:id="@+id/host"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
style="@style/Widget.Material3.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:dropDownAnchor="@id/login_instance_layout"
@ -64,7 +64,7 @@
<com.google.android.material.textfield.MaterialAutoCompleteTextView
android:id="@+id/port"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
style="@style/Widget.Material3.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:dropDownAnchor="@id/login_instance_layout"
@ -84,7 +84,7 @@
<com.google.android.material.textfield.MaterialAutoCompleteTextView
android:id="@+id/proxy_login"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
style="@style/Widget.Material3.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:dropDownAnchor="@id/login_instance_layout"
@ -101,7 +101,7 @@
<com.google.android.material.textfield.MaterialAutoCompleteTextView
android:id="@+id/proxy_password"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
style="@style/Widget.Material3.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:dropDownAnchor="@id/login_instance_layout"

46
app/src/main/res/layout/compose_attachment_item.xml
View file

@ -24,53 +24,55 @@
tools:src="@tools:sample/backgrounds/scenic" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/button_play"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="48dp"
android:layout_height="48dp"
android:adjustViewBounds="true"
android:padding="6dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_compose_attachment_play"
app:layout_constraintBottom_toBottomOf="@id/preview"
app:layout_constraintEnd_toEndOf="@id/preview"
<com.google.android.material.button.MaterialButton
android:id="@+id/button_play"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="48dp"
android:layout_height="48dp"
android:adjustViewBounds="true"
android:padding="6dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_compose_attachment_play"
app:layout_constraintBottom_toBottomOf="@id/preview"
app:layout_constraintEnd_toEndOf="@id/preview"
app:layout_constraintStart_toStartOf="@id/preview"
app:layout_constraintTop_toTopOf="@id/preview" />
<androidx.appcompat.widget.AppCompatImageButton
<com.google.android.material.button.MaterialButton
android:id="@+id/edit_preview"
style="@style/Widget.Material3.Button.Icon"
android:layout_width="36dp"
android:layout_height="36dp"
android:adjustViewBounds="true"
android:backgroundTint="@color/editColor"
android:src="@drawable/ic_baseline_mode_edit_24"
android:icon="@drawable/ic_baseline_mode_edit_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageButton
<com.google.android.material.button.MaterialButton
android:id="@+id/button_remove"
style="@style/Widget.Material3.Button.Icon"
android:layout_width="36dp"
android:layout_height="36dp"
android:adjustViewBounds="true"
android:backgroundTint="@color/errorColor"
android:src="@drawable/ic_compose_attachment_remove"
android:icon="@drawable/ic_compose_attachment_remove"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageButton
<com.google.android.material.button.MaterialButton
android:id="@+id/button_order_up"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
style="@style/Widget.Material3.Button.Icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:adjustViewBounds="true"
android:src="@drawable/ic_compose_attachment_order_up"
android:icon="@drawable/ic_compose_attachment_order_up"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/preview" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_description"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.Icon"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginStart="2dp"
@ -86,13 +88,13 @@
app:strokeColor="@color/no_description" />
<androidx.appcompat.widget.AppCompatImageButton
<com.google.android.material.button.MaterialButton
android:id="@+id/button_order_down"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
style="@style/Widget.Material3.Button.Icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:adjustViewBounds="true"
android:src="@drawable/ic_compose_attachment_order_down"
android:icon="@drawable/ic_compose_attachment_order_down"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/preview" />

6
app/src/main/res/layout/drawer_account.xml
View file

@ -43,7 +43,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintBottom_toTopOf="@id/username"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/avatar"
@ -71,7 +71,7 @@
android:layout_marginTop="6dp"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintTop_toBottomOf="@id/avatar"
tools:text="@tools:sample/lorem/random" />
@ -125,7 +125,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/follow_action"
style="@style/Widget.MaterialComponents.Button"
style="@style/Widget.Material3.Button"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginStart="12dp"

2
app/src/main/res/layout/drawer_account_list.xml
View file

@ -43,7 +43,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintBottom_toTopOf="@id/username"
app:layout_constraintEnd_toStartOf="@+id/list_action"
app:layout_constraintStart_toEndOf="@id/avatar"

2
app/src/main/res/layout/drawer_fetch_more.xml
View file

@ -27,7 +27,7 @@
android:textColor="?colorAccent"
android:text="@string/fetch_more_messages"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
android:textSize="18sp"
app:textAllCaps="false" />

10
app/src/main/res/layout/drawer_instance_reg.xml
View file

@ -45,7 +45,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/instance_pp"
app:layout_constraintTop_toTopOf="parent"
@ -56,7 +56,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintStart_toEndOf="@id/instance_pp"
app:layout_constraintTop_toBottomOf="@id/instance_host"
tools:text="v3.4.1" />
@ -66,7 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintStart_toEndOf="@id/instance_pp"
app:layout_constraintTop_toBottomOf="@id/instance_version"
tools:text="593.3K" />
@ -76,7 +76,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/instance_pp"
@ -84,7 +84,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/watch_trendig"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"

2
app/src/main/res/layout/drawer_list.xml
View file

@ -2,7 +2,7 @@
<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/title"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"

2
app/src/main/res/layout/drawer_status.xml
View file

@ -239,7 +239,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/toggle_truncate"
style="@style/Widget.MaterialComponents.Button.TextButton"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

10
app/src/main/res/layout/drawer_status_compose.xml
View file

@ -170,7 +170,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/button_language"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_marginTop="6dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -314,7 +314,7 @@
android:layout_marginStart="6dp"
android:layout_weight="1"
android:text="@string/v_direct"
android:textAppearance="@style/TextAppearance.MaterialComponents.Button" />
android:textAppearance="@style/TextAppearance.Material3.BodyMedium" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -348,7 +348,7 @@
android:layout_marginStart="6dp"
android:layout_weight="1"
android:text="@string/followers_only"
android:textAppearance="@style/TextAppearance.MaterialComponents.Button" />
android:textAppearance="@style/TextAppearance.Material3.BodyMedium" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -373,7 +373,7 @@
android:layout_marginStart="6dp"
android:layout_weight="1"
android:text="@string/v_unlisted"
android:textAppearance="@style/TextAppearance.MaterialComponents.Button" />
android:textAppearance="@style/TextAppearance.Material3.BodyMedium" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -398,7 +398,7 @@
android:layout_marginStart="6dp"
android:layout_weight="1"
android:text="@string/v_public"
android:textAppearance="@style/TextAppearance.MaterialComponents.Button" />
android:textAppearance="@style/TextAppearance.Material3.BodyMedium" />
</androidx.appcompat.widget.LinearLayoutCompat>

2
app/src/main/res/layout/drawer_status_filtered.xml
View file

@ -46,7 +46,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/display_button"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/show_anyway"

8
app/src/main/res/layout/drawer_suggestion.xml
View file

@ -43,7 +43,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintBottom_toTopOf="@id/username"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/avatar"
@ -71,13 +71,13 @@
android:layout_marginTop="6dp"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintTop_toBottomOf="@id/avatar"
tools:text="@tools:sample/lorem/random" />
<com.google.android.material.button.MaterialButton
android:id="@+id/not_interested"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -89,7 +89,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/follow_action"
style="@style/Widget.MaterialComponents.Button"
style="@style/Widget.Material3.Button"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginStart="12dp"

14
app/src/main/res/layout/fragment_login_join.xml
View file

@ -30,7 +30,7 @@
android:layout_marginTop="12dp"
android:gravity="center_horizontal"
android:text="@string/invite_join_the_fediverse"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
android:textAppearance="@style/TextAppearance.Material3.HeadlineMedium" />
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
@ -64,7 +64,7 @@
android:layout_marginStart="12dp"
android:layout_weight="1"
android:text="Mastodon"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
tools:ignore="HardcodedText" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -74,13 +74,13 @@
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/about_mastodon"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption" />
android:textAppearance="@style/TextAppearance.Material3.BodyMedium" />
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="- joinmastodon.org"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
tools:ignore="HardcodedText" />
<com.google.android.material.button.MaterialButton
@ -126,7 +126,7 @@
android:layout_marginStart="12dp"
android:layout_weight="1"
android:text="PeerTube"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
android:textAppearance="@style/TextAppearance.Material3.Headline5"
tools:ignore="HardcodedText" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -136,13 +136,13 @@
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/join_peertube_message"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption" />
android:textAppearance="@style/TextAppearance.Material3.Caption" />
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="- joinpeertube.org"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
android:textAppearance="@style/TextAppearance.Material3.Caption"
tools:ignore="HardcodedText" />
<com.google.android.material.button.MaterialButton

2
app/src/main/res/layout/fragment_login_main.xml
View file

@ -41,7 +41,7 @@
<com.google.android.material.textfield.MaterialAutoCompleteTextView
android:id="@+id/login_instance"
style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
style="@style/Widget.Material3.TextInputEditText.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:dropDownAnchor="@id/login_instance_layout"

6
app/src/main/res/layout/fragment_login_pick_instance_mastodon.xml
View file

@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pickup_instance_category"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
android:textAppearance="@style/TextAppearance.Material3.BodyLarge" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
@ -39,13 +39,13 @@
android:layout_weight="1"
android:text="@string/category"
android:textAlignment="textEnd"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body2" />
android:textAppearance="@style/TextAppearance.Material3.BodyMedium" />
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/reg_category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
android:textSize="16sp" />
</androidx.appcompat.widget.LinearLayoutCompat>

2
app/src/main/res/layout/popup_add_filter.xml
View file

@ -221,7 +221,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/add_keyword"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"

6
app/src/main/res/layout/popup_notification_settings.xml
View file

@ -40,7 +40,7 @@
</com.google.android.material.button.MaterialButtonToggleGroup>
<com.google.android.material.textview.MaterialTextView
style="@style/TextAppearance.MaterialComponents.Body1"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
@ -131,7 +131,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/more"
style="@style/Widget.MaterialComponents.Button.TextButton"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
@ -145,7 +145,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/clear_all_notif"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/clear_all_notif"

4
app/src/main/res/layout/popup_release_notes.xml
View file

@ -91,7 +91,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/about_support"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -100,7 +100,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/about_support_paypal"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

2
app/src/main/res/layout/popup_status_theme.xml
View file

@ -138,7 +138,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/toggle_truncate"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

4
app/src/main/res/xml/pref_theming.xml
View file

@ -29,7 +29,7 @@
android:key="cyanea_preference_category"
android:title="@string/customize_timelines"
app:iconSpaceReserved="false">
<!--
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
app:defaultValue="-1"
app:iconSpaceReserved="false"
@ -79,7 +79,7 @@
app:summary="@string/text_color"
app:title="@string/text_color_title" />
-->
<Preference
app:iconSpaceReserved="false"
app:key="reset_pref"