From 907e5a10d6d52eef5f3897b30809d79d339d77d3 Mon Sep 17 00:00:00 2001
From: TobiGr <TobiGr@users.noreply.github.com>
Date: Tue, 16 Oct 2018 12:00:23 +0200
Subject: [PATCH 1/7] Rename screenshots to display them in  correct order in
 the F-Droid app

---
 .../phoneScreenshots/{shot_1.png => shot_01.png}    | Bin
 .../phoneScreenshots/{shot_2.png => shot_02.png}    | Bin
 .../phoneScreenshots/{shot_3.png => shot_03.png}    | Bin
 .../phoneScreenshots/{shot_4.png => shot_04.png}    | Bin
 .../phoneScreenshots/{shot_5.png => shot_05.png}    | Bin
 .../phoneScreenshots/{shot_6.png => shot_06.png}    | Bin
 .../phoneScreenshots/{shot_7.png => shot_07.png}    | Bin
 .../phoneScreenshots/{shot_8.png => shot_08.png}    | Bin
 .../phoneScreenshots/{shot_9.png => shot_09.png}    | Bin
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename fastlane/metadata/android/en-US/images/phoneScreenshots/{shot_1.png => shot_01.png} (100%)
 rename fastlane/metadata/android/en-US/images/phoneScreenshots/{shot_2.png => shot_02.png} (100%)
 rename fastlane/metadata/android/en-US/images/phoneScreenshots/{shot_3.png => shot_03.png} (100%)
 rename fastlane/metadata/android/en-US/images/phoneScreenshots/{shot_4.png => shot_04.png} (100%)
 rename fastlane/metadata/android/en-US/images/phoneScreenshots/{shot_5.png => shot_05.png} (100%)
 rename fastlane/metadata/android/en-US/images/phoneScreenshots/{shot_6.png => shot_06.png} (100%)
 rename fastlane/metadata/android/en-US/images/phoneScreenshots/{shot_7.png => shot_07.png} (100%)
 rename fastlane/metadata/android/en-US/images/phoneScreenshots/{shot_8.png => shot_08.png} (100%)
 rename fastlane/metadata/android/en-US/images/phoneScreenshots/{shot_9.png => shot_09.png} (100%)

diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_1.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_2.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_3.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_4.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_5.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_6.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_7.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_7.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png

From 57732c3e5f4e8ba8a9a0ce85094de925f0f8706b Mon Sep 17 00:00:00 2001
From: Igor Nedoboy <bboa@users.noreply.github.com>
Date: Sat, 10 Nov 2018 02:56:14 +0300
Subject: [PATCH 2/7] Update strings.xml

---
 app/src/main/res/values-ru/strings.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 842042e16..9a7ed63fa 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -508,4 +508,21 @@
     <string name="grid">Сетка</string>
 	<string name="auto">Автоматически</string>
 
+    <string name="brightness_gesture_control_summary">Менять жестом яркость в плеере</string>
+    <string name="brightness_gesture_control_title">Жест яркости</string>
+    <string name="download_to_sdcard_error_message">Загрузка на внешний накопитель невозможна. Сбросить местоположение папки для загрузки?</string>
+    <string name="download_to_sdcard_error_title">Внешний накопитель недоступен</string>
+    <string name="main_page_content_summary">Вкладки, видимые на главной странице</string>
+    <string name="restore_defaults">По умолчанию</string>
+    <string name="restore_defaults_confirmation">Хотите восстановить умолчания?</string>
+    <string name="saved_tabs_invalid_json">Ошибка чтения сохранённых вкладок. Используются вкладки по умолчанию</string>
+    <string name="selection">Выбор</string>
+    <string name="subscribers_count_not_available">Количество подписчиков недоступно</string>
+    <string name="switch_view">Переключить вид</string>
+    <string name="tab_choose">Выберите вкладку</string>
+    <string name="tab_new">Новая вкладка</string>
+    <string name="unsubscribe">Отписаться</string>
+    <string name="volume_gesture_control_summary">Менять жестом громкость в плеере</string>
+    <string name="volume_gesture_control_title">Жест громкости</string>
+
 </resources>

From b34f9d7fd350a7183f2ee945d05738af663e4b72 Mon Sep 17 00:00:00 2001
From: Igor Nedoboy <bboa@users.noreply.github.com>
Date: Sat, 10 Nov 2018 03:06:55 +0300
Subject: [PATCH 3/7] Update strings.xml

---
 app/src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9a7ed63fa..94f017a5d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -510,7 +510,7 @@
 
     <string name="brightness_gesture_control_summary">Менять жестом яркость в плеере</string>
     <string name="brightness_gesture_control_title">Жест яркости</string>
-    <string name="download_to_sdcard_error_message">Загрузка на внешний накопитель невозможна. Сбросить местоположение папки для загрузки?</string>
+    <string name="download_to_sdcard_error_message">Загрузка на внешний накопитель невозможна. Сбросить расположение папки для загрузки?</string>
     <string name="download_to_sdcard_error_title">Внешний накопитель недоступен</string>
     <string name="main_page_content_summary">Вкладки, видимые на главной странице</string>
     <string name="restore_defaults">По умолчанию</string>

From b462b7fcc4b9f072c43f6a751b4b3ca024076f0e Mon Sep 17 00:00:00 2001
From: Igor Nedoboy <bboa@users.noreply.github.com>
Date: Sat, 10 Nov 2018 17:08:04 +0300
Subject: [PATCH 4/7] Update strings.xml

---
 app/src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 94f017a5d..d0cf819f7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -510,7 +510,7 @@
 
     <string name="brightness_gesture_control_summary">Менять жестом яркость в плеере</string>
     <string name="brightness_gesture_control_title">Жест яркости</string>
-    <string name="download_to_sdcard_error_message">Загрузка на внешний накопитель невозможна. Сбросить расположение папки для загрузки?</string>
+    <string name="download_to_sdcard_error_message">Загрузка на внешний накопитель невозможна. Сбросить расположение папки загрузки?</string>
     <string name="download_to_sdcard_error_title">Внешний накопитель недоступен</string>
     <string name="main_page_content_summary">Вкладки, видимые на главной странице</string>
     <string name="restore_defaults">По умолчанию</string>

From 64f9228ee38ae197582dcf6ced25ed24bc829f1b Mon Sep 17 00:00:00 2001
From: Igor Nedoboy <bboa@users.noreply.github.com>
Date: Sun, 11 Nov 2018 02:44:45 +0300
Subject: [PATCH 5/7] Update strings.xml

---
 app/src/main/res/values-ru/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d0cf819f7..3fad6b288 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -508,7 +508,7 @@
     <string name="grid">Сетка</string>
 	<string name="auto">Автоматически</string>
 
-    <string name="brightness_gesture_control_summary">Менять жестом яркость в плеере</string>
+    <string name="brightness_gesture_control_summary">Менять яркость плеера жестом</string>
     <string name="brightness_gesture_control_title">Жест яркости</string>
     <string name="download_to_sdcard_error_message">Загрузка на внешний накопитель невозможна. Сбросить расположение папки загрузки?</string>
     <string name="download_to_sdcard_error_title">Внешний накопитель недоступен</string>
@@ -522,7 +522,7 @@
     <string name="tab_choose">Выберите вкладку</string>
     <string name="tab_new">Новая вкладка</string>
     <string name="unsubscribe">Отписаться</string>
-    <string name="volume_gesture_control_summary">Менять жестом громкость в плеере</string>
+    <string name="volume_gesture_control_summary">Менять громкость плеера жестом</string>
     <string name="volume_gesture_control_title">Жест громкости</string>
 
 </resources>

From d27622de1e1067275318ff320be091c1abaae2e9 Mon Sep 17 00:00:00 2001
From: jludden <jasonludden@gmail.com>
Date: Sun, 11 Nov 2018 19:54:35 +0800
Subject: [PATCH 6/7] downloaded files can now be opened with one click

For consistency, I removed the view file option from the overflow menu as well
---
 .../giga/ui/adapter/MissionAdapter.java       | 51 +++++++++----------
 app/src/main/res/menu/mission.xml             |  6 +--
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index d5555c2be..de7301a30 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -96,12 +96,11 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
             }
         });
 
-		/*h.itemView.setOnClickListener(new View.OnClickListener() {
+		h.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
 			public void onClick(View v) {
-				showDetail(h);
 			}
-		});*/
+		});
 
         return h;
     }
@@ -200,14 +199,12 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
         Menu menu = popup.getMenu();
         MenuItem start = menu.findItem(R.id.start);
         MenuItem pause = menu.findItem(R.id.pause);
-        MenuItem view = menu.findItem(R.id.view);
         MenuItem delete = menu.findItem(R.id.delete);
         MenuItem checksum = menu.findItem(R.id.checksum);
 
         // Set to false first
         start.setVisible(false);
         pause.setVisible(false);
-        view.setVisible(false);
         delete.setVisible(false);
         checksum.setVisible(false);
 
@@ -222,7 +219,6 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
                 pause.setVisible(true);
             }
         } else {
-            view.setVisible(true);
             delete.setVisible(true);
             checksum.setVisible(true);
         }
@@ -241,27 +237,6 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
                         mBinder.onMissionRemoved(mItemList.get(h.position));
                         h.lastTimeStamp = -1;
                         h.lastDone = -1;
-                        return true;
-                    case R.id.view:
-                        File f = new File(h.mission.location, h.mission.name);
-                        String ext = Utility.getFileExt(h.mission.name);
-
-                        Log.d(TAG, "Viewing file: " + f.getAbsolutePath() + " ext: " + ext);
-
-                        if (ext == null) {
-                            Log.w(TAG, "Can't view file because it has no extension: " +
-                                    h.mission.name);
-                            return false;
-                        }
-
-                        String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.substring(1));
-                        Log.v(TAG, "Mime: " + mime + " package: " + mContext.getApplicationContext().getPackageName() + ".provider");
-                        if (f.exists()) {
-                            viewFileWithFileProvider(f, mime);
-                        } else {
-                            Log.w(TAG, "File doesn't exist");
-                        }
-
                         return true;
                     case R.id.delete:
                         mDeleteDownloadManager.add(h.mission);
@@ -282,6 +257,28 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
         popup.show();
     }
 
+    private boolean viewFile(ViewHolder h) {
+        File f = new File(h.mission.location, h.mission.name);
+        String ext = Utility.getFileExt(h.mission.name);
+
+        Log.d(TAG, "Viewing file: " + f.getAbsolutePath() + " ext: " + ext);
+
+        if (ext == null) {
+            Log.w(TAG, "Can't view file because it has no extension: " +
+                    h.mission.name);
+            return true;
+        }
+
+        String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.substring(1));
+        Log.v(TAG, "Mime: " + mime + " package: " + mContext.getApplicationContext().getPackageName() + ".provider");
+        if (f.exists()) {
+            viewFileWithFileProvider(f, mime);
+        } else {
+            Log.w(TAG, "File doesn't exist");
+        }
+        return false;
+    }
+
     private void viewFileWithFileProvider(File file, String mimetype) {
         String ourPackage = mContext.getApplicationContext().getPackageName();
         Uri uri = FileProvider.getUriForFile(mContext, ourPackage + ".provider", file);
diff --git a/app/src/main/res/menu/mission.xml b/app/src/main/res/menu/mission.xml
index b76d1a923..c1688ac5b 100644
--- a/app/src/main/res/menu/mission.xml
+++ b/app/src/main/res/menu/mission.xml
@@ -7,11 +7,7 @@
 	<item
 		android:id="@+id/pause"
 		android:title="@string/pause"/>
-	
-	<item
-		android:id="@+id/view"
-		android:title="@string/view"/>
-	
+
 	<item
 		android:id="@+id/delete"
 		android:title="@string/delete"/>

From 0df8d13020420925517f247595908a0ad1951738 Mon Sep 17 00:00:00 2001
From: jludden <jasonludden@gmail.com>
Date: Sun, 11 Nov 2018 22:25:37 +0800
Subject: [PATCH 7/7] downloads can now be viewed with one click fixed

---
 .../main/java/us/shandian/giga/ui/adapter/MissionAdapter.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index de7301a30..bca8796b5 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -99,6 +99,7 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 		h.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
 			public void onClick(View v) {
+                if(h.mission.finished) viewFile(h);
 			}
 		});