GitNex-Android-App/app/src/main/res/layout/activity_merge_pull_request...

153 lines
6.1 KiB
XML
Raw Normal View History

2019-11-27 16:09:26 +01:00
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android"
2020-03-04 20:37:28 +01:00
android:background="?attr/primaryBackgroundColor">
2019-11-27 16:09:26 +01:00
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"
2019-11-27 16:09:26 +01:00
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Widget.AppCompat.SearchView">
2019-11-27 16:09:26 +01:00
<androidx.appcompat.widget.Toolbar
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
2020-03-04 20:37:28 +01:00
android:background="?attr/primaryBackgroundColor"
2019-11-27 16:09:26 +01:00
tools:ignore="UnusedAttribute">
<ImageView
android:id="@+id/close"
Increasing usability and design of files diff. (#413) Applying sizes. Additional changes. First changes. Merge branch 'master' into diff-cleaner Fixing formatting. Merge branch 'master' into diff-cleaner Final changes for working with custom themes. Merge remote-tracking branch 'remotes/main/master' into diff-cleaner First changes for working with custom themes. Merge branch 'master' into diff-cleaner Merge branch 'master' into diff-cleaner Merge branch 'master' into diff-cleaner Merge branch 'master' into diff-cleaner Merge branch 'master' into diff-cleaner Adding custom COLOR_FONT. Even smaller cleanups. Merge remote-tracking branch 'remotes/main/master' into diff-cleaner Small cleanups. Fixing bug and adding maximum line limit. Adding option to set cursor to end and small cleanup. First aid. Merge branch 'master' into diff-cleaner Merge branch 'master' into diff-cleaner Merge branch 'master' into diff-cleaner Few improvements. Performance improvements and cleanups. Minor improvements (code in order) and many bug fixes Bug fix. Combining cited code. Adding code commenting option. Renaming list_files_diffs_new to list_files_diffs Moving ProcessBar into center Increasing performance. Applying size to all icons globally. Removing another unused file. Merge remote-tracking branch 'remotes/main/master' into diff-cleaner Removing unused files. Changing size of 'close'-button. Major changes concerning design and bug fixes. Temporary save point. 2 1 Co-authored-by: opyale <example@example.com> Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/413 Reviewed-by: 6543 <6543@noreply.gitea.io> Reviewed-by: M M Arif <mmarif@swatian.com>
2020-04-28 14:39:41 +02:00
android:layout_width="@dimen/close_button_size"
android:layout_height="@dimen/close_button_size"
2019-11-27 16:09:26 +01:00
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"
2020-03-04 20:37:28 +01:00
android:textColor="?attr/primaryTextColor"
2019-11-27 16:09:26 +01:00
android:maxLines="1"
android:textSize="20sp" />
</HorizontalScrollView>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.AppBarLayout>
<ScrollView
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor">
2019-11-27 16:09:26 +01:00
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:paddingBottom="30dp"
android:orientation="vertical">
<EditText
android:id="@+id/mergeTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:padding="10dp"
android:textSize="14sp"
tools:ignore="Autofill"
android:background="@drawable/shape_inputs"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/hintColor"
android:textColorHighlight="?attr/primaryTextColor"
android:inputType="textCapSentences|text" />
2019-11-27 16:09:26 +01:00
<com.hendraanggrian.appcompat.widget.SocialAutoCompleteTextView
android:id="@+id/mergeDescription"
2019-11-27 16:09:26 +01:00
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
2019-11-27 16:09:26 +01:00
android:padding="10dp"
android:completionThreshold="1"
android:background="@drawable/shape_inputs"
android:maxLines="12"
android:minLines="10"
tools:ignore="Autofill"
android:labelFor="@+id/mergeDescription"
2019-11-27 16:09:26 +01:00
android:scrollbars="vertical"
android:gravity="top|start"
android:textSize="14sp"
android:textColor="?attr/inputTextColor"
2019-11-27 16:09:26 +01:00
android:hint="@string/mergeCommentText"
android:textColorHint="?attr/hintColor"
2019-11-27 16:09:26 +01:00
android:inputType="textCapSentences|textMultiLine"
android:textColorHighlight="?attr/primaryTextColor" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_dropdown"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp" >
<Spinner
android:id="@+id/mergeSpinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:spinnerMode="dropdown"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingStart="5dp" />
</RelativeLayout>
2019-11-27 16:09:26 +01:00
<TextView
android:id="@+id/mergeInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/mergeNoteText"
android:textColor="?attr/hintColor"
2019-11-27 16:09:26 +01:00
android:textSize="12sp"
android:gravity="start"
android:layout_marginTop="10dp" />
<Button
android:id="@+id/mergeButton"
android:gravity="center"
android:layout_gravity="end"
android:layout_marginTop="20dp"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:text="@string/mergePullRequestButtonText"
android:background="@drawable/shape_buttons"
android:textColor="@color/btnTextColor" />
</LinearLayout>
</ScrollView>
</LinearLayout>