044f6191bf
Update missing buttons update libs login screen Merge pr screen create new file screen This will be replaced later by custom built mentions, so removing the dependency. create repo screen comment screen edit issue/pr screen and minor ui fixes collaborator screen release screen label and milestone screens move org, new team, new team member to new design Add new user input transition Co-authored-by: M M Arif <mmarif@swatian.com> Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/725 Reviewed-by: opyale <opyale@noreply.codeberg.org>
201 lines
8.5 KiB
XML
201 lines
8.5 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<LinearLayout android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
android:orientation="vertical"
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:background="?attr/primaryBackgroundColor">
|
|
|
|
<com.google.android.material.appbar.AppBarLayout
|
|
android:id="@+id/appbar"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:theme="@style/Widget.AppCompat.SearchView">
|
|
|
|
<com.google.android.material.appbar.MaterialToolbar
|
|
android:id="@+id/toolbar"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:background="?attr/primaryBackgroundColor">
|
|
|
|
<ImageView
|
|
android:id="@+id/close"
|
|
android:layout_width="@dimen/close_button_size"
|
|
android:layout_height="@dimen/close_button_size"
|
|
android:layout_marginRight="15dp"
|
|
android:layout_marginLeft="15dp"
|
|
android:gravity="center_vertical"
|
|
android:contentDescription="@string/close"
|
|
android:src="@drawable/ic_close" />
|
|
|
|
<HorizontalScrollView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:id="@+id/replyToPRNavHeader"
|
|
android:foregroundGravity="right"
|
|
android:layout_marginEnd="25dp"
|
|
android:layout_marginStart="0dp"
|
|
android:scrollbarThumbHorizontal="@android:color/transparent"
|
|
android:fillViewport="true">
|
|
|
|
<TextView
|
|
android:id="@+id/toolbar_title"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_vertical"
|
|
android:textColor="?attr/primaryTextColor"
|
|
android:maxLines="1"
|
|
android:textSize="20sp" />
|
|
|
|
</HorizontalScrollView>
|
|
|
|
</com.google.android.material.appbar.MaterialToolbar>
|
|
|
|
</com.google.android.material.appbar.AppBarLayout>
|
|
|
|
<ScrollView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:background="?attr/primaryBackgroundColor">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:padding="16dp"
|
|
android:orientation="vertical">
|
|
|
|
<com.google.android.material.textfield.TextInputLayout
|
|
android:id="@+id/mergeTitleLayout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
app:boxBackgroundColor="?attr/inputBackgroundColor"
|
|
android:textColorHint="?attr/hintColor"
|
|
app:hintTextColor="?attr/hintColor"
|
|
app:boxStrokeErrorColor="@color/darkRed"
|
|
android:layout_marginTop="8dp"
|
|
android:layout_marginBottom="8dp"
|
|
app:endIconMode="clear_text"
|
|
app:endIconTint="?attr/iconsColor"
|
|
app:counterEnabled="true"
|
|
app:counterMaxLength="255"
|
|
app:counterTextColor="?attr/inputTextColor"
|
|
android:hint="@string/mergePullRequestButtonText">
|
|
|
|
<com.google.android.material.textfield.TextInputEditText
|
|
android:id="@+id/mergeTitle"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:textColor="?attr/inputTextColor"
|
|
android:textColorHighlight="?attr/hintColor"
|
|
android:textColorHint="?attr/hintColor"
|
|
android:textSize="16sp" />
|
|
|
|
</com.google.android.material.textfield.TextInputLayout>
|
|
|
|
<com.google.android.material.textfield.TextInputLayout
|
|
android:id="@+id/mergeDescriptionLayout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
app:boxBackgroundColor="?attr/inputBackgroundColor"
|
|
android:textColorHint="?attr/hintColor"
|
|
app:hintTextColor="?attr/hintColor"
|
|
app:boxStrokeErrorColor="@color/darkRed"
|
|
android:layout_marginTop="8dp"
|
|
android:layout_marginBottom="8dp"
|
|
app:endIconMode="clear_text"
|
|
app:endIconTint="?attr/iconsColor"
|
|
android:hint="@string/mergeCommentText">
|
|
|
|
<com.google.android.material.textfield.TextInputEditText
|
|
android:id="@+id/mergeDescription"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="140dp"
|
|
android:textColor="?attr/inputTextColor"
|
|
android:textColorHighlight="?attr/hintColor"
|
|
android:textColorHint="?attr/hintColor"
|
|
android:gravity="top|start"
|
|
android:textSize="16sp" />
|
|
|
|
</com.google.android.material.textfield.TextInputLayout>
|
|
|
|
<com.google.android.material.textfield.TextInputLayout
|
|
android:id="@+id/mergeSpinnerLayout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
app:boxBackgroundColor="?attr/inputBackgroundColor"
|
|
android:textColorHint="?attr/hintColor"
|
|
app:hintTextColor="?attr/hintColor"
|
|
android:layout_marginTop="8dp"
|
|
android:layout_marginBottom="8dp"
|
|
android:hint="@string/mergeStrategy"
|
|
app:endIconTint="?attr/iconsColor"
|
|
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
|
|
|
|
<AutoCompleteTextView
|
|
android:id="@+id/mergeSpinner"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:inputType="none"
|
|
android:textColor="?attr/inputTextColor"
|
|
android:labelFor="@+id/mergeSpinner"
|
|
android:textSize="16sp" />
|
|
|
|
</com.google.android.material.textfield.TextInputLayout>
|
|
|
|
<CheckBox
|
|
android:id="@+id/deleteBranch"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/deleteBranchAfterMerge"
|
|
android:checked="false"
|
|
android:textSize="16sp"
|
|
android:layout_marginTop="10dp"
|
|
android:visibility="gone"
|
|
android:textColor="?attr/primaryTextColor"/>
|
|
|
|
<TextView
|
|
android:id="@+id/deleteBranchForkInfo"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/deleteBranchForkInfo"
|
|
android:textColor="?attr/hintColor"
|
|
android:textSize="12sp"
|
|
android:gravity="start"
|
|
android:layout_marginTop="0dp" />
|
|
|
|
<TextView
|
|
android:id="@+id/mergeInfo"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/mergeNoteText"
|
|
android:textColor="?attr/hintColor"
|
|
android:textSize="12sp"
|
|
android:gravity="start"
|
|
android:layout_marginTop="15dp" />
|
|
|
|
<Button
|
|
android:id="@+id/mergeButton"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="60dp"
|
|
android:layout_marginTop="8dp"
|
|
android:text="@string/mergePullRequestButtonText"
|
|
android:textColor="@color/btnTextColor" />
|
|
|
|
<TextView
|
|
android:id="@+id/mergeInfoDisabledMessage"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/mergeInfoDisabledMessage"
|
|
android:textColor="?attr/hintColor"
|
|
android:textSize="12sp"
|
|
android:gravity="start"
|
|
android:visibility="gone"
|
|
android:layout_marginTop="10dp" />
|
|
|
|
</LinearLayout>
|
|
|
|
</ScrollView>
|
|
|
|
</LinearLayout>
|
|
|