From 887c1c4263e65252cc0845a23c09f6e5f7a6b9f1 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Tue, 8 Aug 2017 14:18:58 +0200 Subject: [PATCH 01/12] PreviewMediaFragment java 124 Avoid non default constructors in fragments use a default --- .../ui/activity/FileDisplayActivity.java | 5 ++- .../ui/preview/PreviewMediaFragment.java | 35 +++++++++++++------ 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index 102058bc42..2dda8f3c7f 100644 --- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -486,7 +486,7 @@ public class FileDisplayActivity extends HookActivity if (file.isDown() && PreviewMediaFragment.canBePreviewed(file)) { int startPlaybackPosition = getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0); boolean autoplay = getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true); - secondFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, autoplay); + secondFragment = PreviewMediaFragment.newInstance(file, getAccount(), startPlaybackPosition, autoplay); } else if (file.isDown() && PreviewTextFragment.canBePreviewed(file)) { secondFragment = null; } else { @@ -1996,8 +1996,7 @@ public class FileDisplayActivity extends HookActivity * interactions. */ public void startMediaPreview(OCFile file, int startPlaybackPosition, boolean autoplay) { - Fragment mediaFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, - autoplay); + Fragment mediaFragment = PreviewMediaFragment.newInstance(file, getAccount(), startPlaybackPosition, autoplay); setSecondFragment(mediaFragment); updateFragmentsVisibility(true); updateActionBarTitleAndHomeButton(file); diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 76bb1a08e2..257c24178c 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -1,4 +1,4 @@ -/** +/* * ownCloud Android client application * * @author David A. Velasco @@ -113,6 +113,11 @@ public class PreviewMediaFragment extends FileFragment implements private static final String SCREEN_NAME = "Audio/Video Preview"; + private static final String FILE = "file"; + private static final String ACCOUNT = "account"; + private static final String PLAYBACK_POSITION = "playbackposition"; + private static final String AUTOPLAY = "autoplay"; + /** * Creates a fragment to preview a file. *

@@ -121,16 +126,19 @@ public class PreviewMediaFragment extends FileFragment implements * @param fileToDetail An {@link OCFile} to preview in the fragment * @param ocAccount An ownCloud account; needed to start downloads */ - public PreviewMediaFragment( - OCFile fileToDetail, - Account ocAccount, - int startPlaybackPosition, - boolean autoplay) { + public static PreviewMediaFragment newInstance(OCFile fileToDetail, Account ocAccount, int startPlaybackPosition, + boolean autoplay) { + PreviewMediaFragment previewMediaFragment = new PreviewMediaFragment(); - super(fileToDetail); - mAccount = ocAccount; - mSavedPlaybackPosition = startPlaybackPosition; - mAutoplay = autoplay; + Bundle bundle = new Bundle(); + bundle.putParcelable(FILE, fileToDetail); + bundle.putParcelable(ACCOUNT, ocAccount); + bundle.putInt(PLAYBACK_POSITION, startPlaybackPosition); + bundle.putBoolean(AUTOPLAY, autoplay); + + previewMediaFragment.setArguments(bundle); + + return previewMediaFragment; } /** @@ -157,6 +165,13 @@ public class PreviewMediaFragment extends FileFragment implements public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); + + Bundle bundle = getArguments(); + + setFile(bundle.getParcelable(FILE)); + mAccount = bundle.getParcelable(ACCOUNT); + mSavedPlaybackPosition = bundle.getInt(PLAYBACK_POSITION); + mAutoplay = bundle.getBoolean(AUTOPLAY); } From 5d4049aab90a550a76aeaad7ef1a1de61531712e Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Tue, 8 Aug 2017 14:21:43 +0200 Subject: [PATCH 02/12] add cast --- .../com/owncloud/android/ui/preview/PreviewMediaFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 257c24178c..4389cd0528 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -168,7 +168,7 @@ public class PreviewMediaFragment extends FileFragment implements Bundle bundle = getArguments(); - setFile(bundle.getParcelable(FILE)); + setFile((OCFile) bundle.getParcelable(FILE)); mAccount = bundle.getParcelable(ACCOUNT); mSavedPlaybackPosition = bundle.getInt(PLAYBACK_POSITION); mAutoplay = bundle.getBoolean(AUTOPLAY); From 5535ff3c0e01ecfb389b9aab5a22191a502fa1c7 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Tue, 8 Aug 2017 14:31:13 +0200 Subject: [PATCH 03/12] FileFragment Avoid non default constructors in fragments use a default --- .../android/ui/fragment/FileFragment.java | 30 +++++++++++++++---- .../ui/preview/PreviewMediaFragment.java | 8 ++--- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java index cacfa2d443..88404a10e8 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java @@ -22,6 +22,8 @@ package com.owncloud.android.ui.fragment; import android.accounts.Account; import android.app.Activity; +import android.os.Bundle; +import android.support.annotation.Nullable; import android.support.v4.app.Fragment; import com.owncloud.android.datamodel.OCFile; @@ -29,6 +31,8 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; import com.owncloud.android.ui.activity.ComponentsGetter; +import static com.owncloud.android.ui.activity.FileActivity.EXTRA_FILE; + /** * Common methods for {@link Fragment}s containing {@link OCFile}s @@ -49,14 +53,28 @@ public class FileFragment extends Fragment { public FileFragment() { mFile = null; } - + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + Bundle bundle = getArguments(); + setFile((OCFile) bundle.getParcelable(EXTRA_FILE)); + } + /** * Creates an instance for a given {@OCFile}. * * @param file */ - public FileFragment(OCFile file) { - mFile = file; + public static FileFragment newInstance(OCFile file) { + FileFragment fileFragment = new FileFragment(); + Bundle bundle = new Bundle(); + + bundle.putParcelable(EXTRA_FILE, file); + fileFragment.setArguments(bundle); + + return fileFragment; } /** @@ -111,7 +129,7 @@ public class FileFragment extends Fragment { * * @param file File to show details */ - public void showDetails(OCFile file); + void showDetails(OCFile file); ///// TO UNIFY IN A SINGLE CALLBACK METHOD - EVENT NOTIFICATIONs -> something happened @@ -122,7 +140,7 @@ public class FileFragment extends Fragment { * * @param folder */ - public void onBrowsedDownTo(OCFile folder); + void onBrowsedDownTo(OCFile folder); /** * Callback method invoked when a the 'transfer state' of a file changes. @@ -141,7 +159,7 @@ public class FileFragment extends Fragment { * @param downloading Flag signaling if the file is now downloading. * @param uploading Flag signaling if the file is now uploading. */ - public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading); + void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading); } diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 4389cd0528..932da18038 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -113,10 +113,10 @@ public class PreviewMediaFragment extends FileFragment implements private static final String SCREEN_NAME = "Audio/Video Preview"; - private static final String FILE = "file"; - private static final String ACCOUNT = "account"; - private static final String PLAYBACK_POSITION = "playbackposition"; - private static final String AUTOPLAY = "autoplay"; + private static final String FILE = "FILE"; + private static final String ACCOUNT = "ACCOUNT"; + private static final String PLAYBACK_POSITION = "PLAYBACK_POSITION"; + private static final String AUTOPLAY = "AUTOPLAY"; /** * Creates a fragment to preview a file. From c025fe69f658db20fc9471355879f883aab7d966 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Wed, 9 Aug 2017 08:52:34 +0200 Subject: [PATCH 04/12] add encoding --- scripts/lint/lint-up.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/lint/lint-up.rb b/scripts/lint/lint-up.rb index 9fdfb26aee..467d18b1f0 100644 --- a/scripts/lint/lint-up.rb +++ b/scripts/lint/lint-up.rb @@ -1,6 +1,9 @@ ## Script from https://github.com/tir38/android-lint-entropy-reducer at 07.05.2017 # adapts to drone, use git username / token as parameter +Encoding.default_external = Encoding::UTF_8 +Encoding.default_internal = Encoding::UTF_8 + puts "=================== starting Android Lint Entropy Reducer ====================" # get args From 328962b8c4141dd7d61e772b813f3bde3063fb66 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Wed, 9 Aug 2017 09:18:51 +0200 Subject: [PATCH 05/12] regex for errors and error, same for warning/warnings --- scripts/lint/lint-up.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/lint/lint-up.rb b/scripts/lint/lint-up.rb index 467d18b1f0..b1c552950c 100644 --- a/scripts/lint/lint-up.rb +++ b/scripts/lint/lint-up.rb @@ -76,17 +76,17 @@ lint_report = String.new(lint_reports[0]) # find error/warning count string in HTML report error_warning_string = "" File.open lint_report do |file| - error_warning_string = file.find { |line| line =~ /[0-9]* errors and [0-9]* warnings/ } + error_warning_string = file.find { |line| line =~ /[0-9]* error[s]? and [0-9]* warning[s]?/ } end # find number of errors -error_string = error_warning_string.match(/[0-9]* errors/)[0] +error_string = error_warning_string.match(/[0-9]* error[s]?/)[0] current_error_count = error_string.match(/[0-9]*/)[0].to_i puts "found errors: " + current_error_count.to_s # find number of warnings if CHECK_WARNINGS == true - warning_string = error_warning_string.match(/[0-9]* warnings/)[0] + warning_string = error_warning_string.match(/[0-9]* warning[s]?/)[0] current_warning_count = warning_string.match(/[0-9]*/)[0].to_i puts "found warnings: " + current_warning_count.to_s end From f7c8e7984f777ed33d16dbcbf89faa5e36efc0d8 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Wed, 9 Aug 2017 09:50:10 +0200 Subject: [PATCH 06/12] proper regex for no errors --- scripts/lint/lint-up.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/lint/lint-up.rb b/scripts/lint/lint-up.rb index b1c552950c..2c30fea8d9 100644 --- a/scripts/lint/lint-up.rb +++ b/scripts/lint/lint-up.rb @@ -76,12 +76,18 @@ lint_report = String.new(lint_reports[0]) # find error/warning count string in HTML report error_warning_string = "" File.open lint_report do |file| - error_warning_string = file.find { |line| line =~ /[0-9]* error[s]? and [0-9]* warning[s]?/ } + error_warning_string = file.find { |line| line =~ /([0-9]* error[s]? and )?[0-9]* warning[s]?/ } end # find number of errors -error_string = error_warning_string.match(/[0-9]* error[s]?/)[0] -current_error_count = error_string.match(/[0-9]*/)[0].to_i +error_string = error_warning_string.match(/[0-9]* error[s]?/) + +if (error_string == nil) + current_error_count = 0 +else + current_error_count = error_string[0].match(/[0-9]*/)[0].to_i +end + puts "found errors: " + current_error_count.to_s # find number of warnings From 160fc45c27d477ebeb69c6fa644ad99f8f708d41 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Wed, 9 Aug 2017 16:19:55 +0200 Subject: [PATCH 07/12] remove unsused string --- src/main/res/values/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4795513d98..3f41aab51d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -12,7 +12,6 @@ Details Send Sort - Sort by Sort by A - Z Z - A From 1011e63eb17fc73df0e6288be520bf8d56ddb277 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Wed, 9 Aug 2017 10:22:47 +0200 Subject: [PATCH 08/12] codacy --- scripts/lint/lint-up.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lint/lint-up.rb b/scripts/lint/lint-up.rb index 2c30fea8d9..f18d2a272d 100644 --- a/scripts/lint/lint-up.rb +++ b/scripts/lint/lint-up.rb @@ -82,7 +82,7 @@ end # find number of errors error_string = error_warning_string.match(/[0-9]* error[s]?/) -if (error_string == nil) +if (error_string.nil?) current_error_count = 0 else current_error_count = error_string[0].match(/[0-9]*/)[0].to_i From 91579554a8175f7774651dda860083c2c47ef670 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 10 Aug 2017 12:44:51 +0200 Subject: [PATCH 09/12] remove them in translated files --- src/main/res/values-ar/strings.xml | 1 - src/main/res/values-ast/strings.xml | 1 - src/main/res/values-bg-rBG/strings.xml | 1 - src/main/res/values-ca/strings.xml | 1 - src/main/res/values-cs-rCZ/strings.xml | 1 - src/main/res/values-da/strings.xml | 1 - src/main/res/values-de-rDE/strings.xml | 1 - src/main/res/values-de/strings.xml | 1 - src/main/res/values-el/strings.xml | 1 - src/main/res/values-en-rGB/strings.xml | 1 - src/main/res/values-es-rAR/strings.xml | 1 - src/main/res/values-es-rMX/strings.xml | 1 - src/main/res/values-es/strings.xml | 1 - src/main/res/values-fi-rFI/strings.xml | 1 - src/main/res/values-fr/strings.xml | 1 - src/main/res/values-he/strings.xml | 1 - src/main/res/values-hu-rHU/strings.xml | 1 - src/main/res/values-id/strings.xml | 1 - src/main/res/values-is/strings.xml | 1 - src/main/res/values-it/strings.xml | 1 - src/main/res/values-ja-rJP/strings.xml | 1 - src/main/res/values-ko/strings.xml | 1 - src/main/res/values-lv/strings.xml | 1 - src/main/res/values-nb-rNO/strings.xml | 1 - src/main/res/values-nl/strings.xml | 1 - src/main/res/values-pl/strings.xml | 1 - src/main/res/values-pt-rBR/strings.xml | 1 - src/main/res/values-pt-rPT/strings.xml | 1 - src/main/res/values-ro/strings.xml | 1 - src/main/res/values-ru/strings.xml | 1 - src/main/res/values-sk-rSK/strings.xml | 1 - src/main/res/values-sl/strings.xml | 1 - src/main/res/values-sq/strings.xml | 1 - src/main/res/values-sr/strings.xml | 1 - src/main/res/values-sv/strings.xml | 1 - src/main/res/values-tr/strings.xml | 1 - src/main/res/values-uk/strings.xml | 1 - src/main/res/values-zh-rCN/strings.xml | 1 - src/main/res/values-zh-rTW/strings.xml | 1 - 39 files changed, 39 deletions(-) diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index 85291c430a..cf1c22ef45 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -12,7 +12,6 @@ تفاصيل أرسل ترتيب - ترتيب بـ ترتيب أ - ى ى -أ diff --git a/src/main/res/values-ast/strings.xml b/src/main/res/values-ast/strings.xml index 1a2ab7e9aa..51e7bc6606 100644 --- a/src/main/res/values-ast/strings.xml +++ b/src/main/res/values-ast/strings.xml @@ -12,7 +12,6 @@ Detalles Unviar Ordenar - Ordenar per Ordenar per A - Z Z - A diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index 4af82965b1..780330b48c 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -12,7 +12,6 @@ Детайли Изпращане Сортирай - Сортиране по Сортиране по А - Я Я - А diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index fcc69c3e93..f575dd3425 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -12,7 +12,6 @@ Detalls Envia Ordena - Ordena per Ordena per A - Z Z - A diff --git a/src/main/res/values-cs-rCZ/strings.xml b/src/main/res/values-cs-rCZ/strings.xml index 9ee1bd1348..1df7a61830 100644 --- a/src/main/res/values-cs-rCZ/strings.xml +++ b/src/main/res/values-cs-rCZ/strings.xml @@ -12,7 +12,6 @@ Podrobnosti Odeslat Seřadit - Seřadit podle Řadit podle A - Z Z - A diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index 57808b014b..273ea3f038 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -12,7 +12,6 @@ Detaljer Send Sortér - Sortér efter Sortér efter A - Z Z - A diff --git a/src/main/res/values-de-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml index 462448375f..0720468bc5 100644 --- a/src/main/res/values-de-rDE/strings.xml +++ b/src/main/res/values-de-rDE/strings.xml @@ -12,7 +12,6 @@ Details Senden Sortieren - Sortiere nach Sortiere nach A - Z Z - A diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 57c8dc822e..92fc7199b4 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -12,7 +12,6 @@ Details Senden Sortieren - Sortieren nach Sortieren nach A - Z Z - A diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 9c85cad7b8..145e15ee28 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -12,7 +12,6 @@ Λεπτομέρειες Αποστολή Ταξινόμηση - Ταξινόμηση κατά Ταξινόμηση κατά Α - Ω Ω - Α diff --git a/src/main/res/values-en-rGB/strings.xml b/src/main/res/values-en-rGB/strings.xml index 307923ea8a..4c4e3517a7 100644 --- a/src/main/res/values-en-rGB/strings.xml +++ b/src/main/res/values-en-rGB/strings.xml @@ -12,7 +12,6 @@ Details Send Sort - Sort by Sort by A - Z Z - A diff --git a/src/main/res/values-es-rAR/strings.xml b/src/main/res/values-es-rAR/strings.xml index 7fdd28d847..dd3365a05d 100644 --- a/src/main/res/values-es-rAR/strings.xml +++ b/src/main/res/values-es-rAR/strings.xml @@ -12,7 +12,6 @@ Detalles Enviar Ordenar - Ordenar por Ordenar por A - Z Z - A diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml index 6597d35df6..4379ea0d1c 100644 --- a/src/main/res/values-es-rMX/strings.xml +++ b/src/main/res/values-es-rMX/strings.xml @@ -12,7 +12,6 @@ Detalles Enviar Ordenar - Ordenar por Ordenar por A - Z Z - A diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 4220053ebf..4ac5d85279 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -12,7 +12,6 @@ Detalles Enviar Ordenar - Ordenar por Ordenar por A - Z Z - A diff --git a/src/main/res/values-fi-rFI/strings.xml b/src/main/res/values-fi-rFI/strings.xml index eb095cfc19..a5bb1cac77 100644 --- a/src/main/res/values-fi-rFI/strings.xml +++ b/src/main/res/values-fi-rFI/strings.xml @@ -12,7 +12,6 @@ Tiedot Lähetä Lajittele - Lajittelujärjestys Lajittelujärjestys A - Ö Ö - A diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 59ae239fff..22df0f5e15 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -12,7 +12,6 @@ Propriétés Exporter Trier - Trier par Trier par De A à Z  De Z à A diff --git a/src/main/res/values-he/strings.xml b/src/main/res/values-he/strings.xml index e59222b443..3f93c20004 100644 --- a/src/main/res/values-he/strings.xml +++ b/src/main/res/values-he/strings.xml @@ -12,7 +12,6 @@ פרטים שליחה מיון - מיון על בסיס כל הקבצים הגדרות העלאות diff --git a/src/main/res/values-hu-rHU/strings.xml b/src/main/res/values-hu-rHU/strings.xml index 06be7afe8b..fb54a87194 100644 --- a/src/main/res/values-hu-rHU/strings.xml +++ b/src/main/res/values-hu-rHU/strings.xml @@ -12,7 +12,6 @@ Részletek Küldés Rendezés - Rendezés elve Rendezés elve A - Z Z - A diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml index 28976164c3..b8beb6c27f 100644 --- a/src/main/res/values-id/strings.xml +++ b/src/main/res/values-id/strings.xml @@ -12,7 +12,6 @@ Rincian Kirim Urutkan - Urutan Semua berkas Dalam perangkat Pengaturan diff --git a/src/main/res/values-is/strings.xml b/src/main/res/values-is/strings.xml index 16183a7a03..038c8b6ac1 100644 --- a/src/main/res/values-is/strings.xml +++ b/src/main/res/values-is/strings.xml @@ -12,7 +12,6 @@ Nánar Senda Raða - Raða sem Raða eftir A - Ö Ö - A diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 46b7d3261d..14c4db251e 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -12,7 +12,6 @@ Dettagli Invia Ordina - Ordina per Ordina per A - Z Z - A diff --git a/src/main/res/values-ja-rJP/strings.xml b/src/main/res/values-ja-rJP/strings.xml index af1d53a0b8..55ff7dcde8 100644 --- a/src/main/res/values-ja-rJP/strings.xml +++ b/src/main/res/values-ja-rJP/strings.xml @@ -12,7 +12,6 @@ 詳細 送信 ソート - ソート: ソート A - Z Z - A diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index eff50b4356..a0d2bb4e68 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -12,7 +12,6 @@ 자세한 정보 보내기 정렬 - 정렬 순서 정렬 A - Z Z - A diff --git a/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml index 46c11fec43..7651f0ef37 100644 --- a/src/main/res/values-lv/strings.xml +++ b/src/main/res/values-lv/strings.xml @@ -12,7 +12,6 @@ Detaļas Sūtīt Kārtot - Kārtot pēc Kārtot pēc A - Z Z - A diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml index 0b01bdfed7..ddd9ca3e00 100644 --- a/src/main/res/values-nb-rNO/strings.xml +++ b/src/main/res/values-nb-rNO/strings.xml @@ -12,7 +12,6 @@ Detaljer Send Sorter - Sorter etter Sorter etter A - Z Z - A diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index c8a7be4792..b91913a6ed 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -12,7 +12,6 @@ Details Versturen Sorteren - Sorteer op Sorteer op A - Z Z - A diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index d3088a6895..a7d830e092 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -12,7 +12,6 @@ Szczegóły Wyślij Sortuj - Sortuj według Sortuj po A - Z Z - A diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index f40b210d8e..d20b752b28 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -12,7 +12,6 @@ Detalhes Enviar Classificar - Classificar por Classificado por A - Z Z - A diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml index 2dbb729854..fc9682a235 100644 --- a/src/main/res/values-pt-rPT/strings.xml +++ b/src/main/res/values-pt-rPT/strings.xml @@ -12,7 +12,6 @@ Detalhes Enviar Ordenar - Ordenar por Todos os ficheiros No dispositivo Definições diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml index 5afda33a55..5047443d91 100644 --- a/src/main/res/values-ro/strings.xml +++ b/src/main/res/values-ro/strings.xml @@ -12,7 +12,6 @@ Detalii Expediază Sortează - Sortare după Sortare după A - Z Z - A diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index d1e0e3bad5..e97a3f635d 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -13,7 +13,6 @@ Подробно Отправить Сортировка - Сортировать по Порядок сортировки А–Я Я–A diff --git a/src/main/res/values-sk-rSK/strings.xml b/src/main/res/values-sk-rSK/strings.xml index ecea22d82e..a1d9546b51 100644 --- a/src/main/res/values-sk-rSK/strings.xml +++ b/src/main/res/values-sk-rSK/strings.xml @@ -12,7 +12,6 @@ Podrobnosti Odoslať Zoradiť - Zoradiť podľa Zoradiť podľa A - Z Z - A diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml index 75fe60af92..6dce2d912f 100644 --- a/src/main/res/values-sl/strings.xml +++ b/src/main/res/values-sl/strings.xml @@ -12,7 +12,6 @@ Podrobnosti Pošlji Razvrsti - Razvrsti ... Razvrsti po A - Ž Ž - A diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml index acb596d8cd..091e8bed24 100644 --- a/src/main/res/values-sq/strings.xml +++ b/src/main/res/values-sq/strings.xml @@ -12,7 +12,6 @@ Hollësi Dërgojeni Renditni - Renditni sipas Rendit sipas A - Z Z - A diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 4b177add9d..9f0f8d3afd 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -12,7 +12,6 @@ Детаљи Пошаљи Сортирање по - Сортирање Сортирај по А - Ш Ш - А diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index c7d2d065c3..ab3fbe3856 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -12,7 +12,6 @@ Detaljer Skicka Sortera - Sortera efter Sortera efter A - Ö Ö - A diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 56363e828f..76f2f89644 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -12,7 +12,6 @@ Ayrıntılar Gönder Sırala - Şuna göre sırala Sıralama A - Z Z - A diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 2efd5f8c81..5a0c5ecb22 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -12,7 +12,6 @@ Деталі Надіслати Сортувати - Сортувати за Сортувати по А - Я Я - А diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index f669392214..c6c6a1f600 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -12,7 +12,6 @@ 详细信息 发送 排序 - 排序方式 排序方式 按名称顺序 按名称倒序 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 3a26faf309..ac46b8cbf9 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -12,7 +12,6 @@ 詳細資料 寄出 排序 - 排序依照 排列方式 A - Z Z - A From e30bc9eefc89e089abb9e0a9bd825fca86007d90 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 10 Aug 2017 14:16:40 +0200 Subject: [PATCH 10/12] add object descriptions for accessibility --- src/main/res/layout/participate_layout.xml | 12 ++++++++---- src/main/res/values/strings.xml | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/res/layout/participate_layout.xml b/src/main/res/layout/participate_layout.xml index e130a64590..0ffe85876e 100755 --- a/src/main/res/layout/participate_layout.xml +++ b/src/main/res/layout/participate_layout.xml @@ -101,7 +101,8 @@ android:background="@color/white" android:onClick="onGetRCPlayStoreClick" android:padding="@dimen/zero" - android:src="@drawable/playstore"/> + android:src="@drawable/playstore" + android:contentDescription="@string/participate_rc_play_store"/> + android:src="@drawable/fdroid" + android:contentDescription="@string/participate_rc_fdroid"/> @@ -139,7 +141,8 @@ android:background="@color/white" android:onClick="onGetBetaFDroidClick" android:padding="@dimen/zero" - android:src="@drawable/fdroid"/> + android:src="@drawable/fdroid" + android:contentDescription="@string/participate_dev_fdroid"/> + android:src="@drawable/apk" + android:contentDescription="@string/participate_dev_direct_download"/> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3f41aab51d..67e2e15dc6 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -588,6 +588,10 @@ <font color=\"%1$s\"><a href=\"%2$s\">%3$s</a></font> Review, amend and write code, see %1$s for details <font color=\"%1$s\"><a href=\"%2$s\">CONTRIBUTING.md</a></font> + Get release candidate via Google Play store + Get release candidate via f-droid app store + Get development release via f-droid app store + Get development release via direct download Move to… Copy to… Choose remote folder… From 38657443d869094c7690fbe2dd438ecf3687fe4a Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 10 Aug 2017 14:03:51 +0200 Subject: [PATCH 11/12] removed some unused code to get the warnings down ;-) --- .../res/layout/alert_dialog_list_view.xml | 10 --- .../layout/notification_with_progress_bar.xml | 69 ------------------- src/main/res/values/dims.xml | 5 -- 3 files changed, 84 deletions(-) delete mode 100644 src/main/res/layout/alert_dialog_list_view.xml delete mode 100644 src/main/res/layout/notification_with_progress_bar.xml diff --git a/src/main/res/layout/alert_dialog_list_view.xml b/src/main/res/layout/alert_dialog_list_view.xml deleted file mode 100644 index ce5a569e1f..0000000000 --- a/src/main/res/layout/alert_dialog_list_view.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/src/main/res/layout/notification_with_progress_bar.xml b/src/main/res/layout/notification_with_progress_bar.xml deleted file mode 100644 index 79588e6e89..0000000000 --- a/src/main/res/layout/notification_with_progress_bar.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/values/dims.xml b/src/main/res/values/dims.xml index a3556ead6c..4a2aad0f2d 100644 --- a/src/main/res/values/dims.xml +++ b/src/main/res/values/dims.xml @@ -41,7 +41,6 @@ 8dp 4dp 2dp - -2dp 56dp 72dp 16sp @@ -60,7 +59,6 @@ 32dp 1dip 10dip - 5dip 16dip 8dip 196dip @@ -76,10 +74,7 @@ 16dip 100dp 2dp - 16dp 32dp - 12dp - 64dp 200dp 20dp 12sp From f75bc443bdc18d201cc2e01f82b58746e3f441c4 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot <> Date: Thu, 10 Aug 2017 14:53:36 +0000 Subject: [PATCH 12/12] Drone: update Lint results to reflect reduced error/warning count [skip ci] --- scripts/lint/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lint/lint-results.txt b/scripts/lint/lint-results.txt index 5bb29643d8..07b2f49055 100644 --- a/scripts/lint/lint-results.txt +++ b/scripts/lint/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 3 errors and 646 warnings + Lint Report: 1 error and 632 warnings