mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2024-12-23 09:10:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

remove useless elements

Browse source
This commit is contained in:
Thomas 2022-11-28 15:03:17 +01:00
parent 4ea542c1f8
commit 320f913c63
33 changed files with 105 additions and 194 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/app/fedilab/android/BaseMainActivity.java
View file

@ -139,7 +139,6 @@ import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.MastodonHelper;
import app.fedilab.android.helper.PinnedTimelineHelper;
import app.fedilab.android.helper.PushHelper;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonConversation;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;
import app.fedilab.android.ui.fragment.timeline.FragmentNotificationContainer;
@ -191,7 +190,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
intentCompose.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intentCompose);
})
.setTextColor(ThemeHelper.getAttColor(BaseMainActivity.this, R.attr.mTextColor))
.show();
}
}
@ -264,7 +262,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
intentContext.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intentContext);
})
.setTextColor(ThemeHelper.getAttColor(BaseMainActivity.this, R.attr.mTextColor))
.show();
//The message was edited, we need to update the timeline
if (statusEditId != null) {
@ -307,7 +304,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
mamageNewIntent(getIntent());
ThemeHelper.initiliazeColors(BaseMainActivity.this);
filterFetched = false;
networkStateReceiver = new NetworkStateReceiver();
networkStateReceiver.addListener(this);

20
app/src/main/java/app/fedilab/android/helper/ThemeHelper.java
View file

@ -88,26 +88,6 @@ public class ThemeHelper {
return new ColorStateList(states, colors);
}
/**
* Initialize colors in a static variable
* Currently link_color cannot be retrieved with getAttColor in ViewModel due to application and theme
*
* @param activity Activity
*/
public static void initiliazeColors(Activity activity) {
TypedValue typedValue = new TypedValue();
Resources.Theme theme = activity.getTheme();
theme.resolveAttribute(R.attr.linkColor, typedValue, true);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
linkColor = -1;
if (prefs.getBoolean("use_custom_theme", false)) {
linkColor = prefs.getInt("theme_link_color", -1);
}
if (linkColor == -1) {
linkColor = typedValue.data;
}
}
/**

9
app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentThemingSettings.java
View file

@ -209,10 +209,10 @@ public class FragmentThemingSettings extends PreferenceFragmentCompat implements
if (linksColor != -1) {
binding.cardUrl.setTextColor(linksColor);
} else {
binding.cardUrl.setTextColor(ThemeHelper.getAttColor(requireActivity(), R.attr.linkColor));
binding.cardUrl.setTextColor(ThemeHelper.getAttColor(requireActivity(), R.attr.colorPrimary));
}
if (iconsColor == -1) {
iconsColor = ThemeHelper.getAttColor(requireActivity(), R.attr.iconColor);
iconsColor = ThemeHelper.getAttColor(requireActivity(), R.attr.colorControlNormal);
}
Helper.changeDrawableColor(requireActivity(), binding.actionButtonReply, iconsColor);
Helper.changeDrawableColor(requireActivity(), binding.actionButtonMore, iconsColor);
@ -221,15 +221,10 @@ public class FragmentThemingSettings extends PreferenceFragmentCompat implements
Helper.changeDrawableColor(requireActivity(), R.drawable.ic_person, iconsColor);
if (displayNameColor != -1) {
binding.displayName.setTextColor(displayNameColor);
} else {
binding.displayName.setTextColor(ThemeHelper.getAttColor(requireActivity(), R.attr.statusTextColor));
}
if (userNameColor != -1) {
binding.username.setTextColor(userNameColor);
Helper.changeDrawableColor(requireActivity(), binding.statusBoostIcon, userNameColor);
} else {
binding.username.setTextColor(ThemeHelper.getAttColor(requireActivity(), R.attr.statusTextColor));
Helper.changeDrawableColor(requireActivity(), binding.statusBoostIcon, ThemeHelper.getAttColor(requireActivity(), R.attr.statusTextColor));
}
Glide.with(binding.getRoot().getContext())
.load(R.drawable.fedilab_logo_bubbles)

5
app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAccount.java
View file

@ -40,7 +40,6 @@ import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.FragmentPaginationBinding;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.MastodonHelper;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.ui.drawer.AccountAdapter;
import app.fedilab.android.ui.pageadapter.FedilabProfileTLPageAdapter;
import app.fedilab.android.viewmodel.mastodon.AccountsVM;
@ -80,10 +79,6 @@ public class FragmentMastodonAccount extends Fragment {
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent);
binding.swipeContainer.setColorSchemeColors(
c1, c1, c1
);
binding.loader.setVisibility(View.VISIBLE);
binding.recyclerView.setVisibility(View.GONE);
accountsVM = new ViewModelProvider(FragmentMastodonAccount.this).get(viewModelKey, AccountsVM.class);

5
app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAnnouncement.java
View file

@ -30,7 +30,6 @@ import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Announcement;
import app.fedilab.android.databinding.FragmentPaginationBinding;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.ui.drawer.AnnouncementAdapter;
import app.fedilab.android.viewmodel.mastodon.AnnouncementsVM;
@ -47,10 +46,6 @@ public class FragmentMastodonAnnouncement extends Fragment {
binding = FragmentPaginationBinding.inflate(inflater, container, false);
View root = binding.getRoot();
int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent);
binding.swipeContainer.setColorSchemeColors(
c1, c1, c1
);
announcementsVM = new ViewModelProvider(FragmentMastodonAnnouncement.this).get(AnnouncementsVM.class);
binding.loader.setVisibility(View.VISIBLE);
binding.recyclerView.setVisibility(View.GONE);

5
app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonContext.java
View file

@ -43,7 +43,6 @@ import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.FragmentPaginationBinding;
import app.fedilab.android.helper.DividerDecoration;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.ui.drawer.StatusAdapter;
import app.fedilab.android.viewmodel.mastodon.StatusesVM;
@ -151,10 +150,6 @@ public class FragmentMastodonContext extends Fragment {
getChildFragmentManager().beginTransaction().remove(this).commit();
}
binding = FragmentPaginationBinding.inflate(inflater, container, false);
int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent);
binding.swipeContainer.setColorSchemeColors(
c1, c1, c1
);
statusesVM = new ViewModelProvider(FragmentMastodonContext.this).get(StatusesVM.class);
binding.recyclerView.setNestedScrollingEnabled(true);
this.statuses = new ArrayList<>();

6
app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonConversation.java
View file

@ -42,7 +42,6 @@ import app.fedilab.android.databinding.FragmentPaginationBinding;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.MastodonHelper;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.ui.drawer.ConversationAdapter;
import app.fedilab.android.viewmodel.mastodon.TimelinesVM;
@ -237,11 +236,6 @@ public class FragmentMastodonConversation extends Fragment implements Conversati
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent);
binding.swipeContainer.setColorSchemeColors(
c1, c1, c1
);
initialConversations = null;
binding.loader.setVisibility(View.VISIBLE);
binding.recyclerView.setVisibility(View.GONE);

5
app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonDomainBlock.java
View file

@ -34,7 +34,6 @@ import app.fedilab.android.R;
import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.client.entities.api.Domains;
import app.fedilab.android.databinding.FragmentPaginationBinding;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.ui.drawer.DomainBlockAdapter;
import app.fedilab.android.viewmodel.mastodon.AccountsVM;
@ -59,10 +58,6 @@ public class FragmentMastodonDomainBlock extends Fragment {
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent);
binding.swipeContainer.setColorSchemeColors(
c1, c1, c1
);
binding.loader.setVisibility(View.VISIBLE);
binding.recyclerView.setVisibility(View.GONE);
accountsVM = new ViewModelProvider(FragmentMastodonDomainBlock.this).get(AccountsVM.class);

5
app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java
View file

@ -50,7 +50,6 @@ import app.fedilab.android.databinding.FragmentPaginationBinding;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.MastodonHelper;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.ui.drawer.NotificationAdapter;
import app.fedilab.android.viewmodel.mastodon.NotificationsVM;
import app.fedilab.android.viewmodel.mastodon.TimelinesVM;
@ -190,10 +189,6 @@ public class FragmentMastodonNotification extends Fragment implements Notificati
notificationType = (NotificationTypeEnum) getArguments().get(Helper.ARG_NOTIFICATION_TYPE);
}
aggregateNotification = false;
int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent);
binding.swipeContainer.setColorSchemeColors(
c1, c1, c1
);
LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(receive_action, new IntentFilter(Helper.RECEIVE_STATUS_ACTION));
return root;

5
app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonSuggestion.java
View file

@ -34,7 +34,6 @@ import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Suggestion;
import app.fedilab.android.client.entities.api.Suggestions;
import app.fedilab.android.databinding.FragmentPaginationBinding;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.ui.drawer.SuggestionAdapter;
import app.fedilab.android.viewmodel.mastodon.AccountsVM;
@ -58,10 +57,6 @@ public class FragmentMastodonSuggestion extends Fragment {
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent);
binding.swipeContainer.setColorSchemeColors(
c1, c1, c1
);
binding.loader.setVisibility(View.VISIBLE);
binding.recyclerView.setVisibility(View.GONE);
accountsVM = new ViewModelProvider(FragmentMastodonSuggestion.this).get(AccountsVM.class);

5
app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTag.java
View file

@ -37,7 +37,6 @@ import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.FragmentPaginationBinding;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.MastodonHelper;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.ui.drawer.TagAdapter;
import app.fedilab.android.viewmodel.mastodon.SearchVM;
import app.fedilab.android.viewmodel.mastodon.TimelinesVM;
@ -65,10 +64,6 @@ public class FragmentMastodonTag extends Fragment {
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent);
binding.swipeContainer.setColorSchemeColors(
c1, c1, c1
);
binding.loader.setVisibility(View.VISIBLE);
binding.recyclerView.setVisibility(View.GONE);
router();

8
app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
View file

@ -61,7 +61,6 @@ import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.CrossActionHelper;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.MastodonHelper;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.ui.drawer.StatusAdapter;
import app.fedilab.android.viewmodel.mastodon.AccountsVM;
import app.fedilab.android.viewmodel.mastodon.SearchVM;
@ -364,13 +363,6 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
LocalBroadcastManager.getInstance(requireActivity()).registerReceiver(receive_action, new IntentFilter(Helper.RECEIVE_STATUS_ACTION));
binding = FragmentPaginationBinding.inflate(inflater, container, false);
int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent);
binding.swipeContainer.setColorSchemeColors(
c1, c1, c1
);
return binding.getRoot();
}

4
app/src/main/res/drawable/ic_baseline_bookmark_24.xml
View file

@ -1,10 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/iconColor"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?attr/colorControlNormal"
android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z" />
</vector>

4
app/src/main/res/drawable/ic_baseline_bookmark_border_24.xml
View file

@ -1,10 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/iconColor"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?attr/colorControlNormal"
android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z" />
</vector>

4
app/src/main/res/drawable/ic_repeat.xml
View file

@ -2,10 +2,10 @@
android:width="28dp"
android:height="28dp"
android:autoMirrored="true"
android:tint="?attr/iconColor"
android:tint="?attr/colorControlNormal"
android:viewportWidth="28"
android:viewportHeight="28">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?attr/colorControlNormal"
android:pathData="M7,7h10v1.79c0,0.45 0.54,0.67 0.85,0.35l2.79,-2.79c0.2,-0.2 0.2,-0.51 0,-0.71l-2.79,-2.79c-0.31,-0.31 -0.85,-0.09 -0.85,0.36L17,5L6,5c-0.55,0 -1,0.45 -1,1v4c0,0.55 0.45,1 1,1s1,-0.45 1,-1L7,7zM17,17L7,17v-1.79c0,-0.45 -0.54,-0.67 -0.85,-0.35l-2.79,2.79c-0.2,0.2 -0.2,0.51 0,0.71l2.79,2.79c0.31,0.31 0.85,0.09 0.85,-0.36L7,19h11c0.55,0 1,-0.45 1,-1v-4c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v3z" />
</vector>

4
app/src/main/res/drawable/ic_star_outline.xml
View file

@ -1,10 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="28dp"
android:height="28dp"
android:tint="?attr/iconColor"
android:tint="?attr/colorControlNormal"
android:viewportWidth="28"
android:viewportHeight="28">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?attr/colorControlNormal"
android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" />
</vector>

7
app/src/main/res/drawable/menu_selector_dark.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="?attr/colorAccent" android:state_checked="true" />
<item android:drawable="?attr/colorAccent" android:state_pressed="true" />
<item android:drawable="?attr/colorAccent" android:state_focused="true" />
<item android:drawable="@color/transparent" />
</selector>

7
app/src/main/res/drawable/menu_selector_light.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="?attr/colorAccent" android:state_checked="true" />
<item android:drawable="?attr/colorAccent" android:state_pressed="true" />
<item android:drawable="?attr/colorAccent" android:state_focused="true" />
<item android:drawable="@color/transparent" />
</selector>

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

@ -79,7 +79,7 @@
android:gravity="end"
android:contentDescription="@string/display_timelines"
android:src="@drawable/ic_baseline_more_horiz_24"
android:tint="?attr/iconColor"
android:tint="?attr/colorControlNormal"
android:visibility="gone" />
</LinearLayout>

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

@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="@string/bottom_menu"
android:textColor="?colorAccent"
android:textColor="?colorPrimary"
android:textSize="16sp"
app:layout_constraintTop_toTopOf="parent" />
@ -56,7 +56,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="@string/top_menu"
android:textColor="?colorAccent"
android:textColor="?colorPrimary"
android:textSize="16sp"
app:layout_constraintTop_toBottomOf="@+id/lv_reorder_bottom_container" />

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

@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="6dp"
android:layout_marginTop="6dp"
app:cardElevation="0dp">
app:cardElevation="1dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@ -86,39 +86,49 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/mute"
style="@style/Widget.Material3.Button.IconButton"
android:layout_width="36dp"
android:layout_height="36dp"
android:padding="6dp"
style="@style/Widget.Material3.Button.OutlinedButton.Icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="0dp"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:icon="@drawable/ic_baseline_volume_mute_24"
app:strokeWidth="1dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/mute_notification"
style="@style/Widget.Material3.Button.IconButton"
android:layout_width="36dp"
android:layout_height="36dp"
android:padding="6dp"
app:icon="@drawable/ic_baseline_notifications_off_24" />
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="0dp"
app:icon="@drawable/ic_baseline_notifications_off_24"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:strokeWidth="1dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/mute_timed"
style="@style/Widget.Material3.Button.IconButton"
android:layout_width="36dp"
android:layout_height="36dp"
android:padding="6dp"
app:icon="@drawable/ic_baseline_access_time_filled_24" />
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="0dp"
app:icon="@drawable/ic_baseline_access_time_filled_24"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:strokeWidth="1dp" />
</com.google.android.material.button.MaterialButtonToggleGroup>
<com.google.android.material.button.MaterialButton
android:id="@+id/block"
style="@style/Widget.Material3.Button.IconButton"
android:layout_width="36dp"
android:layout_height="36dp"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="24dp"
android:layout_marginTop="6dp"
android:padding="6dp"
android:padding="0dp"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:icon="@drawable/ic_baseline_block_24"
app:layout_constraintStart_toEndOf="@id/mute_group"
app:layout_constraintTop_toBottomOf="@id/bio" />
@ -126,13 +136,13 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/follow_action"
style="@style/Widget.Material3.Button"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="12dp"
android:layout_marginTop="6dp"
android:insetTop="0dp"
android:insetBottom="0dp"
android:padding="6dp"
android:padding="0dp"
app:iconGravity="textStart"
app:iconPadding="0dp"
app:icon="@drawable/ic_baseline_person_add_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/bio" />

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

@ -77,8 +77,7 @@
android:layout_height="28dp"
android:contentDescription="@string/add_reaction"
android:padding="3dp"
android:src="@drawable/ic_baseline_emoji_emotions_24"
app:tint="?attr/iconColor" />
android:src="@drawable/ic_baseline_emoji_emotions_24" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/status_emoji"
@ -87,8 +86,7 @@
android:layout_marginStart="6dp"
android:contentDescription="@string/add_reaction"
android:padding="3dp"
android:src="@drawable/ic_baseline_add_reaction_24"
app:tint="?attr/iconColor" />
android:src="@drawable/ic_baseline_add_reaction_24" />
</androidx.appcompat.widget.LinearLayoutCompat>

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

@ -69,10 +69,6 @@
android:textAlignment="textEnd" />
</androidx.appcompat.widget.LinearLayoutCompat>
<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
android:layout_height="1dp" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/spoiler"
android:layout_width="match_parent"

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

@ -24,7 +24,7 @@
android:layout_marginTop="@dimen/card_margin"
android:clipChildren="false"
android:clipToPadding="false"
app:cardElevation="0dp">
app:cardElevation="1dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/main_container"
@ -35,9 +35,6 @@
android:clipToPadding="false"
android:orientation="vertical">
<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
android:layout_height="1dp" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/status_booster_info"
@ -247,9 +244,7 @@
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/display_toot_truncate"
android:textAllCaps="false"
app:iconTint="?colorAccent"
app:strokeColor="?colorAccent" />
android:textAllCaps="false" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/container_trans"
@ -375,7 +370,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="?linkColor"
tools:text="https://domain.test" />
</androidx.appcompat.widget.LinearLayoutCompat>

3
app/src/main/res/layout/drawer_status_history.xml
View file

@ -77,9 +77,6 @@
android:layout_marginBottom="5dp"
tools:text="@tools:sample/date/ddmmyy" />
<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
android:layout_height="1dp" />
<app.fedilab.android.helper.CustomTextView
android:id="@+id/spoiler"

3
app/src/main/res/layout/drawer_status_simple.xml
View file

@ -75,9 +75,6 @@
</androidx.appcompat.widget.LinearLayoutCompat>
<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
android:layout_height="1dp" />
<app.fedilab.android.helper.CustomTextView
android:id="@+id/spoiler"

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

@ -25,7 +25,7 @@
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:contentDescription="@string/information"
android:src="@drawable/ic_baseline_more_vert_24"
app:tint="?iconColor" />
app:tint="?colorControlNormal" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
@ -73,7 +73,7 @@
android:contentDescription="@string/open_menu"
android:gravity="center_vertical"
android:src="@drawable/ic_baseline_arrow_drop_down_24"
app:tint="?iconColor" />
app:tint="?colorControlNormal" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -101,7 +101,7 @@
android:layout_gravity="center_vertical|end"
android:contentDescription="@string/information"
android:src="@drawable/ic_baseline_info_24"
app:tint="?iconColor" />
app:tint="?colorControlNormal" />
</androidx.appcompat.widget.LinearLayoutCompat>

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

@ -15,9 +15,9 @@
android:layout_marginBottom="10dp"
android:drawableEnd="@drawable/ic_baseline_navigate_next_24"
android:text="@string/display_full_link"
android:textColor="?colorAccent"
android:textColor="?colorPrimary"
android:textSize="16sp"
app:drawableTint="?colorAccent" />
app:drawableTint="?colorPrimary" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/share_link"
@ -27,9 +27,9 @@
android:layout_marginBottom="10dp"
android:drawableEnd="@drawable/ic_baseline_navigate_next_24"
android:text="@string/share_link"
android:textColor="?colorAccent"
android:textColor="?colorPrimary"
android:textSize="16sp"
app:drawableTint="?colorAccent" />
app:drawableTint="?colorPrimary" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/open_other_app"

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

@ -263,8 +263,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="https://domain.test"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="?linkColor" />
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -295,7 +294,6 @@
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?statusTextColor"
tools:text="1 January 2021, 12:00" />
<androidx.appcompat.widget.LinearLayoutCompat
@ -316,8 +314,7 @@
android:id="@+id/reblogs_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="10"
android:textColor="?statusTextColor" />
tools:text="10" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -339,8 +336,7 @@
android:id="@+id/favorites_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="10"
android:textColor="?statusTextColor" />
tools:text="10" />
</androidx.appcompat.widget.LinearLayoutCompat>

1
app/src/main/res/layout/tab_custom_default_view.xml
View file

@ -29,7 +29,6 @@
android:background="@drawable/shape_counter"
android:paddingLeft="2dp"
android:paddingRight="2dp"
android:textColor="?mTextColor"
android:textSize="12sp"
android:visibility="gone"
tools:text="35"

1
app/src/main/res/layout/tab_custom_view.xml
View file

@ -35,7 +35,6 @@
android:background="@drawable/shape_counter"
android:paddingLeft="2dp"
android:paddingRight="2dp"
android:textColor="?mTextColor"
android:textSize="12sp"
android:visibility="gone"
tools:text="35"

5
app/src/main/res/values/colors.xml
View file

@ -1,6 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="PrivateResource">
<color name="my_app_primary_color">#6200EE</color>
<color name="my_app_secondary_color">#03DAC6</color>
<color name="my_app_background_color">#000</color>
<color name="colorPrimaryVariant">#3700B3</color>
<!-- Header Profile-->
<!-- Header Profile DARK-->

66
app/src/main/res/values/styles.xml
View file

@ -1,17 +1,16 @@
<resources>
<attr name="linkColor" type="color" />
<attr name="errorColor" type="color" />
<attr name="iconColor" type="color" />
<attr name="statusTextColor" type="color" />
<attr name="mTextColor" type="color" />
<style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/deep_purple_700</item>
<item name="colorPrimaryVariant">@color/deep_purple_900</item>
<item name="colorOnPrimary">@color/deep_purple_600</item>
<item name="iconColor">@color/black</item>
<item name="statusTextColor">@color/black</item>
<item name="mTextColor">@color/black</item>
<item name="linkColor">@color/light_link_toot</item>
<item name="errorColor">@color/red_1</item>
<item name="colorSecondary">@color/indigo_700</item>
<item name="colorSecondaryVariant">@color/indigo_900</item>
<item name="colorOnSecondary">@color/indigo_600</item>
<item name="colorError">@color/red_900</item>
<item name="windowNoTitle">true</item>
<!-- specify shared element transitions -->
@ -24,14 +23,17 @@
</style>
<style name="AppThemeDark" parent="Theme.Material3.Dark.NoActionBar">
<item name="colorAccent">@color/mastodonC4</item>
<item name="iconColor">@color/dark_icon_theme</item>
<item name="statusTextColor">@color/dark_text</item>
<item name="mTextColor">@color/dark_text</item>
<item name="android:textColor">@color/dark_text</item>
<item name="linkColor">@color/dark_link_toot</item>
<item name="colorPrimary">@color/deep_purple_700</item>
<item name="colorPrimaryVariant">@color/deep_purple_900</item>
<item name="colorOnPrimary">@color/deep_purple_600</item>
<item name="colorSecondary">@color/indigo_700</item>
<item name="colorSecondaryVariant">@color/indigo_900</item>
<item name="colorOnSecondary">@color/indigo_600</item>
<item name="colorError">@color/red_900</item>
<item name="windowNoTitle">true</item>
<item name="errorColor">@color/red_1</item>
<!-- specify enter and exit transitions -->
<item name="android:windowEnterTransition">@android:transition/explode</item>
<item name="android:windowExitTransition">@android:transition/explode</item>
@ -47,20 +49,30 @@
<style name="AppThemeBar" parent="Theme.Material3.Light">
<item name="iconColor">@color/black</item>
<item name="statusTextColor">@color/black</item>
<item name="mTextColor">@color/black</item>
<item name="android:textColor">@color/black</item>
<item name="linkColor">@color/light_link_toot</item>
<item name="colorPrimary">@color/deep_purple_700</item>
<item name="colorPrimaryVariant">@color/deep_purple_900</item>
<item name="colorOnPrimary">@color/deep_purple_600</item>
<item name="colorSecondary">@color/indigo_700</item>
<item name="colorSecondaryVariant">@color/indigo_900</item>
<item name="colorOnSecondary">@color/indigo_600</item>
<item name="colorError">@color/red_900</item>
</style>
<style name="AppThemeBarDark" parent="Theme.Material3.Dark">
<item name="iconColor">@color/dark_icon_theme</item>
<item name="statusTextColor">@color/dark_text</item>
<item name="mTextColor">@color/dark_text</item>
<item name="android:textColor">@color/dark_text</item>
<item name="linkColor">@color/dark_link_toot</item>
<item name="colorPrimary">@color/deep_purple_700</item>
<item name="colorPrimaryVariant">@color/deep_purple_900</item>
<item name="colorOnPrimary">@color/deep_purple_600</item>
<item name="colorSecondary">@color/indigo_700</item>
<item name="colorSecondaryVariant">@color/indigo_900</item>
<item name="colorOnSecondary">@color/indigo_600</item>
<item name="colorError">@color/red_900</item>
</style>