shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enhance bottomsheets ui (#550)

Browse Source 
Fix name collision in themes

Add space between org and repo name

standard use of dimens

more ui improvements

wip to enhance all bottom sheets

Fix radius and improve the ui

enhance bottom sheet

Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-by: opyale <opyale@noreply.codeberg.org>
This commit is contained in:
M M Arif 2020-06-24 22:29:58 +02:00 committed by 6543
parent 4f79ea0156
commit c7c2ac2a11
22 changed files with 167 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
View File

@ -153,7 +153,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
TextView repoWatchers = view.findViewById(R.id.repoWatchers); TextView repoWatchers = view.findViewById(R.id.repoWatchers);
TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader); TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
bottomSheetHeader.setText(fullName.getText()); bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
BottomSheetDialog dialog = new BottomSheetDialog(context); BottomSheetDialog dialog = new BottomSheetDialog(context);
dialog.setContentView(view); dialog.setContentView(view);
dialog.show(); dialog.show();

2
app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
View File

@ -151,7 +151,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
TextView repoWatchers = view.findViewById(R.id.repoWatchers); TextView repoWatchers = view.findViewById(R.id.repoWatchers);
TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader); TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
bottomSheetHeader.setText(repoFullName.getText()); bottomSheetHeader.setText(String.format("%s / %s", repoFullName.getText().toString().split("/")[0], repoFullName.getText().toString().split("/")[1]));
BottomSheetDialog dialog = new BottomSheetDialog(context); BottomSheetDialog dialog = new BottomSheetDialog(context);
dialog.setContentView(view); dialog.setContentView(view);
dialog.show(); dialog.show();

2
app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
View File

@ -153,7 +153,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
TextView repoWatchers = view.findViewById(R.id.repoWatchers); TextView repoWatchers = view.findViewById(R.id.repoWatchers);
TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader); TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
bottomSheetHeader.setText(fullName.getText()); bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
BottomSheetDialog dialog = new BottomSheetDialog(context); BottomSheetDialog dialog = new BottomSheetDialog(context);
dialog.setContentView(view); dialog.setContentView(view);
dialog.show(); dialog.show();

2
app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
View File

@ -150,7 +150,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
TextView repoWatchers = view.findViewById(R.id.repoWatchers); TextView repoWatchers = view.findViewById(R.id.repoWatchers);
TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader); TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
bottomSheetHeader.setText(fullName.getText()); bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
BottomSheetDialog dialog = new BottomSheetDialog(context); BottomSheetDialog dialog = new BottomSheetDialog(context);
dialog.setContentView(view); dialog.setContentView(view);
dialog.show(); dialog.show();

2
app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
View File

@ -151,7 +151,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
TextView repoWatchers = view.findViewById(R.id.repoWatchers); TextView repoWatchers = view.findViewById(R.id.repoWatchers);
TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader); TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
bottomSheetHeader.setText(fullName.getText()); bottomSheetHeader.setText(String.format("%s / %s", fullName.getText().toString().split("/")[0], fullName.getText().toString().split("/")[1]));
BottomSheetDialog dialog = new BottomSheetDialog(context); BottomSheetDialog dialog = new BottomSheetDialog(context);
dialog.setContentView(view); dialog.setContentView(view);
dialog.show(); dialog.show();

13
app/src/main/res/drawable/bottom_sheet_top_corners.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:topLeftRadius="12dp"
android:topRightRadius="12dp" />
<padding android:top="12dp" />
<solid android:color="?attr/primaryBackgroundColor" />
</shape>

10
app/src/main/res/layout/bottom_sheet_admin_users.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,10 +27,10 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

10
app/src/main/res/layout/bottom_sheet_file_viewer.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,10 +27,10 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

14
app/src/main/res/layout/bottom_sheet_issue_comments.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,7 +27,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/commentMenuDelete" android:id="@+id/commentMenuDelete"
@ -39,7 +39,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/issueCommentShare" android:id="@+id/issueCommentShare"
@ -51,10 +51,10 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

12
app/src/main/res/layout/bottom_sheet_issues_filter.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,7 +27,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/closedIssues" android:id="@+id/closedIssues"
@ -39,10 +39,10 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

24
app/src/main/res/layout/bottom_sheet_labels_in_list.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -24,10 +24,16 @@
android:text="@string/labelName" android:text="@string/labelName"
android:paddingStart="18dp" android:paddingStart="18dp"
android:paddingEnd="18dp" android:paddingEnd="18dp"
android:paddingTop="16dp" android:paddingBottom="18dp"
android:paddingBottom="16dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" /> android:textSize="18sp" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:id="@+id/divider"
android:layout_marginBottom="12dp"
android:background="?attr/dividerColor" />
<TextView <TextView
android:id="@+id/labelMenuEdit" android:id="@+id/labelMenuEdit"
@ -39,7 +45,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/labelMenuDelete" android:id="@+id/labelMenuDelete"
@ -51,10 +57,10 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

12
app/src/main/res/layout/bottom_sheet_milestones_filter.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,7 +27,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/closedMilestone" android:id="@+id/closedMilestone"
@ -39,10 +39,10 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

12
app/src/main/res/layout/bottom_sheet_milestones_in_list.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,7 +27,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/openMilestone" android:id="@+id/openMilestone"
@ -39,10 +39,10 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

12
app/src/main/res/layout/bottom_sheet_organization.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,7 +27,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/createTeam" android:id="@+id/createTeam"
@ -39,10 +39,10 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

10
app/src/main/res/layout/bottom_sheet_organization_teams.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,10 +27,10 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

10
app/src/main/res/layout/bottom_sheet_profile.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,10 +27,10 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

12
app/src/main/res/layout/bottom_sheet_pull_request_filter.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,7 +27,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/closedPr" android:id="@+id/closedPr"
@ -39,10 +39,10 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

44
app/src/main/res/layout/bottom_sheet_repo.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,7 +27,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/createNewIssue" android:id="@+id/createNewIssue"
@ -39,7 +39,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/createNewMilestone" android:id="@+id/createNewMilestone"
@ -51,7 +51,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/createLabel" android:id="@+id/createLabel"
@ -63,7 +63,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/createRelease" android:id="@+id/createRelease"
@ -75,13 +75,13 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="10dp" android:layout_marginTop="12dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="12dp"
android:layout_marginStart="64dp" android:layout_marginStart="64dp"
android:background="?attr/dividerColor" /> android:background="?attr/dividerColor" />
@ -95,7 +95,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/starRepository" android:id="@+id/starRepository"
@ -107,7 +107,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/unStarRepository" android:id="@+id/unStarRepository"
@ -119,7 +119,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/watchRepository" android:id="@+id/watchRepository"
@ -131,7 +131,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/unWatchRepository" android:id="@+id/unWatchRepository"
@ -143,13 +143,13 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="10dp" android:layout_marginTop="12dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="12dp"
android:layout_marginStart="64dp" android:layout_marginStart="64dp"
android:background="?attr/dividerColor" /> android:background="?attr/dividerColor" />
@ -160,10 +160,10 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:drawableStart="@drawable/ic_share_24dp" android:drawableStart="@drawable/ic_share_24dp"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:padding="16dp"
android:text="@string/shareRepository" android:text="@string/shareRepository"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" /> android:textSize="16sp"
android:padding="12dp" />
<TextView <TextView
android:id="@+id/openWebRepo" android:id="@+id/openWebRepo"
@ -172,13 +172,13 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:drawableStart="@drawable/ic_open_in_browser" android:drawableStart="@drawable/ic_open_in_browser"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:padding="16dp"
android:text="@string/openWebRepo" android:text="@string/openWebRepo"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" /> android:textSize="16sp"
android:padding="12dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

26
app/src/main/res/layout/bottom_sheet_repository_in_list.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -24,10 +24,16 @@
android:text="@string/repoName" android:text="@string/repoName"
android:paddingStart="18dp" android:paddingStart="18dp"
android:paddingEnd="18dp" android:paddingEnd="18dp"
android:paddingTop="16dp" android:paddingBottom="18dp"
android:paddingBottom="16dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" /> android:textSize="18sp" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:id="@+id/divider"
android:layout_marginBottom="12dp"
android:background="?attr/dividerColor" />
<TextView <TextView
android:id="@+id/repoOpenInBrowser" android:id="@+id/repoOpenInBrowser"
@ -39,7 +45,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/repoStargazers" android:id="@+id/repoStargazers"
@ -51,7 +57,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/repoWatchers" android:id="@+id/repoWatchers"
@ -63,10 +69,10 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

45
app/src/main/res/layout/bottom_sheet_single_issue.xml
View File

@ -4,9 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingTop="6dp"
android:background="?attr/primaryBackgroundColor" android:paddingBottom="12dp"
android:paddingTop="8dp"> android:background="?attr/primaryBackgroundColor">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -28,7 +28,7 @@
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:visibility="gone" android:visibility="gone"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/mergePullRequest" android:id="@+id/mergePullRequest"
@ -40,7 +40,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/editIssue" android:id="@+id/editIssue"
@ -52,7 +52,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/addRemoveAssignees" android:id="@+id/addRemoveAssignees"
@ -64,7 +64,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/editLabels" android:id="@+id/editLabels"
@ -76,7 +76,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/subscribeIssue" android:id="@+id/subscribeIssue"
@ -88,8 +88,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" android:padding="12dp" />
android:visibility="gone" />
<TextView <TextView
android:id="@+id/unsubscribeIssue" android:id="@+id/unsubscribeIssue"
@ -98,17 +97,17 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:drawableStart="@drawable/ic_watchers" android:drawableStart="@drawable/ic_watchers"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:padding="16dp"
android:text="@string/singleIssueUnSubscribe" android:text="@string/singleIssueUnSubscribe"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:visibility="gone" /> android:visibility="gone"
android:padding="12dp" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="10dp" android:layout_marginTop="12dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="12dp"
android:layout_marginStart="64dp" android:layout_marginStart="64dp"
android:background="?attr/dividerColor" /> android:background="?attr/dividerColor" />
@ -119,10 +118,10 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:drawableStart="@drawable/ic_share_24dp" android:drawableStart="@drawable/ic_share_24dp"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:padding="16dp"
android:text="@string/shareIssue" android:text="@string/shareIssue"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" /> android:textSize="16sp"
android:padding="12dp" />
<TextView <TextView
android:id="@+id/copyIssueUrl" android:id="@+id/copyIssueUrl"
@ -131,16 +130,16 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:drawableStart="@drawable/ic_content_copy" android:drawableStart="@drawable/ic_content_copy"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:padding="16dp"
android:text="@string/copyIssueUrl" android:text="@string/copyIssueUrl"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" /> android:textSize="16sp"
android:padding="12dp" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="10dp" android:layout_marginTop="12dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="12dp"
android:layout_marginStart="64dp" android:layout_marginStart="64dp"
android:background="?attr/dividerColor" /> android:background="?attr/dividerColor" />
@ -154,7 +153,7 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="12dp" />
<TextView <TextView
android:id="@+id/reOpenIssue" android:id="@+id/reOpenIssue"
@ -166,8 +165,8 @@
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" android:visibility="gone"
android:visibility="gone" /> android:padding="12dp" />
</LinearLayout> </LinearLayout>

3
app/src/main/res/values-v23/themes.xml
View File

@ -24,6 +24,7 @@
<item name="hintColor">@color/hintColor</item> <item name="hintColor">@color/hintColor</item>
<item name="colorControlActivated">@color/darkGreen</item> <item name="colorControlActivated">@color/darkGreen</item>
<item name="dividerColor">@color/lightThemeDividerColor</item> <item name="dividerColor">@color/lightThemeDividerColor</item>
<item name="bottomSheetDialogTheme">@style/AppThemeLightBottomSheetDialog</item>
</style> </style>
</resources> </resources>

16
app/src/main/res/values/themes.xml
View File

@ -24,6 +24,7 @@
<item name="hintColor">@color/hintColor</item> <item name="hintColor">@color/hintColor</item>
<item name="colorControlActivated">@color/darkGreen</item> <item name="colorControlActivated">@color/darkGreen</item>
<item name="dividerColor">@color/dividerColorDark</item> <item name="dividerColor">@color/dividerColorDark</item>
<item name="bottomSheetDialogTheme">@style/AppThemeDarkBottomSheetDialog</item>
</style> </style>
<!-- Dark theme - default --> <!-- Dark theme - default -->
@ -50,9 +51,22 @@
<item name="hintColor">@color/hintColor</item> <item name="hintColor">@color/hintColor</item>
<item name="colorControlActivated">@color/darkGreen</item> <item name="colorControlActivated">@color/darkGreen</item>
<item name="dividerColor">@color/lightThemeDividerColor</item> <item name="dividerColor">@color/lightThemeDividerColor</item>
<item name="bottomSheetDialogTheme">@style/AppThemeLightBottomSheetDialog</item>
</style> </style>
<!-- Light theme --> <!-- Light theme -->
<style name="AppThemeDarkBottomSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
<item name="bottomSheetStyle">@style/AppBottomSheetModalStyle</item>
</style>
<style name="AppThemeLightBottomSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
<item name="bottomSheetStyle">@style/AppBottomSheetModalStyle</item>
</style>
<style name="AppBottomSheetModalStyle" parent="Widget.Design.BottomSheet.Modal">
<item name="android:background">@drawable/bottom_sheet_top_corners</item>
</style>
<style name="AppThemeLightSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView"> <style name="AppThemeLightSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
<item name="android:textColor">@color/lightThemeTextColor</item> <item name="android:textColor">@color/lightThemeTextColor</item>
<item name="android:textColorHint">@color/lightThemeTextColor</item> <item name="android:textColorHint">@color/lightThemeTextColor</item>
@ -104,4 +118,4 @@
<item name="buttonTint">@color/colorWhite</item> <item name="buttonTint">@color/colorWhite</item>
</style> </style>
</resources> </resources>