diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_git_config.xml | 231 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
2 files changed, 142 insertions, 91 deletions
diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml index 87db8c9c..17deb499 100644 --- a/app/src/main/res/layout/activity_git_config.xml +++ b/app/src/main/res/layout/activity_git_config.xml @@ -1,96 +1,147 @@ -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/scrollView2" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - android:paddingBottom="@dimen/activity_vertical_margin" + android:background="@android:color/white" tools:context="com.zeapo.pwdstore.git.GitActivity" - android:background="@android:color/white"> + tools:layout_editor_absoluteX="0dp" + tools:layout_editor_absoluteY="81dp"> - <LinearLayout - android:layout_width="match_parent" + + <TextView + android:id="@+id/textView5" + style="@android:style/TextAppearance.Large" + android:layout_width="344dp" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:background="@drawable/bottom_line" + android:gravity="start" + android:paddingBottom="6dp" + android:text="@string/git_config" + android:textColor="@color/blue_grey_500" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + + <TextView + android:id="@+id/label_git_user_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginStart="8dp" + android:paddingBottom="8dp" + android:text="@string/git_user_name" + app:layout_constraintBaseline_toBaselineOf="@+id/git_user_name" + app:layout_constraintStart_toStartOf="parent" /> + + <EditText + android:id="@+id/git_user_name" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:hint="@string/git_user_name_hint" + android:inputType="textWebEmailAddress" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/label_git_user_name" + app:layout_constraintTop_toBottomOf="@+id/textView5" /> + + + <TextView + android:id="@+id/label_git_user_email" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:paddingBottom="8dp" + android:text="@string/git_user_email" + app:layout_constraintBaseline_toBaselineOf="@+id/git_user_email" + app:layout_constraintEnd_toEndOf="@+id/label_git_user_name" + app:layout_constraintStart_toStartOf="@+id/label_git_user_name" /> + + <EditText + android:id="@+id/git_user_email" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:layout_marginRight="8dp" + android:layout_marginTop="8dp" + android:hint="@string/git_user_email_hint" + android:inputType="textWebEmailAddress" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="@+id/git_user_name" + app:layout_constraintTop_toBottomOf="@+id/git_user_name" /> + + + <Button + android:id="@+id/save_button" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:layout_marginRight="8dp" + android:layout_marginTop="8dp" + android:onClick="applyGitConfigs" + android:text="@string/crypto_save" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toBottomOf="@+id/git_user_email" /> + + <TextView + android:id="@+id/textView6" + style="@android:style/TextAppearance.Large" + android:layout_width="344dp" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:background="@drawable/bottom_line" + android:gravity="start" + android:paddingBottom="6dp" + android:text="Hackish tools" + android:textColor="@color/blue_grey_500" + android:textStyle="bold" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toBottomOf="@+id/save_button" /> + + <Button + android:id="@+id/git_abort_rebase" + android:layout_width="0dp" android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/git_config" - android:textStyle="bold" - style="@android:style/TextAppearance.Large" - android:gravity="start" - android:paddingBottom="6dp" - android:textColor="@color/blue_grey_500" - android:background="@drawable/bottom_line"/> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_gravity="center_vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/git_user_name" - android:id="@+id/label_git_user_name" - android:layout_centerVertical="true" - android:layout_alignParentLeft="true" - android:paddingBottom="8dp" - android:layout_alignParentStart="true" /> - - <EditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/git_user_name_hint" - android:id="@+id/git_user_name" - android:layout_marginLeft="8dp" - android:layout_marginStart="8dp" - android:layout_toEndOf="@+id/label_git_user_name" - android:layout_toRightOf="@+id/label_git_user_name" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - android:inputType="textWebEmailAddress"/> - </RelativeLayout> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_gravity="center_vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/git_user_email" - android:id="@+id/label_git_user_email" - android:layout_centerVertical="true" - android:layout_alignParentLeft="true" - android:paddingBottom="8dp" - android:layout_alignParentStart="true" /> - - <EditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/git_user_email_hint" - android:id="@+id/git_user_email" - android:layout_marginLeft="35dp" - android:layout_marginStart="35dp" - android:layout_toEndOf="@+id/label_git_user_email" - android:layout_toRightOf="@+id/label_git_user_email" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - android:inputType="textWebEmailAddress"/> - </RelativeLayout> - - <Button - android:id="@+id/save_button" - android:text="@string/crypto_save" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:onClick="applyGitConfigs"/> - </LinearLayout> - -</ScrollView> + android:layout_marginEnd="8dp" + android:layout_marginLeft="16dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:onClick="abortRebase" + android:text="Abort rebase" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView7" /> + + <TextView + android:id="@+id/textView7" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:text="Commit hash" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView6" /> + + <TextView + android:id="@+id/git_commit_hash" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:text="HASH" + android:textStyle="bold" + app:layout_constraintBaseline_toBaselineOf="@+id/textView7" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintStart_toEndOf="@+id/textView7" /> + + +</android.support.constraint.ConstraintLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a73b5ef5..e9ad089b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -100,7 +100,7 @@ <!-- Preferences --> <string name="pref_git_title">Git</string> <string name="pref_edit_server_info">Edit git server settings</string> - <string name="pref_edit_git_config">Edit git config</string> + <string name="pref_edit_git_config">Git utils</string> <string name="pref_ssh_title">Import SSH key</string> <string name="pref_ssh_keygen_title">Generate SSH key pair</string> <string name="pref_ssh_see_key_title">View generated public SSH key</string> |