GitNex/GitNex
GitNex/GitNex
2
5
Fork 0
mirror of https://codeberg.org/gitnex/GitNex.git synced 2023-12-13 20:50:18 +01:00
Code Issues 1 Projects Releases Wiki Activity

Fix and enhance colors on UI

Browse source
This commit is contained in:
M M Arif 2023-03-24 17:09:20 +05:00
parent bed66a52b7
commit 1ecd1a3432
63 changed files with 210 additions and 170 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/build.gradle
View file

@ -54,16 +54,16 @@ configurations {
}
dependencies {
def lifecycle_version = '2.6.0-rc01'
def lifecycle_version = '2.6.0'
def markwon_version = '4.6.2'
def work_version = '2.8.0'
def acra = '5.9.7'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.9.0-alpha02'
implementation 'androidx.compose.material3:material3:1.1.0-alpha07'
implementation 'androidx.compose.material3:material3-window-size-class:1.1.0-alpha07'
implementation 'com.google.android.material:material:1.9.0-beta01'
implementation 'androidx.compose.material3:material3:1.1.0-alpha08'
implementation 'androidx.compose.material3:material3-window-size-class:1.1.0-alpha08'
implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "androidx.legacy:legacy-support-v4:1.0.0"

91
app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
View file

@ -552,9 +552,12 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
text.indexOf('|'),
text.indexOf('|') + 1,
Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
if (!isNightModeThemeDynamic(context)) {
textView.setTextColor(
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
textView.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
textView.setText(spannableString);
timelineData.addView(textView);
@ -589,8 +592,11 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
issueComment.getUser().getLogin(),
commitText,
info);
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(AppUtil.dynamicColorResource(context));
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
start.setText(HtmlCompat.fromHtml(commitString, HtmlCompat.FROM_HTML_MODE_LEGACY));
start.setTextSize(fontSize);
@ -650,8 +656,11 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
TextView start = new TextView(context);
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(AppUtil.dynamicColorResource(context));
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
if (issueComment.isRemovedAssignee()) {
@ -705,8 +714,11 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
TextView start = new TextView(context);
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(AppUtil.dynamicColorResource(context));
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
if (issueComment.getMilestone() != null) {
@ -747,8 +759,11 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
TextView start = new TextView(context);
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(AppUtil.dynamicColorResource(context));
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
if (issue.getIssueType().equalsIgnoreCase("Issue")) {
@ -869,8 +884,11 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
TextView start = new TextView(context);
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(AppUtil.dynamicColorResource(context));
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
if (issueComment.getType().equalsIgnoreCase("review")) {
@ -898,8 +916,11 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
TextView start = new TextView(context);
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(AppUtil.dynamicColorResource(context));
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
start.setText(
@ -921,8 +942,11 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
TextView start = new TextView(context);
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(AppUtil.dynamicColorResource(context));
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
if (issueComment.getType().equalsIgnoreCase("lock")) {
@ -953,8 +977,11 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
TextView start = new TextView(context);
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(AppUtil.dynamicColorResource(context));
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
if (issueComment.getType().equalsIgnoreCase("add_dependency")) {
@ -986,8 +1013,11 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
TextView start = new TextView(context);
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(AppUtil.dynamicColorResource(context));
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
if (issueComment.getProjectId() > 0) {
@ -1018,8 +1048,11 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
TextView start = new TextView(context);
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(AppUtil.dynamicColorResource(context));
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
// TODO pretty-print
@ -1060,8 +1093,11 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
TextView start = new TextView(context);
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(AppUtil.dynamicColorResource(context));
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
if (issueComment.getType().equalsIgnoreCase("change_target_branch")) {
@ -1097,8 +1133,11 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<RecyclerView.View
TextView start = new TextView(context);
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(AppUtil.dynamicColorResource(context));
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
start.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
if (issueComment.getType().equalsIgnoreCase("start_tracking")) {

2
app/src/main/java/org/mian/gitnex/fragments/MyIssuesFragment.java
View file

@ -44,6 +44,8 @@ public class MyIssuesFragment extends Fragment {
fragmentIssuesBinding.recyclerView.setHasFixedSize(true);
fragmentIssuesBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
fragmentIssuesBinding.createNewIssue.setVisibility(View.GONE);
((MainActivity) requireActivity())
.setFragmentRefreshListenerMyIssues(
myIssues -> {

22
app/src/main/java/org/mian/gitnex/helpers/AppUtil.java
View file

@ -24,6 +24,13 @@ import androidx.annotation.ColorInt;
import androidx.browser.customtabs.CustomTabColorSchemeParams;
import androidx.browser.customtabs.CustomTabsIntent;
import androidx.core.content.pm.PackageInfoCompat;
import org.mian.gitnex.R;
import org.mian.gitnex.activities.LoginActivity;
import org.mian.gitnex.activities.MainActivity;
import org.mian.gitnex.core.MainApplication;
import org.mian.gitnex.database.api.BaseApi;
import org.mian.gitnex.database.api.UserAccountsApi;
import org.mian.gitnex.database.models.UserAccount;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@ -42,13 +49,6 @@ import java.util.Locale;
import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.mian.gitnex.R;
import org.mian.gitnex.activities.LoginActivity;
import org.mian.gitnex.activities.MainActivity;
import org.mian.gitnex.core.MainApplication;
import org.mian.gitnex.database.api.BaseApi;
import org.mian.gitnex.database.api.UserAccountsApi;
import org.mian.gitnex.database.models.UserAccount;
/**
* @author M M Arif
@ -665,16 +665,10 @@ public class AppUtil {
}
public static boolean isNightModeThemeDynamic(Context context) {
TinyDB tinyDB = TinyDB.getInstance(context);
int nightModeFlags =
context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
if (tinyDB.getInt("themeId") == 8) {
return nightModeFlags == Configuration.UI_MODE_NIGHT_YES;
} else {
return nightModeFlags == Configuration.UI_MODE_NIGHT_NO;
}
return nightModeFlags == Configuration.UI_MODE_NIGHT_YES;
}
public static int dynamicColorResource(Context context) {

73
app/src/main/java/org/mian/gitnex/helpers/Markdown.java
View file

@ -1,7 +1,5 @@
package org.mian.gitnex.helpers;
import static org.mian.gitnex.helpers.AppUtil.isNightModeThemeDynamic;
import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
@ -11,33 +9,6 @@ import androidx.annotation.NonNull;
import androidx.core.content.res.ResourcesCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import io.noties.markwon.AbstractMarkwonPlugin;
import io.noties.markwon.Markwon;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.SoftBreakAddsNewLinePlugin;
import io.noties.markwon.core.CorePlugin;
import io.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
import io.noties.markwon.ext.tables.TableAwareMovementMethod;
import io.noties.markwon.ext.tables.TablePlugin;
import io.noties.markwon.ext.tasklist.TaskListPlugin;
import io.noties.markwon.html.HtmlPlugin;
import io.noties.markwon.image.picasso.PicassoImagesPlugin;
import io.noties.markwon.inlineparser.InlineProcessor;
import io.noties.markwon.inlineparser.MarkwonInlineParser;
import io.noties.markwon.linkify.LinkifyPlugin;
import io.noties.markwon.movement.MovementMethodPlugin;
import io.noties.markwon.recycler.MarkwonAdapter;
import io.noties.markwon.recycler.SimpleEntry;
import io.noties.markwon.recycler.table.TableEntry;
import io.noties.markwon.recycler.table.TableEntryPlugin;
import java.util.Objects;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.commonmark.ext.gfm.tables.TableBlock;
import org.commonmark.node.AbstractVisitor;
import org.commonmark.node.FencedCodeBlock;
@ -59,6 +30,33 @@ import org.mian.gitnex.helpers.codeeditor.markwon.MarkwonHighlighter;
import org.mian.gitnex.helpers.codeeditor.theme.Theme;
import org.mian.gitnex.helpers.contexts.IssueContext;
import org.mian.gitnex.helpers.contexts.RepositoryContext;
import java.util.Objects;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import io.noties.markwon.AbstractMarkwonPlugin;
import io.noties.markwon.Markwon;
import io.noties.markwon.MarkwonConfiguration;
import io.noties.markwon.SoftBreakAddsNewLinePlugin;
import io.noties.markwon.core.CorePlugin;
import io.noties.markwon.core.MarkwonTheme;
import io.noties.markwon.ext.strikethrough.StrikethroughPlugin;
import io.noties.markwon.ext.tables.TableAwareMovementMethod;
import io.noties.markwon.ext.tables.TablePlugin;
import io.noties.markwon.ext.tasklist.TaskListPlugin;
import io.noties.markwon.html.HtmlPlugin;
import io.noties.markwon.image.picasso.PicassoImagesPlugin;
import io.noties.markwon.inlineparser.InlineProcessor;
import io.noties.markwon.inlineparser.MarkwonInlineParser;
import io.noties.markwon.linkify.LinkifyPlugin;
import io.noties.markwon.movement.MovementMethodPlugin;
import io.noties.markwon.recycler.MarkwonAdapter;
import io.noties.markwon.recycler.SimpleEntry;
import io.noties.markwon.recycler.table.TableEntry;
import io.noties.markwon.recycler.table.TableEntryPlugin;
import stormpot.Allocator;
import stormpot.BlazePool;
import stormpot.Config;
@ -66,6 +64,7 @@ import stormpot.Pool;
import stormpot.Poolable;
import stormpot.Slot;
import stormpot.Timeout;
import static org.mian.gitnex.helpers.AppUtil.isNightModeThemeDynamic;
/**
* @author opyale
@ -168,6 +167,7 @@ public class Markdown {
private Context context;
private String markdown;
private TextView textView;
TinyDB tinyDB = TinyDB.getInstance(null);
public Renderer(Slot slot) {
@ -208,6 +208,12 @@ public class Markdown {
if (tf == null) {
tf = AppUtil.getTypeface(textView.getContext());
}
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
textView.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
textView.setTypeface(tf);
super.beforeSetText(textView, markdown);
}
@ -308,6 +314,7 @@ public class Markdown {
private RecyclerView recyclerView;
private MarkwonAdapter adapter;
private RepositoryContext repository;
TinyDB tinyDB = TinyDB.getInstance(null);
private LinkPostProcessor linkPostProcessor;
@ -367,11 +374,13 @@ public class Markdown {
if (tf == null) {
tf = AppUtil.getTypeface(context);
}
textView.setTypeface(tf);
if (!isNightModeThemeDynamic(context)) {
textView.setTextColor(
if (tinyDB.getInt("themeId") == 8) {
if (!isNightModeThemeDynamic(context)) {
textView.setTextColor(
AppUtil.dynamicColorResource(context));
}
}
textView.setTypeface(tf);
super.beforeSetText(textView, markdown);
}

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

@ -145,7 +145,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/addNewAccountText"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textSize="@dimen/dimen16sp"
android:textStyle="bold"/>

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

@ -101,9 +101,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/adminCreateNewUser"
android:contentDescription="@string/adminCreateNewUser"
android:textColor="?attr/primaryBackgroundColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryBackgroundColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -192,7 +192,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/newFileButtonCopy"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
</LinearLayout>

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

@ -240,7 +240,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/newCreateButtonCopy"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold" />
</LinearLayout>

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

@ -117,7 +117,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/newCreateButtonCopy"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
</LinearLayout>

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

@ -161,7 +161,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/newCreateButtonCopy"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
</LinearLayout>

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

@ -171,7 +171,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/newCreateButtonCopy"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
</LinearLayout>

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

@ -76,7 +76,7 @@
android:id="@+id/markdown_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textIsSelectable="true"
android:textSize="@dimen/dimen16sp" />

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

@ -122,7 +122,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/newCreateButtonCopy"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
</LinearLayout>

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

@ -265,7 +265,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/newCreateButtonCopy"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
</LinearLayout>

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

@ -203,7 +203,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/newCreateButtonCopy"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
<com.google.android.material.button.MaterialButton
@ -212,7 +212,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/create_tag"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
</LinearLayout>

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

@ -153,7 +153,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/newCreateButtonCopy"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
</LinearLayout>

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

@ -186,7 +186,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/newCreateButtonCopy"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
</LinearLayout>

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

@ -49,7 +49,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen24dp"
android:text="@string/addNewAccountText"
android:textColor="@color/btnTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textSize="@dimen/dimen16sp"
android:textStyle="bold"/>
@ -59,7 +59,7 @@
android:layout_height="@dimen/dimen60dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/openWebRepo"
android:textColor="@color/btnTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textSize="@dimen/dimen16sp"/>
<com.google.android.material.button.MaterialButton
@ -68,7 +68,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/launchApp"
android:textColor="@color/btnTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textSize="@dimen/dimen16sp"
android:textStyle="bold"/>
@ -99,7 +99,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen24dp"
android:text="@string/navRepos"
android:textColor="@color/btnTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textSize="@dimen/dimen16sp"
android:textStyle="bold"/>
@ -109,7 +109,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/navOrg"
android:textColor="@color/btnTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textSize="@dimen/dimen16sp"
android:textStyle="bold"/>
@ -119,7 +119,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/pageTitleNotifications"
android:textColor="@color/btnTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textSize="@dimen/dimen16sp"
android:textStyle="bold"/>
@ -129,7 +129,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/pageTitleExplore"
android:textColor="@color/btnTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textSize="@dimen/dimen16sp"
android:textStyle="bold"/>
@ -139,7 +139,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/launchApp"
android:textColor="@color/btnTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textSize="@dimen/dimen16sp"
android:textStyle="bold"/>

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

@ -182,7 +182,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/saveButton"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
</LinearLayout>

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

@ -61,9 +61,9 @@
android:backgroundTint="?attr/fabColor"
android:contentDescription="@string/commentButtonText"
android:text="@string/commentButtonText"
android:textColor="@color/colorWhite"
app:icon="@drawable/ic_reply"
app:iconTint="@color/colorWhite" />
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
app:icon="@drawable/ic_reply" />
<RelativeLayout
android:id="@+id/relativeMainLayoutFrame"

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

@ -235,7 +235,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/btnLogin"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
<TextView

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

@ -187,7 +187,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/mergePullRequestButtonText"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
<TextView

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

@ -85,7 +85,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen8dp"
android:text="@string/saveButton"
android:textColor="@color/btnTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textStyle="bold"/>
</LinearLayout>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -46,7 +46,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -54,7 +54,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -46,7 +46,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -53,7 +53,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -47,7 +47,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/dividerColor" />
android:background="?attr/fabColor" />
</com.google.android.material.card.MaterialCardView>

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

@ -187,7 +187,7 @@
android:layout_gravity="center_horizontal"
android:layout_margin="@dimen/dimen24dp"
android:text="@string/websiteText"
android:textColor="@color/btnTextColor"
android:textColor="?attr/materialCardBackgroundColor"
android:textSize="@dimen/dimen16sp"
android:textStyle="bold" />

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

@ -196,7 +196,7 @@
android:layout_height="@dimen/dimen54dp"
android:layout_marginTop="@dimen/dimen16dp"
android:text="@string/saveButton"
android:textColor="@color/colorWhite"
android:textColor="?attr/materialCardBackgroundColor"
android:textSize="16sp"
android:textStyle="bold"/>

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

@ -105,7 +105,7 @@
android:layout_marginTop="@dimen/dimen16dp"
android:backgroundTint="@color/darkRed"
android:text="@string/repoTransferText"
android:textColor="@color/colorWhite"
android:textColor="?attr/materialCardBackgroundColor"
android:textSize="16sp"
android:textStyle="bold"/>

18
app/src/main/res/layout/custom_user_accounts_dialog.xml
View file

@ -21,22 +21,18 @@
</LinearLayout>
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/dividerColor" />
<com.google.android.material.button.MaterialButton
android:id="@+id/newAccount"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen54dp"
android:layout_margin="16dp"
android:paddingStart="4dp"
android:paddingEnd="4dp"
android:layout_marginBottom="@dimen/dimen16dp"
android:layout_marginStart="@dimen/dimen16dp"
android:layout_marginEnd="@dimen/dimen16dp"
android:paddingStart="@dimen/dimen4dp"
android:paddingEnd="@dimen/dimen4dp"
android:text="@string/addNewAccount"
android:textColor="@color/colorWhite"
android:textSize="16sp"
android:textColor="?attr/materialCardBackgroundColor"
android:textSize="@dimen/dimen16sp"
android:textStyle="bold" />
</LinearLayout>

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

@ -44,9 +44,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/collaborator"
android:contentDescription="@string/collaborator"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -95,9 +95,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/pageTitleNewFile"
android:contentDescription="@string/pageTitleNewFile"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -56,9 +56,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/pageTitleCreateNewIssue"
android:contentDescription="@string/pageTitleCreateNewIssue"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -56,9 +56,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/createLabel"
android:contentDescription="@string/createLabel"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -65,9 +65,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/pageTitleCreateMilestone"
android:contentDescription="@string/pageTitleCreateMilestone"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -54,9 +54,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/newNote"
android:contentDescription="@string/newNote"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -55,10 +55,10 @@
android:layout_margin="16dp"
android:text="@string/markAsRead"
android:contentDescription="@string/markAsRead"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_done" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -52,9 +52,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/addRemoveMember"
android:contentDescription="@string/addRemoveMember"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -56,9 +56,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/pageTitleCreateTeam"
android:contentDescription="@string/pageTitleCreateTeam"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -52,9 +52,9 @@
android:layout_margin="16dp"
android:text="@string/pageTitleCreateOrganization"
android:contentDescription="@string/pageTitleCreateOrganization"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -52,9 +52,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/pageTitleAddEmail"
android:contentDescription="@string/pageTitleAddEmail"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -56,9 +56,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/pageTitleNewPullRequest"
android:contentDescription="@string/pageTitleNewPullRequest"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -56,9 +56,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/createRelease"
android:contentDescription="@string/createRelease"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -413,7 +413,7 @@
android:layout_marginTop="@dimen/dimen6dp"
android:layout_marginBottom="@dimen/dimen20dp"
android:text="@string/infoShowMoreInformation"
android:textColor="?attr/primaryTextColor"/>
android:textColor="?attr/materialCardBackgroundColor"/>
</LinearLayout>

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

@ -56,9 +56,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/pageTitleNewRepo"
android:contentDescription="@string/pageTitleNewRepo"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -56,9 +56,9 @@
android:layout_margin="@dimen/dimen16dp"
android:text="@string/createWikiPage"
android:contentDescription="@string/createWikiPage"
android:textColor="?attr/primaryTextColor"
android:textColor="?attr/materialCardBackgroundColor"
app:iconTint="?attr/materialCardBackgroundColor"
android:backgroundTint="?attr/fabColor"
app:iconTint="?attr/primaryTextColor"
app:icon="@drawable/ic_add" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>