diff options
| author | zeapo <mohamed@zenadi.com> | 2017-08-11 09:31:48 +0200 |
|---|---|---|
| committer | zeapo <mohamed@zenadi.com> | 2017-08-11 09:31:48 +0200 |
| commit | 040f000d99b6ba2be9caa512431cc25fe4e68df1 (patch) | |
| tree | a6a55eeb2d9eda523ed386cd483c2e86661ffe91 /app/src/main | |
| parent | d6017be4eca37fafc7fb02ef7616fba6f086e106 (diff) | |
fix lint
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/res/layout/activity_git_config.xml | 13 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 |
2 files changed, 11 insertions, 5 deletions
diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml index 17deb499..2174ffb6 100644 --- a/app/src/main/res/layout/activity_git_config.xml +++ b/app/src/main/res/layout/activity_git_config.xml @@ -99,7 +99,7 @@ android:background="@drawable/bottom_line" android:gravity="start" android:paddingBottom="6dp" - android:text="Hackish tools" + android:text="@string/hackish_tools" android:textColor="@color/blue_grey_500" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -115,7 +115,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:onClick="abortRebase" - android:text="Abort rebase" + android:text="@string/abort_rebase" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -127,9 +127,10 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginTop="8dp" - android:text="Commit hash" + android:text="@string/commit_hash" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView6" /> + app:layout_constraintTop_toBottomOf="@+id/textView6" + android:layout_marginLeft="8dp" /> <TextView android:id="@+id/git_commit_hash" @@ -141,7 +142,9 @@ app:layout_constraintBaseline_toBaselineOf="@+id/textView7" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintStart_toEndOf="@+id/textView7" /> + app:layout_constraintStart_toEndOf="@+id/textView7" + android:layout_marginLeft="16dp" + tools:ignore="HardcodedText" /> </android.support.constraint.ConstraintLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e9ad089b..4f5e422f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -210,4 +210,7 @@ <string name="jgit_error_push_dialog_text">Error occurred during the push operation:</string> <string name="ssh_key_clear_passphrase">Clear ssh-key saved passphrase</string> <string name="remember_the_passphase">Remember the passphase</string> + <string name="hackish_tools">Hackish tools</string> + <string name="abort_rebase">Abort rebase</string> + <string name="commit_hash">Commit hash</string> </resources> |