From 0f0d1994e589b4f2b2603c882f52c79e2307a4f7 Mon Sep 17 00:00:00 2001
From: Nosweh <62889203+Nosweh@users.noreply.github.com>
Date: Fri, 28 Aug 2020 17:31:40 +0200
Subject: Add Activity to view the Git commit log (#1056)

---
 app/src/main/res/layout/activity_git_config.xml | 38 ++++++++++-----------
 app/src/main/res/layout/activity_git_log.xml    | 22 ++++++++++++
 app/src/main/res/layout/git_log_row_layout.xml  | 45 +++++++++++++++++++++++++
 app/src/main/res/values-de/strings.xml          |  2 ++
 app/src/main/res/values-es/strings.xml          |  2 --
 app/src/main/res/values-fr/strings.xml          |  2 --
 app/src/main/res/values-pt-rBR/strings.xml      |  2 --
 app/src/main/res/values-ru/strings.xml          |  2 --
 app/src/main/res/values/strings.xml             | 14 +++++---
 9 files changed, 96 insertions(+), 33 deletions(-)
 create mode 100644 app/src/main/res/layout/activity_git_log.xml
 create mode 100644 app/src/main/res/layout/git_log_row_layout.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml
index df1874a9..1d495250 100644
--- a/app/src/main/res/layout/activity_git_config.xml
+++ b/app/src/main/res/layout/activity_git_config.xml
@@ -17,7 +17,7 @@
         android:id="@+id/username_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/normal_margin"
         android:hint="@string/git_user_name_hint"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -35,7 +35,7 @@
         android:id="@+id/email_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/normal_margin"
         android:hint="@string/git_user_email"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/username_input_layout">
@@ -52,7 +52,7 @@
         android:id="@+id/save_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/normal_margin"
         android:text="@string/crypto_save"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/email_input_layout" />
@@ -62,45 +62,43 @@
         style="@style/TextAppearance.MaterialComponents.Headline5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:text="@string/hackish_tools"
+        android:layout_margin="@dimen/normal_margin"
+        android:text="@string/git_tools"
         android:textSize="24sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/save_button" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/commit_hash_label"
+        android:id="@+id/git_head_status"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:text="@string/commit_hash"
+        android:layout_margin="@dimen/normal_margin"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/git_tools_title" />
+        app:layout_constraintTop_toBottomOf="@id/git_tools_title"
+        tools:text="HEAD status" />
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/git_commit_hash"
-        android:layout_width="wrap_content"
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/git_log"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:textStyle="bold"
-        app:layout_constraintStart_toEndOf="@id/commit_hash_label"
-        app:layout_constraintTop_toBottomOf="@id/git_tools_title"
-        tools:text="HASH" />
+        android:layout_margin="@dimen/normal_margin"
+        android:text="@string/git_log"
+        app:layout_constraintTop_toBottomOf="@+id/git_head_status" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/git_abort_rebase"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/normal_margin"
         android:text="@string/abort_rebase"
-        app:layout_constraintTop_toBottomOf="@id/commit_hash_label" />
+        app:layout_constraintTop_toBottomOf="@+id/git_log" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/git_reset_to_remote"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/normal_margin"
         android:text="@string/reset_to_remote"
         app:layout_constraintTop_toBottomOf="@id/git_abort_rebase" />
 
diff --git a/app/src/main/res/layout/activity_git_log.xml b/app/src/main/res/layout/activity_git_log.xml
new file mode 100644
index 00000000..96b28487
--- /dev/null
+++ b/app/src/main/res/layout/activity_git_log.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
+  ~ SPDX-License-Identifier: GPL-3.0-only
+  -->
+
+<LinearLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/git_log_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:scrollbars="vertical"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:context="com.zeapo.pwdstore.git.log.GitLogActivity"
+        tools:listitem="@layout/git_log_row_layout" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/git_log_row_layout.xml b/app/src/main/res/layout/git_log_row_layout.xml
new file mode 100644
index 00000000..5a29f241
--- /dev/null
+++ b/app/src/main/res/layout/git_log_row_layout.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
+  ~ SPDX-License-Identifier: GPL-3.0-only
+  -->
+<androidx.constraintlayout.widget.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:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="@dimen/activity_vertical_margin"
+    android:paddingVertical="@dimen/activity_horizontal_margin">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/git_log_row_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/normal_margin"
+        android:ellipsize="end"
+        android:maxLines="2"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/git_log_row_hash"
+        tools:text="Commit message" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/git_log_row_hash"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?attr/colorSecondary"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Hash" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/git_log_row_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:alpha="0.5"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Time" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index fd94c8a9..d5abea1a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -11,6 +11,7 @@
     <string name="dialog_delete">Ordner löschen</string>
     <string name="dialog_do_not_delete">Abbruch</string>
     <string name="title_activity_git_clone">Repository Informationen</string>
+    <string name="title_activity_git_log">Commit-Log</string>
     <!-- Password Store -->
     <string name="creation_dialog_text">Bitte klone oder erstelle ein neues Repository, bevor du versuchst ein Passwort hinzuzufügen oder jegliche Synchronisation-Operation durchführst.</string>
     <string name="move">Verschieben</string>
@@ -121,6 +122,7 @@
     <string name="git_sync">Synchronisiere Repository</string>
     <string name="git_pull">Git Pull</string>
     <string name="git_push">Git Push</string>
+    <string name="git_log">Commit-Log anzeigen</string>
     <string name="show_password_pref_title">Zeige das Password</string>
     <string name="show_password_pref_summary">Soll das entschlüsselte Passwort sichtbar sein? Dies deaktiviert nicht das Kopieren.</string>
     <string name="show_extra_content_pref_title">Zeige weiteren Inhalt</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ff04cf3e..03e153e9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -178,7 +178,5 @@
     <string name="git_push_generic_error">El envío fue rechazado por el servidor, la razón:</string>
     <string name="jgit_error_push_dialog_text">Ocurrió un error durante el envío:</string>
     <string name="git_operation_remember_passphrase">Recordar contraseñagit  (inseguro)</string>
-    <string name="hackish_tools">Hackish tools</string>
     <string name="abort_rebase">Abortar rebase</string>
-    <string name="commit_hash">Hash del commit</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9f9e1768..db98bfd8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -178,6 +178,4 @@
     <string name="git_push_other_error">Pousser au dépôt distant sans avance rapide rejetée. Vérifiez la variable receive.denyNonFastForwards dans le fichier de configuration du répertoire de destination.</string>
     <string name="jgit_error_push_dialog_text">Une erreur s\'est produite lors de l\'opération de poussée:</string>
     <string name="git_operation_remember_passphrase">Se rappeler de la phrase secrète dans la configuration de l\'application (peu sûr)</string>
-    <string name="hackish_tools">Outils de hack</string>
-    <string name="commit_hash">Commettre la clé</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a7f3e046..2e07190a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -248,10 +248,8 @@
     <string name="clear_saved_passphrase_ssh">Limpar a frase secreta salva para chave SSH local</string>
     <string name="clear_saved_passphrase_https">Limpar senha HTTPS salva</string>
     <string name="git_operation_remember_passphrase">Lembrar senha da chave</string>
-    <string name="hackish_tools">Ferramentas de hackers</string>
     <string name="abort_rebase">Abortar rebase e realizar push do novo branch</string>
     <string name="reset_to_remote">Hard reset no branch remoto</string>
-    <string name="commit_hash">Commit hash</string>
     <string name="openkeychain_ssh_api_connect_fail">Falha ao conectar ao serviço de API SSH do OpenKeychain.</string>
     <string name="no_ssh_api_provider">Nenhum provedor de API SSH encontrado. O OpenKeychain está instalado?</string>
     <string name="ssh_api_pending_intent_failed">SSH API pendente falhou</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3fab8cf9..d1fbc215 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -233,10 +233,8 @@
     <string name="git_push_other_error">Удаленный репозиторий отклонил запись изменений без быстрой перемотки вперед. Проверьте переменную receive.denyNonFastForwards в файле конфигурации репозитория назначения.</string>
     <string name="jgit_error_push_dialog_text">В хоте операции записи изменений возникла ошибка:</string>
     <string name="git_operation_remember_passphrase">Заполнить парольную фразу в конфигурации приложнеия (небезопасно)</string>
-    <string name="hackish_tools">Костыльные инструменты</string>
     <string name="abort_rebase">Прервать перебазирование и записать изменения в новую ветку</string>
     <string name="reset_to_remote">Полный сброс до состояния удаленной ветки</string>
-    <string name="commit_hash">Хэш-сумма изменений</string>
     <string name="openkeychain_ssh_api_connect_fail">Ошибка при подключении к сервису OpenKeychain SSH API</string>
     <string name="no_ssh_api_provider">Не найдено SSH API провайдеров. OpenKeychain установлен?</string>
     <string name="ssh_api_pending_intent_failed">Ожидаемое намерение SSH API не удалось</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a6e33047..72d4d5db 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,6 +20,7 @@
     <string name="dialog_do_not_delete">Cancel</string>
     <string name="title_activity_git_clone">Repository information</string>
     <string name="title_activity_git_config" translatable="false">Git configuration</string>
+    <string name="title_activity_git_log">Commit log</string>
 
     <!-- Password Store -->
     <string name="creation_dialog_text">Please clone or create a new repository below before trying to add a password or running any synchronization operation.</string>
@@ -117,8 +118,8 @@
 
     <!-- Preferences -->
     <string name="pref_repository_title">Repository</string>
-    <string name="pref_edit_server_info">Edit git server settings</string>
-    <string name="pref_edit_git_config">Git utils</string>
+    <string name="pref_edit_server_info">Edit Git server settings</string>
+    <string name="pref_edit_git_config">Local Git config &amp; utilities</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>
@@ -217,6 +218,7 @@
     <string name="git_pull">Pull from remote</string>
     <string name="git_push">Push to remote</string>
     <string name="git_push_up_to_date">Everything up-to-date</string>
+    <string name="git_log">Show commit log</string>
     <string name="show_password_pref_title">Show the password</string>
     <string name="show_password_pref_summary">Control the visibility of the passwords once decrypted. This does not disable copying to clipboard.</string>
     <string name="show_extra_content_pref_title">Show extra content</string>
@@ -281,10 +283,12 @@
     <string name="clear_saved_passphrase_ssh">Clear saved passphrase for local SSH key</string>
     <string name="clear_saved_passphrase_https">Clear saved HTTPS password</string>
     <string name="git_operation_remember_passphrase">Remember key passphrase</string>
-    <string name="hackish_tools">Hackish tools</string>
+    <string name="git_tools">Utilities</string>
     <string name="abort_rebase">Abort rebase and push new branch</string>
     <string name="reset_to_remote">Hard reset to remote branch</string>
-    <string name="commit_hash">Commit hash</string>
+    <string name="git_head_on_branch">On branch %1$s</string>
+    <string name="git_head_detached">HEAD detached at %1$s</string>
+    <string name="git_head_missing">Unable to locate HEAD</string>
     <string name="openkeychain_ssh_api_connect_fail">Failed to connect to OpenKeychain SSH API service.</string>
     <string name="no_ssh_api_provider">No SSH API provider found. Is OpenKeychain installed?</string>
     <string name="ssh_api_pending_intent_failed">SSH API pending intent failed</string>
@@ -393,6 +397,6 @@
     <!-- GPG key selection in folder creation -->
     <string name="folder_creation_err_file_exists">A file by that name already exists</string>
     <string name="folder_creation_err_folder_exists">A folder by that name already exists</string>
-    <string name="xkpwgen_extrachars_label" >Digits/Symbols (d/s)</string>
+    <string name="xkpwgen_extrachars_label">Digits/Symbols (d/s)</string>
     <string name="xk_numbers_symbols_append_default">ds</string>
 </resources>
-- 
cgit v1.2.3