gitnex/GitNex
gitnex/GitNex
Archived
14
57
Fork 14
Code Issues Pull Requests 2 Releases 22 Wiki Activity

Improve bottomsheet with scroll and separater #125

Manually merged
6543 merged 1 commits from 100-bottomsheet-scroll into master 2019-10-11 13:09:00 +00:00
Conversation 2 Commits 1 Files Changed 7 +300 -202
7 changed files with 300 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/res/layout/admin_users_bottom_sheet_layout.xml
View File

@ -2,22 +2,35 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:background="@color/backgroundColor" android:background="@color/backgroundColor"
android:paddingTop="8dp"> android:paddingTop="8dp">
<TextView <androidx.core.widget.NestedScrollView
android:id="@+id/createNewUser"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_gravity="center_vertical"
android:text="@string/adminCreateNewUser" <LinearLayout
android:drawableStart="@drawable/ic_add_person" android:layout_width="match_parent"
android:drawablePadding="24dp" android:orientation="vertical"
android:textColor="@color/white" android:layout_height="wrap_content">
android:textSize="16sp"
android:padding="16dp" /> <TextView
android:id="@+id/createNewUser"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/adminCreateNewUser"
android:drawableStart="@drawable/ic_add_person"
android:drawablePadding="24dp"
android:textColor="@color/white"
android:textSize="16sp"
android:padding="16dp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

35
app/src/main/res/layout/nav_sub_menu_bottom_sheet_layout.xml
View File

@ -2,22 +2,35 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:background="@color/backgroundColor" android:background="@color/backgroundColor"
android:paddingTop="8dp"> android:paddingTop="8dp">
<TextView <androidx.core.widget.NestedScrollView
android:id="@+id/adminUsers"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_gravity="center_vertical"
android:text="@string/adminUsers" <LinearLayout
android:drawableStart="@drawable/ic_users" android:layout_width="match_parent"
android:drawablePadding="24dp" android:orientation="vertical"
android:textColor="@color/white" android:layout_height="wrap_content">
android:textSize="16sp"
android:padding="16dp" /> <TextView
android:id="@+id/adminUsers"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/adminUsers"
android:drawableStart="@drawable/ic_users"
android:drawablePadding="24dp"
android:textColor="@color/white"
android:textSize="16sp"
android:padding="16dp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

38
app/src/main/res/layout/org_bottom_sheet_layout.xml
View File

@ -1,22 +1,36 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:background="@color/backgroundColor" android:background="@color/backgroundColor"
android:paddingTop="8dp"> android:paddingTop="8dp">
<TextView <androidx.core.widget.NestedScrollView
android:id="@+id/createTeam"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_gravity="center_vertical"
android:text="@string/orgCreateTeam" <LinearLayout
android:drawableStart="@drawable/ic_organizations" android:layout_width="match_parent"
android:drawablePadding="24dp" android:orientation="vertical"
android:textColor="@color/white" android:layout_height="wrap_content">
android:textSize="16sp"
android:padding="16dp" /> <TextView
android:id="@+id/createTeam"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/orgCreateTeam"
android:drawableStart="@drawable/ic_organizations"
android:drawablePadding="24dp"
android:textColor="@color/white"
android:textSize="16sp"
android:padding="16dp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

38
app/src/main/res/layout/profile_bottom_sheet_layout.xml
View File

@ -1,22 +1,36 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:background="@color/backgroundColor" android:background="@color/backgroundColor"
android:paddingTop="8dp"> android:paddingTop="8dp">
<TextView <androidx.core.widget.NestedScrollView
android:id="@+id/addNewEmailAddress"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_gravity="center_vertical"
android:text="@string/profileCreateNewEmailAddress" <LinearLayout
android:drawableStart="@drawable/ic_email" android:layout_width="match_parent"
android:drawablePadding="24dp" android:orientation="vertical"
android:textColor="@color/white" android:layout_height="wrap_content">
android:textSize="16sp"
android:padding="16dp" /> <TextView
android:id="@+id/addNewEmailAddress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/profileCreateNewEmailAddress"
android:drawableStart="@drawable/ic_email"
android:drawablePadding="24dp"
android:textColor="@color/white"
android:textSize="16sp"
android:padding="16dp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

174
app/src/main/res/layout/repo_bottom_sheet_layout.xml
View File

@ -1,94 +1,112 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:background="@color/backgroundColor" android:background="@color/backgroundColor"
android:paddingTop="8dp"> android:paddingTop="8dp">
<TextView <androidx.core.widget.NestedScrollView
android:id="@+id/newFile"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="400dp">
android:layout_gravity="center_vertical"
android:text="@string/pageTitleNewFile"
android:drawableStart="@drawable/ic_file"
android:drawablePadding="24dp"
android:textColor="@color/white"
android:textSize="16sp"
android:padding="16dp" />
<TextView <LinearLayout
android:id="@+id/createNewIssue" android:layout_width="match_parent"
android:layout_width="match_parent" android:orientation="vertical"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_gravity="center_vertical"
android:text="@string/pageTitleCreateNewIssue"
android:drawableStart="@drawable/ic_issue_open_white"
android:drawablePadding="24dp"
android:textColor="@color/white"
android:textSize="16sp"
android:padding="16dp" />
<TextView <TextView
android:id="@+id/createNewMilestone" android:id="@+id/newFile"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/pageTitleCreateMilestone" android:text="@string/pageTitleNewFile"
android:drawableStart="@drawable/ic_milestone" android:drawableStart="@drawable/ic_file"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="16dp" />
<TextView <TextView
android:id="@+id/createLabel" android:id="@+id/createNewIssue"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/createLabel" android:text="@string/pageTitleCreateNewIssue"
android:drawableStart="@drawable/ic_label" android:drawableStart="@drawable/ic_issue_open_white"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="16dp" />
<TextView <TextView
android:id="@+id/createRelease" android:id="@+id/createNewMilestone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/createRelease" android:text="@string/pageTitleCreateMilestone"
android:drawableStart="@drawable/ic_new_releases" android:drawableStart="@drawable/ic_milestone"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="16dp" />
<TextView <TextView
android:id="@+id/addCollaborator" android:id="@+id/createLabel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/addCollaboratorTitle" android:text="@string/createLabel"
android:drawableStart="@drawable/ic_person_filled" android:drawableStart="@drawable/ic_label"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="16dp" />
<TextView <TextView
android:id="@+id/openWebRepo" android:id="@+id/createRelease"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:drawableStart="@drawable/ic_open_in_browser" android:text="@string/createRelease"
android:drawablePadding="24dp" android:drawableStart="@drawable/ic_new_releases"
android:padding="16dp" android:drawablePadding="24dp"
android:text="@string/openWebRepo" android:textColor="@color/white"
android:textColor="@color/white" android:textSize="16sp"
android:textSize="16sp" /> android:padding="16dp" />
<View style="@style/lineDividerHorizontal" />
<TextView
android:id="@+id/addCollaborator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/addCollaboratorTitle"
android:drawableStart="@drawable/ic_person_filled"
android:drawablePadding="24dp"
android:textColor="@color/white"
android:textSize="16sp"
android:padding="16dp" />
<View style="@style/lineDividerHorizontal" />
<TextView
android:id="@+id/openWebRepo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:drawableStart="@drawable/ic_open_in_browser"
android:drawablePadding="24dp"
android:padding="16dp"
android:text="@string/openWebRepo"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

174
app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
View File

@ -1,94 +1,112 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:background="@color/backgroundColor" android:background="@color/backgroundColor"
android:paddingTop="8dp"> android:paddingTop="8dp">
<TextView <androidx.core.widget.NestedScrollView
android:id="@+id/replyToIssue"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="400dp">
android:layout_gravity="center_vertical"
android:text="@string/replyToIssue"
android:drawableStart="@drawable/ic_reply"
android:drawablePadding="24dp"
android:textColor="@color/white"
android:textSize="16sp"
android:padding="16dp" />
<TextView <LinearLayout
android:id="@+id/editIssue" android:layout_width="match_parent"
android:layout_width="match_parent" android:orientation="vertical"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_gravity="center_vertical"
android:text="@string/editIssue"
android:drawableStart="@drawable/ic_edit"
android:drawablePadding="24dp"
android:textColor="@color/white"
android:textSize="16sp"
android:padding="16dp" />
<TextView <TextView
android:id="@+id/addRemoveAssignees" android:id="@+id/replyToIssue"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/addRemoveAssignees" android:text="@string/replyToIssue"
android:drawableStart="@drawable/ic_person_filled" android:drawableStart="@drawable/ic_reply"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="16dp" />
<TextView <TextView
android:id="@+id/editLabels" android:id="@+id/editIssue"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/singleIssueEditLabels" android:text="@string/editIssue"
android:drawableStart="@drawable/ic_label" android:drawableStart="@drawable/ic_edit"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="16dp" />
<TextView <TextView
android:id="@+id/closeIssue" android:id="@+id/addRemoveAssignees"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/closeIssue" android:text="@string/addRemoveAssignees"
android:drawableStart="@drawable/ic_done" android:drawableStart="@drawable/ic_person_filled"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="16dp" />
<TextView <TextView
android:id="@+id/reOpenIssue" android:id="@+id/editLabels"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:text="@string/reOpenIssue" android:text="@string/singleIssueEditLabels"
android:drawableStart="@drawable/ic_reopen" android:drawableStart="@drawable/ic_label"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
android:padding="16dp" /> android:padding="16dp" />
<TextView <View style="@style/lineDividerHorizontal" />
android:id="@+id/copyIssueUrl"
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" android:id="@+id/copyIssueUrl"
android:layout_gravity="center_vertical" android:layout_width="match_parent"
android:drawableStart="@drawable/ic_content_copy" android:layout_height="wrap_content"
android:drawablePadding="24dp" android:layout_gravity="center_vertical"
android:padding="16dp" android:drawableStart="@drawable/ic_content_copy"
android:text="@string/copyIssueUrl" android:drawablePadding="24dp"
android:textColor="@color/white" android:padding="16dp"
android:textSize="16sp" /> android:text="@string/copyIssueUrl"
android:textColor="@color/white"
android:textSize="16sp" />
<View style="@style/lineDividerHorizontal" />
<TextView
android:id="@+id/closeIssue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/closeIssue"
android:drawableStart="@drawable/ic_done"
android:drawablePadding="24dp"
android:textColor="@color/white"
android:textSize="16sp"
android:padding="16dp" />
<TextView
android:id="@+id/reOpenIssue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/reOpenIssue"
android:drawableStart="@drawable/ic_reopen"
android:drawablePadding="24dp"
android:textColor="@color/white"
android:textSize="16sp"
android:padding="16dp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

8
app/src/main/res/values/styles.xml
View File

@ -47,5 +47,13 @@
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </style>
<style name="lineDividerHorizontal">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item>
<item name="android:background">@color/divider</item>
<item name="android:layout_marginStart">64dp</item>
<item name="android:layout_marginTop">10dp</item>
<item name="android:layout_marginBottom">10dp</item>
</style>
</resources> </resources>