From fbf05c7ef800f316c98c1198454d23367bd96c21 Mon Sep 17 00:00:00 2001 From: Igor Popov Date: Mon, 8 Jan 2018 18:17:06 +0300 Subject: [PATCH 1/8] Removed banners mentions. --- app/src/main/res/values-cs/strings.xml | 12 ++---------- app/src/main/res/values-de/strings.xml | 12 ++---------- app/src/main/res/values-es/strings.xml | 12 ++---------- app/src/main/res/values-fr/strings.xml | 12 ++---------- app/src/main/res/values-in/strings.xml | 12 ++---------- app/src/main/res/values-it/strings.xml | 5 +++-- app/src/main/res/values-ja/strings.xml | 3 --- app/src/main/res/values-ko/strings.xml | 12 ++---------- app/src/main/res/values-lt/strings.xml | 9 ++------- app/src/main/res/values-pl/strings.xml | 13 ++----------- app/src/main/res/values-pt-rBR/strings.xml | 12 ++---------- app/src/main/res/values-pt-rPT/strings.xml | 12 ++---------- app/src/main/res/values-ru/strings.xml | 8 -------- app/src/main/res/values-tr/strings.xml | 12 ++---------- app/src/main/res/values-zh-rCN/strings.xml | 12 ++---------- app/src/main/res/values-zh-rTW/strings.xml | 8 ++------ app/src/main/res/values/strings.xml | 12 ++---------- 17 files changed, 31 insertions(+), 147 deletions(-) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e7f8fda5..234087bd 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1,4 +1,5 @@ - + Načítám, vyčkejte prosím… Akce Nastavení @@ -367,15 +368,6 @@ Povolit zaškrtávací pole pro přepínání podpisu v textovém editoru Štítky Přidat komentář - Představujeme vám bannery - S FastHub 2.5.0 se nyní můžete lépe vyjádřit pomocí bannerů - pro svou profilovou stránku.\n\nKaždý, kdo používá aplikaci FastHub, uvidí vaše záhlaví a vy - také uvidíte záhlaví ostatních uživatelů! Chcete-li si sám vytvořit banner, udělejte ho - v rozlišení 1280x384 nebo dělitelný, jinak může být oříznut.\n\nBanner můžete kdykoli přidat nebo - změnit, a to tak, že vytvoříte gist pojmenovaný jako "header.fst" se souborem obsahujícím - přímý odkaz na obrázek záhlaví.\n\nNebo ještě jednoduššeji, použijte vestavěné obrázky! - - ZVOLTE BANNER Chyba při načítání obrázku, zkuste to znovu. Trendy Řazení podle emoji není funkční kvůli omezení GitHub diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e8b6af67..854a1059 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,4 +1,5 @@ - + Wird geladen… Aktionen Einstellungen @@ -349,15 +350,6 @@ Aktivieren, damit Signatur im Editor angezeigt wird Tags Kommentar hinzufügen - Einführung von Bannern - Mit FastHub 2.5.0 kannst du nun dein Profil mit einem Banner - gestalten und jeder FastHub User wird dein Banner sehen und umgekehrt.\n\nWenn du - selber ein Banner erstellen möchtest, ist es am besten wenn du als Auflösung etwas - nimmst, was sich durch 1280x384 teilen lässt, sonst wird ein Teil des Bildes abgeschnitten.\n\n\n\n - Du kannst dein Banner jederzeit wechseln, indem du ein Gist namens "header.fst" erstellst - und als Inhalt einen Direktlink zum Banner angibst. Oder du benutzt einfach den eingebauten Bildwähler! - - BANNER AUSWÄHLEN Bild konnte nicht geladen werden. Im Trend Leider kann derzeit nicht nach Emojis sortiert werden diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 9c32f147..1b956432 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,4 +1,5 @@ - + Cargando, por favor espere… Acción Configuración @@ -368,15 +369,6 @@ Habilitar un checkbox para poner o quitar la firma en el editor de mensajes Etiquetas Agregar comentario - Introducing Banners - Con FastHub 2.5.0, ahora puedes expresarte mejor con banners para tu página de perfil.\n\n - Cualquiera usando FastHub, podrá ver tu cabecera y tu verás las cabeceras de otros también! Si quisieras - crear un banner para ti, hazlo de 1280x384 o múltiplo, de otro modo quedará cortado\n\n - Puedes agregar o modificar tu banner en cualquier momento creando un Gist "header.fst" con un archivo conteniendo - un vínculo directo a la imagen de la cabecera.\n\n - O más fácilmente ¡usá el selector de imagen incorporado! - - ELIGE UN BANNER Error cargando imagen, por favor intenta nuevamente. Tendencias Ordenar por emojies no funciona debido a una limitación de GitHub diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ad08ea75..89b4d617 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,4 +1,5 @@ - + Chargement, veuillez patienter… Action Paramètres @@ -369,15 +370,6 @@ Enable checkbox to toggle signature in text editor Étiquettes Ajouter un commentaire - Bannières d\'introduction - With FastHub 2.5.0, you can now better express yourself with banners - for your profile page.\n\nAnyone using the FastHub app, will see your header, and you\'ll - begin seeing other peoples headers as well! If you\'d like to create a banner for yourself, - make it 1280x384 or divisible, otherwise, it may get cropped.\n\nYou can add or change your - banner at any time, by creating a gist described "header.fst" with a file containing a - direct link to the header image.\n\nOr even simpler, just use the built-in image chooser! - - CHOISISSEZ UNE BANNIÈRE Erreur de chargement de l\'image, merci de recommencer. Trending Trier par emojis ne fonctionne pas suite à une limitation de GitHub diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index f310b0bd..c408f391 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1,4 +1,5 @@ - + - + 加载中, 请稍候… 动作 设置 @@ -395,15 +396,6 @@ https://github.com/k0shk0sh/FastHub/blob/master/.github/CONTRIBUTING.md#contribu 在编辑器下选择每次是否签名 标签 添加评论 - 简介横幅 - - 从 FastHub 2.5.0 开始, 您可以在个人页面使用横幅来更好的展示自己. \n\n - 任何使用 FastHub 应用的人都会看到您的横幅, 您也可以看到其他人的横幅! - 如果您想为自己创建一个横幅, 确保其分辨率为 1280x384 或其他等比例大小, 否则显示时可能会被裁剪.\n\n - 您可以按照以下步骤随意设置或更改您的横幅: 创建一个描述为 "header.fst", 内容为横幅图片的直链链接的 Gist.\n\n - 或还可以更简单, 直接使用内置的图片选择器! - - 选择横幅 加载图片时出错, 请重试. 趋势 由于 GitHub 的限制, 无法正常按 Emoji 排序 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index dfb8b50a..4ceec420 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -20,7 +20,8 @@ Readme APP --> - + 載入中，請稍後 動作 設定 @@ -385,11 +386,6 @@ APP 選擇複選框以在編輯器中切換簽名 標籤 新增 - 介紹橫幅 - 透過 FastHub 2.5.0, 您可以在個人資料頁面快速的表達您的橫幅。\n\n任何使用 FastHub 的人都能看到，而且您也能看到他人的! 如果您想要自己創建橫幅 - ，讓他的解析度為 1280x384 或等比例，否則可能會被裁減。\n\n您可以在任何時候更改橫幅, 透過創建一個 gist 叫做「header.fst」包含著圖片的直接連結。\n\n或是也可以用內建的圖片選擇器。 - - 選擇橫幅 載入圖片錯誤，請重試。 趨勢 因為 GitHub 的限制，無法使用表情符號來排序。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c76939b1..1e12338e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,5 @@ - + FastHub @@ -502,15 +503,6 @@ Enable checkbox to toggle signature in text editor Tags Add comment - Introducing Banners - With FastHub 2.5.0, you can now better express yourself with banners - for your profile page.\n\nAnyone using the FastHub app, will see your header, and you\'ll - begin seeing other peoples headers as well! If you\'d like to create a banner for yourself, - make it 1280x384 or divisible, otherwise, it may get cropped.\n\nYou can add or change your - banner at any time, by creating a gist described "header.fst" with a file containing a - direct link to the header image.\n\nOr even simpler, just use the built-in image chooser! - - CHOOSE BANNER Error loading image, please try again. Trending Sort by emojies is not really working due to GitHub limitation From 65842e98c0c1242203064fe75fe622ed2d4ad41c Mon Sep 17 00:00:00 2001 From: Igor Popov Date: Mon, 8 Jan 2018 18:20:23 +0300 Subject: [PATCH 2/8] Removed one more banners mention. --- app/src/main/res/values-bg/strings.xml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index f0f9daf9..858219a9 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1,4 +1,5 @@ - + Зареждане, моля изчакай… Действие Настройки @@ -373,16 +374,6 @@ Активиране на отметка за подпис в текстовия редактор Тагове Добави коментар - Представяне на банери - С FastHub 2.5.0, можеш да изразиш себе си по-добре като използваш банери - на профилната си страница.\n\nВсеки, който използва приложението FastHub, може да види заглавието, - което си сложил/а. Ще можеш да виждаш заглавията и на другите хора. Ако искаш да създадеш собствен - банер, направи го с размери 1280x384 или кратни такива, в противен случай може да бъде отрязан.\n\n - Можеш да добавиш или смениш банера си по всяко време, като създадеш gist с име "header.fst" с файл - съдържащ директна връзка към заглавно изображение.\n\nИли пък за по-лесно, направо използвай вграденият - диалог за избор на изображения. - - ИЗБЕРИ БАНЕР Грешка при зареждане на изображение, моля опитай пак. Тенденции Сортиране по емотикони не работи поради ограничения в GitHub From cf2efcd8ed6edba485c7e02505afc418bd6ecf7c Mon Sep 17 00:00:00 2001 From: Igor Popov Date: Sat, 13 Jan 2018 15:46:39 +0300 Subject: [PATCH 3/8] Removed banners. --- .../profile/banner/BannerInfoActivity.java | 100 ------------------ .../modules/profile/banner/BannerInfoMvp.java | 21 ---- .../profile/banner/BannerInfoPresenter.java | 57 ---------- .../layout/activity_banner_info.xml | 66 ------------ 4 files changed, 244 deletions(-) delete mode 100644 app/src/main/java/com/fastaccess/ui/modules/profile/banner/BannerInfoActivity.java delete mode 100644 app/src/main/java/com/fastaccess/ui/modules/profile/banner/BannerInfoMvp.java delete mode 100644 app/src/main/java/com/fastaccess/ui/modules/profile/banner/BannerInfoPresenter.java delete mode 100644 app/src/main/res/layouts/main_layouts/layout/activity_banner_info.xml diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/banner/BannerInfoActivity.java b/app/src/main/java/com/fastaccess/ui/modules/profile/banner/BannerInfoActivity.java deleted file mode 100644 index 8374e9ee..00000000 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/banner/BannerInfoActivity.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.fastaccess.ui.modules.profile.banner; - -import android.Manifest; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.widget.Button; - -import com.fastaccess.App; -import com.fastaccess.R; -import com.fastaccess.helper.ActivityHelper; -import com.fastaccess.helper.BundleConstant; -import com.fastaccess.helper.FileHelper; -import com.fastaccess.ui.base.BaseActivity; - -import butterknife.BindView; -import butterknife.OnClick; -import es.dmoral.toasty.Toasty; - -/** - * Created by JediB on 5/25/2017. - */ - -public class BannerInfoActivity extends BaseActivity implements BannerInfoMvp.View { - - @BindView(R.id.imageChooser) Button imageChooser; - - @Override protected int layout() { - return R.layout.activity_banner_info; - } - - @Override protected boolean isTransparent() { - return false; - } - - @Override protected boolean canBack() { - return true; - } - - @Override protected boolean isSecured() { - return false; - } - - @Override public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - - @OnClick(R.id.imageChooser) void onChooseImage() { - if (ActivityHelper.checkAndRequestReadWritePermission(this)) { - showFileChooser(); - } - } - - @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == BundleConstant.REQUEST_CODE) { - if (resultCode == RESULT_OK) { - String path = FileHelper.getPath(this, data.getData()); - if (path == null) { - showMessage(R.string.error, R.string.image_error); - return; - } - getPresenter().onPostImage(path); - } - - finish(); - } - } - - @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults); - if (requestCode == 1) { - if (permissions[0].equals(Manifest.permission.READ_EXTERNAL_STORAGE)) { - if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { - showFileChooser(); - } else { - Toasty.error(App.getInstance(), getString(R.string.permission_failed)).show(); - } - } - } - } - - @NonNull @Override public BannerInfoPresenter providePresenter() { - return new BannerInfoPresenter(); - } - - @Override public void onFinishedUploading() { - showMessage(R.string.success, R.string.successfully_submitted); - setResult(RESULT_OK); - finish(); - } - - private void showFileChooser() { - Intent intent = new Intent(); - intent.setType("image/*"); - intent.setAction(Intent.ACTION_GET_CONTENT); - startActivityForResult(Intent.createChooser(intent, getString(R.string.select_picture)), BundleConstant.REQUEST_CODE); - } -} diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/banner/BannerInfoMvp.java b/app/src/main/java/com/fastaccess/ui/modules/profile/banner/BannerInfoMvp.java deleted file mode 100644 index a305dcaf..00000000 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/banner/BannerInfoMvp.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.fastaccess.ui.modules.profile.banner; - -import android.support.annotation.NonNull; - -import com.fastaccess.ui.base.mvp.BaseMvp; - -/** - * Created by JediB on 5/25/2017. - */ - -public interface BannerInfoMvp { - - interface View extends BaseMvp.FAView { - void onFinishedUploading(); - } - - interface Presenter { - void onPostImage(@NonNull String path); - } - -} diff --git a/app/src/main/java/com/fastaccess/ui/modules/profile/banner/BannerInfoPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/profile/banner/BannerInfoPresenter.java deleted file mode 100644 index f85d6d0c..00000000 --- a/app/src/main/java/com/fastaccess/ui/modules/profile/banner/BannerInfoPresenter.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.fastaccess.ui.modules.profile.banner; - -import android.support.annotation.NonNull; - -import com.fastaccess.ui.base.mvp.presenter.BasePresenter; - -/** - * Created by JediB on 5/25/2017. - */ - -public class BannerInfoPresenter extends BasePresenter implements BannerInfoMvp.Presenter { -// @NonNull private Observable getHeaderGist() { -// return RxHelper.getObserver(RestProvider.getGistService(true).getGistFile(ProfileOverviewMvp.HEADER_FST_URL)); -// } - - @Override public void onPostImage(@NonNull String path) { -// Login login = Login.getUser(); -// RequestBody image = RequestBody.create(MediaType.parse("image/*"), new File(path)); -// ImgurProvider.getImgurService().postImage("", image); -// makeRestCall(RxHelper.getObserver(ImgurProvider.getImgurService().postImage("", image)) -// .filter(imgurReponseModel -> imgurReponseModel != null && imgurReponseModel.getData() != null) -// .map(imgurReponseModel -> imgurReponseModel.getData().getLink()) -// .flatMap(link -> getHeaderGist(), (imageLink, gistContent) -> { -// boolean isReplace = false; -// if (gistContent.contains(login.getLogin() + "->")) { -// String[] splitByNewLine = gistContent.split("\n"); -// for (String s : splitByNewLine) { -// String[] splitByUser = s.split("->"); -// if (login.getLogin().equalsIgnoreCase(splitByUser[0])) { -// gistContent = gistContent.replaceFirst(splitByUser[0] + "->" + -// splitByUser[1], login.getLogin() + "->" + imageLink); -// isReplace = true; -// break; -// } -// } -// } -// PrefGetter.setProfileBackgroundUrl(imageLink); -// if (!isReplace) { -// gistContent += "\n" + login.getLogin() + "->" + imageLink; -// } -// return gistContent; -// }) -// .map(s -> { -// CreateGistModel createGistModel = new CreateGistModel(); -// createGistModel.setPublicGist(true); -// HashMap modelHashMap = new HashMap<>(); -// FilesListModel file = new FilesListModel(); -// file.setFilename("header.fst"); -// file.setContent(s); -// modelHashMap.put("header.fst", file); -// createGistModel.setFiles(modelHashMap); -// return createGistModel; -// }) -// .flatMap(body -> RxHelper.getObserver(RestProvider.getGistService().editGist(body, ProfileOverviewMvp.HEADER_GIST_ID))), -// gist -> sendToView(BannerInfoMvp.View::onFinishedUploading)); - } -} \ No newline at end of file diff --git a/app/src/main/res/layouts/main_layouts/layout/activity_banner_info.xml b/app/src/main/res/layouts/main_layouts/layout/activity_banner_info.xml deleted file mode 100644 index 03160511..00000000 --- a/app/src/main/res/layouts/main_layouts/layout/activity_banner_info.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -