chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

First pass at re-theming to match Chinwag

Browse source
This commit is contained in:
Mike Barnes 2020-12-15 12:53:03 +11:00
commit b2723b7707
36 changed files with 68 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
View file

@ -357,7 +357,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
viewModel.isRefreshing.observe(this, { isRefreshing ->
swipeToRefreshLayout.isRefreshing = isRefreshing == true
})
swipeToRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
swipeToRefreshLayout.setColorSchemeResources(R.color.chinwag_green)
}
private fun onAccountChanged(account: Account?) {

2
app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
View file

@ -482,7 +482,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
icon = ContextCompat.getDrawable(context, R.drawable.ic_repeat_24dp);
if (icon != null) {
icon.setColorFilter(ContextCompat.getColor(context,
R.color.tusky_blue), PorterDuff.Mode.SRC_ATOP);
R.color.chinwag_green), PorterDuff.Mode.SRC_ATOP);
}
format = context.getString(R.string.notification_reblog_format);

2
app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt
View file

@ -69,7 +69,7 @@ class AnnouncementsActivity : BottomSheetActivity(), AnnouncementActionListener,
}
swipeRefreshLayout.setOnRefreshListener(this::refreshAnnouncements)
swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green)
announcementsList.setHasFixedSize(true)
announcementsList.layoutManager = LinearLayoutManager(this)

8
app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
View file

@ -489,13 +489,13 @@ class ComposeActivity : BaseActivity(),
@ColorInt val color = if (contentWarningShown) {
composeHideMediaButton.setImageResource(R.drawable.ic_hide_media_24dp)
composeHideMediaButton.isClickable = false
ContextCompat.getColor(this, R.color.transparent_tusky_blue)
ContextCompat.getColor(this, R.color.transparent_chinwag_green)
} else {
composeHideMediaButton.isClickable = true
if (markMediaSensitive) {
composeHideMediaButton.setImageResource(R.drawable.ic_hide_media_24dp)
ContextCompat.getColor(this, R.color.tusky_blue)
ContextCompat.getColor(this, R.color.chinwag_green)
} else {
composeHideMediaButton.setImageResource(R.drawable.ic_eye_24dp)
ThemeUtils.getColor(this, android.R.attr.textColorTertiary)
@ -509,7 +509,7 @@ class ComposeActivity : BaseActivity(),
@ColorInt val color = if (composeScheduleView.time == null) {
ThemeUtils.getColor(this, android.R.attr.textColorTertiary)
} else {
ContextCompat.getColor(this, R.color.tusky_blue)
ContextCompat.getColor(this, R.color.chinwag_green)
}
composeScheduleButton.drawable.colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN)
}
@ -873,7 +873,7 @@ class ComposeActivity : BaseActivity(),
composeContentWarningBar.show()
composeContentWarningField.setSelection(composeContentWarningField.text.length)
composeContentWarningField.requestFocus()
ContextCompat.getColor(this, R.color.tusky_blue)
ContextCompat.getColor(this, R.color.chinwag_green)
} else {
composeContentWarningBar.hide()
composeEditField.requestFocus()

4
app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.java
View file

@ -58,7 +58,7 @@ public final class ProgressImageView extends AppCompatImageView {
}
private void init() {
circlePaint.setColor(ContextCompat.getColor(getContext(), R.color.tusky_blue));
circlePaint.setColor(ContextCompat.getColor(getContext(), R.color.chinwag_green));
circlePaint.setStrokeWidth(Utils.dpToPx(getContext(), 4));
circlePaint.setStyle(Paint.Style.STROKE);
@ -82,7 +82,7 @@ public final class ProgressImageView extends AppCompatImageView {
public void setChecked(boolean checked) {
this.markBgPaint.setColor(ContextCompat.getColor(getContext(),
checked ? R.color.tusky_blue : R.color.tusky_grey_10));
checked ? R.color.chinwag_green : R.color.tusky_grey_10));
invalidate();
}

2
app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
View file

@ -102,7 +102,7 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res
swipeRefreshLayout.setOnRefreshListener {
viewModel.refresh()
}
swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green)
}
private fun onTopLoaded() {

2
app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java
View file

@ -295,7 +295,7 @@ public class NotificationHelper {
.setSmallIcon(R.drawable.ic_notify)
.setContentIntent(summary ? summaryResultPendingIntent : eventResultPendingIntent)
.setDeleteIntent(deletePendingIntent)
.setColor(BuildConfig.FLAVOR == "green" ? Color.parseColor("#19A341") : ContextCompat.getColor(context, R.color.tusky_blue))
.setColor(BuildConfig.FLAVOR == "green" ? Color.parseColor("#19A341") : ContextCompat.getColor(context, R.color.chinwag_green))
.setGroup(account.getAccountId())
.setAutoCancel(true)
.setShortcutId(Long.toString(account.getId()))

2
app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
View file

@ -101,7 +101,7 @@ class ReportStatusesFragment : Fragment(), Injectable, AdapterHandler {
}
private fun setupSwipeRefreshLayout() {
swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green)
swipeRefreshLayout.setOnRefreshListener {
snackbarErrorRetry?.dismiss()

2
app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledTootActivity.kt
View file

@ -56,7 +56,7 @@ class ScheduledTootActivity : BaseActivity(), ScheduledTootActionListener, Injec
}
swipeRefreshLayout.setOnRefreshListener(this::refreshStatuses)
swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green)
scheduledTootList.setHasFixedSize(true)
scheduledTootList.layoutManager = LinearLayoutManager(this)

2
app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt
View file

@ -56,7 +56,7 @@ abstract class SearchFragment<T> : Fragment(),
private fun setupSwipeRefreshLayout() {
swipeRefreshLayout.setOnRefreshListener(this)
swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green)
}
private fun subscribeObservables() {

2
app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt
View file

@ -187,7 +187,7 @@ class AccountMediaFragment : BaseFragment(), RefreshableFragment, Injectable {
swipeRefreshLayout.setOnRefreshListener {
refresh()
}
swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green)
}
statusView.visibility = View.GONE

2
app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
View file

@ -221,7 +221,7 @@ public class NotificationsFragment extends SFragment implements
appBarOptions = rootView.findViewById(R.id.appBarOptions);
swipeRefreshLayout.setOnRefreshListener(this);
swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue);
swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green);
loadNotificationsFilter();

2
app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
View file

@ -423,7 +423,7 @@ public class TimelineFragment extends SFragment implements
swipeRefreshLayout.setEnabled(isSwipeToRefreshEnabled);
if (isSwipeToRefreshEnabled) {
swipeRefreshLayout.setOnRefreshListener(this);
swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue);
swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green);
}
}

2
app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
View file

@ -149,7 +149,7 @@ public final class ViewThreadFragment extends SFragment implements
Context context = getContext();
swipeRefreshLayout = rootView.findViewById(R.id.swipeRefreshLayout);
swipeRefreshLayout.setOnRefreshListener(this);
swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue);
swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green);
recyclerView = rootView.findViewById(R.id.recyclerView);
recyclerView.setHasFixedSize(true);

4
app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt
View file

@ -70,7 +70,7 @@ class SendStatusBroadcastReceiver : BroadcastReceiver() {
val builder = NotificationCompat.Builder(context, NotificationHelper.CHANNEL_MENTION + senderIdentifier)
.setSmallIcon(R.drawable.ic_notify)
.setColor(ContextCompat.getColor(context, (R.color.tusky_blue)))
.setColor(ContextCompat.getColor(context, (R.color.chinwag_green)))
.setGroup(senderFullName)
.setDefaults(0) // So it doesn't ring twice, notify only in Target callback
@ -112,7 +112,7 @@ class SendStatusBroadcastReceiver : BroadcastReceiver() {
val builder = NotificationCompat.Builder(context, NotificationHelper.CHANNEL_MENTION + senderIdentifier)
.setSmallIcon(R.drawable.ic_notify)
.setColor(ContextCompat.getColor(context, (R.color.tusky_blue)))
.setColor(ContextCompat.getColor(context, (R.color.chinwag_green)))
.setGroup(senderFullName)
.setDefaults(0) // So it doesn't ring twice, notify only in Target callback

6
app/src/main/java/com/keylesspalace/tusky/service/SendTootService.kt
View file

@ -89,7 +89,7 @@ class SendTootService : Service(), Injectable {
.setContentText(notificationText)
.setProgress(1, 0, true)
.setOngoing(true)
.setColor(ContextCompat.getColor(this, R.color.tusky_blue))
.setColor(ContextCompat.getColor(this, R.color.chinwag_green))
.addAction(0, getString(android.R.string.cancel), cancelSendingIntent(sendingNotificationId))
if (tootsToSend.size == 0 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@ -180,7 +180,7 @@ class SendTootService : Service(), Injectable {
.setSmallIcon(R.drawable.ic_notify)
.setContentTitle(getString(R.string.send_toot_notification_error_title))
.setContentText(getString(R.string.send_toot_notification_saved_content))
.setColor(ContextCompat.getColor(this@SendTootService, R.color.tusky_blue))
.setColor(ContextCompat.getColor(this@SendTootService, R.color.chinwag_green))
notificationManager.cancel(tootId)
notificationManager.notify(errorNotificationId--, builder.build())
@ -229,7 +229,7 @@ class SendTootService : Service(), Injectable {
.setSmallIcon(R.drawable.ic_notify)
.setContentTitle(getString(R.string.send_toot_notification_cancel_title))
.setContentText(getString(R.string.send_toot_notification_saved_content))
.setColor(ContextCompat.getColor(this@SendTootService, R.color.tusky_blue))
.setColor(ContextCompat.getColor(this@SendTootService, R.color.chinwag_green))
notificationManager.notify(tootId, builder.build())