mirror of
https://github.com/gsantner/dandelion
synced 2024-11-22 04:12:08 +01:00
Disable swipe refresh in tags&aspect list
This commit is contained in:
Gregor Santner
parent
93ee2b896a
commit
50b11a2747
5 changed files with 37 additions and 35 deletions
|
|
@ -38,7 +38,7 @@ public class CustomWebViewClient extends WebViewClient {
|
|||
public void onPageStarted(WebView view, String url, Bitmap favicon) {
|
||||
super.onPageStarted(view, url, favicon);
|
||||
swipeRefreshLayout.setEnabled(true);
|
||||
if(url.contains(app.getSettings().getPodDomain()+"/conversations/") || url.endsWith("status_messages/new")){
|
||||
if(url.contains(app.getSettings().getPodDomain()+"/conversations/") || url.endsWith("status_messages/new") || url.equals("about:blank")){
|
||||
swipeRefreshLayout.setEnabled(false);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ public class Helpers {
|
|||
AppSettings appSettings = app.getSettings();
|
||||
sb.append("<span style='margin-left: 30px; '></span>» ");
|
||||
sb.append(String.format(Locale.getDefault(),
|
||||
"<a href='https://%s/followed_tags' style='color: #000000; text-decoration: none;'>%s</a>",
|
||||
"<a href='https://%s/followed_tags' style='color: #000000; text-decoration: none;'><b>%s</b></a>",
|
||||
appSettings.getPodDomain(), app.getString(R.string.all_tags)));
|
||||
sb.append("<hr style='height:5px;' />");
|
||||
for (String tag: profile.getFollowedTags()) {
|
||||
|
|
|
|||
|
|
@ -28,16 +28,16 @@
|
|||
|
||||
<!-- Titles -->
|
||||
|
||||
<string name="title_notifications">D* Benachrichtigungen</string>
|
||||
<string name="title_conversations">D* Unterhaltungen</string>
|
||||
<string name="title_stream">D* Stream</string>
|
||||
<string name="title_profil">D* Profil</string>
|
||||
<string name="title_aspects">D* Aspekte</string>
|
||||
<string name="title_activities">D* Aktivitäten</string>
|
||||
<string name="title_liked">D* Gelikte Beiträge</string>
|
||||
<string name="title_commented">D* Kommentiert</string>
|
||||
<string name="title_mentions">D* Erwähnungen</string>
|
||||
<string name="title_public">D* Öffentliche Aktivitäten</string>
|
||||
<string name="title_notifications">Benachrichtigungen</string>
|
||||
<string name="title_conversations">Unterhaltungen</string>
|
||||
<string name="title_stream">Stream</string>
|
||||
<string name="title_profil">Profil</string>
|
||||
<string name="title_aspects">Aspekte</string>
|
||||
<string name="title_activities">Aktivitäten</string>
|
||||
<string name="title_liked">Gelikte Beiträge</string>
|
||||
<string name="title_commented">Kommentiert</string>
|
||||
<string name="title_mentions">Erwähnungen</string>
|
||||
<string name="title_public">Öffentliche Aktivitäten</string>
|
||||
|
||||
<!-- Drawer and App -->
|
||||
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
<!-- Dialog -->
|
||||
|
||||
<string name="messages">Unterhaltungen</string>
|
||||
<string name="new_post">D* Neuer Beitrag</string>
|
||||
<string name="new_post">Neuer Beitrag</string>
|
||||
<string name="notifications">Benachrichtigungen</string>
|
||||
<string name="image">Konnte Bild nicht laden …</string>
|
||||
<string name="jb_share">Inhalt Teilen</string>
|
||||
|
|
@ -157,5 +157,6 @@ along with this program. If not, see http://www.gnu.org/licenses.<br> <br
|
|||
<string name="toast_set_proxy_failed">Warnung: Proxy konnte nicht aktiviert werden…</string>
|
||||
|
||||
<string name="toggle_desktop_page">Mobil-/Desktopansicht umschalten</string>
|
||||
<string name="all_tags">Alle Tags</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
<!-- Titles -->
|
||||
|
||||
<string name="title_notifications">D* Notifications</string>
|
||||
<string name="title_conversations">D* Discussions</string>
|
||||
<string name="title_stream">D* Flux</string>
|
||||
<string name="title_profil">D* Profil</string>
|
||||
<string name="title_aspects">D* Aspects</string>
|
||||
<string name="title_activities">D* Activités</string>
|
||||
<string name="title_liked">D* Aimés</string>
|
||||
<string name="title_commented">D* Commentés</string>
|
||||
<string name="title_mentions">D* Mentions</string>
|
||||
<string name="title_public">D* Public</string>
|
||||
<string name="title_notifications">Notifications</string>
|
||||
<string name="title_conversations">Discussions</string>
|
||||
<string name="title_stream">Flux</string>
|
||||
<string name="title_profil">Profil</string>
|
||||
<string name="title_aspects">Aspects</string>
|
||||
<string name="title_activities">Activités</string>
|
||||
<string name="title_liked">Aimés</string>
|
||||
<string name="title_commented">Commentés</string>
|
||||
<string name="title_mentions">Mentions</string>
|
||||
<string name="title_public">Public</string>
|
||||
|
||||
|
||||
<!-- Pod Activity -->
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
<string name="confirmation">Confirmation</string>
|
||||
<string name="confirm_pod">Voulez-vous vraiment utiliser\nhttps://%1$s\ncomme pod Diaspora ?</string>
|
||||
<string name="confirm_exit">Souhaitez-vous quitter ?</string>
|
||||
<string name="new_post">D* Nouveau message</string>
|
||||
<string name="new_post">Nouveau message</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="messages">Discussions</string>
|
||||
|
||||
|
|
@ -155,4 +155,5 @@
|
|||
|
||||
<string name="toast_set_proxy_failed">Attention: connexion au proxy impossible…</string>
|
||||
<string name="share_dotdotdot">Partager…</string>
|
||||
<string name="all_tags">Tout Tags</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -21,16 +21,16 @@
|
|||
|
||||
<!-- Titles -->
|
||||
|
||||
<string name="title_notifications">D* Notifications</string>
|
||||
<string name="title_conversations">D* Conversations</string>
|
||||
<string name="title_stream">D* Stream</string>
|
||||
<string name="title_profil">D* Profil</string>
|
||||
<string name="title_aspects">D* Aspects</string>
|
||||
<string name="title_activities">D* Activities</string>
|
||||
<string name="title_liked">D* Liked</string>
|
||||
<string name="title_commented">D* Commented</string>
|
||||
<string name="title_mentions">D* Mentions</string>
|
||||
<string name="title_public">D* Public</string>
|
||||
<string name="title_notifications">Notifications</string>
|
||||
<string name="title_conversations">Conversations</string>
|
||||
<string name="title_stream">Stream</string>
|
||||
<string name="title_profil">Profil</string>
|
||||
<string name="title_aspects">Aspects</string>
|
||||
<string name="title_activities">Activities</string>
|
||||
<string name="title_liked">Liked</string>
|
||||
<string name="title_commented">Commented</string>
|
||||
<string name="title_mentions">Mentions</string>
|
||||
<string name="title_public">Public</string>
|
||||
|
||||
|
||||
<!-- Pod Activity -->
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
<string name="confirmation">Confirmation</string>
|
||||
<string name="confirm_pod">Do you really want to use\nhttps://%1$s\nas your Diaspora Pod?</string>
|
||||
<string name="confirm_exit">Do you want to exit?</string>
|
||||
<string name="new_post">D* New message</string>
|
||||
<string name="new_post">New message</string>
|
||||
<string name="notifications">Notifications</string>
|
||||
<string name="messages">Conversations</string>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue