From 86fd914c677f877b466b8d0030fbf17cc6318633 Mon Sep 17 00:00:00 2001 From: nxt3 Date: Fri, 15 Apr 2016 13:59:27 -0400 Subject: [PATCH 001/188] Moved Settings back to bottom in drawer --- app/src/main/res/layout/drawer_loggedin.xml | 141 ++++++++------------ 1 file changed, 59 insertions(+), 82 deletions(-) diff --git a/app/src/main/res/layout/drawer_loggedin.xml b/app/src/main/res/layout/drawer_loggedin.xml index f290eccdf3..8b814dd606 100644 --- a/app/src/main/res/layout/drawer_loggedin.xml +++ b/app/src/main/res/layout/drawer_loggedin.xml @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_marginStart="-27dp" - android:layout_toRightOf="@+id/welcome" + android:layout_toEndOf="@+id/welcome" android:padding="16dp" android:text="ccrama" android:textColor="#fff" @@ -49,11 +49,9 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_margin="12dp" app:srcCompat="@drawable/down" /> - - - - - - - @@ -120,7 +112,7 @@ android:id="@+id/godown" android:layout_width="48dp" android:layout_height="48dp" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_gravity="center_vertical" android:layout_marginEnd="2dp" @@ -215,7 +207,6 @@ android:layout_width="match_parent" android:layout_height="48dp" android:background="?android:selectableItemBackground" - android:orientation="horizontal" android:paddingStart="0dp"> @@ -231,10 +222,9 @@ @@ -243,13 +233,12 @@ android:id="@+id/count" android:layout_width="28dp" android:layout_height="28dp" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_gravity="center_vertical" android:layout_marginEnd="16dp" android:background="@drawable/roundedback" android:gravity="center" - android:textColor="#fff" android:textSize="14sp" android:textStyle="bold" @@ -261,7 +250,6 @@ android:layout_width="match_parent" android:layout_height="48dp" android:background="?android:selectableItemBackground" - android:orientation="horizontal" android:paddingStart="0dp"> @@ -277,7 +265,7 @@ - @@ -329,52 +315,6 @@ android:textStyle="bold" /> - - - - - - - - - + + android:src="@drawable/circle" /> + - - /> + android:paddingEnd="24dp" /> + + + + + + + + Date: Fri, 15 Apr 2016 13:26:20 -0500 Subject: [PATCH 002/188] Deeper integration with the Slide video plugin (always open with that if possible, despite external settings), Start for package install listener, Other bugfixes --- app/src/main/AndroidManifest.xml | 7 ++++ .../redditslide/Activities/MainActivity.java | 2 +- .../Activities/SettingsHandling.java | 2 +- .../Adapters/SideArrayAdapter.java | 35 +++++++++++++++---- .../me/ccrama/redditslide/CheckInstall.java | 22 ++++++++++++ .../me/ccrama/redditslide/ContentType.java | 11 +++--- .../redditslide/SpoilerRobotoTextView.java | 2 +- .../PopulateSubmissionViewHolder.java | 2 +- app/src/main/res/values/strings.xml | 1 + 9 files changed, 69 insertions(+), 15 deletions(-) create mode 100644 app/src/main/java/me/ccrama/redditslide/CheckInstall.java diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 86f6d1cb77..5075c1bc09 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -33,6 +33,13 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/app_name"> + + + + + + + { - private final List objects; private Filter filter; public ArrayList baseItems; public ArrayList fitems; public boolean openInSubView = true; + public ArrayList history; + public ArrayList user; + public ArrayList allSubs; - public SideArrayAdapter(Context context, ArrayList objects, ArrayList allSubreddits) { + + public SideArrayAdapter(Context context, ArrayList objects, ArrayList userSubs, ArrayList historySubs, ArrayList allSubs) { super(context, 0, objects); - this.objects = new ArrayList<>(allSubreddits); + this.allSubs = allSubs; + this.history = historySubs; + this.user = userSubs; + + for(String s : this.user){ + history.remove(s); + this.allSubs.remove(s); + } + for(String s : this.history){ + this.allSubs.remove(s); + } filter = new SubFilter(); fitems = new ArrayList<>(objects); baseItems = new ArrayList<>(objects); @@ -111,10 +123,21 @@ protected FilterResults performFiltering(CharSequence constraint) { results.count = list.size(); } else { openInSubView = true; - final ArrayList list = new ArrayList<>(objects); final ArrayList nlist = new ArrayList<>(); - for (String sub : list) { + for (String sub : user) { + if (sub.contains(prefix)) + nlist.add(sub); + if (sub.equals(prefix)) + openInSubView = false; + } + for (String sub : history) { + if (sub.contains(prefix)) + nlist.add(sub); + if (sub.equals(prefix)) + openInSubView = false; + } + for (String sub : allSubs) { if (sub.contains(prefix)) nlist.add(sub); if (sub.equals(prefix)) diff --git a/app/src/main/java/me/ccrama/redditslide/CheckInstall.java b/app/src/main/java/me/ccrama/redditslide/CheckInstall.java new file mode 100644 index 0000000000..28f088c029 --- /dev/null +++ b/app/src/main/java/me/ccrama/redditslide/CheckInstall.java @@ -0,0 +1,22 @@ +package me.ccrama.redditslide; + +/** + * Created by carlo_000 on 10/13/2015. + */ + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; + +import me.ccrama.redditslide.util.LogUtil; + +public class CheckInstall extends BroadcastReceiver { + + private Context c; + + @Override + public void onReceive(Context context, Intent intent) { + c = context; + LogUtil.v("Package installed!"); + } +} \ No newline at end of file diff --git a/app/src/main/java/me/ccrama/redditslide/ContentType.java b/app/src/main/java/me/ccrama/redditslide/ContentType.java index 5e11f0a49f..94901a1fa7 100644 --- a/app/src/main/java/me/ccrama/redditslide/ContentType.java +++ b/app/src/main/java/me/ccrama/redditslide/ContentType.java @@ -120,8 +120,10 @@ public static Type getContentType(String url) { if (!scheme.equals("http") && !scheme.equals("https")) { return Type.EXTERNAL; } - if (PostMatch.openExternal(url)) { + if (PostMatch.openExternal(url) && !(Reddit.videoPlugin && (host.contains("youtu.be") || host.contains("youtube.co")))) { return Type.EXTERNAL; + } else if (Reddit.videoPlugin && (host.contains("youtu.be") || host.contains("youtube.co"))) { + return Type.VIDEO; } if (isGif(uri)) { return Type.GIF; @@ -138,12 +140,10 @@ public static Type getContentType(String url) { if (isRedditLink(uri)) { return Type.REDDIT; } + if (host.endsWith("vid.me")) { return Type.VID_ME; } - if (Reddit.videoPlugin && (host.endsWith("youtu.be") || host.endsWith("youtube.co"))) { - return Type.VIDEO; - } if (host.endsWith("deviantart.com")) { return Type.DEVIANTART; } @@ -264,8 +264,9 @@ private static int getContentID(Submission submission) { case STREAMABLE: return R.string.type_streamable; case VIDEO: + return R.string.type_youtube; case VID_ME: - return R.string.type_vid; + return R.string.type_vidme; } } return R.string.type_link; diff --git a/app/src/main/java/me/ccrama/redditslide/SpoilerRobotoTextView.java b/app/src/main/java/me/ccrama/redditslide/SpoilerRobotoTextView.java index 421b77ed26..e07a8ea0b5 100644 --- a/app/src/main/java/me/ccrama/redditslide/SpoilerRobotoTextView.java +++ b/app/src/main/java/me/ccrama/redditslide/SpoilerRobotoTextView.java @@ -263,7 +263,7 @@ public void onLinkClick(String url, int xOffset, String subreddit) { throw new RuntimeException("Could not find activity from context:" + context); } - if (!PostMatch.openExternal(url)) { + if (!PostMatch.openExternal(url) || type == ContentType.Type.VIDEO) { switch (type) { case IMGUR: if (SettingValues.image) { diff --git a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java index 46a2a0d40d..b913df7689 100644 --- a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java @@ -115,7 +115,7 @@ public void onClick(View v) { } } - if (!PostMatch.openExternal(submission.getUrl())) { + if (!PostMatch.openExternal(submission.getUrl()) || type == ContentType.Type.VIDEO) { switch (type) { case VID_ME: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4713d0b697..76985dfaea 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -661,4 +661,5 @@ Open externally Vertical album view Download album + YouTube \ No newline at end of file From 5faa988aa02f478160fb9a09c26ce8fe5f1fd013 Mon Sep 17 00:00:00 2001 From: nxt3 Date: Fri, 15 Apr 2016 14:45:47 -0400 Subject: [PATCH 003/188] More settings tweaks --- .../redditslide/Activities/Settings.java | 2 +- .../Activities/SettingsGeneral.java | 9 ++-- .../Activities/SettingsReddit.java | 36 +++++++-------- .../res/layout/activity_settings_reddit.xml | 44 +++++++++++++------ app/src/main/res/values/strings.xml | 3 ++ 5 files changed, 55 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Settings.java b/app/src/main/java/me/ccrama/redditslide/Activities/Settings.java index 4f4586a5e4..8b180d7a4c 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Settings.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Settings.java @@ -323,7 +323,7 @@ public void onClick(View v) { } }); } else { - findViewById(R.id.reddit_settings).setVisibility(View.GONE); + findViewById(R.id.reddit_settings).setEnabled(false); } } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java index 60521c1a51..e1939f0ebd 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java @@ -278,12 +278,11 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (Reddit.notificationTime > 0) { ((TextView) findViewById(R.id.notifications_current)).setText(getString(R.string.settings_notification_short, TimeUtils.getTimeInHoursAndMins(Reddit.notificationTime, getBaseContext()))); - } else { ((TextView) findViewById(R.id.notifications_current)).setText(R.string.settings_notifdisabled); } - if (Authentication.isLoggedIn) + if (Authentication.isLoggedIn) { findViewById(R.id.notifications).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -292,11 +291,11 @@ public void onClick(View v) { setupNotificationSettings(dialoglayout, SettingsGeneral.this); } }); - else findViewById(R.id.notifications).setVisibility(View.GONE); - + } else { + findViewById(R.id.notifications).setEnabled(false); + } ((TextView) findViewById(R.id.sorting_current)).setText(Reddit.getSortingStrings(getBaseContext())[Reddit.getSortingId("")]); - { findViewById(R.id.sorting).setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsReddit.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsReddit.java index 31ec2ec7ba..aed05fde16 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsReddit.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsReddit.java @@ -77,7 +77,6 @@ protected Void doInBackground(Void... params) { @Override protected void onPostExecute(Void aVoid) { { - final SwitchCompat thumbnails = (SwitchCompat) findViewById(R.id.nsfwcontent); thumbnails.setChecked(Boolean.parseBoolean(prefs.data("over_18"))); @@ -91,21 +90,21 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { } { - final SwitchCompat thumbnails = (SwitchCompat) findViewById(R.id.nsfwrpev); - - thumbnails.setChecked(Boolean.parseBoolean(prefs.data("no_profanity"))); - thumbnails.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - editor.setArgs("no_profanity", String.valueOf(isChecked)); - } - }); - + if (((SwitchCompat) findViewById(R.id.nsfwcontent)).isChecked()) { + thumbnails.setEnabled(false); + } else { + thumbnails.setChecked(Boolean.parseBoolean(prefs.data("no_profanity"))); + thumbnails.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + editor.setArgs("no_profanity", String.valueOf(isChecked)); + } + }); + } } //Thumbnail type - String thumbType = String.valueOf(prefs.data("media")); ((TextView) findViewById(R.id.thumbtext)).setText(thumbType.equals("on") ? getString(R.string.thumb_type_always) : thumbType.equals("off") ? getString(R.string.thumb_type_off) : getString(R.string.thumb_type_sub)); @@ -134,16 +133,14 @@ public boolean onMenuItemClick(MenuItem item) { return true; } }); - popup.show(); } }); - d.dismiss(); } }.execute(); - findViewById(R.id.delete).setOnClickListener(new View.OnClickListener() { + findViewById(R.id.viewRedditPrefs).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (SettingValues.web) { @@ -151,11 +148,12 @@ public void onClick(View v) { browserIntent.putExtra(Website.EXTRA_URL, "https://www.reddit.com/prefs/"); browserIntent.putExtra(Website.EXTRA_COLOR, Palette.getDefaultColor()); startActivity(browserIntent); - } else OpenRedditLink.customIntentChooser( - "https://www.reddit.com/prefs/", SettingsReddit.this); + } else { + OpenRedditLink + .customIntentChooser("https://www.reddit.com/prefs/", + SettingsReddit.this); + } } }); } - - } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_settings_reddit.xml b/app/src/main/res/layout/activity_settings_reddit.xml index 2fed00f433..57840b35d9 100644 --- a/app/src/main/res/layout/activity_settings_reddit.xml +++ b/app/src/main/res/layout/activity_settings_reddit.xml @@ -18,6 +18,16 @@ android:background="?attr/activity_background" android:orientation="vertical"> + + - + - - + android:layout_height="wrap_content" /> - + - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4713d0b697..45905c27f8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -438,6 +438,9 @@ Post buttons Navigation Collapse actions + NSFW content + Content thumbnails + Open Reddit settings in browser From 88d3d189ffdc10705bb95ecb4bbabe70245bf734 Mon Sep 17 00:00:00 2001 From: ccrama Date: Fri, 15 Apr 2016 15:13:51 -0500 Subject: [PATCH 004/188] New bottom sheet on album images for better readability and UX, Fixed some other bugs --- app/build.gradle | 7 +- .../redditslide/Activities/AlbumPager.java | 289 ++++++------------ .../Activities/ForceTouchLink.java | 9 +- .../redditslide/Activities/MainActivity.java | 31 +- .../redditslide/Activities/MediaView.java | 4 +- .../me/ccrama/redditslide/OpenRedditLink.java | 14 +- .../redditslide/util/ImageExtractor.java | 9 +- app/src/main/res/layout/album_image_pager.xml | 134 +++++--- app/src/main/res/layout/album_pager.xml | 8 - 9 files changed, 218 insertions(+), 287 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7237595ad0..9887b67ee8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,13 +109,13 @@ dependencies { compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4' compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.4.1' compile 'com.android.support:cardview-v7:23.2.0' - compile 'com.wefika:flowlayout:0.4.1' compile 'com.cocosw:bottomsheet:1.3.0@aar' compile 'org.apache.commons:commons-lang3:3.4' compile 'com.github.johnkil.android-robototextview:robototextview:2.4.3' compile 'com.makeramen:roundedimageview:2.2.1' compile 'com.android.support:multidex:1.0.1' - compile 'org.jsoup:jsoup:1.8.3' + compile 'com.sothree.slidinguppanel:library:3.3.0' + compile 'rapid.decoder:library:0.3.0' testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:1.10.19' testCompile 'org.robolectric:robolectric:3.0' @@ -123,10 +123,9 @@ dependencies { testCompile 'commons-io:commons-io:2.4' testCompile 'org.hamcrest:hamcrest-all:1.3' compile files('src/main/assets/synccit.jar') - debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1' - compile 'rapid.decoder:library:0.3.0' compile('com.github.ozodrukh:CircularReveal:1.3.1@aar') { transitive = true; } compile 'com.github.rjeschke:txtmark:0.13' + compile 'org.jetbrains:annotations-java5:15.0' } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java b/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java index d73c98eec4..515542c436 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java @@ -23,7 +23,6 @@ import android.support.v4.view.ViewPager; import android.support.v7.app.NotificationCompat; import android.support.v7.widget.Toolbar; -import android.text.Html; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -64,6 +63,7 @@ import me.ccrama.redditslide.R; import me.ccrama.redditslide.Reddit; import me.ccrama.redditslide.SettingValues; +import me.ccrama.redditslide.SpoilerRobotoTextView; import me.ccrama.redditslide.Views.ImageSource; import me.ccrama.redditslide.Views.MediaVideoView; import me.ccrama.redditslide.Views.SubsamplingScaleImageView; @@ -91,7 +91,7 @@ public boolean onOptionsItemSelected(MenuItem item) { if (id == android.R.id.home) { onBackPressed(); } - if(id == R.id.vertical){ + if (id == R.id.vertical) { SettingValues.albumSwipe = false; SettingValues.prefs.edit().putBoolean(SettingValues.PREF_ALBUM_SWIPE, false).apply(); Intent i = new Intent(AlbumPager.this, Album.class); @@ -99,10 +99,10 @@ public boolean onOptionsItemSelected(MenuItem item) { startActivity(i); finish(); } - if(id == R.id.grid){ + if (id == R.id.grid) { mToolbar.findViewById(R.id.grid).callOnClick(); } - if(id == R.id.external){ + if (id == R.id.external) { Reddit.defaultShare(getIntent().getExtras().getString("url", ""), this); } if (id == R.id.download) { @@ -204,204 +204,63 @@ public void doWithData(final ArrayList jsonElements) { AlbumViewPager adapter = new AlbumViewPager(getSupportFragmentManager()); p.setAdapter(adapter); - { - JsonElement user = jsonElements.get(0); - - - if (user.getAsJsonObject().has("image")) { - String title = ""; - if (!user.getAsJsonObject().getAsJsonObject("image").get("title").isJsonNull()) { - List text = SubmissionParser.getBlocks(user.getAsJsonObject().getAsJsonObject("image").get("title").getAsString()); - title = text.get(0); - if (getSupportActionBar() != null) - - getSupportActionBar().setTitle(title); - - } - - if (!user.getAsJsonObject().getAsJsonObject("image").get("caption").isJsonNull()) { - List text = SubmissionParser.getBlocks(user.getAsJsonObject().getAsJsonObject("image").get("caption").getAsString()); - final String done = text.get(0); - final String finalTitle = title; - findViewById(R.id.text).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(AlbumPager.this).setMessage(Html.fromHtml(done)); - if (!finalTitle.isEmpty()) { - builder.setTitle(finalTitle); - } - builder.show(); - } - }); - if (done.isEmpty()) { - findViewById(R.id.text).setVisibility(View.GONE); - } else { - findViewById(R.id.text).setVisibility(View.VISIBLE); - } - } - } else { - String title = ""; - if (user.getAsJsonObject().has("title") && !user.getAsJsonObject().get("title").isJsonNull()) { - List text = SubmissionParser.getBlocks(user.getAsJsonObject().get("title").getAsString()); - title = text.get(0); - if (getSupportActionBar() != null) - - getSupportActionBar().setTitle(title); - - } - - if (user.getAsJsonObject().has("description") && !user.getAsJsonObject().get("description").isJsonNull()) { - List text = SubmissionParser.getBlocks(user.getAsJsonObject().get("description").getAsString()); - final String done = text.get(0); - final String finalTitle = title; - findViewById(R.id.text).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(AlbumPager.this).setMessage(Html.fromHtml(done)); - if (!finalTitle.isEmpty()) { - builder.setTitle(finalTitle); - } - builder.show(); - } - - }); - if (done.isEmpty()) { - findViewById(R.id.text).setVisibility(View.GONE); - } else { - findViewById(R.id.text).setVisibility(View.VISIBLE); - } - - } else { - findViewById(R.id.text).setVisibility(View.GONE); - } + final ArrayList list = new ArrayList<>(); + if (gallery) { + for (final JsonElement elem : images) { + list.add("https://imgur.com/" + elem.getAsJsonObject().get("hash").getAsString() + ".png"); } - final ArrayList list = new ArrayList<>(); - if (gallery) { - for (final JsonElement elem : images) { - list.add("https://imgur.com/" + elem.getAsJsonObject().get("hash").getAsString() + ".png"); - } - } else { - for (final JsonElement elem : images) { - list.add(elem.getAsJsonObject().get("link").getAsString()); - } + } else { + for (final JsonElement elem : images) { + list.add(elem.getAsJsonObject().get("link").getAsString()); } - findViewById(R.id.grid).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - LayoutInflater l = getLayoutInflater(); - View body = l.inflate(R.layout.album_grid_dialog, null, false); - AlertDialogWrapper.Builder b = new AlertDialogWrapper.Builder(AlbumPager.this); - GridView gridview = (GridView) body.findViewById(R.id.images); - gridview.setAdapter(new ImageGridAdapter(AlbumPager.this, list)); - - - b.setView(body); - final Dialog d = b.create(); - gridview.setOnItemClickListener(new AdapterView.OnItemClickListener() { - public void onItemClick(AdapterView parent, View v, - int position, long id) { - p.setCurrentItem(position); - d.dismiss(); - } - }); - d.show(); - } - }); - p.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - if (getSupportActionBar() != null) - - getSupportActionBar().setSubtitle((position + 1) + "/" + images.size()); - } + } + findViewById(R.id.grid).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + LayoutInflater l = getLayoutInflater(); + View body = l.inflate(R.layout.album_grid_dialog, null, false); + AlertDialogWrapper.Builder b = new AlertDialogWrapper.Builder(AlbumPager.this); + GridView gridview = (GridView) body.findViewById(R.id.images); + gridview.setAdapter(new ImageGridAdapter(AlbumPager.this, list)); + + + b.setView(body); + final Dialog d = b.create(); + gridview.setOnItemClickListener(new AdapterView.OnItemClickListener() { + public void onItemClick(AdapterView parent, View v, + int position, long id) { + p.setCurrentItem(position); + d.dismiss(); + } + }); + d.show(); + } + }); + p.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + if (getSupportActionBar() != null) - @Override - public void onPageSelected(int position) { - JsonElement user = jsonElements.get(position); - - - if (user.getAsJsonObject().has("image")) { - String title = ""; - if (!user.getAsJsonObject().getAsJsonObject("image").get("title").isJsonNull()) { - List text = SubmissionParser.getBlocks(user.getAsJsonObject().getAsJsonObject("image").get("title").getAsString()); - title = text.get(0); - if (getSupportActionBar() != null) - - getSupportActionBar().setTitle(title); - - } - - if (!user.getAsJsonObject().getAsJsonObject("image").get("caption").isJsonNull()) { - List text = SubmissionParser.getBlocks(user.getAsJsonObject().getAsJsonObject("image").get("caption").getAsString()); - final String done = text.get(0); - final String finalTitle = title; - findViewById(R.id.text).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(AlbumPager.this).setMessage(Html.fromHtml(done)); - if (!finalTitle.isEmpty()) { - builder.setTitle(finalTitle); - } - builder.show(); - } - }); - if (done.isEmpty()) { - findViewById(R.id.text).setVisibility(View.GONE); - } else { - findViewById(R.id.text).setVisibility(View.VISIBLE); - } - } else { - findViewById(R.id.text).setVisibility(View.GONE); - } - } else { - String title = ""; - if (user.getAsJsonObject().has("title") && !user.getAsJsonObject().get("title").isJsonNull()) { - List text = SubmissionParser.getBlocks(user.getAsJsonObject().get("title").getAsString()); - title = text.get(0); - if (getSupportActionBar() != null) - - getSupportActionBar().setTitle(title); - - } - - if (user.getAsJsonObject().has("description") && !user.getAsJsonObject().get("description").isJsonNull()) { - List text = SubmissionParser.getBlocks(user.getAsJsonObject().get("description").getAsString()); - final String done = text.get(0); - final String finalTitle = title; - findViewById(R.id.text).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(AlbumPager.this).setMessage(Html.fromHtml(done)); - if (!finalTitle.isEmpty()) { - builder.setTitle(finalTitle); - } - builder.show(); - } - - }); - if (done.isEmpty()) { - findViewById(R.id.text).setVisibility(View.GONE); - } else { - findViewById(R.id.text).setVisibility(View.VISIBLE); - } + getSupportActionBar().setSubtitle((position + 1) + "/" + images.size()); + } - } - } + @Override + public void onPageSelected(int position) { - } + } - @Override - public void onPageScrollStateChanged(int state) { + @Override + public void onPageScrollStateChanged(int state) { - } - }); - adapter.notifyDataSetChanged(); - } + } + }); + adapter.notifyDataSetChanged(); } } } public ArrayList images; + @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); @@ -446,7 +305,7 @@ public Fragment getItem(int i) { return f; } } - + @Override public int getCount() { @@ -710,6 +569,54 @@ public void onProgressUpdate(String imageUri, View view, int current, int total) } }); + { + if (user.getAsJsonObject().has("image")) { + String title = ""; + String description = ""; + if (!user.getAsJsonObject().getAsJsonObject("image").get("title").isJsonNull()) { + List text = SubmissionParser.getBlocks(user.getAsJsonObject().getAsJsonObject("image").get("title").getAsString()); + title = text.get(0).trim(); + } + + if (!user.getAsJsonObject().getAsJsonObject("image").get("caption").isJsonNull()) { + List text = SubmissionParser.getBlocks(user.getAsJsonObject().getAsJsonObject("image").get("caption").getAsString()); + description = text.get(0).trim(); + } + if (title.isEmpty() && description.isEmpty()) { + rootView.findViewById(R.id.panel).setVisibility(View.GONE); + rootView.findViewById(R.id.margin).setVisibility(View.GONE); + } else if (title.isEmpty()) { + ((SpoilerRobotoTextView) rootView.findViewById(R.id.title)).setTextHtml(description); + } else { + ((SpoilerRobotoTextView) rootView.findViewById(R.id.title)).setTextHtml(title); + ((SpoilerRobotoTextView) rootView.findViewById(R.id.body)).setTextHtml(description); + } + + } else { + String title = ""; + String description = ""; + if (user.getAsJsonObject().has("title") && !user.getAsJsonObject().get("title").isJsonNull()) { + List text = SubmissionParser.getBlocks(user.getAsJsonObject().get("title").getAsString()); + title = text.get(0).trim(); + } + + if (user.getAsJsonObject().has("description") && !user.getAsJsonObject().get("description").isJsonNull()) { + List text = SubmissionParser.getBlocks(user.getAsJsonObject().get("description").getAsString()); + description = text.get(0).trim(); + + } + if (title.isEmpty() && description.isEmpty()) { + rootView.findViewById(R.id.panel).setVisibility(View.GONE); + rootView.findViewById(R.id.margin).setVisibility(View.GONE); + } else if (title.isEmpty()) { + ((SpoilerRobotoTextView) rootView.findViewById(R.id.title)).setTextHtml(description); + } else { + ((SpoilerRobotoTextView) rootView.findViewById(R.id.title)).setTextHtml(title); + ((SpoilerRobotoTextView) rootView.findViewById(R.id.body)).setTextHtml(description); + } + } + + } return rootView; } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/ForceTouchLink.java b/app/src/main/java/me/ccrama/redditslide/Activities/ForceTouchLink.java index 6de4f16d88..8dc169d316 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/ForceTouchLink.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/ForceTouchLink.java @@ -7,14 +7,11 @@ import android.view.Window; import android.widget.ImageView; -import java.io.IOException; - import me.ccrama.redditslide.ContentType; import me.ccrama.redditslide.R; import me.ccrama.redditslide.Reddit; import me.ccrama.redditslide.Views.MediaVideoView; import me.ccrama.redditslide.util.GifUtils; -import me.ccrama.redditslide.util.ImageExtractor; /** * Created by ccrama on 01/29/2016. @@ -75,11 +72,11 @@ public boolean onTouch(View v, MotionEvent event) { String urlGotten; @Override protected Void doInBackground(Void... params) { - try { - urlGotten = ImageExtractor.extractImageUrl(url); + /*try { + urlGotten = ImageExtractor.extractImageUrl(url); } catch (IOException e) { e.printStackTrace(); - } + }*/ return null; } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java index bbca7bea0a..16617f036d 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java @@ -85,8 +85,6 @@ import net.dean.jraw.paginators.UserRecordPaginator; import net.dean.jraw.util.JrawUtils; -import org.apache.commons.lang3.StringUtils; - import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -274,6 +272,14 @@ public void onClick(DialogInterface dialog, int which) { // permissions this app might request } } + public static String abbreviate(final String str, final int maxWidth) { + if (str.length() <= maxWidth) { + return str; + } + + final String abrevMarker = "..."; + return str.substring(0, maxWidth - 3) + abrevMarker; + } public boolean commentPager = false; @@ -1102,8 +1108,10 @@ public void doDrawer() { header.findViewById(R.id.multi).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Intent inte = new Intent(MainActivity.this, MultiredditOverview.class); - MainActivity.this.startActivity(inte); + if(runAfterLoad == null) { + Intent inte = new Intent(MainActivity.this, MultiredditOverview.class); + MainActivity.this.startActivity(inte); + } } }); @@ -1344,17 +1352,8 @@ public void onClick(View view) { MainActivity.this.startActivityForResult(inte, INBOX_RESULT); } }); - if (Authentication.mod) { - header.findViewById(R.id.mod).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Intent inte = new Intent(MainActivity.this, ModQueue.class); - MainActivity.this.startActivity(inte); - } - }); - } else { header.findViewById(R.id.mod).setVisibility(View.GONE); - } + headerMain = header; if (runAfterLoad == null) { @@ -2409,7 +2408,7 @@ public int getCount() { public CharSequence getPageTitle(int position) { if (usedArray != null) { - return StringUtils.abbreviate(usedArray.get(position), 25); + return abbreviate(usedArray.get(position), 25); } else { return ""; } @@ -2597,7 +2596,7 @@ public int getCount() { public CharSequence getPageTitle(int position) { if (usedArray != null && position != toOpenComments) { - return StringUtils.abbreviate(usedArray.get(position), 25); + return abbreviate(usedArray.get(position), 25); } else { return ""; } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/MediaView.java b/app/src/main/java/me/ccrama/redditslide/Activities/MediaView.java index 7899e3355d..afde6a42fc 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/MediaView.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/MediaView.java @@ -106,7 +106,7 @@ public void showBottomSheetImage() { save.setColorFilter(color, PorterDuff.Mode.SRC_ATOP); BottomSheet.Builder b = new BottomSheet.Builder(this) - .title(actuallyLoaded); + .title(contentUrl); b.sheet(2, external, "Open externally"); b.sheet(5, share, "Share link"); @@ -122,7 +122,7 @@ public void onClick(DialogInterface dialog, int which) { break; } case (3): { - shareImage(contentUrl); + shareImage(actuallyLoaded); break; } case (5): { diff --git a/app/src/main/java/me/ccrama/redditslide/OpenRedditLink.java b/app/src/main/java/me/ccrama/redditslide/OpenRedditLink.java index e3e5e16605..29277915aa 100644 --- a/app/src/main/java/me/ccrama/redditslide/OpenRedditLink.java +++ b/app/src/main/java/me/ccrama/redditslide/OpenRedditLink.java @@ -80,7 +80,7 @@ public OpenRedditLink(Context context, String url) { String querry; int index = end.indexOf("q="); if (end.contains("&") && end.contains("+")) { - querry = end.substring(index + 2, end.contains("+") ? Math.min(end.indexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)); + querry = end.substring(index + 2, end.contains("+") ? Math.max(end.lastIndexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)); } else if (end.contains("&")) { querry = end.substring(index + 2, end.indexOf("&", index)); } else { @@ -92,7 +92,7 @@ public OpenRedditLink(Context context, String url) { String author; int index = end.indexOf("author:"); if (end.contains("&") && end.contains("+")) { - author = end.substring(index + 7, end.contains("+") ? Math.min(end.indexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)); + author = end.substring(index + 7, end.contains("+") ? Math.max(end.indexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)); } else if (end.contains("&")) { author = end.substring(index + 7, end.indexOf("&", index)); } else { @@ -104,7 +104,7 @@ public OpenRedditLink(Context context, String url) { boolean nsfw; int index = end.indexOf("nsfw:"); if (end.contains("&") && end.contains("+")) { - nsfw = end.substring(index + 5, end.contains("+") ? Math.min(end.indexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)).equals("yes"); + nsfw = end.substring(index + 5, end.contains("+") ? Math.max(end.indexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)).equals("yes"); } else if (end.contains("&")) { nsfw = end.substring(index + 5, end.indexOf("&", index)).equals("yes"); } else { @@ -116,7 +116,7 @@ public OpenRedditLink(Context context, String url) { boolean self; int index = end.indexOf("self:"); if (end.contains("&") && end.contains("+")) { - self = end.substring(index + 5, end.contains("+") ? Math.min(end.indexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)).equals("yes"); + self = end.substring(index + 5, end.contains("+") ? Math.max(end.indexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)).equals("yes"); } else if (end.contains("&")) { self = end.substring(index + 5, end.indexOf("&", index)).equals("yes"); } else { @@ -128,7 +128,7 @@ public OpenRedditLink(Context context, String url) { boolean selftext; int index = end.indexOf("selftext:"); if (end.contains("&") && end.contains("+")) { - selftext = end.substring(index + 5, end.contains("+") ? Math.min(end.indexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)).equals("yes"); + selftext = end.substring(index + 5, end.contains("+") ? Math.max(end.indexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)).equals("yes"); } else if (end.contains("&")) { selftext = end.substring(index + 5, end.indexOf("&", index)).equals("yes"); } else { @@ -140,7 +140,7 @@ public OpenRedditLink(Context context, String url) { String s_url; int index = end.indexOf("url:"); if (end.contains("&") && end.contains("+")) { - s_url = end.substring(index + 4, end.contains("+") ? Math.min(end.indexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)); + s_url = end.substring(index + 4, end.contains("+") ? Math.max(end.indexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)); } else if (end.contains("&")) { s_url = end.substring(index + 4, end.indexOf("&", index)); } else { @@ -152,7 +152,7 @@ public OpenRedditLink(Context context, String url) { String site; int index = end.indexOf("site:"); if (end.contains("&") && end.contains("+")) { - site = end.substring(index + 5, end.contains("+") ? Math.min(end.indexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)); + site = end.substring(index + 5, end.contains("+") ? Math.max(end.indexOf("+", index), end.indexOf("&", index)) : end.indexOf("&", index)); } else if (end.contains("&")) { site = end.substring(index + 5, end.indexOf("&", index)); } else { diff --git a/app/src/main/java/me/ccrama/redditslide/util/ImageExtractor.java b/app/src/main/java/me/ccrama/redditslide/util/ImageExtractor.java index 52ab973d8e..936c79527f 100644 --- a/app/src/main/java/me/ccrama/redditslide/util/ImageExtractor.java +++ b/app/src/main/java/me/ccrama/redditslide/util/ImageExtractor.java @@ -2,8 +2,10 @@ /** * Created by carlo_000 on 1/29/2016. + * + * Might be a thing in the future, removing all code for now to get rid of dependencies */ -import org.jsoup.Jsoup; +/*import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -17,7 +19,7 @@ * >here * * Code from https://gist.github.com/Daenyth/4742267 - */ + public class ImageExtractor { // TODO: Add junit test case for this. (Construct Document from string, extract, check) @@ -124,5 +126,4 @@ private static String getImageFromSchema(Document document) { return null; } return image.absUrl("src"); - } -} \ No newline at end of file + }*/ diff --git a/app/src/main/res/layout/album_image_pager.xml b/app/src/main/res/layout/album_image_pager.xml index 3197bdd4e7..6b69c43be2 100644 --- a/app/src/main/res/layout/album_image_pager.xml +++ b/app/src/main/res/layout/album_image_pager.xml @@ -1,59 +1,95 @@ - - + android:gravity="bottom" + sothree:umanoOverlay="true" + sothree:umanoPanelHeight="48dp" + sothree:umanoShadowHeight="4dp"> - + android:orientation="vertical"> + + + + + + + + + + + + + + + - - - - - + android:layout_height="wrap_content"> + + - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/album_pager.xml b/app/src/main/res/layout/album_pager.xml index 865e58b15c..2b9bcd9fb1 100644 --- a/app/src/main/res/layout/album_pager.xml +++ b/app/src/main/res/layout/album_pager.xml @@ -23,14 +23,6 @@ android:layout_width="0dp" android:layout_height="0dp" /> - - Date: Fri, 15 Apr 2016 21:16:11 +0100 Subject: [PATCH 005/188] Externalise strings, remove shorthands, add years for post ages --- .../redditslide/Activities/Discover.java | 9 +- .../redditslide/Activities/Profile.java | 32 ++--- .../redditslide/Activities/Sendmessage.java | 8 +- .../Activities/SettingsGeneral.java | 4 +- .../Activities/SettingsSubreddit.java | 4 +- .../redditslide/Activities/SubredditView.java | 2 +- .../redditslide/Adapters/CommentAdapter.java | 2 +- .../redditslide/Adapters/InboxAdapter.java | 10 +- .../DragSort/ReorderSubreddits.java | 4 +- .../Notifications/CheckForMail.java | 4 +- .../PopulateSubmissionViewHolder.java | 2 +- .../java/me/ccrama/redditslide/TimeUtils.java | 55 ++++++--- .../res/layout/activity_settings_general.xml | 2 +- app/src/main/res/layout/drawer_loggedin.xml | 2 +- .../main/res/layout/fragment_basicinfo.xml | 2 +- app/src/main/res/layout/postmenu.xml | 2 +- app/src/main/res/values/donottranslate.xml | 1 + app/src/main/res/values/strings.xml | 114 ++++++++++++------ 18 files changed, 162 insertions(+), 97 deletions(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java b/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java index 201a843672..120c0a3bf0 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java @@ -49,14 +49,13 @@ public boolean onOptionsItemSelected(MenuItem item) { .alwaysCallInputCallback() .inputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS) .inputRange(3, 100) - .input("Search term or topic", null, new MaterialDialog.InputCallback() { + .input(getString(R.string.discover_search), null, new MaterialDialog.InputCallback() { @Override public void onInput(MaterialDialog dialog, CharSequence input) { if (input.length() >= 3) { dialog.getActionButton(DialogAction.POSITIVE).setEnabled(true); } else { dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false); - } } }) @@ -86,7 +85,7 @@ public void onCreate(Bundle savedInstance) { applyColorTheme(""); setContentView(R.layout.activity_multireddits); - setupAppBar(R.id.toolbar, "Discover", true, false); + setupAppBar(R.id.toolbar, R.string.discover_title, true, false); findViewById(R.id.header).setBackgroundColor(Palette.getDefaultColor()); tabs = (TabLayout) findViewById(R.id.sliding_tabs); @@ -123,9 +122,9 @@ public int getCount() { @Override public CharSequence getPageTitle(int position) { if (position == 0) { - return "popular"; + return getString(R.string.discover_popular); } else { - return "trending"; + return getString(R.string.discover_trending); } } } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Profile.java b/app/src/main/java/me/ccrama/redditslide/Activities/Profile.java index a84ab7bd0d..88b7a10c98 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Profile.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Profile.java @@ -203,27 +203,27 @@ public void onClick(View v) { dialoglayout.findViewById(R.id.share).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Reddit.defaultShareText(name + "'s profile" + "\n" + "https://www.reddit.com/u/" + name, Profile.this); + Reddit.defaultShareText(getString(R.string.profile_share, name) + + "\n" + "https://www.reddit.com/u/" + name, Profile.this); } }); final int currentColor = Palette.getColorUser(name); title.setBackgroundColor(currentColor); - StringBuilder info = new StringBuilder(); - info.append("Redditor for "); - info.append(TimeUtils.getLengthTimeSince(account.getCreated().getTime(), Profile.this)); - info.append(". "); + + String info = getString(R.string.profile_age, + TimeUtils.getTimeSince(account.getCreated().getTime(), Profile.this)); /*todo better if (account.hasGold() &&account.getDataNode().has("gold_expiration") ) { Calendar c = Calendar.getInstance(); c.setTimeInMillis(account.getDataNode().get("gold_expiration").asLong()); info.append("Gold expires on " + new SimpleDateFormat("dd/MM/yy").format(c.getTime())); }*/ - ((TextView) dialoglayout.findViewById(R.id.moreinfo)).setText(info.toString()); + ((TextView) dialoglayout.findViewById(R.id.moreinfo)).setText(info); String tag = UserTags.getUserTag(name); if (tag.isEmpty()) { - tag = "Tag user"; + tag = getString(R.string.profile_tag_user); } else { - tag = "User tagged as '" + tag + "'"; + tag = getString(R.string.profile_tag_user_existing, tag); } ((TextView) dialoglayout.findViewById(R.id.tagged)).setText(tag); LinearLayout l = (LinearLayout) dialoglayout.findViewById(R.id.trophies_inner); @@ -232,17 +232,17 @@ public void onClick(View v) { @Override public void onClick(View v) { MaterialDialog.Builder b = new MaterialDialog.Builder(Profile.this) - .title("Set tag for " + name) - .input("Tag", UserTags.getUserTag(name), false, new MaterialDialog.InputCallback() { + .title(getString(R.string.profile_tag_set, name)) + .input(getString(R.string.profile_tag), UserTags.getUserTag(name), false, new MaterialDialog.InputCallback() { @Override public void onInput(MaterialDialog dialog, CharSequence input) { } - }).positiveText("Set tag") + }).positiveText(R.string.profile_btn_tag) .neutralText(R.string.btn_cancel); if (UserTags.isUserTagged(name)) { - b.negativeText("Remove tag"); + b.negativeText(R.string.profile_btn_untag); } b.onPositive(new MaterialDialog.SingleButtonCallback() { @Override @@ -250,9 +250,9 @@ public void onClick(MaterialDialog dialog, DialogAction which) { UserTags.setUserTag(name, dialog.getInputEditText().getText().toString()); String tag = UserTags.getUserTag(name); if (tag.isEmpty()) { - tag = "Tag user"; + tag = getString(R.string.profile_tag_user); } else { - tag = "User tagged as '" + tag + "'"; + tag = getString(R.string.profile_tag_user_existing, tag); } ((TextView) dialoglayout.findViewById(R.id.tagged)).setText(tag); } @@ -262,9 +262,9 @@ public void onClick(MaterialDialog dialog, DialogAction which) { UserTags.removeUserTag(name); String tag = UserTags.getUserTag(name); if (tag.isEmpty()) { - tag = "Tag user"; + tag = getString(R.string.profile_tag_user); } else { - tag = "User tagged as '" + tag + "'"; + tag = getString(R.string.profile_tag_user_existing, tag); } ((TextView) dialoglayout.findViewById(R.id.tagged)).setText(tag); } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Sendmessage.java b/app/src/main/java/me/ccrama/redditslide/Activities/Sendmessage.java index eb81f71127..6e3a1e5cc6 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Sendmessage.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Sendmessage.java @@ -61,9 +61,9 @@ public void onCreate(Bundle savedInstanceState) { to.setText(name); to.setInputType(InputType.TYPE_NULL); if (reply) { - b.setTitle(String.format(getString(R.string.mail_reply_to), name)); + b.setTitle(getString(R.string.mail_reply_to, name)); previousMessage = DataShare.sharedMessage; - subject.setText(String.format(getString(R.string.mail_re), previousMessage.getSubject())); + subject.setText(getString(R.string.mail_re, previousMessage.getSubject())); subject.setInputType(InputType.TYPE_NULL); @@ -72,7 +72,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public void onClick(View v) { AlertDialogWrapper.Builder b = new AlertDialogWrapper.Builder(Sendmessage.this); - b.setTitle(String.format(getString(R.string.mail_author_wrote), name)); + b.setTitle(getString(R.string.mail_author_wrote, name)); b.setMessage(previousMessage.getBody()); b.create().show(); @@ -80,7 +80,7 @@ public void onClick(View v) { }); } else { - b.setTitle(String.format(getString(R.string.mail_send_to), name)); + b.setTitle(getString(R.string.mail_send_to, name)); oldMSG.setVisibility(View.GONE); } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java index 60521c1a51..cabba89736 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java @@ -166,7 +166,7 @@ public void onClick(View v) { } }); } - String loc = Reddit.appRestart.getString("imagelocation", "Not set yet"); + String loc = Reddit.appRestart.getString("imagelocation", getString(R.string.settings_image_location_unset)); ((TextView) findViewById(R.id.location)).setText(loc); { SwitchCompat single = (SwitchCompat) findViewById(R.id.expandedmenu); @@ -434,7 +434,7 @@ public void onClick(DialogInterface dialogInterface, int i) { public void onFolderSelection(FolderChooserDialog dialog, File folder) { if (folder != null) { Reddit.appRestart.edit().putString("imagelocation", folder.getAbsolutePath().toString()).apply(); - Toast.makeText(this, "Images will be saved to " + folder.getAbsolutePath(), Toast.LENGTH_LONG).show(); + Toast.makeText(this, getString(R.string.settings_set_image_location, folder.getAbsolutePath()), Toast.LENGTH_LONG).show(); ((TextView) findViewById(R.id.location)).setText(folder.getAbsolutePath()); } } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsSubreddit.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsSubreddit.java index 75f78438b4..9d26a25077 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsSubreddit.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsSubreddit.java @@ -2,6 +2,7 @@ import android.content.DialogInterface; import android.content.Intent; +import android.content.res.Resources; import android.graphics.Color; import android.os.AsyncTask; import android.os.Bundle; @@ -158,10 +159,11 @@ protected Void doInBackground(Void... params) { protected void onPostExecute(Void aVoid) { reloadSubList(); + Resources res = getResources(); new AlertDialogWrapper.Builder(SettingsSubreddit.this) .setTitle(R.string.color_sync_complete) - .setMessage(done + getString(R.string.color_sync_colored)) + .setMessage(res.getQuantityString(R.plurals.color_sync_colored, done, done)) .setPositiveButton(getString(R.string.btn_ok), null) .show(); } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SubredditView.java b/app/src/main/java/me/ccrama/redditslide/Activities/SubredditView.java index 8904485855..767ca0c6b6 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SubredditView.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SubredditView.java @@ -911,7 +911,7 @@ else if (SettingValues.storeHistory) // Over 18 interstitial for signed out users or those who haven't enabled NSFW content if (subreddit.isNsfw() && !Reddit.over18) { new AlertDialogWrapper.Builder(SubredditView.this) - .setTitle(String.format(getString(R.string.over18_title), subreddit.getDisplayName())) + .setTitle(getString(R.string.over18_title, subreddit.getDisplayName())) .setMessage(getString(R.string.over18_desc) + "\n\n" + getString(Authentication.isLoggedIn ? R.string.over18_desc_loggedin : R.string.over18_desc_loggedout)) .setCancelable(false) diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapter.java index 831a24310c..6339eb9d2f 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapter.java @@ -2835,7 +2835,7 @@ public void showBottomSheet(final Context mContext, final CommentViewHolder hold } } b.sheet(5, gild, mContext.getString(R.string.comment_gild)) - .sheet(7, copy, mContext.getString(R.string.submission_copy)) + .sheet(7, copy, mContext.getString(R.string.misc_copy_text)) .sheet(23, permalink, mContext.getString(R.string.comment_permalink)) .sheet(4, share, mContext.getString(R.string.comment_share)); if (!currentBaseNode.isTopLevel()) { diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/InboxAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/InboxAdapter.java index 99c22e8de2..ae3a7a29c8 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/InboxAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/InboxAdapter.java @@ -177,17 +177,17 @@ public boolean onLongClick(View v) { if(comment.getAuthor()!=null) b.sheet(1, profile, "/u/" + comment.getAuthor()); - String read = "Mark read"; + String read = mContext.getString(R.string.mail_mark_read); Drawable rDrawable = hide; if (comment.isRead()) { - read = "Mark unread"; + read = mContext.getString(R.string.mail_mark_unread); rDrawable = unhide; } b.sheet(2, rDrawable, read); b.sheet(3, reply, mContext.getString(R.string.btn_reply)); - b.sheet(25, copy, "Copy text"); + b.sheet(25, copy, mContext.getString(R.string.misc_copy_text)); if (comment.isComment()) { - b.sheet(30, reddit, "View full thread"); + b.sheet(30, reddit, mContext.getString(R.string.mail_view_full_thread)); } b.listener(new DialogInterface.OnClickListener() { @Override @@ -227,7 +227,7 @@ public void onClick(DialogInterface dialog, int which) { ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE); ClipData clip = ClipData.newPlainText("Message", comment.getBody()); clipboard.setPrimaryClip(clip); - Toast.makeText(mContext, "Message copied", Toast.LENGTH_SHORT).show(); + Toast.makeText(mContext, mContext.getString(R.string.mail_message_copied), Toast.LENGTH_SHORT).show(); } break; case 30: { diff --git a/app/src/main/java/me/ccrama/redditslide/DragSort/ReorderSubreddits.java b/app/src/main/java/me/ccrama/redditslide/DragSort/ReorderSubreddits.java index 9ca8f89c55..3580d2a045 100644 --- a/app/src/main/java/me/ccrama/redditslide/DragSort/ReorderSubreddits.java +++ b/app/src/main/java/me/ccrama/redditslide/DragSort/ReorderSubreddits.java @@ -18,6 +18,7 @@ import android.app.Dialog; import android.content.DialogInterface; +import android.content.res.Resources; import android.graphics.Color; import android.graphics.PorterDuff; import android.os.AsyncTask; @@ -126,6 +127,7 @@ protected void onPostExecute(ArrayList newSubs) { d.dismiss(); // Determine if we should insert subreddits at the end of the list or sorted boolean sorted = (subs.equals(UserSubscriptions.sortNoExtras(subs))); + Resources res = getResources(); for (String s : newSubs) { if (!subs.contains(s)) { @@ -143,7 +145,7 @@ protected void onPostExecute(ArrayList newSubs) { } new AlertDialogWrapper.Builder(ReorderSubreddits.this) .setTitle(R.string.reorder_sync_complete) - .setMessage(done + getString(R.string.reorder_subs_added)) + .setMessage(res.getQuantityString(R.plurals.reorder_subs_added, done, done)) .setPositiveButton(R.string.btn_ok, null) .show(); } diff --git a/app/src/main/java/me/ccrama/redditslide/Notifications/CheckForMail.java b/app/src/main/java/me/ccrama/redditslide/Notifications/CheckForMail.java index 6575534786..17e170a033 100644 --- a/app/src/main/java/me/ccrama/redditslide/Notifications/CheckForMail.java +++ b/app/src/main/java/me/ccrama/redditslide/Notifications/CheckForMail.java @@ -111,7 +111,7 @@ public void onPostExecute(List messages) { messages.get(0).getSubject(), messages.get(0).getAuthor())) .setContentText(Html.fromHtml(messages.get(0).getBody())) .setStyle(notiStyle) - .addAction(R.drawable.ic_check_all_black, c.getString(R.string.misc_mark_read), readPI) + .addAction(R.drawable.ic_check_all_black, c.getString(R.string.mail_mark_read), readPI) .build(); notificationManager.notify(0, notification); } else { @@ -133,7 +133,7 @@ public void onPostExecute(List messages) { .setAutoCancel(true) .setContentTitle(res.getQuantityString(R.plurals.mail_notification_title, amount, amount)) .setStyle(notiStyle) - .addAction(R.drawable.ic_check_all_black, c.getString(R.string.misc_mark_read), readPI) + .addAction(R.drawable.ic_check_all_black, c.getString(R.string.mail_mark_read), readPI) .build(); notificationManager.notify(0, notification); } diff --git a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java index b913df7689..76857712d7 100644 --- a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java @@ -620,7 +620,7 @@ public void showModBottomSheet(final Activity mContext, } else { approved = true; whoApproved = submission.getDataNode().get("approved_by").asText(); - b.sheet(1, approve, String.format(res.getString(R.string.mod_btn_approved), whoApproved)); + b.sheet(1, approve, res.getString(R.string.mod_btn_approved, whoApproved)); } // b.sheet(2, spam, mContext.getString(R.string.mod_btn_spam)) todo this diff --git a/app/src/main/java/me/ccrama/redditslide/TimeUtils.java b/app/src/main/java/me/ccrama/redditslide/TimeUtils.java index 1fcf3e2472..dcaa91bc0f 100644 --- a/app/src/main/java/me/ccrama/redditslide/TimeUtils.java +++ b/app/src/main/java/me/ccrama/redditslide/TimeUtils.java @@ -27,25 +27,25 @@ public static String getTimeAgo(long time, Context c) { return null; } - final long diff = now - time; if (diff < MINUTE_MILLIS) { - String just_now = c.getString(R.string.time_just_now); - if(just_now == null ||just_now.isEmpty()) just_now = "just now"; - return just_now; - } else if (diff < 60 * MINUTE_MILLIS) { - Integer value = longToInt(diff / MINUTE_MILLIS); - return value + "m"; - } else if (diff < 24 * HOUR_MILLIS) { - Integer value = longToInt(diff / HOUR_MILLIS); - return value + "h"; + return c.getString(R.string.time_just_now); + } else if (diff < HOUR_MILLIS) { + int minutes = longToInt(diff / MINUTE_MILLIS); + return c.getString(R.string.time_minutes_short, minutes); + } else if (diff < DAY_MILLIS) { + int hours = longToInt(diff / HOUR_MILLIS); + return c.getString(R.string.time_hours_short, hours); + } else if (diff < YEAR_MILLIS){ + int days = longToInt(diff / DAY_MILLIS); + return c.getString(R.string.time_days_short, days); } else { - Integer value = longToInt(diff / DAY_MILLIS); - return value + "d"; + int years = longToInt(diff / YEAR_MILLIS); + return c.getString(R.string.time_years_short, years); } - } - public static String getLengthTimeSince(long time, Context c) { + + public static String getTimeSince(long time, Context c) { if (time < 1000000000000L) { // if timestamp given in seconds, convert to millis time *= 1000; @@ -59,13 +59,27 @@ public static String getLengthTimeSince(long time, Context c) { Resources res = c.getResources(); final long diff = now - time; - if (diff < YEAR_MILLIS) { - return longToInt(diff / MONTH_MILLIS) + " month"+ (longToInt(diff / MONTH_MILLIS) > 1?"s":""); - } else { - Integer value = longToInt(diff / YEAR_MILLIS); - return value + " year" + (value > 1?"s":""); + if (diff < SECOND_MILLIS) { + return res.getQuantityString(R.plurals.time_seconds, 0, 0); + } else if (diff < MINUTE_MILLIS) { + int seconds = longToInt(diff / MINUTE_MILLIS); + return res.getQuantityString(R.plurals.time_seconds, seconds, seconds); + } else if (diff < HOUR_MILLIS) { + int minutes = longToInt(diff / MINUTE_MILLIS); + return res.getQuantityString(R.plurals.time_minutes, minutes, minutes); + } else if (diff < DAY_MILLIS) { + int hours = longToInt(diff / HOUR_MILLIS); + return res.getQuantityString(R.plurals.time_hours, hours, hours); + } else if (diff < MONTH_MILLIS) { + int days = longToInt(diff / DAY_MILLIS); + return res.getQuantityString(R.plurals.time_days, days, days); + } else if (diff < YEAR_MILLIS) { + int months = longToInt(diff / MONTH_MILLIS); + return res.getQuantityString(R.plurals.time_months, months, months); + } else { + int years = longToInt(diff / YEAR_MILLIS); + return res.getQuantityString(R.plurals.time_years, years, years); } - } private static Integer longToInt(Long temp) { @@ -78,6 +92,7 @@ public static String getTimeInHoursAndMins(int mins, Context c) { Resources res = c.getResources(); String hour = ""; String minute = ""; + if (hours > 0) hour = res.getQuantityString(R.plurals.time_hours, hours, hours); if (minutes > 0) diff --git a/app/src/main/res/layout/activity_settings_general.xml b/app/src/main/res/layout/activity_settings_general.xml index a0904231f3..989375d0a8 100644 --- a/app/src/main/res/layout/activity_settings_general.xml +++ b/app/src/main/res/layout/activity_settings_general.xml @@ -303,7 +303,7 @@ diff --git a/app/src/main/res/layout/drawer_loggedin.xml b/app/src/main/res/layout/drawer_loggedin.xml index 8b814dd606..a2df0014fc 100644 --- a/app/src/main/res/layout/drawer_loggedin.xml +++ b/app/src/main/res/layout/drawer_loggedin.xml @@ -103,7 +103,7 @@ android:layout_height="match_parent" android:layout_toEndOf="@+id/proficon" android:gravity="center_vertical" - android:text="You" + android:text="@string/drawer_profile" android:textColor="?attr/font" android:textSize="14sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/fragment_basicinfo.xml b/app/src/main/res/layout/fragment_basicinfo.xml index 41ec6f01a1..39f0600c25 100644 --- a/app/src/main/res/layout/fragment_basicinfo.xml +++ b/app/src/main/res/layout/fragment_basicinfo.xml @@ -129,7 +129,7 @@ android:layout_height="56dp" android:padding="16dp" - android:text="@string/welcome_finish" + android:text="@string/btn_done" android:textSize="14sp" android:textAllCaps="true" diff --git a/app/src/main/res/layout/postmenu.xml b/app/src/main/res/layout/postmenu.xml index c40a470a21..2d0d6024ce 100644 --- a/app/src/main/res/layout/postmenu.xml +++ b/app/src/main/res/layout/postmenu.xml @@ -240,7 +240,7 @@ diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 0c82638972..7f3e85cae5 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -27,6 +27,7 @@ DeviantArt Streamable vid.me + YouTube diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 76985dfaea..90c3d88599 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -74,7 +74,7 @@ - Profile + You Go Pro Go to profile Add an account @@ -107,6 +107,18 @@ Friend Add friend Remove friend + Manage accounts + Would you really like to remove this account? + Delete account + History + %s\'s profile + Redditor for %s + Tag + Set tag for %s + Tag user + User tagged as ‘%s’ + Set tag + Remove tag @@ -127,7 +139,6 @@ Get started Personalize - Start tutorial @@ -149,6 +160,7 @@ Past year All time + URL Text @@ -219,7 +231,7 @@ External - + %1$s wrote… Recipient Subject @@ -231,18 +243,22 @@ Reply to %1$s %1$s from %2$s View their message - + re: %1$s + Mark read + Mark unread + View full thread + Message copied You have %d new message! You have %d new messages! You have %d new modmail! - You have %d new mod modmail! + You have %d new modmail! - + Error None Would you like to try again? @@ -255,7 +271,7 @@ Please wait… Share image with Open URL with - Mark as read + Copy text @@ -317,7 +333,6 @@ Flair post Flair text No reports - Approve Approved by /u/%1$s Set flair @@ -406,6 +421,9 @@ Crop lead image in comment view Mark posts as seen when scrolled past Use Chrome Custom Tabs + Select image/GIF save location + Not yet set + Images will be saved to %s @@ -489,10 +507,46 @@ Subreddit name Remove this subreddit? You will not be unsubscribed, but will not see this subreddit in your sidebar! + Sync complete + + %d subreddit added + %d subreddits added + - just now + Just now + + %d year + %d years + + + %d month + %d months + + + %d day + %d days + + + %d hour + %d hours + + + %d minute + %d minutes + + + %d second + %d seconds + + + + %dy + %dd + %dh + %dm + %ds @@ -512,8 +566,21 @@ You can disable this permanently in Settings → Reddit preferences → Show NSFW content + Sync complete - " subreddits were colored" + + %d subreddit was colored + %d subreddits were colored + + + + + Discover + Search term or topic + Popular + Trending + + Load more comments Colorful comment depth indicators Navigate comments using volume buttons @@ -527,11 +594,6 @@ Could not authenticate Make sure your username and authentication key are correct! Synccit integration - Sync complete - " subreddits added" - Manage accounts - Would you really like to remove this account? - Delete account Right-aligned thumbnail Share post Subreddit filters @@ -545,7 +607,7 @@ Disabled Use internal browser Use external browser - Enables a bottom bar with nav arrows + Enables a bottom bar with navigation arrows Fully collapse comments Also disables comment animations Collapse child comments by default @@ -553,8 +615,8 @@ Card with centered image Card Thumbnail only - Big pic cropped - Big pic + Big picture cropped + Big picture Swipe anywhere in view to exit Press arrow to show actionbar Long press for actionbar @@ -574,16 +636,6 @@ Reason for reporting Report sent - - %d hour - %d hours - - - - %d minute - %d minutes - - %d column in landscape %d columns in landscape @@ -623,9 +675,7 @@ Force external browser Choose domains that will always open externally Show domain in info line - Tag user Send replies to inbox - Discover Data saving Show first paragraph of selftext VIEW @@ -633,11 +683,9 @@ Preview Default comment sorting AMOLED with contrast - Select image/GIF save location [deleted] Continue this thread Selftext - re: %1$s Show \"create comment\" floating action button Right-handed comment reply menu Unhide post @@ -653,7 +701,6 @@ You can add a draft by clicking the \'save\' icon in the editor bar! Message saved as a draft [removed] - History Guest \nPlease try again in a minute. Sliding album view @@ -661,5 +708,4 @@ Open externally Vertical album view Download album - YouTube \ No newline at end of file From 217c9ad39792574620bd866724328601be8ce722 Mon Sep 17 00:00:00 2001 From: Alex Macleod Date: Fri, 15 Apr 2016 22:01:39 +0100 Subject: [PATCH 006/188] Updated translations --- app/src/main/res/values-af-rZA/strings.xml | 19 +- app/src/main/res/values-ar-rSA/strings.xml | 20 +- app/src/main/res/values-ca-rES/strings.xml | 21 +- app/src/main/res/values-cs-rCZ/strings.xml | 23 +- app/src/main/res/values-da-rDK/strings.xml | 10 +- app/src/main/res/values-de-rDE/strings.xml | 104 +++++-- app/src/main/res/values-el-rGR/strings.xml | 10 +- app/src/main/res/values-en-rGB/strings.xml | 199 ++++++++++--- app/src/main/res/values-eo-rUY/strings.xml | 23 +- app/src/main/res/values-es-rES/strings.xml | 103 ++++--- app/src/main/res/values-fi-rFI/strings.xml | 21 +- app/src/main/res/values-fr-rFR/strings.xml | 132 ++++++--- app/src/main/res/values-ga-rIE/strings.xml | 17 +- app/src/main/res/values-gl-rES/strings.xml | 14 +- app/src/main/res/values-hr-rHR/strings.xml | 52 ++-- app/src/main/res/values-hu-rHU/strings.xml | 29 +- app/src/main/res/values-in-rID/strings.xml | 18 +- app/src/main/res/values-it-rIT/strings.xml | 151 ++++++++-- app/src/main/res/values-iw-rIL/strings.xml | 15 +- app/src/main/res/values-ja-rJP/strings.xml | 90 ++++-- app/src/main/res/values-lv-rLV/strings.xml | 11 +- app/src/main/res/values-nl-rNL/strings.xml | 297 ++++++++++++++++--- app/src/main/res/values-no-rNO/strings.xml | 22 +- app/src/main/res/values-pl-rPL/strings.xml | 108 ++++--- app/src/main/res/values-pt-rBR/strings.xml | 128 ++++++-- app/src/main/res/values-pt-rPT/strings.xml | 11 +- app/src/main/res/values-ro-rRO/strings.xml | 49 ++-- app/src/main/res/values-ru-rRU/strings.xml | 50 +++- app/src/main/res/values-sr-rSP/strings.xml | 16 +- app/src/main/res/values-sv-rSE/strings.xml | 25 +- app/src/main/res/values-tr-rTR/strings.xml | 22 +- app/src/main/res/values-uk-rUA/strings.xml | 10 +- app/src/main/res/values-vi-rVN/strings.xml | 10 +- app/src/main/res/values-zh-rCN/strings.xml | 24 +- app/src/main/res/values-zh-rTW/strings.xml | 321 ++++++++++++++++++--- 35 files changed, 1633 insertions(+), 542 deletions(-) diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml index a5e6ba38ea..37c3cc355e 100644 --- a/app/src/main/res/values-af-rZA/strings.xml +++ b/app/src/main/res/values-af-rZA/strings.xml @@ -24,6 +24,7 @@ Lig Donker AMOLED swart + Donker blou Primêre kleur Verander kleur Aksent kleur @@ -37,7 +38,6 @@ Landskap Dubbel kolomme in portret mode - Profiel Gaan na profiel Voeg rekening by Hallo, @@ -45,8 +45,12 @@ Privaat boodskap + Gebruiker nie gevind nie Oorsig Kommentaar + Versteek + Vriend + Verwyder Vriend @@ -73,9 +77,10 @@ - + Teks - + + Kopie teks @@ -84,17 +89,25 @@ + Nuwe + Kommentaar Multi-kolom Kommentaar + + + + + + Deel artikel Kaart diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index 2a422dc627..7828db3edb 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -46,7 +46,6 @@ أفقي أعمدة مزدوجة في الوضع العامودي - الصفحة الشخصية اشتر نسخة Pro انتقل إلى الصفحة الشخصية إضافة حساب @@ -122,7 +121,7 @@ ألبوم صورة فيديو - + المُستلم موضوع جسم @@ -131,11 +130,12 @@ الرد على %1$s %1$s من %2$s عرض الرسالة الخاصة بهم - + خطأ لاشيء النقاط مخفية NSFW + نسخ الكتابه أدخل اسم المستخدم الانتقال إلى استخدام @@ -176,6 +176,9 @@ اذهب الى + أعلى + جديد + تعليقات أثبت أنك لست روبوت @@ -205,6 +208,7 @@ فلترة الخط عامّ + إرسال المنشورة إعدادات @@ -233,17 +237,21 @@ اسم السوبريديت إزالة هذا سوبريديت؟ لن يتم الغاء الاشتراك, لاكن لن ترى هذا السوبريديت بالقائمة الجانبيه الخاصه بك! + تم أكمال المزامنة - الآن + + + + تم أكمال المزامنة - " تم تلوين السوبريديت" + إظهار المزيد من التعليقات إسم المستخدم حذف حساب synccit حقا ؟ تم الاتصال بنجاح! - تم أكمال المزامنة مشاركة المنشور بطاقة ابلاغ اسم السوبريديت + فتح بالخارج diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index 3e9c7f23b9..28d89dae9b 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -46,7 +46,6 @@ Configuració de la multi-columna Apaïsat - Perfil Passar-se a Pro Anar al perfil Afegir un compte @@ -122,7 +121,7 @@ Àlbum Imatge Vídeo - + %1$s ha escrit… Destinatari Tema @@ -137,7 +136,7 @@ Tens %d missatge nou! Tens %d missatges nous! - + Error Res Ho vols tornar a intentar? @@ -185,6 +184,9 @@ Vés a + Millor + Nou + comentaris Comparteix l\'imatge @@ -193,6 +195,7 @@ Dóna Configuració de la multi-columna comentaris + Bústia d\'entrada Tema @@ -203,9 +206,6 @@ Tornar - Compartir post - Targeta - Informar %d hora %d hores @@ -214,4 +214,13 @@ %d minut %d minuts + + + + + + Compartir post + Targeta + Informar + Obrir externament diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index d28c6cbda6..4a1f42e1fb 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -47,7 +47,6 @@ Více sloupců Na šířku - Profil Povýšit na verzi Pro Přejít na profil Přidat účet @@ -138,7 +137,7 @@ Album Obrázek Video - + Příjemce Předmět Text zprávy @@ -152,7 +151,7 @@ Máte %d nových zpráv! Máte %d nových zpráv! - + Chyba Žádný Chcete to zkusit znovu? @@ -161,6 +160,7 @@ Pokračovat Odhlášeno Žádné další příspěvky! + Zkopírovat text Zadejte uživatelské jméno Přejít na uživatele @@ -218,6 +218,9 @@ Co hledáte? Hledat vše Hledat %1$s + Nejlepší + Nové + komentáře Zadejte kód nahoře Dokažte, že nejste robot @@ -258,6 +261,7 @@ Plovoucí tlačítko akce Komentáře Obecný + Subreddit témata & rozložení Upravit motiv @@ -287,10 +291,6 @@ Zpět - právě teď - Sdílet příspěvek - Karta - Nahlásit %d hodinu %d hodiny @@ -301,5 +301,14 @@ %d minut %d minut + + + + + + Sdílet příspěvek + Karta + Nahlásit [deleted] + Otevřít externě diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml index a9140e000c..a5a2a376c0 100644 --- a/app/src/main/res/values-da-rDK/strings.xml +++ b/app/src/main/res/values-da-rDK/strings.xml @@ -24,8 +24,8 @@ - - + + @@ -37,10 +37,16 @@ + + + + + + diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 3a508a69d0..bde153f254 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -60,7 +60,6 @@ Querformat Zwei Spalten im Hochformat - Profil Hol dir PRO Zu Benutzer wechseln Konto hinzufügen @@ -70,6 +69,7 @@ Slide ist im Offline-Modus Versuche, zum Online-Modus zu wechseln + Subreddit-Wiki Subreddit Moderatoren Link-Karma @@ -88,6 +88,11 @@ Freund Freund hinzufügen Freund entfernen + Konten verwalten + Möchtest du dieses Konto wirklich löschen? + Konto löschen + Verlauf + Nutzer makieren Gold geben Kommentar teilen @@ -99,10 +104,11 @@ Nicht mehr speichern Lade %1$d mehr Mehr Kommentare werden geladen… + Permalink zum Kommentar laden + Übergeordneten Kommentar anzeigen Loslegen Personalisieren - Tutorial starten Beiträge sortieren nach Wähle einen Zeitrahmen @@ -174,7 +180,7 @@ Video Eingebettet Imgur-Inhalt - + %1$s schrieb… Empfänger Betreff @@ -185,11 +191,12 @@ Antworte an %1$s %1$s von %2$s Deren Nachricht anzeigen + Re: %1$s Du hast eine neue Mail! Du hast %d neue Mails! - + Fehler Kein Möchtest du es noch einmal versuchen? @@ -202,7 +209,7 @@ Ein Augenblick bitte… Teile Bild mit URL öffnen mit - Gelesen + Text kopieren Benutzername eingeben Gehe zu Nutzer @@ -245,6 +252,7 @@ Du musst angemeldet sein, um Abzustimmen! Mod-Nachrichten + Mod-Mail ungelesen Gemeldete Beiträge Möchtest du diesen Beitrag wirklich genehmigen? Beitrag genehmigt. @@ -254,7 +262,15 @@ Text des Flairs Keine Berichte Genehmingen + Von /u/%1$s genehmigt + Flair setzen + Als NSFW markieren + Nicht länger als NSFW markieren + Anheften + Lösen Beitrag entfernen + Mit Begründung entfernen + Autorenprofil %d Bericht anzeigen %d Berichte anzeigen @@ -275,6 +291,10 @@ Was suchst du? Alle durchsuchen In %1$s suchen + Relevanz + Top + Neu + Kommentare Gib den obenstehenden Code ein Beweise, dass du kein Roboter bist @@ -334,6 +354,9 @@ Filter Schriftart Allgemein + Darstellung + Sonstige + Subreddit-Einstellungen Design bearbeiten @@ -373,10 +396,32 @@ Füge einen Subreddit hinzu Subreddit-Name Diesen Subreddit entfernen? + Synchronisation abgeschlossen - jetzt gerade + + %d Stunde + %d Stunden + + + %d Minute + %d Minuten + + + + /r/slideforreddit abonnieren? + Möchtest du /r/slideforreddit abonnieren, um über die Neuigkeiten informiert zu werden? + Farben jetzt synchronisieren? + Slide authentifiziert sich + Einige Dinge einrichten... + Dies sollte nur eine Sekunde dauern! + + /r/%1$s enthält jugendgefährdende Inhalte + Bist du volljährig und möchtest jugendfreie Inhalte sehen? + Log dich ein, um diese Warnung dauerhaft zu deaktivieren + Synchronisation abgeschlossen - " subreddits wurden gefärbt" + + Entdecken Mehr Kommentare laden Kommentare mit Lautstärketasten navigieren SYNCCIT TRENNEN @@ -387,40 +432,41 @@ Verbindung erfolgreich! Synccit ist jetzt aktiv für dieses Gerät Konnte nicht authentifizieren - Synchronisation abgeschlossen - " subreddits hinzugefügt" - Konten verwalten - Möchtest du dieses Konto wirklich löschen? - Konto löschen + Synccit-Integration + Rechtsbündige Miniaturansicht Beitrag teilen Subreddit-Filter Subreddit-Design Auswählen + Wähle Subreddits, die du bearbiten willst Synchronisieren der Farben + Dies wird versuchen, die \"Key-Farbe\" eines Subreddits, die durch die Moderatoren festlegt wurde, abzurufen. Es überschreibt keine bereits gefärbten Subreddits. Angesehene Beiträge ausblenden Neuen Beitrag hinzufügen Deaktiviert In internem Browser öffnen In externem Browser öffnen + Kommentare komplett zusammenklappen + Deaktiviert Animationen in den Kommentaren + Untergeordnete Kommentare standardmäßig zusammenklappen Liste Karte mit zentrierten Bild Karte Nur Thumbnail - Großes Bild Kommentare teilen Anzahl der Kommentare seit dem letzten Besuch anzeigen Video nicht gefunden Beim Laden des Videos ist ein Fehler aufgetreten + Kommentar-Fenster + Inhalt öffnen Melden - - %d Stunde - %d Stunden - - - %d Minute - %d Minuten - + Grund für die Meldung + Beitrag wurde gemeldet + Mobile Daten und Wi-Fi + Mobile Daten Niemals + Dies ist ein gesperrter Beitrag. Du kannst keine Bewertung oder Kommentare abgeben. + Kartenhintergrund Subreddit-Name Immer anzeigen Nie anzeigen @@ -431,17 +477,19 @@ Ich bin über 18 und möchte NSFW Inhalte sehen Ansichtsmodus Bildmodus + Miniaturansicht Domäne in der Infozeile anzeigen Über Antworten benachrichtigen - Entdecken + Datenverbrauch + ANSICHT Kommentare anzeigen Vorschau + Standardmäßige Kommentar-Sortierung + AMOLED mit Kontrast [gelöscht] + Diesen Beitrag fortsetzen Selftext - Re: %1$s - /r/slideforreddit abonnieren? - Möchtest du /r/slideforreddit abonnieren, um über die Neuigkeiten informiert zu werden? - Farben jetzt synchronisieren? - Einige Dinge einrichten... - Dies sollte nur eine Sekunde dauern! + Beitrag nicht mehr verstecken + Beitrag nicht mehr versteckt + Extern öffnen diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index f51cbd0452..b3fbbbafc0 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -19,8 +19,8 @@ - - + + @@ -32,10 +32,16 @@ + + + + + + diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index b8047f340f..a7ad1ccc6a 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -11,9 +11,9 @@ Submission unsaved Submission saved - This is an archived post. You won\'t be able to vote or comment. + This is an archived post. You won\'t be able to vote or comment Post saved - Post hidden forever. + Post hidden forever Pinned Open externally Copy URL @@ -27,7 +27,7 @@ Save post Share post Load full thread - This is a no participation link. Please don\'t vote or comment. + This is a no participation link. Please don\'t vote or comment Tap to load GIF Uh oh, post not found! Sorry, this post could not be found @@ -40,6 +40,10 @@ %d new message %d new messages + + pt + pts + Light Dark @@ -61,7 +65,7 @@ Landscape Dual columns in portrait mode - Profile + You Go Pro Go to profile Add an account @@ -80,7 +84,7 @@ Saved Upvoted User not found - Reddit user could not be retrieved. + Reddit user could not be retrieved Overview Comments Submitted @@ -90,21 +94,34 @@ Friend Add friend Remove friend + Manage accounts + Would you really like to remove this account? + Delete account + History + %s\'s profile + Redditor for %s + Tag + Set tag for %s + Tag user + User tagged as ‘%s’ + Set tag + Remove tag Gild comment Share comment Delete comment - Do you really want to delete this comment? This cannot be undone. - Uh oh, something went wrong. + Do you really want to delete this comment? This cannot be undone + Uh oh, something went wrong Would you like to try again? [deleted] Unsave Load %1$d more Loading more comments… + Load comment permalink + Show parent comment Get started Personalise - Start tutorial Choose a sorting type Choose a time frame @@ -129,7 +146,7 @@ Insert link INSERT Title - Please try again in a few seconds. + Please try again in a few seconds Uploading image to Imgur Self text Select picture @@ -162,7 +179,7 @@ Select subreddits to add Multireddit name Invalid multireddit name - Multireddit names may only contain letters, numbers and underscores. + Multireddit names may only contain letters, numbers and underscores NSFW image NSFW GIF @@ -172,11 +189,16 @@ GIF Title post Album + NSFW album Image Video + NSFW video Embedded + NSFW embedded Imgur content - + NSFW Imgur content + External + %1$s wrote… Recipient Subject @@ -184,14 +206,24 @@ Send a message to %1$s Send a message New message from %1$s + New modmail from %1$s Reply to %1$s %1$s from %2$s View their message + re: %1$s + Mark read + Mark unread + View full thread + Message copied You have %d new message! You have %d new messages! - + + You have %d new modmail! + You have %d new modmail! + + Error None Would you like to try again? @@ -204,11 +236,11 @@ Please wait… Share image with Open URL with - Mark as read + Copy text Enter username Go to user - Reddit usernames can only contain letters, numbers, underscores and dashes. + Reddit usernames can only contain letters, numbers, underscores and dashes Add Cancel @@ -236,7 +268,7 @@ Restoring your Settings Backing up your Settings Restoring settings successful! - App will now restart. + App will now restart Slide backs up all your data to a private Google Drive folder. You can sync this data across devices (or to the same device), and your data never goes through a third-party service or server. Backup Restore @@ -250,7 +282,7 @@ Mod mail unread Reports Do you really want to approve this post? - Post approved. + Post approved Do you really want to mark this as NSFW? Do you really want to remove the NSFW tag? Flair Post @@ -286,6 +318,10 @@ What are you searching for? Search all Search %1$s + Relevance + Top + New + Comments Enter the code above Prove you\'re not a robot @@ -318,7 +354,7 @@ Slide is connecting to Google. Try again in a few seconds! Tapping the clear button will remove the posts from the current view, but will not hide the posts forever. \nLong pressing the button will hide the posts forever! FAB clear actions - Notifications disabled. + Notifications disabled Coloured navigation bar Domain filters Selftext filters @@ -330,6 +366,9 @@ Crop lead image in comment view Mark posts as seen when scrolled past Use Chrome Custom Tabs + Select image/GIF save location + Not yet set + Images will be saved to %s Backup & restore Main theme @@ -349,6 +388,16 @@ General Appearance Other + + Sorting + Display + Images + App theme + Tinting + Post information + Post buttons + Navigation + Collapse actions Subreddit themes & layouts Edit theme @@ -380,7 +429,7 @@ Caching submissions Please go online and refresh the subreddit to do that Last updated %1$s - Please go back online and select ‘Cache comments’ from the 3 dot menu to view comments offline. + Please go back online and select ‘Cache comments’ from the 3 dot menu to view comments offline Go back Open in external browser @@ -390,10 +439,67 @@ Subreddit name Remove this subreddit? You will not be unsubscribed, but will not see this subreddit in your sidebar! + Sync complete + + %d subreddit added + %d subreddits added + - just now + Just now + + %d year + %d years + + + %d month + %d months + + + %d day + %d days + + + %d hour + %d hours + + + %d minute + %d minutes + + + %d second + %d seconds + + + %dy + %dd + %dh + %dm + %ds + + Subscribe to /r/slideforreddit? + Would you like to subscribe to /r/slideforreddit for the latest news and to report issues? + Sync colours now? + Would you like to sync your subreddit colours now? This can be done later in Settings → Subreddit themes + Slide is authenticating + Setting things up! + This should only take a second… + + /r/%1$s contains mature content + Are you over eighteen and willing to see adult content? + Log in to disable this warning permanently + You can disable this permanently in Settings → Reddit preferences → Show NSFW content + Sync complete - " subreddits were coloured" + + %d subreddit was coloured + %d subreddits were coloured + + + Discover + Search term or topic + Popular + Trending Load more comments Colourful comment depth indicators Navigate comments using volume buttons @@ -407,11 +513,6 @@ Could not authenticate Make sure your username and authentication key are correct! Synccit integration - Sync complete - " subreddits added" - Manage accounts - Would you really like to remove this account? - Delete account Right-aligned thumbnail Share post Subreddit filters @@ -425,7 +526,7 @@ Disabled Use internal browser Use external browser - Enables a bottom bar with nav arrows + Enables a bottom bar with navigation arrows Fully collapse comments Also disables comment animations Collapse child comments by default @@ -433,8 +534,8 @@ Card with centred image Card Thumbnail only - Big pic cropped - Big pic + Big picture cropped + Big picture Swipe anywhere in view to exit Press arrow to show actionbar Long press for actionbar @@ -453,14 +554,6 @@ Report Reason for reporting Report sent - - %d hour - %d hours - - - %d minute - %d minutes - %d column in landscape %d columns in landscape @@ -499,9 +592,7 @@ Force external browser Choose domains that will always open externally Show domain in info line - Tag user Send replies to inbox - Discover Data saving Show first paragraph of selftext VIEW @@ -509,17 +600,29 @@ Preview Default comment sorting AMOLED with contrast - Select image/GIF save location [deleted] Continue this thread Selftext - re: %1$s - Subscribe to /r/slideforreddit? - Would you like to subscribe to /r/slideforreddit for the latest news and to report issues? - Sync colours now? - Would you like to sync your subreddit colours now? This can be done later in Settings → Subreddit themes - Slide is authenticating - Setting things up! - This should only take a second... - Show create comment FAB + Show \"create comment\" floating action button + Right-handed comment reply menu + Unhide post + Submission unhidden + Domains entered below will always open externally + Enter a domain or part of a domain + Uh oh, posting this comment failed! + "Reason: " + \n\nYour message has been saved as a draft. Please try again later. + Copy comment + Select a draft + No drafts yet + You can add a draft by clicking the \'save\' icon in the editor bar! + Message saved as a draft + [removed] + Guest + \nPlease try again in a minute. + Sliding album view + Album grid + Open externally + Vertical album view + Download album diff --git a/app/src/main/res/values-eo-rUY/strings.xml b/app/src/main/res/values-eo-rUY/strings.xml index fc715f8076..73e9f95165 100644 --- a/app/src/main/res/values-eo-rUY/strings.xml +++ b/app/src/main/res/values-eo-rUY/strings.xml @@ -32,7 +32,6 @@ Horizontala orientiĝo - Profilo Aldoni konton Saluton, @@ -87,7 +86,7 @@ Albumo Bildo Video - + %1$s skribis… Ricevonto Temo @@ -101,10 +100,11 @@ Vi havas %d novan mesaĝon! Vi havas %d novajn mesaĝojn! - + Eraro MPL/NSFW Daŭrigi + Kopii tekston Tajpu uzantnomon @@ -136,6 +136,9 @@ %1$d abonantoj Serĉi + Supraj + Novaj + komentoj Konigi ligilon @@ -149,6 +152,7 @@ Pri Komentoj Ĝenerala + Redakti etoson Afiŝi @@ -162,10 +166,6 @@ Reen - ĵus - Konigi afiŝon - Karto - Raporti %d horo %d horoj @@ -174,5 +174,14 @@ %d minuto %d minutoj + + + + + + Konigi afiŝon + Karto + Raporti [forigita] + Malfermi ekstere diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 165144aea8..772a2eb031 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -61,7 +61,6 @@ Apaisado Dos columnas en el modo retrato - Perfil Conviértete en Pro Ir al perfil Añadir cuenta @@ -90,6 +89,11 @@ Amigo Agregar amigo Eliminar amigo + Gestionar cuentas + Seguro que quieres eliminar esta cuenta? + Eliminar cuenta + Historia + Etiqueta usuario Recompensar comentario Compartir comentario @@ -101,10 +105,11 @@ Eliminar de guardados Carga %1$d más Cargando mas comentarios… + Carga link permanente de comentario + Muestra comentario pariente Comenzar Personalizar - Empezar tutorial Elige un tipo de clasificación Elegir un marco de tiempo @@ -129,7 +134,7 @@ Insertar enlace INSERTAR Titulo - Por favor, vuelve a intentarlo tras unos segundos. + Por favor, vuelve a intentarlo en unos segundos. Subiendo imagen a imgur Auto texto Seleccionar imagen @@ -155,7 +160,7 @@ ¡Sin Multireddits (aún)! ¿Quieres crear un nuevo Multireddit? - El título no puede estar en blanco + El título no puede estar vacío Por favor, ponle un título a tu multireddit No se ha añadido ningún subreddit Añade más subreddits usando el boton +! @@ -176,7 +181,7 @@ Vídeo Incrustado Contenido Imgur - + %1$s escribió... Destinatario Sujeto @@ -187,11 +192,12 @@ Responder a %1$s %1$s de %2$s Ver su mensaje + re: %1$s ¡Tienes un nuevo mensaje! ¡Tienes %1$d mensajes nuevos! - + Error Ninguno ¿Quieres volver a intentarlo? @@ -204,7 +210,7 @@ Paciencia… Compartir imagen con Abrir URL con - Marcar como leído + Copiar texto Introduce el nombre de usuario Ir al usuario @@ -213,12 +219,12 @@ Añadir Cancelar Cerrar - Cancelar + Descarta Hecho Retroceder No gracias No - Vale + OK Borrar Responder Restablecer @@ -232,7 +238,7 @@ Borrar Periodo - Copia de seguridad correcta! + ¡Copia de seguridad correcta! Restaurando tus Ajustes Guardando tus Ajustes ¡Restauración Correcta! @@ -247,6 +253,7 @@ ¡Debes iniciar sesión para poder votar! Mod Mail + Correo de mod no leído Informes ¿Quieres aprobar este post? Post aprobado. @@ -257,6 +264,7 @@ No hay reportes Aprobar Aprovado por /u/%1$s + Establecer flair Marcar NSFW Desmarcar NSFW Pin @@ -284,6 +292,10 @@ Qué estás buscando? Buscar todo Buscar %1$s + Relevancia + Top + Nuevo + comentarios Introduce el código siguiente Demuestra que no eres un robot @@ -345,6 +357,9 @@ Filtros Fuente General + Apariencia + Otros + Ajustes del Subreddit Editar Tema @@ -386,10 +401,34 @@ Nombre del subreddit Borrar subreddit? No se dará de baja del subreddit, pero no lo volverá a ver en la barra lateral! + Sincronización completada - ahora mismo + + %d hora + %d horas + + + %d minuto + %d minutos + + + + ¿Suscribirse a /r/slideforreddit? + ¿Te gustaría suscribirte a /r/slideforreddit para las últimas noticias y reportar problemas? + ¿Sincronizar colores? + ¿Te gustaría sincronizar los colores de tu subreddit ahora? Se puede hacer más tarde en Ajustes → Temas de Subreddit + Slide está autenticando + ¡Ajustando todo! + Esto debería tomar sólo un segundo… + + /r/%1$s contiene contenido adulto + ¿Eres mayor de dieciocho años y dispuesto a ver contenido para adultos? + Inicia sesión para deshabilitar esta advertencia permanentemente + Puedes deshabilitar esto permanentemente en Ajustes → Preferencias de Reddit → Mostrar contenido NSFW + Sincronización completada - " subreddits han sido coloreados" + + Descubre Cargar más comentarios Indicadores de profundidad de color para comentarios Navegar comentarios con los botones de volumen @@ -403,11 +442,6 @@ No se ha podido autenticar Asegúrate que tu nombre de usuario y clave de autenticación sean correctas! Integración Synccit - Sincronización completada - " subreddits añadidos" - Gestionar cuentas - Seguro que quieres eliminar esta cuenta? - Eliminar cuenta Vista previa a la derecha Compartir post Filtros de Subreddit @@ -421,7 +455,6 @@ Deshabilitado Usar navegador web interno Usar navegador web externo - Habilita una barra inferior con flechas de navegación Colapsar los comentarios completamente También desactiva animaciones de comentarios Ocultar comentarios hijos predeterminado @@ -429,8 +462,6 @@ Tarjeta con imagen centrada Tarjeta Sólo miniatura - Gran imagen recortada - Gran imagen Deslize en cualquier parte para salir Pulsar la flecha para mostrar la actionbar Pulsación larga para Actionbar @@ -449,14 +480,6 @@ Reportar Motivo Reporte enviado - - %d hora - %d horas - - - %d minuto - %d minutos - %d columna en la vista %d columnas en la vista @@ -468,12 +491,17 @@ Este es un artículo bloqueado. No podrás votar o comentar. Fondo de la tarjeta Nombre del subreddit + Ocultar imagen principal en posts de texto Asegúrate de no haber seleccionado \'Declinar\' en la última pantalla e inténtalo en 1 minuto Mostrar siempre No mostrar + Muestra ajustes por subreddit + Navegación por deslices + Deslice desde el borde izquierdo para salir.\n\nEsto aplica para imágenes, GIFs, álbumes, ajustes y más! Cargar imágenes en baja Vista Navegador + Intercambiar acciones de toque y presionar Tengo más de 18 y quiero ver contenido NSFW Modo De otra forma, abre siempre las imágenes en alta @@ -482,6 +510,7 @@ Imagen Menú de herramientas expandido Muestra más opciones en las herramientas del subreddit + Modo de pintado en autorización Modo miniaturas Modo Actionbar Sólo color de fondo en los multireddits, página de inicio y todo @@ -489,24 +518,18 @@ Forzar navegador externo Seleccionar dominios que siempre se abrirán externamente Mostrar dominio en la barra de información - Etiqueta usuario Envía respuestas al buzón - Descubre Guardando datos + Ver el primer párrafo de posts de texto VER Comentarios abiertos Preliminar - Ordenamiento predeterminado de comentarios + Orden predeterminado de comentarios AMOLED con contraste - Selecciona ubicación para guardar imágenes o GIF [eliminado] Continuar este hilo - ¿Suscribirse a /r/slideforreddit? - ¿Te gustaría suscribirte a /r/slideforreddit para las últimas noticias y reportar problemas? - ¿Sincronizar colores? - ¿Te gustaría sincronizar los colores de tu subreddit ahora? Se puede hacer más tarde en Ajustes → Temas de Subreddit - Slide está autenticando - ¡Ajustando todo! - Esto debería tomar sólo un segundo… - Mostrar FAB para crear comentario + Post de texto + Mostrar el post + Post mostrado + Abrir externamente diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index 0fccb1637d..f42e9ca49f 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -50,7 +50,6 @@ Usean sarakkeen asetukset Vaakakuva - Profiili Hanki Pro Profiiliin Lisää tili @@ -89,7 +88,6 @@ Aloita Personalisoi - Aloita opastus Valitse lajittelun tyyppi Valitse aikaväli @@ -132,16 +130,17 @@ GIF:iä ei löytynyt - + Vastaanottaja Aihe Teksti Lähetä viesti - + Virhe NSFW Tilatut Jatka + Kopioi teksti Lisää @@ -171,6 +170,9 @@ Etsi Etsi kaikki Etsi %1$s + Parhaat + Uudet + Kommentit Syötä yllä oleva koodi Todista että et ole robotti @@ -185,6 +187,7 @@ Kommentit Fontti Yleiset + Jaa Kirjaudu Reddittiin @@ -207,13 +210,16 @@ Subredditin nimi Poistetaanko tämä subredditti? Tilaustasi ei peruta, mutta et näe enää tätä subreddittiä sivupalkissasi! + Synkronointi valmis - juuri nyt + + + + Synkronointi valmis - " subredditit väritettiin" + Lataa lisää kommentteja Käyttäjänimi - Synkronointi valmis Jaa postaus Kortti Jaa kommentit @@ -221,4 +227,5 @@ Ilmoita Subredditin nimi [poistettu] + Avaa ulkoisesti diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index b8f4e5fb93..2de44792ac 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -6,10 +6,10 @@ Voulez-vous vraiment quitter Slide ? Activer le Mode Shadowbox J\'ai décidé de rendre certaines fonctionnalités de Slide (notamment le mode multi-colonnes) disponibles en achetant une Clé Pro sur le Play Store.\n\nCela me permet de continuer à développer Slide sans avoir à afficher des publicités dans la version gratuite.\n\nLa version pro vous donne accès au mode multi-colonnes, au mode Shadowbox (pour les subreddits axés images), et d nombreuses autres choses à venir !\n\nVoulez-vous deverouiller Slide pour Reddit Pro? - Ouvrir les paramètres du Subreddit + Barre latérale Synchronisation des abonnements - Message désenregistré + Message non enregistré Message enregistré Il s\'agit d\'une publication archivée. Vous ne pourrez pas voter ou la commenter. Publication enregistrée @@ -17,10 +17,10 @@ Épinglé Ouvrir en externe Copier l\'URL - Partager l\'url + Partager l\'URL Quel lien souhaitez-vous partager ? - Commentaires - Contenu + Lien reddit + Lien du contenu Masquer la publication Signaler la publication Ouvrir dans un navigateur @@ -30,14 +30,14 @@ Il s\'agit d\'un lien sans participation. Merci de ne pas voter ou commenter. Appuyez pour charger le GIF Publication non trouvée ! - Désolé, ce message est introuvable + Désolé, cette publication est introuvable Copier le texte %d point - %d point + %d points - %d nouveaux messages + %d nouveau message %d nouveaux messages @@ -54,14 +54,13 @@ Taille de la police Bouton \"Cacher le post\" dans la barre d\'action - Seulement tinter en dehors de la subreddit + Colorer en dehors du subreddit uniquement Bouton \"Sauvegarder le post\" dans la barre d\'action Paramètres multi-colonnes Paysage Deux colonnes en mode portrait - Profil Passez à la version Pro Voir le profil Ajouter un compte @@ -71,39 +70,46 @@ Slide est en mode hors-ligne Essayez d\'entrer dans le mode en ligne + Wiki du subreddit Modérateurs du subreddit - karma de liens - karma de commentaires + Karma du lien + Karma du commentaire Message privé enregistré - upvoted + Plussoyé Utilisateur non trouvé L\'utilisateur Reddit n\'a pas pu être récupéré. vue d\'ensemble commentaires - publié + Publié doré - downvoted + Moinsoyé caché Ami Ajouter un ami Supprimer cet ami + Gérer les comptes + Voulez-vous vraiment supprimer ce compte ? + Effacer le compte + Historique + Tagger l\'utilisateur Dorer le commentaire Partager le commentaire Supprimer le commentaire Voulez-vous vraiment supprimer ce commentaire ? Cela ne peut pas être annulée. - Uh oh, quelque chose a mal tourné. + Oh oh, quelque chose a mal tourné Voulez-vous réessayer ? [supprimé] Désenregistrer Charger %1$d de plus Chargement de plus de commentaires… + Charger le permalien du commentaire + Montrer le commentaire parent - Pour commencer + Démarrer Personnaliser - Tutoriel de démarrage Choisissez un mode de tri Choisissez un laps de temps @@ -175,7 +181,7 @@ Video Intégré Contenu d\'Imgur - + %1$s a écrit… Destinataire Objet  @@ -186,11 +192,12 @@ Répondre à %1$s %1$s de %2$s Voir le message + Re : %1$s Vous avez un nouveau message ! Vous avez %1$d nouveaux messages ! - + Erreur Aucun Voulez-vous réessayer ? @@ -203,7 +210,7 @@ Veuillez patienter… Partager l\'image avec Ouvrir l\'URL avec - Marquer comme lu + Copier le texte Entrez votre pseudo Voir l\'utilisateur @@ -246,6 +253,7 @@ Vous devez être connecté pour voter ! Msg. Modération + Mail de moderation non lus Rapports Voulez-vous vraiment approuver cette publication ? Publication approuvée. @@ -255,7 +263,19 @@ Texte du flair Aucun rapport Approuver + Approuvé par /u/%1$s + Rédiger le flair + Marquer comme NSFW + Enlever le NSFW + Épingler + Détacher Enlever + Enlever avec une raison + Profil de l\'auteur + + Afficher le rapport %d + Afficher le rapport %d + Wiki non trouvé Ce subreddit n\'a pas de wiki ! @@ -272,6 +292,10 @@ Que recherchez-vous? Tout rechercher Rechercher %1$s + Pertinence + Le meilleur + Nouveau + commentaires Entrez le code ci-dessus Montrez patte blanche @@ -333,6 +357,9 @@ Filtres Polices Général + Apparence + Autres + Paramètres de subreddit Modifier le thème @@ -374,10 +401,34 @@ Nom de la subreddit Supprimer cette subreddit ? Vous ne serez pas désabonné, mais vous ne verrez pas la subreddit dans votre barre latérale ! + Synchronisation réussie - à l\'instant + + %d heure + %d heures + + + %d minute + %d minutes + + + + S\'abonner à /r/slideforreddit ? + Souhaitez-vous vous abonner à /r/slideforreddit pour être informé des nouveautés et pour pouvoir rapporter des problèmes ? + Synchroniser les couleurs maintenant ? + Vous voulez synchroniser les couleurs de vos subreddit maintenant ? Cela peut être fait plus tard dans les paramètres de thème → Subreddit + Slide s\'authentifie + Configuration des choses ! + Cela ne devrait prendre qu\'une seconde… + + /r/%1$s contient du contenu mature + Avez-vous plus de 18 ans et voulez vous voir du contenu pour adultes ? + Connectez-vous pour désactiver cet avertissement définitivement + Vous pouvez désactiver cela définitivement dans réglages →préférences Reddit → voir le contenu NSFW + Synchronisation réussie - " les subreddits étaient de couleur" + + Découvrir Charger plus de commentaires Indicateurs du nombre de commentaire coloré Naviguer à l\'aide des boutons de volume @@ -391,11 +442,6 @@ N\'a pas pu s\'authentifier Assurez-vous que votre d\'utilisateur et la clé d\'authentification sont corrects ! Intégration de Synccit - Synchronisation réussie - " subreddits ajouté" - Gérer les comptes - Voulez-vous vraiment supprimer ce compte ? - Effacer le compte Vignette aligné à droite Partager la publication Filtres de subreddit @@ -409,7 +455,6 @@ Désactivé Utiliser le navigateur web intégré Visionner dans un navigateur externe - Permet une barre en bas avec les flèches de navigation Complètement cacher les commentaires Désactive également les animations de commentaire Réduire les réponses aux commentaires par défaut @@ -417,8 +462,6 @@ Carte avec image centrée Cartes Vignette seulement - Grandes images rognées - Grande photo Glisser n\'importe où pour quitter Appuyez sur la flèche pour montrer la barre d\'action Appui long sur la barre d\'action @@ -437,14 +480,6 @@ Rapport Raison du signalement Signalement envoyé - - %d heure - %d heures - - - %d minute - %d minutes - %d colonnes en mode paysage %d colonnes en mode paysage @@ -462,6 +497,7 @@ Ne jamais afficher Afficher les paramètres par subreddit Navigation par balayage + Glisser depuis le bord gauche pour sortir.\n\nCela s\'applique aux gifs, images, albums, préférences et plus ! Charger les images en basse qualité Type d\'affichage Navigateur Web @@ -473,23 +509,27 @@ Toujours afficher les images en grand dans ce subreddit Mode d\'affichage des images Étendre la barre d\'outil du menu + Afficher plus d\'options dans la barre d\'outils subreddit + Mode de teinte des soumissions + Mode vignettes + ActionBar mode + Colore le fond d\'écran dans les multireddits, frontpage et all uniquement + Balise de contenu plus petite Forcer l\'utilisation du navigateur web externe Choisir les domaines à ouvrir systématiquement avec le navigateur externe Afficher le domaine dans la ligne d\'information - Tagger l\'utilisateur Envoyez les réponses dans la boite de réception - Découvrir Économie de données mobile + Voir le premier paragraphe des publications texte VOIR Ouvrir les commentaires Prévisualiser Tri des commentaires par défaut AMOLED avec contraste - Choisir la destination de l\'image / GIF [supprimé] Continuer ce fil - Re : %1$s - S\'abonner à /r/slideforreddit ? - Souhaitez-vous vous abonner à /r/slideforreddit pour être informé des nouveautés et pour pouvoir rapporter des problèmes ? - Synchroniser les couleurs maintenant ? + Texte brut + Afficher le post + Message non masqué + Ouvrir en externe diff --git a/app/src/main/res/values-ga-rIE/strings.xml b/app/src/main/res/values-ga-rIE/strings.xml index b6cbd5efbd..7447aef8ba 100644 --- a/app/src/main/res/values-ga-rIE/strings.xml +++ b/app/src/main/res/values-ga-rIE/strings.xml @@ -21,6 +21,7 @@ Síos vótail + Cuir clib ar úsáideoir @@ -47,11 +48,12 @@ Físeán - + Scríobh %1$s… Téacs - + Earráid + Cóipeáil na téacs Caite @@ -68,19 +70,24 @@ Téigh go dtí + Nua + + + + + + + Faigh amach Ainm Úsáideora Liosta Cárta - Pictúir mór - Cuir clib ar úsáideoir - Faigh amach diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml index b6bd1b98b1..d03ebceb81 100644 --- a/app/src/main/res/values-gl-rES/strings.xml +++ b/app/src/main/res/values-gl-rES/strings.xml @@ -29,7 +29,6 @@ Axustes da Multi-Columna Apaisado - Perfil Ir ao perfil Engadir unha conta Ola, @@ -57,9 +56,9 @@ Ligazón Álbum Imaxe - + Texto - + Erro Ningún @@ -80,6 +79,7 @@ + Novo @@ -87,6 +87,7 @@ Doar Axustes da Multi-Columna Xeral + Axustes Multireddits @@ -97,7 +98,12 @@ - xusto agora + + + + + Compartir post Tarxeta + Abrir externamente diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml index fa007a7809..af6ad9073e 100644 --- a/app/src/main/res/values-hr-rHR/strings.xml +++ b/app/src/main/res/values-hr-rHR/strings.xml @@ -58,7 +58,6 @@ Vodoravno Dvostruki stupci u portretnom načinu - Profil Kupi Pro Idi na profil Dodaj račun @@ -83,6 +82,9 @@ Prijatelj Dodajte prijetelja Uklonite prijatelja + Upravljanje korisničkim računima + Želite li zaista ukloniti ovaj korisnički račun? + Izbriši korisnički račun Pozlati komentar Podijeli komentar @@ -97,7 +99,6 @@ Započni Osobne postavke - Započni vodič Odaberite vrstu sortiranja Izaberi vremenski okvir @@ -169,7 +170,7 @@ Video Ugrađeno Imgur sadržaj - + %1$s je napisao… Primatelj Tema @@ -180,7 +181,7 @@ Odgovori %1$s %1$s iz %2$s Pogledaj njihovu poruku - + Greška Ništa Želite li pokušati ponovno? @@ -193,7 +194,7 @@ Molimo pričekajte… Podijeli sliku sa Otvori URL sa - Označi kao pročitano + Kopiraj tekst Unesite korisničko ime Otiđite na korisnika @@ -258,6 +259,9 @@ Što tražite? Pretraži sve Traži %1$s + Vrh + Novo + komentari Unesite kod prikazan iznad Dokažite da niste robot @@ -314,6 +318,7 @@ Filteri Font Općenito + Podreddit teme & Izgledi Uredi temu @@ -354,10 +359,24 @@ Ime podreddita Ukloniti ovaj subreddit? Vaša pretplata neće biti otkazana, ali nećete vidjeti ovaj podreddit u sidebaru! + Sinkronizacija dovršena - upravo sada + + %d sata + %d sata + %d sati + + + %d minute + %d minute + %d minuta + + + + + Sinkronizacija dovršena - " podredditi su obojani" + Učitaj više komentara Obojani indikatori podređenih komentara Navigacija komentarima pomoću tipki za glasnoću @@ -371,11 +390,6 @@ Nije bilo moguće provjeriti autentičnost Provjerite je li ispravno vaše korisničko ime i autentifikacijski ključ! Synccit integracija - Sinkronizacija dovršena - " podredditi dodani" - Upravljanje korisničkim računima - Želite li zaista ukloniti ovaj korisnički račun? - Izbriši korisnički račun Desno poravnata minijatura Podijeli post Podreddit filteri @@ -389,15 +403,12 @@ Onemogućeno Koristi interni preglednik Koristi eksterni preglednik - Omogućuje donju traku sa navigacijskim strelicama Potpuno sažmi komentare Također onemogućuje animacije komentara Lista Kartice s centriranom slikom Kartica Samo sličica minijature - Obrezana velika slika - Velika slika Pritisnite strelicu za prikaz akcijske trake Dugi pritisak za prikaz akcijske trake Uvijek pokaži akcijsku traku @@ -407,16 +418,7 @@ Prikaži broj novih komentara od zadnjeg posjeta Podreddit tabovi Izvješće - - %d sata - %d sata - %d sati - - - %d minute - %d minute - %d minuta - Ime podreddita [izbrisano] + Otvori u eksternom pregledniku diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index d958ed2ef5..fb02d263e8 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -54,7 +54,6 @@ Fekvő Kettő oszlop álló módban - Profil Pro megvásárlása Ugrás profilra Fiók hozzáadása @@ -80,6 +79,9 @@ Barát Barát hozzáadása Barát törlése + Fiókok kezelése + Biztosan el szeretnéd távolítani ezt a fiókot? + Fiók törlése Hozzászólás aranyozása Hozzászólás megosztása @@ -93,7 +95,6 @@ Vágjunk bele Személyre szabás - Útmutató elkezdése Válaszd ki egy rendezési módot Válaszd ki az időkeretet @@ -163,7 +164,7 @@ Videó Beágyazott Imgur tartalom - + %1$s ezt írta… Címzett Tárgy @@ -178,7 +179,7 @@ %d új üzeneted van! %d új üzeneted van! - + Hiba Egyik sem Meg szeretnéd próbálni újra? @@ -191,7 +192,7 @@ Kérlek, várj… Kép megosztása ezzel URL megnyitása ezzel - Megjelölés olvasottként + Szöveg másolása Add meg a felhasználónevet Ugrás felhasználóra @@ -243,6 +244,9 @@ Keresés Mit keresel? %1$s keresése + Csúcs + Legújabb + Hozzászólások Reddit beállítások @@ -278,6 +282,7 @@ Szűrők Betűtípus Általános + Alreddit témák & elrendezések Téma szerkesztése @@ -315,10 +320,14 @@ Alreddit neve Eltávolítod ezt az alredditet? Nem iratkozol le erről az alredditről, de nem lesz látható az oldalsávodban! + Szinkronizálás befejezve - épp most + + + + Szinkronizálás befejezve - " alreddit lett beszínezve" + További hozzászólások betöltése Hozzászólásszálak jelölése színekkel SYNCCIT LECSATLAKOZTATÁSA @@ -331,11 +340,6 @@ Nem sikerült a hitelesítés Győzödj meg róla, hogy a felhasználónév és a hitelesítő kód helyes! Synccit integráció - Szinkronizálás befejezve - " alreddit hozzáadva" - Fiókok kezelése - Biztosan el szeretnéd távolítani ezt a fiókot? - Fiók törlése Jobbra igazított miniatűr Bejegyzés megosztása Alreddit szűrők @@ -357,4 +361,5 @@ Alreddit fülek Jelentés Alreddit neve + Megnyitás külső alkalmazásban diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index 8180f1c6c6..db9335b5ea 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -86,7 +86,7 @@ Album Gambar Video - + %1$s menulis… Penerima Subjek @@ -99,7 +99,7 @@ Anda mempunyai %d pesan baru! - + Kesalahan Tidak ada Apakah Anda ingin mencoba lagi? @@ -109,6 +109,7 @@ Lanjutkan Berhenti berlangganan Tidak ada lagi post! + Salin teks Masukkan nama pengguna @@ -138,6 +139,8 @@ Apa yang Anda cari? Cari Semua Cari %1$s + Teratas + Baru Masukan kode diatas Buktikan bahwa Anda bukan robot @@ -154,6 +157,7 @@ Menyambungkan ke Google Donasi + Setelan Pesan Masuk @@ -168,14 +172,18 @@ Kembali - baru saja - Bagikan post - Kartu %d jam %d menit + + + + + + Bagikan post + Kartu [deleted] diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index 495fb6fa4b..97f4191140 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -36,6 +36,10 @@ %d punto %d punti + + %d nuovo messaggio + %d nuovi messaggi + Chiaro Scuro @@ -57,7 +61,6 @@ Orizzontale Due colonne in modalità ritratto - Profilo Passa alla versione Pro Vai al profilo Aggiungi un account @@ -67,6 +70,8 @@ Slide è in modalità offline Prova ad entrare in modalità online + Wiki del subreddit + Moderatori del subreddit karma link karma commenti @@ -84,6 +89,11 @@ Amico Aggiungi amico Rimuovi amico + Gestione account + Vuoi davvero eliminare questo account? + Cancella account + Cronologia + Tagga utente Dona gold Condividi commento @@ -95,10 +105,10 @@ Annulla salvataggio Carica altri %1$d Caricando ulteriori commenti… + Mostra commento genitore Inizia Personalizza - Inizia il tutorial Ordinato per Scegli un intervallo di tempo @@ -170,7 +180,7 @@ Video Incorporato Contenuto Imgur - + %1$s ha scritto… Destinatario Oggetto @@ -181,11 +191,12 @@ Rispondi a %1$s %1$s da %2$s Vedi il suo messaggio + re: %1$s Hai un nuovo messaggio! Hai %1$d nuovi messaggi! - + Errore Nessuna Vuoi riprovare? @@ -198,7 +209,7 @@ Attendere prego… Condividi immagine con Apri URL con - Segna come già letto + Copia testo Inserisci username Vai al profilo utente @@ -233,11 +244,14 @@ Slide salva tutti i tuoi dati in una cartella privata su Google Drive. Puoi sincronizzare questi dati tra i tuoi dispositivi (o sullo stesso dispositivo), e questi dati non finiranno mai su un server di terzi. Backup Ripristina + Esegui backup su file + Ripristina da file Errore nella votazione! Devi effettuare l\'accesso per poter votare! Posta moderatore + Mod mail non letta Segnalazioni Vuoi davvero approvare questo post? Post approvato. @@ -247,7 +261,19 @@ Testo del flair Nessuna segnalazione Approva + Approvato da /u/%1$s + Imposta flair + Segna come NSFW + Togli segno NSFW + Fissa in alto + Non fissare in alto Elimina + Rimuovi con motivazione + Profilo autore + + Leggi %d segnalazione + Leggi %d segnalazioni + Wiki non trovata Questo subreddit non ha una wiki! @@ -264,6 +290,10 @@ Cosa stai cercando? Cerca tutto Cerca %1$s + Rilevanza + Più votati + Nuovi + commenti Inserisci il codice mostrato sopra Dimostra di non essere un robot @@ -325,6 +355,9 @@ Filtri Caratteri Generali + Aspetto + Altro + Temi subreddit & layout Modifica tema @@ -366,10 +399,34 @@ Nome subreddit Rimuovere questo subreddit? Non sarai disiscritto da questo subreddit, ma non lo vedrai nella tua sidebar! + Sincronizzazione completata - proprio ora + + %d ora + %d ore + + + %d minuto + %d minuti + + + + Iscrizione a /r/slideforreddit? + Vorresti iscriverti a /r/slideforreddit per le ultime notizie e per segnalare malfunzionamenti? + Sincronizzare i colori? + Vorresti sincronizzare i colori dei tuoi subreddit adesso? Puoi anche farlo più avanti in Impostazioni → Temi dei subreddit + Slide si sta autenticando + Impostando le ultime cose! + Dovrebbe volerci solo un secondo… + + /r/%1$s contiene materiale per adulti + Hai più di diciotto anni e confermi di voler visualizzare contenuti per adulti? + Esegui il login per rimuovere permanentemente questo avviso + Puoi disabilitare permanentemente questo avviso in Impostazioni → Mostra contenuto NSFW + Sincronizzazione completata - " subreddit sono stati colorati" + + Scopri Carica altri commenti Indicatori colorati di profondità dei commenti Naviga attraverso i commenti con i pulsanti volume @@ -383,37 +440,89 @@ Errore di autenticazione Assicurati che l\'username e il codice di autenticazione siano corretti! Integrazione con Synccit - Sincronizzazione completata - " subreddit aggiunti" - Gestione account - Vuoi davvero eliminare questo account? - Cancella account + Miniature allineate a destra Condividi post + Filtri subreddit Tema subreddit Seleziona Scegli i subreddit da modificare + Sincronizzazione colori + Nascondi post già visti Crea nuovo post Disabilitato + Usa browser integrato + Usa browser esterno Nascondi interamente i commenti Disattiva anche le animazioni dei commenti + Collassa commenti figli di default Lista + Card con immagine centrata Card - Immagine grande + Solo miniatura + Fai swipe ovunque nella schermata per uscire + Premi freccia per mostrare la barra azioni + Premi e mantieni per la barra azioni + Mostra sempre la barra azioni + Filtro contenuto subreddit Condividi commenti Filtra questo contenuto Mostra il numero di commenti dall\'ultima visita + Video non trovato + Si è verificato un errore durante il caricamento di questo video + Subreddit a schede + No schede dei subreddit + Collassa commenti figli + Apri contenuto Segnala - - %d ora - %d ore - - - %d minuto - %d minuti + Motivazione della segnalazione + Segnalazione inviata + + %d colonna in modalità landscape + %d colonne in modalità landscape + Dati cellulare e Wi-Fi + Dati cellulare + Mai + Forza vista completa commenti + Questo è un post chiuso. Non puoi votare o commentare. + Sfondo card Nome subreddit + Assicurati di non aver selezionato \"Declino\" nell\'ultima schermata e prova di nuovo tra un minuto + Mostra sempre + Non mostrare mai + Mostra impostazioni per ciascun subreddit + Navigazione swipe + Fai swipe dal bordo sinistro per uscire.\n\nPuoi farlo da immagini, GIF, album, impostazioni e altro! + Carica immagini di bassa qualità + Tipo di vista + Browser web + Scambia azioni di tap e pressione prolungata + Ho più di 18 anni e voglio visualizzare contenuti NSFW + Modalità visualizzazione + Altrimenti, apri sempre immagini di alta qualità + Carica immagini di qualità inferiore se possibile + Mostra sempre immagini grandi in questo subreddit + Modalità immagine Mostra più opzioni nella barra degli strumenti del subreddit + Modalità miniatura + Modalità barra azioni + Colora sfondo solo nei multireddit, frontpage e all + Tag contenuto più piccola + Forza browser esterno + Scegli domini da aprire sempre esternamente + Mostra dominio nella riga delle informazioni Invia risposte alla posta in arrivo - Scopri + Risparmio dati + Mostra primo paragrafo del testo + VEDI + Apri commenti + Anteprima + Ordinamento dei commenti predefinito + AMOLED con contrasto [eliminato] + Continua questa discussione + Testo + Mostra post + Post non nascosto + Apri con diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index f61089197e..1cb89246e5 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -43,7 +43,6 @@ הגדרות עמודות מרובות רוחב - פרופיל צפה בפרופיל הוסף משתמש היי @@ -99,9 +98,9 @@ - + טקסט - + @@ -110,18 +109,28 @@ + המצליחים ביותר + חדש + תגובות הגדרות עמודות מרובות תגובות + + + + + + שתף פוסט קלף דיווח + פתח חיצונית diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 79908ba421..07eac6d932 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -59,7 +59,6 @@ 横向き ポートレート モードで二列表示 - プロフィール Pro 版 プロファイルへ アカウントを追加 @@ -69,6 +68,7 @@ Slide はオフライン モードです オンライン モードを試してください + サブレディットのwiki サブレディットのモデレーター リンク カルマ @@ -87,6 +87,11 @@ 友達 友達を追加 友達を削除 + アカウントを管理 + このアカウントを削除してもよろしいですか? + アカウントを削除 + 履歴 + タグ ユーザー コメントをゴールド コメントを共有 @@ -98,10 +103,11 @@ 未保存 さらに %1$d を読み込む 追加のコメントを読み込んでいます… + コメントの固定リンクを読み込む + 親コメントを表示する 始めましょう パーソナライズ - チュートリアルを開始 並べ替えの種類を選択 時間枠を選択 @@ -173,7 +179,7 @@ 動画 埋め込み Imgur コンテンツ - + %1$s が書きました 宛先 タイトル @@ -184,10 +190,11 @@ %1$s へ返信 %2$s から %1$s 彼らのメッセージを表示 + 返信: %1$s %d の新しいメッセージがあります! - + エラー！ なし もう一度試しますか? @@ -200,7 +207,7 @@ お待ちください… 画像を共有 URL を開く - 既読としてマーク + テキストをコピー ユーザー名を入力します。 ユーザーに移動します。 @@ -243,6 +250,7 @@ 投票するにはログインする必要があります! Mod メール + モデレーターからのメッセージが未読です 報告 この投稿を承認してもよろしいですか? 投稿を承認しました。 @@ -252,7 +260,18 @@ フレアー テキスト レポートはありません 承認 + /u/%1$sにより承認されました + フレアを設定する + NSFWタグを付ける + NSFWタグを外す + ピン留めする + ピン留め解除 削除 + 何らかの理由により削除 + 著者のプロフィール + + %d件の通報を見る + Wiki が見つかりません この Subreddit は Wiki がありません! @@ -269,6 +288,10 @@ 何を探しますか? すべて検索 %1$s を検索 + 関連性 + トップ + 新着 + コメント 上記のコードを入力してください あなたがロボットではないことを証明します @@ -330,6 +353,9 @@ フィルター フォント 一般設定 + 表示設定 + その他の設定 + Subreddit テーマ & レイアウト テーマを編集 @@ -371,10 +397,32 @@ Subreddit 名 この Subreddit を削除しますか? あなたは購読しませんが、サイドバーにこの subreddit は表示されません! + 同期が完了しました - たった今 + + %d 時 + + + %d 分 + + + + /r/slideforredditを購読しますか? + 最新のお知らせや問題の報告の為に/r/slideforredditを購読しますか? + 色を今同期しますか? + 今あなたのサブレディットの色を同期しますか? 後で 設定 → サブレディット テーマ からでも変更できます + Slideは認証中です + 色々設定しましょう! + こんなのすぐに済むハズなんだけどなぁ... + + /r/%1$sには成人向けコンテンツが含まれています + あなたは18歳以上で、成人向けコンテンツを閲覧しますか? + この注意を永久に表示しない為にはログインして下さい + この機能は 設定 → Reddit 設定 → NSFWコンテンツを表示する で無効化できます + 同期が完了しました - " Subreddit に色を付けました" + + 発見 残りのコメントを読み込む カラフルなコメントの深さインジケーター 音量ボタンを使用してコメントを移動 @@ -388,11 +436,6 @@ 認証できませんでした ユーザー名と認証キーが正しいかを確認してください! Synccit 統合 - 同期が完了しました - "Subreddit を追加しました" - アカウントを管理 - このアカウントを削除してもよろしいですか? - アカウントを削除 サムネイルの右揃え 投稿を共有 Subreddit フィルター @@ -406,7 +449,6 @@ 無効 内部ブラウザーを使用する 外部ブラウザーを使用する - ナビゲーション矢印と下部のバーを有効にします コメントを完全に折りたたむ コメントのアニメーションも無効にします デフォルトで子コメントを畳む @@ -414,8 +456,6 @@ 中央に画像のあるカード カード サムネイルのみ - 大きな画像をトリミング - 大きな画像 画面のどこかをスワイプすると終了します 矢印を押してアクションバーを表示します アクションバーの長押し @@ -434,12 +474,6 @@ 報告する 報告する理由 報告を送信しました - - %d 時 - - - %d 分 - 画面内に%d行表示する @@ -477,9 +511,7 @@ 強制的に外部ブラウザー 常に外部で開くドメインを選択します 情報ラインにドメインを表示 - タグ ユーザー 受信トレイに返信を送信 - 発見 データの保存 自分が投稿した文章の最初の段落を表示 ビュー @@ -487,16 +519,10 @@ プレビュー デフォルトのコメントのソート順 AMOLEDでコントラストを使用する - 画像/GIFの保存先を選択 [削除済] このスレッドの続きを読む 自己投稿文 - 返信: %1$s - /r/slideforredditを購読しますか? - 最新のお知らせや問題の報告の為に/r/slideforredditを購読しますか? - 色を今同期しますか? - 今あなたのサブレディットの色を同期しますか? 後で 設定 → サブレディット テーマ からでも変更できます - Slideは認証中です - 色々設定しましょう! - こんなのすぐに済むハズなんだけどなぁ... + 投稿の非表示の取り消し + サブミの非表示が取り消されました + 外部で開く diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml index fc133c4e35..77cc6e2e66 100644 --- a/app/src/main/res/values-lv-rLV/strings.xml +++ b/app/src/main/res/values-lv-rLV/strings.xml @@ -46,10 +46,10 @@ Virsraksts nevar būt tukšs Izvēlaties subredditu ko vēlaties pievienot - + Tēma Galvenā sadaļa - + Doties uz lietotāja profilu Reddit lietotājvārds drīkst saturēt tikai burtus, ciparus, zemsvītras un domuzīmes. @@ -79,6 +79,7 @@ Ko jūs vēlaties meklēt? Meklēt visos Meklēt %1$s + komentāri Pierādiet ka neesat robots @@ -93,6 +94,7 @@ Ziedot Par aplikāciju komentāri + Rediģēt motīvu Iestatījumi @@ -106,5 +108,10 @@ + + + + + Ziņo diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index 02a0609d50..418faa37b3 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -6,12 +6,13 @@ Wil je Slide echt sluiten? Shadowbox-modus inschakelen Ik heb ervoor gekozen om enkele functies van Slide (inclusief multikolommodus) beschikbaar te stellen middels de aanschaf van een \"Pro Unlock\"-sleutel in de Play Store. \n\nDit om de ontwikkeling gaande te houden, maar ook om de gratis versie van Slide advertentievrij te houden! \n\nInbegrepen zijn de multikolommodus, Shadowbox-modus (voor subreddits met afbeeldingen) en er komt nog veel meer aan! \n\nWil je Slide for Reddit Pro aanschaffen? - Subreddit-instellingen openen + Zijbalk Abbonementen synchroniseren - Post niet opgeslagen - Post opgeslagen - Post opgeslagen + Bericht niet opgeslagen + Bericht opgeslagen + Dit bericht is gearchiveerd. Je kan niet meer stemmen of reageren + Bericht opgeslagen Post voor altijd verborgen. gepind Extern openen @@ -19,25 +20,32 @@ URL delen Welke link wil je delen? Reddit-URL - Inhouds-URL - Post verbergen + Content-URL + Bericht verbergen Post melden Openen in browser - Post opslaan - Post delen + Bericht opslaan + Bericht delen Volledige thread laden + Dit bericht is doorgelinkt. Liever niet stemmen of reageren Tik om GIF te laden - Oh oh, post niet gevonden! - Sorry, deze post kon niet gevonden worden + Oh oh, bericht niet gevonden! + Sorry, dit bericht kon niet gevonden worden Tekst kopiëren %d punt %d punten + + %d nieuw bericht + %d nieuwe berichten + Licht Donker AMOLED-zwart + Donkerblauw + Primaire kleur Kleur wijzigen Accentkleur Basisthema @@ -46,47 +54,65 @@ Lettergrootte \"Post verbergen\"-knop in actiebalk + Kleur alleen om de subreddit + \"Bericht opslaan\"-knop in de actiebalk Multikolom-instellingen - Landschapmodus + Landschapsmodus + Dubbele kolommen in portretsmodus - Profiel Neem Pro Naar profiel gaan Een account toevoegen Hallo, Zoek naar een subreddit Modereren + Slide is in offlinemodus + Probeer online te gaan + Subredditwiki + Subredditmoderators linkkarma reactiekarma Privébericht - opgeslagen - upvoted + Opgeslagen + Omhoog gestemd Gebruiker niet gevonden Reddit-gebruiker kan niet worden geladen. overzicht reacties ingezonden verguld - downvoted - verborgen + Omlaag gestemd + Verborgen Vriend - Voeg vriend toe + Vriend toevoegen Vriend verwijderen + Beheer accounts + Weet je zeker dat je dit account wil verwijderen? + Verwijder account + Geschiedenis + Tag gebruiker Reactie vergulden Reactie delen - Verwijder reactie + Reactie verwijderen Weet je zeker dat je deze reactie wil verwijderen? Dit kan niet ongedaan worden gemaakt. Oh oh, er is iets misgegaan. Wil je het nog een keer proberen? [verwijderd] + Verwijderen + Laad er %1$d meer Meer reacties aan het laden… + Laad de reactie permalink + Toon bovenliggende reactie + Aan de slag + Personaliseer Kies een sorteerwijze + Kies een tijdsbestek Post sortering wijzigen Beste Top @@ -96,11 +122,11 @@ Oud Controversieel Stijgende - afgelopen Uur - afgelopen 24 uur - afgelopen Week - afgelopen Maand - afgelopen Jaar + Afgelopen uur + Afgelopen 24 uur + Afgelopen week + Afgelopen maand + Afgelopen Jaar Altijd URL @@ -126,18 +152,22 @@ Reddit kon niet worden bereikt. Opnieuw proberen? Probeer het zometeen opnieuw! Toegang geweigerd + Je hebt Slide geen toegang gegeven tot de externe opslag. Hierdoor kunnen er geen tijdelijke afbeeldingen of berichten worden opgeslagen :(. \nWil je Slide alsnog toegang geven tot de externe opslag? Authenticatie mislukt GIF niet gevonden Er is een fout opgetreden bij het laden van deze GIF. Probeer de GIF opnieuw te openen. (Nog) geen multireddits! - Wilt U een nieuwe Multireddit maken? + Wil je een nieuwe multireddit maken? Titel mag niet leeg zijn Voer een titel in voor je multireddit + Er zijn geen subreddits toegevoegd + Voeg wat subreddits toe door op de + te drukken! Selecteer subreddits om toe te voegen - Multireddit naam - Ongeldige multireddit naam + Multiredditnaam + Ongeldige multiredditnaam + De titel van een multireddit mag alleen letters, nummers of underscores bevatten NSFW-afbeelding NSFW-GIF @@ -150,7 +180,8 @@ Afbeelding Video Ingesloten - + Imgur inhoud + %1$s schreef… Ontvanger Onderwerp @@ -161,11 +192,12 @@ %1$s beantwoorden %1$s van %2$s Hun bericht bekijken + re: %1$s Je hebt %d nieuw bericht! Je hebt %d nieuwe berichten! - + Fout Geen Wil je het nog een keer proberen? @@ -178,7 +210,7 @@ Even geduld… Deel afbeelding met Open URL met - Markeer als gelezen + Tekst kopiëren Gebruikersnaam invoeren Naar gebruiker gaan @@ -187,9 +219,9 @@ Toevoegen Annuleren Sluiten - Verwerpen + Annuleer Klaar - Teruggaan + Terug Nee, bedankt Nee Oké @@ -202,7 +234,9 @@ Ongedaan maken Ja Vernieuwen + Cache reacties Verwijder + Tijdsbestek Back-up gelukt! Je instellingen herstellen @@ -212,11 +246,14 @@ Slide slaat al uw data op in een privé Google Drive map. Je kunt deze data synchroniseren tussen apparaten (of naar hetzelfde apparaat) en jouw data zal nooit via een derde partij gaan. Backup Herstellen + Back-up maken naar bestand + Herstel vanuit bestand Fout bij het uitbrengen van je stem! Je moet ingelogd zijn om te stemmen! Mod Berichten + Ongelezen modmail Meldingen Weet je zeker dat je deze post wil goedkeuren? Post goedgekeurd. @@ -224,31 +261,49 @@ Weet je zeker dat je de NSFW-markering wilt verwijderen? Post markeren Markeringstekst - Geen rapporten + Geen meldingen Goedkeuren + Goedgekeurd door /u/%1$s + Kies flair + Markeer NSFW + Demarkeer NSFW + Vastzetten + Losmaken Verwijderen + Verwijder met reden + Auteurs profiel + + Bekijk %d melding + Bekijk %d meldingen + Geen wiki gevonden Deze subreddit heeft geen wiki! %1$d abonnees De subreddit %1$s kon niet worden gevonden. Misschien is het verkeerd gespeld? + Subreddit \'%1$s\' kon niet worden gevonden. Wellicht is het fout gespeld of je hebt hier geen toegang tot. Subreddit niet gevonden Kies een subreddit Reacties doorzoeken Ga naar Zoeken - Wat zoekt u? - Zoek alle + Waar zoek je naar? + Doorzoek alles Zoek %1$s + Relevantie + Top + Nieuw + reacties Voer de bovenstaande code in Bewijs dat je geen robot bent + Reddit-voorkeuren Accentkleur aanpassen Wil je echt de instellingen voor /r/%1$s verwijderen? - Post lay-out + Postlay-out Interne albumweergave Interne GIF-weergave Linkgedrag @@ -257,35 +312,54 @@ Hoe hoger de frequentie, hoe meer batterij Slide op de achtergrond zal verbruiken! Hoofdkleur aanpassen Elke %1$s op nieuwe berichten controleren - Check elke %1$s + Controleer elke %1$s Alle NSFW-foto\'s verbergen + Bewaar geschiedenis + Bewaar NSFW-geschiedenis \"Sluiten bevestigen\"-melding - Navigeren tussen reacties + Navigeer tussen bovenliggende reacties Link delen - Posts voor altijd verborgen + Berichten voor altijd verborgen Afbeelding delen Open-source-bibliotheken Bugs melden - Bekijk changelog + Bekijk wijzigingen Verbinden met Google Slide is aan het verbinden met Google. Probeer het over een paar seconden opnieuw! - Op de wis-knop tikken verbergt de posts tijdelijk uit de huidige weergave. \nHou de knop ingedrukt om de posts permanent te verbergen! + Op de wis-knop tikken verbergt de berichten tijdelijk uit de huidige weergave. \nHou de knop ingedrukt om de berichten permanent te verbergen! FAB wis acties Meldingen uitgeschakeld. + Gekleurde navigatiebalk + Domeinfilters + Zelftekstfilter + Titelfilters + Voeg woorden of zinsdelen toe gescheiden door komma\'s + Bekijk alle reddit.com-voorkeuren + Lettertype berichttitel + Lettertype reactie + Hoofdafbeelding bijsnijden in reactieweergave + Berichten als gelezen markeren wanneer je er voorbij scrolt + Gebruik Chrome Custom Tabs Back-up & Herstellen Hoofdthema Algemeen + Geschiedenis Berichtinstellingen Neem Pro - Subreddit thema \'s + Subredditthema \'s Standaardsortering Doneren Over Multikolom-instellingen Zwevende actieknop Reacties + Filters + Lettertype Algemeen + Uiterlijk + Overig + Subreddit Thema´s & Layouts Thema aanpassen @@ -293,9 +367,11 @@ Instellingen Delen met Inloggen op Reddit + Herschik subreddits Multireddits - Postvak In + Inbox Thema + Creëer een multireddit Moderator Dit bedrag… @@ -312,14 +388,21 @@ Bedankt voor het steunen van Slide voor Reddit! Het betekent echt veel voor mij. Als je een probleem ondervindt, stuur me een e-mail of plaats een bericht in /r/slideforreddit! Graag gedaan! + Berichten aan het cachen + Ga online en vernieuw de subreddit om dit te doen + Laatst bijgewerkt: %1$s + Ga online en selecteer \'Cache reacties\' in het menu om reacties offline te bekijken - Teruggaan + Terug + Weergeven in externe browser + Selecteer subreddits om toe te voegen + Subreddit toevoegen + Subredditnaam + Deze subreddit verwijderen? + Je meld je niet af maar de subreddit verschijnt niet meer in de zijbalk! + Synchronisatie voltooid - zojuist - Post delen - Kaart - Melden %d uur %d uur @@ -328,5 +411,125 @@ %d minuut %d minuten + + + Abonneren op /r/slideforreddit? + Wil je abonneren op /r/slideforreddit voor het laatste nieuws en om problemen te melden? + Kleuren nu synchroniseren? + Wil je de subredditkleuren nu synchroniseren? Je kan dit later doen via Instellingen → Subreddit-thema\'s + Slide is aan het aanmelden + Bezig met voorbereiden! + Een seconde geduld… + + /r/%1$s bevat inhoud voor volwassenen + Ben je ouder dan 18 jaar en wil je inhoud voor volwassenen zien? + Meld je aan om deze melding permanent uit te schakelen + Je kan deze melding permanent uitschakelen in Instellingen → Reddit-voorkeuren → Toon NSFW-inhoud + + Synchronisatie voltooid + + Ontdek + Laad meer reacties + Diepte-indicatie tonen bij onderliggende reacties + Navigeren in reacties met volumeknoppen + VERBINDING VERBREKEN MET SYNCIT + Autorisatiecode + Gebruikersnaam + Weet je zeker dat je het Synccit-account wil verwijderen? + Bezig het aanmelden bij Synccit + Succesvol verbonden! + Synccit is nu actief voor dit apparaat + Er kon niet worden aangemeld + Controleer of jouw gebruikersnaam en autorisatiecode kloppen! + Synccit-integratie + Rechtsuitgelijnde thumbnail + Bericht delen + Subreddit-filter + Subreddit-thema + Selecteren + Kies subreddits om te bewerken + Kleuren synchroniseren + Hiermee wordt geprobeerd de \'hoofdkleur\' te bepalen die door de moderators is gekozen. Bestaande subredditkleuren worden niet overschreven. + Verberg bekeken berichten + Nieuw bericht maken + Uitgeschakeld + Gebruik de geïntegreerde browser + Gebruik de externe browser + Reacties volledig inklappen + Reactie-animaties ook uitschakelen + Onderliggende reacties standaard inklappen + Lijst + Kaart met gecentreerde afbeelding + Kaart + Alleen miniatuur + Veeg overal in de weergave om af te sluiten + Druk op de pijl om de actiebalk te tonen + Lang drukken voor de actiebalk + Actiebalk altijd tonen + Subreddit inhoudfilter + Deel reacties + Filter deze berichten + Toon aantal nieuwe reacties sinds laatste bezoek + Video niet gevonden + Er is een fout opgetreden tijdens het laden van deze video + Subreddit tabbladen + Geen subreddit tabbladen + Reactiepaneel + Onderliggende reacties inklappen + Open inhoud + Melden + Reden voor de melding + Melding verzonden + + %d kolom in landschapsmodus + %d kolommen in landschapsmodus + + Mobiele data en Wi-Fi + Mobiele data + Nooit + Forceer volledige reactieweergave + Dit bericht is gesloten. Je kan niet meer stemmen of reageren. + Achtergrondkleur kaart + Subredditnaam + Verberg hoofdafbeelding bij zelfteksten + Weet je zeker dat je op het vorige scherm niet \'Decline\' hebt gekozen? Probeer het nogmaals over een minuut + Altijd tonen + Nooit weergeven + Toon subreddit specifieke instellingen + Swipenavigatie + Swipe vanaf de linkerkant om af te sluiten.\n\nDit geldt voor afbeeldingen, GIFs, albums, instellingen en meer! + Laad afbeeldingen van lage kwaliteit + Weergave + Webbrowser + Wissel lange druk- and klikacties + Ik ben ouder dan 18 jaar en ik wil NSFW-inhoud zien + Weergavemodus + Anders altijd hoge kwaliteit afbeeldingen tonen + Laad lagere kwaliteit afbeeldingen indien mogelijk + Altijd grote afbeeldingen tonen in deze subreddit + Afbeeldingsmodus + Uitgeklapte werkbalk + Toon meer opties in de subredditwerkbalk + Bericht kleurmode + Thumbnailmode + Werkbalkmode + Alleen de achtergrond kleuren in multireddits, voorpagina en /r/all + Kleinere contenttag + Forceer externe browser + Kies domeinen die altijd extern geopend worden + Toon domeininformatie + Stuur reacties naar de inbox + Databesparing + Toon de eerste paragraaf van zelfteksten + BEKIJK + Toon reacties + Voorbeeld + Standaard reactie sortering + AMOLED met contrast [verwijderd] + Verdergaan met deze thread + Zelftekst + Bericht weer tonen + Bericht wordt weer getoond + Extern openen diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 2e28137b57..2d481dbcdb 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -46,7 +46,6 @@ Flerkolonneinnstillinger Landskap - Profil Gå til profil Legg til en konto Hei, @@ -131,7 +130,7 @@ Bilde Video Innebygget - + %1$s skrev… Til Emne @@ -146,7 +145,7 @@ %d ny melding %d nye meldinger - + Feil Ingen Vil du prøve igjen? @@ -211,6 +210,9 @@ Søk i kommentarene Gå til + Topp + Nye + kommentarer Skriv inn koden ovenfor Vis at du ikke er en robot @@ -248,6 +250,7 @@ Flerkolonneinnstillinger kommentarer Generelt + Subredditinnstillinger Rediger tema @@ -278,10 +281,6 @@ Tilbake - akkurat nå - Dele post - Kort - Rapport %d time %d timer @@ -290,4 +289,13 @@ %d minutt %d minutter + + + + + + Dele post + Kort + Rapport + Åpne eksternt diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index 4270840bfc..5581aa421c 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -64,7 +64,6 @@ Horyzontalnie Dwie kolumny w trybie pionowym - Profil Kup Pro Przejdź do profilu Dodaj konto @@ -74,6 +73,7 @@ Slide jest w trybie offline Spróbuj przejść w tryb online + Wiki subreddita Moderatorzy subreddita karmy linków @@ -92,6 +92,11 @@ Znajomy Dodaj znajomego Usuń znajomego + Zarządzanie kontami + Czy chcesz usunąć to konto? + Usuń konto + Historia + Otaguj użytkownika Podaruj złoto Udostępnij komentarz @@ -103,10 +108,11 @@ Wypisz Załaduj %1$d więcej Ładowanie więcej komentarzy… + Załaduj permalink komentarza + Pokaż komentarz nadrzędny Zaczynajmy Personalizuj - Rozpocznij tutorial Wybierz typ sortowania Wybierz okres czasu @@ -136,7 +142,7 @@ Post tekst. Wybierz obraz Tekst (opcjonalnie) - Dodaj komentarz + Dodaj post Subreddit Zdjęcie zapisane @@ -178,7 +184,7 @@ Wideo W aplikacji Imgur - + %1$s napisał… Odbiorca Temat @@ -189,12 +195,13 @@ Odpowiedz do %1$s %1$s od %2$s Zobacz wiadomość + re: %1$s Masz %d nową wiadomość! Masz %d nowych wiadomości! Masz %d nowych wiadomości! - + Błąd Brak Czy chcesz spróbować ponownie? @@ -207,7 +214,7 @@ Proszę czekać… Udostępnij zdjęcie przez Otwórz link przez - Oznacz jako przeczytane + Skopiuj tekst Wpisz nazwę użytkownika Przejdź do profilu @@ -226,7 +233,7 @@ Odpowiedz Domyślne Zapisz - Dodaj post + Dodaj Oczywiście! Cofnij Tak @@ -250,6 +257,7 @@ Musisz być zalogowany by głosować! Mail moderatora + Nieprzeczytany modmail Zgłoszenia Czy naprawdę chcesz zatwierdzić ten post? Post zatwierdzony. @@ -259,7 +267,20 @@ Tekst flagi Brak zgłoszeń Zatwierdź + Zatwierdzone przez /u/%1$s + Ustaw flagę + Oznacz NSFW + Odznacz NSFW + Odepnij + Przypnij Usuń + Usuń z powodem + Profil autora + + Przejrzyj %d zgłoszenie + Przejrzyj %d zgłoszenia + Przejrzyj %d zgłoszeń + Nie znaleziono wiki Ten subreddit nie ma wiki! @@ -276,6 +297,10 @@ Co chcesz wyszukać? Przeszukaj wszystko Przeszukaj %1$s + Związłość + Najwięcej punktów + Nowe + Komentarze Wpisz powyższy kod Udowodnij, że nie jesteś robotem @@ -337,6 +362,9 @@ Filtry Czcionka Ogólne + Wygląd + Inne + Ustawienia Subreddita Edytuj motyw @@ -378,10 +406,36 @@ Nazwa subreddita Usunąć ten subreddit? Nie odsubskrybujesz subreddita, ale nie będziesz go widzieć w pasku bocznym! + Synchronizacja zakończona - teraz + + %d godzinę + %d godziny + %d godzin + + + %d minutę + %d minuty + %d minut + + + + Zasubskrybować /r/slideforreddit? + Czy chciałbyś zasubskrybować /r/slideforreddit dla najnowszych wiadomości i zgłaszania błędów? + Zsynchronizować kolory? + Czy chcesz zsynchronizować teraz kolory? Możesz to zrobić potem w Ustawienia → Motywy subredditów + Trwa uwierzytelnianie + Konfigurowanie ustawień! + Zajmie to sekundkę… + + /r/%1$s zawiera materiały dla dorosłych + Czy masz więcej niż 18 lat i chcesz zobaczyć zawartość dla dorosłych? + Zaloguj się, by permamentnie wyłączyć to ostrzeżenie + Możesz to wyłączyć permamentnie w Ustawienia → Preferencje Reddita → Pokazuj obrazy NSFW + Synchronizacja zakończona - " subredditów zmienionych" + + Odkrywaj Załaduj więcej komentarzy Kolorowa indykacja drzew komentarzy Przeglądaj komentarze przyciskami głośności @@ -395,11 +449,6 @@ Nie można uwierzytelnić Upewnij się, że nazwa użytkownika i klucz są poprawne! Integracja Synccit - Synchronizacja zakończona - " subreddity dodane" - Zarządzanie kontami - Czy chcesz usunąć to konto? - Usuń konto Podgląd dopasowany do prawej Udostępnij post Filtr subredditów @@ -413,7 +462,6 @@ Wyłączony Używaj wbudowanej przeglądarki Używaj zewnętrznej przeglądarki - Włącza pasek dolny z przyciskami nawigacji Zwiń komentarze w pełni Wyłącza również animacje komentarzy Domyślnie zwijaj komentarze @@ -421,8 +469,6 @@ Karty z wycentrowanym obrazem Karta Tylko miniaturka - Duże zdjecie ucięte - Duże zdjecie Przesuń z dowolnego miejsca, by wyjść Tapnij strzałkę, by pokazać pasek akcji Długie przyciśnięcie pokazuje action bar @@ -441,16 +487,6 @@ Zgłoś Powód zgłoszenia Zgłoszenie wysłane - - %d godzinę - %d godziny - %d godzin - - - %d minutę - %d minuty - %d minut - %d kolumna horyzontalnie %d kolumny horyzontalnie @@ -490,25 +526,19 @@ Wymuszanie zewnętrznej przeglądarki Wybierz domeny, które będą otwierane zewnętrznie Pokazuj domenę - Otaguj użytkownika Informuj o odpowiedziach - Odkrywaj Oszczędzanie danych Pokaż pierwszy akapit postu tekstowego Otwórz Otwórz komentarze - Pogdląd + Podgląd Domyślnie sortowanie komentarzy AMOLED z kontrastem - Wybierz lokalizację zapisu obrazów [usunięte] + Kontynuuj wątek Post tekstowy - re: %1$s - Zasubskrybować /r/slideforreddit? - Czy chciałbyś zasubskrybować /r/slideforreddit dla najnowszych wiadomości i zgłaszania błędów? - Zsynchronizować kolory? - Czy chcesz zsynchronizować teraz kolory? Możesz to zrobić potem w Ustawienia → Motywy subredditów - Trwa uwierzytelnianie - Konfigurowanie ustawień! - Zajmie to sekundkę… + Odkryj post + Post usunięty z ukrytych + Otwórz poza aplikacją + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 2fc00065fb..7ae9999551 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -53,7 +53,7 @@ Tamanho da fonte - Botão \'\'Ocultar post\'\' na barra de ações + Botão \'\'Ocultar postagem\'\' na barra de ações Colorir apenas fora do subreddit Botão \'\'Ocultar post\'\' na barra de ações @@ -61,7 +61,6 @@ Paisagem Duas colunas em modo retrato - Perfil Adquira a versão Pro Ir para o perfil Adicionar conta @@ -71,6 +70,7 @@ O slide está no modo off-line Tente entrar no modo on-line + Wiki do subreddit Moderadores do Subreddit link karma @@ -89,6 +89,10 @@ Amigo(a) Adicionar amigo Remover amigo + Gerenciar contas + Excluir conta + Histórico + Aba do usuário Dê gold Compartilhar comentário @@ -100,10 +104,11 @@ Não salvar Carregar mais %1$d Carregando mais comentários… + Carregar comentários com ligação permanente + Mostrar comentário pai Começar Personalizar - Iniciar o Tutorial Escolha um tipo de classificação Escolha um período de tempo @@ -175,7 +180,7 @@ Vídeo Incorporado Conteúdo do Imgur - + %1$s escreveu… Destinatário Assunto @@ -186,11 +191,12 @@ Resposta para %1$s %1$s de %2$s Visualizar a mensagem + re: %1$s Você tem %d nova mensagem! Você tem %d novas mensagens! - + Erro Vazio Gostaria de tentar novamente? @@ -199,11 +205,11 @@ Inscrito Continuar Desinscrito - Sem mais posts! + Sem mais postagens! Aguarde, por favor… Compartilhar imagem com Abrir URL com - Marcar como lido + Copiar texto Digite o nome de usuário Ir para o usuário @@ -223,7 +229,7 @@ Reiniciar Salvar Enviar - Certo! + Claro! Desfazer Sim Atualizar @@ -234,7 +240,7 @@ Backup bem sucedido! Restaurar as configurações Backup de suas configurações - Restaurando as configurações com êxito! + Configurações restauradas com sucesso! O app reiniciará agora. O Slide faz backup de todos os seus dados para uma pasta pessoal no Google Drive. Você pode sincronizar dados entre os dispositivos (ou para o mesmo dispositivo), e seus dados nunca passaram através de um serviço de terceiros ou de servidores. Backup @@ -246,6 +252,7 @@ Você deve estar logado para votar! Mod mail + Modmail não lido Relatórios Você realmente quer aprovar este post? Post aprovado. @@ -255,7 +262,18 @@ Texto do flair Nenhum report Aprovar + Aprovado por /u/%1$s + Conjunto flair + Marcar NSFW + Desmarcar o NSFW + Fixar + Desafixar Remover + Perfil do autor + + Visualizar %d denúncia + Visualizar %d denúncias + Nenhuma wiki encontrada Este subreddit não tem uma wiki! @@ -272,6 +290,10 @@ O que você está procurando? Pesquisar tudo Pesquisar %1$s + Relevância + Início + Novo + comentários Digite o código acima Prove que não é um robô @@ -280,10 +302,10 @@ Editar cor secundária Você realmente quer apagar as configurações para /r/%1$s? Layout da postagem - Vista interna do álbum - Vista interna do GIF + Exibição interna do álbum + Exibição interna do GIF Funcionamento dos links - Exibição de imagem interna + Exibição interna de imagens Cheque por novas mensagens Quanto maior a frequência, mais bateria o Slide usa em 2° plano! Editar a cor principal @@ -319,7 +341,7 @@ Backup & Restaurar Tema principal - Geral + Configurações gerais Histórico Notificações Adquira a versão Pro @@ -332,7 +354,10 @@ Comentários Filtros Fontes - Geral + Configurações gerais + Aparência + Outros + Temas de subreddit & Layouts Editar o tema @@ -364,34 +389,69 @@ Salvando submissões em cache Por favor, conecte-se à internet e atualize o subreddit para fazer isso Último atualização %1$s + Por favor, volte online e selecione \'Comentários em cache\' a partir do menu de 3 pontos, para ver os comentários offline Retornar Abrir em um navegador externo + Selecione um subreddit para adicionar Adicionar um subreddit + Nome do Subreddit Remover este subreddit? + Você não irá se desinscrever, porém não verá mais este subreddit na sua barra lateral! + Sincronização completa - agora mesmo + + %d hora + %d horas + + + %d minuto + %d minutos + + + + Inscrever-se para o /r/slideforreddit? + Gostaria de inscrever-se para o /r/slideforreddit, para poder obter as últimas notícias e reportar problemas? + Sincronizar as cores agora? + Slide está autenticando + Configurando as coisas! + Isto deve demorar só um segundo… + + /r/%1$s contém conteúdo adulto + Você tem mais de dezoito anos e está disposto a ver conteúdo adulto? + Logue para desabilitar este aviso permanentemente + Sincronização completa + + Descobrir Carregar mais comentários + Código de autenticação Nome de usuário Conectado com sucesso! - Sincronização completa - Excluir conta + Não foi possível autenticar + Verifique se o seu nome de usuário e chave de autenticação estão corretos! Compartilhar post Filtros de Subreddit Tema do Subreddit - Selecioce + Selecione + Escolha subreddits para editar + Sincronização de cor + Ocultar postagens visualizadas + Criar novo post + Desativado + Usar navegador interno + Usar navegador externo Lista Cartão Apenas miniatura - Imagem grande cortada - Grande foto + Deslize em qualquer lugar no modo de exibição para sair + Filtro de conteúdo do subreddit Filtrar este conteúdo Mostrar a contagem de comentários desde a última visita Vídeo não encontrado Ocorreu um erro ao carregar este vídeo - Guias do Subreddit + Guias de Subreddit Sem guias de subreddit Painel de comentários Recolher comentários infantis @@ -399,16 +459,11 @@ Reporte Razão por ser reportado Relatório enviado - - %d hora - %d horas - - - %d minuto - %d minutos - + Dados móveis e Wi-Fi Dados móveis Nunca + Nome do Subreddit + Exibir sempre Nunca mostrar Carregar imagens de baixa qualidade Tipo de exibição @@ -419,11 +474,22 @@ Carregar uma imagem de qualidade inferior, se possível Sempre mostrar fotos grandes neste subreddit Modo de Imagem + Barra de ferramentas expandida Mostrar mais opções na barra de ferramentas do subreddit + Modo de miniatura + Colorir apenas o plano de fundo em multireddits, primeira página, e tudo Abrir em um navegador externo - Aba do usuário + Escolha os domínios que vão sempre abrir externamente + Mostrar domínio na linha de informação Enviar respostas para caixa de entrada - Descobrir Economia de dados + VISUALIZAR + Abrir comentários + Pré-visualizar + Padrão de classificação de comentários + AMOLED com contraste [deletado] + Continuar esta discussão + Reexibir postagem + Abrir externamente diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 9e85dd8395..a90670e448 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -26,8 +26,9 @@ - - + + + Copiar texto @@ -39,10 +40,16 @@ + + + + + + diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml index 2aabb4dbc4..2a33637c6b 100644 --- a/app/src/main/res/values-ro-rRO/strings.xml +++ b/app/src/main/res/values-ro-rRO/strings.xml @@ -58,7 +58,6 @@ Orizontală Două coloane în modul portret - Profil Cumpără Pro Vezi profilul Adaugă un cont @@ -85,6 +84,9 @@ Prieten Adaugă prieten Elimină prieten + Gestionează conturile + Eşti sigur că vrei să ştergi acest cont? + Șterge contul Dă-i aur comentariului Distribuie comentariul @@ -99,7 +101,6 @@ Să începem Personalizare - Începe tutorial Alege un tip de sortare Mod sortare @@ -170,7 +171,7 @@ Video Încorporat Conținut de pe Imgur - + %1$s a scris… Destinatar Subiect @@ -186,7 +187,7 @@ Ai %d mesaje noi! Ai %d mesaje noi! - + Eroare Nimic Dorești sa încerci din nou? @@ -199,7 +200,7 @@ Răbdare… Distribuie imaginea cu Deschide URL-ul cu - Marchează ca citit + Copiază textul Introdu numele de utilizator Du-te la utilizator @@ -264,6 +265,9 @@ Ce cauți? Caută tot Caută %1$s + Top + Noi + Comentarii Introdu codul de mai sus Demonstrează că nu ești un robot @@ -322,6 +326,7 @@ Filtre Font General + Setări subreddit Editare temă @@ -363,10 +368,24 @@ Numele subreddit-ului Elimini acest subreddit? Nu vei fi dezabonat, dar nu vei mai vedea subredditul acesta în bara laterală! + Sincronizare reușită - chiar acum + + %d oră + %d ore + %d ore + + + %d minut + %d minute + %d minute + + + + + Sincronizare reușită - " subreddit-urile au fost colorate" + Încarcă mai multe comentarii Indicatoare colorate pentru profunditatea comentariilor Navighează între comentarii folosind butoanele de volum @@ -380,25 +399,11 @@ Nu s-a putut autentifica Asigură-te că numele de utilizator și cheia de autentificare sunt corecte! Integrare Synccit - Sincronizare reușită - " subbredit-uri adăugate" - Gestionează conturile - Eşti sigur că vrei să ştergi acest cont? - Șterge contul Miniatură în partea dreapta Distribuiți postarea Card Reportează - - %d oră - %d ore - %d ore - - - %d minut - %d minute - %d minute - Numele subreddit-ului [deleted] + Deschideți extern diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index 9c6b38a46a..0bc4a0ec3f 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -52,7 +52,6 @@ Многостолбцовый Горизонтально - Профиль Перейти на Pro Перейти в профиль Добавить аккаунт @@ -78,6 +77,10 @@ Друг Добавить в друзья Удалить из друзей + Управление аккаунтами + Вы действительно хотите удалить эту учетную запись? + Удалить аккаунт + История Позолотить комментарий Поделиться комментарием @@ -89,7 +92,6 @@ Приступить Персонализация - Начать туториал Выберите типа сортировки Режим сортировки @@ -154,7 +156,7 @@ Изображение Видео Встроенное - + %1$s написал… Получатель Тема @@ -165,7 +167,7 @@ Ответ %1$s %1$s от %2$s Просмотреть их сообщение - + Ошибка Ничего Хотите попробовать еще раз? @@ -176,6 +178,7 @@ Отписан Больше нет записей! Пожалуйста, подождите… + Копировать текст Введите имя пользователя Перейти к пользователю @@ -199,7 +202,7 @@ Отменить Да обновить - Кэш комментариев + Загрузить комментарии Удалить Период @@ -241,6 +244,9 @@ Что вы ищете? Искать все Искать %1$s + Лучшее + Новое + комментарии Введите код выше Докажите, что вы не робот @@ -278,6 +284,7 @@ Резервное копирование & восстановление Основная тема Основное + История Уведомления Перейти на Pro Темы сабреддитов @@ -287,7 +294,11 @@ Многостолбцовый Поведение плавающей кнопки Коментарии + Шрифт Основное + Вид + Другое + Темы и макеты сабреддиттов Редактировать тему @@ -295,9 +306,11 @@ Настройки Поделиться через Войдите в Reddit + Переупорядочить сабреддиты Мультиреддиты Входящие Тема + Создать мультиреддит Модератор Эта сумма… @@ -316,13 +329,38 @@ Кэширование публикаций Проверьте подключение к сети и обновите сабреддит + Последнее обновление %1$s + Подключитесь к Интернету и выберите \"Загрузить комментарии\" в меню с тремя точками, чтобы просматривать комментарии оффлайн Назад + Открыть во внешнем браузере + Выберите сабреддиты для добавления + Добавить сабреддит + Название сабреддита + Удалить этот сабреддит? + Синхронизация завершена - только что + + + Подписаться на /r/slideforreddit? + Хотели бы вы подписаться на /r/slideforreddit для получения последних новостей и сообщения об ошибках? + Синхронизировать цвета? + Slide выполняет вход + + + Синхронизация завершена + + Загрузить больше комментариев + ОТКЛЮЧИТЬ SYNCCIT + Код авторизации + Имя пользователя Поделиться постом + Выбрать + Синхронизация цветов Карточка Отчет + Название сабреддита [deleted] + Открыть в другом приложении diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml index 67ed37f1bd..9e9af8c4b2 100644 --- a/app/src/main/res/values-sr-rSP/strings.xml +++ b/app/src/main/res/values-sr-rSP/strings.xml @@ -44,7 +44,6 @@ Више колона Водоравно - Профил Купи про Иди на профил Додај налог @@ -111,7 +110,7 @@ - + Тема Тело Пошаљи поруку кориснику %1$s @@ -120,7 +119,7 @@ Одговори кориснику %1$s %1$s од %2$s Погледај њихову поруку - + Грешка Ништа Да ли желите да покушате поново? @@ -130,6 +129,7 @@ Настави Отказивање пријаве Нема више постова! + Копирај текст Унеси корисничко име Иди на корисника @@ -163,6 +163,9 @@ + Топ + Ново + коментари Изглед поста @@ -171,6 +174,7 @@ Купи про Више колона коментари + @@ -178,8 +182,14 @@ Врати се + + + + + Подели пост Картица Извештај [избрисано] + Отвори у вањском прегледачу diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 0b1218a943..53a5479593 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -56,7 +56,6 @@ Landskap Två kolumner i porträttläge - Profil Bli pro Gå till profil Lägga till ett konto @@ -97,7 +96,6 @@ Kom igång Anpassa - Starta guiden Välj en sortering Ändra inläggssortering @@ -168,7 +166,7 @@ Video Inbäddad Innehåll från Imgur - + %1$s skrev… Mottagare Ämne @@ -183,7 +181,7 @@ Du har %d nytt meddelande! Du har %d nya meddelanden! - + Fel Ingen Vill du försöka igen? @@ -196,7 +194,7 @@ Vänligen vänta… Dela bild med Öppna URL med - Markera som läst + Kopiera text Ange användarnamn Gå till användaren @@ -260,6 +258,9 @@ Vad söker du efter? Sök alla Sök %1$s + Högsta poäng + Nya + kommentarer Ange koden ovan Bevisa att du inte är en robot @@ -315,6 +316,7 @@ Flytande action-knapp Kommentarer Allmänt + Subreddit inställningar Redigera tema @@ -347,10 +349,6 @@ Gå tillbaka - just nu - Dela inlägg - Kort - Rapportera %d timme %d timmar @@ -359,5 +357,14 @@ %d minut %d minuter + + + + + + Dela inlägg + Kort + Rapportera [borttagen] + Öppna externt diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index a9deeea71f..6e39cdeb7f 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -44,7 +44,6 @@ Çoklu-sütun Ayarları Yatay - Profil Pro sürüme geç Profile git Bir hesap ekleyin @@ -128,7 +127,7 @@ Resim Video Yerleştirilmiş - + %1$s yazdı… Alıcı Konu @@ -143,7 +142,7 @@ %d yeni mesajın var! %d yeni mesajın var! - + Hata Hiçbiri Tekrar denemek ister misiniz? @@ -206,6 +205,9 @@ Yorumları ara Şuraya git + En üst + Yeni + yorumlar Yukarıdaki kodu girin Robot olmadığınızı kanıtlayın @@ -235,6 +237,7 @@ Çoklu-sütun Ayarları yorumlar Genel + Subreddit Ayarları Temayı Düzenle @@ -265,10 +268,6 @@ Geri git - şimdi - Mesajı paylaş - Kart - Rapor Et %d saat %d saat @@ -277,4 +276,13 @@ %d dakika %d dakika + + + + + + Mesajı paylaş + Kart + Rapor Et + Harici olarak aç diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml index f51cbd0452..b3fbbbafc0 100644 --- a/app/src/main/res/values-uk-rUA/strings.xml +++ b/app/src/main/res/values-uk-rUA/strings.xml @@ -19,8 +19,8 @@ - - + + @@ -32,10 +32,16 @@ + + + + + + diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml index dc9199e47c..2ec2a9c02f 100644 --- a/app/src/main/res/values-vi-rVN/strings.xml +++ b/app/src/main/res/values-vi-rVN/strings.xml @@ -22,8 +22,8 @@ - - + + @@ -35,10 +35,16 @@ + + + + + + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 602ed62416..9fef292ccd 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -52,7 +52,6 @@ 风景 纵向模式时显示双栏 - 帐户 升级为专业版 查看用户资料 添加帐户 @@ -152,7 +151,7 @@ 视频 内嵌 Imgur 内容 - + %1$s 写道… 接收者 主题 @@ -166,7 +165,7 @@ 你有 %d 条信息！ - + 错误 无 你想再试一次吗？ @@ -179,7 +178,7 @@ 请稍等... 分享图片方式 打开链接方式 - 标记已读 + 复制文字 输入用户名 前往用户信息 @@ -244,6 +243,9 @@ 你在搜索什么？ 全部搜索 搜索 %1$s + 置顶 + 新的 + 评论 输入上面的代码 证明你不是个机器人 @@ -298,6 +300,7 @@ 过滤 字体 通用 + 版块设置 编辑主题 @@ -336,16 +339,21 @@ 板块名称 你不会取消订阅，但你不会在侧边栏看见此板块！ - 马上 - 分享告示 - 卡片 - 报告 %d 小时 %d 分钟 + + + + + + 分享告示 + 卡片 + 报告 板块名称 [deleted] + 外部打开 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 9643973c33..4f3a992fec 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3,30 +3,33 @@ 確認退出 - 您真的想要退出Slide嗎? - 啟用壹模式 - 開啟Subreddit設定 + 你真的想要退出 Slide 嗎？ + 黑房模式 + 我選擇把 Slide 的幾項功能（包括多列模式）需透過在 Play Store 購買專業版後才可使用。\n\n這是為了讓 Slide 的開發在不顯示廣告的同時得以延續。\n\n在專業版中的功能包括多列模式、（供瀏覽圖片 Subreddit 用的）黑房模式、以及以後會加入的更多的功能！\n\n你想取得 Slide 專業版嗎？ + 開啟 Subreddit 設定 同步訂閱 - 未保存提交 - 以保存提交 - 告示以保存 - 告示永遠隱藏. + 已取消儲存貼文 + 已儲存貼文 + 此貼文已被存檔，你不能對它投票或留言。 + 已儲存貼文 + 已永遠隱藏貼文 已置頂 - 使用其他App開啟 + 使用其他 App 開啟 複製連結 - 分享網址 - 您希望分享哪個連結？ + 分享連結 + 你希望分享哪個連結？ Reddit 連結 內容連結 - 隱藏告示 - 檢舉告示 + 隱藏貼文 + 檢舉貼文 在瀏覽器中開啟 - 儲存告示 - 分享告示 - 載入線程 + 儲存貼文 + 分享貼文 + 載入所有留言 此為不參與版本，請勿投票或留言。 點擊以載入 GIF + 呃啊，找不到貼文！ 對不起，找不到此貼文 複製文字 @@ -49,17 +52,16 @@ 字型大小 在動作列中顯示「隱藏貼文」按鈕 - 只在 Subreddit 外染色 + 只在 Subreddit 外顯示色 在動作列中顯示「儲存貼文」按鈕 多列 橫向 在縱向時顯示多列 - 我的頁面 升級為專業版 去其他用戶的頁面 - 增加賬戶 + 增加帳戶 哈囉， 去 Subreddit 版主管理 @@ -69,29 +71,43 @@ Subreddit wiki Subreddit 版主 + 連結 karma + 留言 karma 私人訊息 已儲存 + 已投上票 找不到此用戶 無法查看此 Reddit 使用者。 概觀 留言 已提交 + 已送金 + 已投下票 已隱藏 朋友 新增為朋友 移除朋友 + 管理帳戶 + 你肯定要移除此帳戶嗎？ + 刪除帳戶 + 歷史 + 標籤用戶 + 給留言送金 分享留言 刪除留言 - 你確認要刪除留言嗎？此舉不能被還原。 + 你肯定要刪除此留言嗎？此舉不能被還原。 + 呃啊，出問題了。 + 你想再試一次嗎？ [已刪除] 取消儲存 - 載入 %1$d 更多 + 載入另外 %1$d 條留言 正在載入更多留言⋯⋯ + 載入留言固定連結 + 顯示上一層留言 - 入門指南 + 開始使用 個人化 - 開始教學 選擇排序方式 選擇時間 @@ -99,7 +115,7 @@ 最佳 最高 熱門 - 問&答 (AMA) + 問與答（AMA） 最新 最舊 最具爭議 @@ -141,31 +157,72 @@ 載入此 GIF 時發生錯誤，請嘗試重新打開 GIF。 （還） 沒有 multireddits ！ - 你要加入新的 multireddit 嗎？ + 你要建立新的 multireddit 嗎？ 標題不能為空白 - 請輸入您 multireddit 的標題 + 請輸入你 multireddit 的標題 + 沒有增加 Subreddit + 請按 + 按鈕來增加 Subreddit！ + 選擇要增加的 Subreddit + Multireddit 名稱 + Multireddit 名稱無效 + Multireddit 的名稱只可以含有英文字母、數字及底線。 - - 文字 - - 以此 App 分享圖片 - 以此 App 開啟連結 - 標記為已讀 + NSFW 圖片 + NSFW GIF + Reddit 連結 + 連結 + NSFW 連結 + GIF + 標題貼文 + 圖片集 + 圖片 + 影片 + 内嵌 + Imgur 内容 + + %1$s 寫道⋯ + 收件者 + 主題 + 內文 + 發訊息予 %1$s + 發送訊息 + %1$s 發了訊息給你 + 回覆 %1$s + 來自 %2$s 的 %1$s + 檢視他們的訊息 + 回覆： %1$s + + 你有 %d 條新訊息！ + + + 錯誤 + 無 + 你想再試一次嗎？ + 分數已隱藏 + NSFW + 已訂閱 + 繼續 + 已取消訂閱 + 沒有更多的貼文了！ + 請稍候⋯ + 分享圖片使用 + 開啟連結使用 + 複製文字 輸入使用者名稱 前往使用者頁面 Reddit 使用者名稱只能包含字母、 數字、 底線和短劃線。 - 加入 + 增加 取消 關閉 - 放棄內容 + 放棄 完成 返回 不用了，謝謝 否 好 - 删除 + 刪除 回覆 重設 儲存 @@ -174,7 +231,7 @@ 撤消 是 重新整理 - 緩存評論 + 緩存留言 刪除 時間期間 @@ -183,6 +240,7 @@ 正在備份你的設定 設定還原成功！ App 即將重新啟動。 + Slide 會把你的數據存放在一個私人 Google 雲端硬碟的資料夾中。你可以在不同裝置（或在同一裝置）間同步這些資料，這些數據絕不會經過第三方的服務或伺服器。 備份 還原 備份至檔案 @@ -208,7 +266,7 @@ 移除 NSFW 標記 置頂 取消置頂 - 删除 + 刪除 有原因刪除 提交者用戶頁 @@ -230,23 +288,32 @@ 你在找什麼？ 搜尋全部 搜尋 %1$s + 相關性 + 最高 + 最新 + 留言 輸入以上的文字 以證明你不是個機械人 Reddit 設定 更改次要顏色 + 你肯定要刪除 /r/%1$s 的設定嗎？ 貼文排版 內置圖片集瀏覽器 內置 GIF 瀏覽器 連結處理方式 - 內置圖片集瀏覽 + 內置圖片瀏覽器 + 檢查新訊息 + 頻率愈高，Slide 在背景用的電量可能會愈多！ 更改主要顏色 + 每 %1$s 檢查一次新訊息 每 %1$s 檢查一次 隱藏所有 NSFW 圖片 保存瀏覽歷史 保存 NSFW 瀏覽歷史 確認退出對話框 + 在上下層留言間移動 分享連結 永久隱藏的貼文 分享圖片 @@ -254,8 +321,23 @@ 報告問題 檢視更改日誌 正在連接至 Google - 導航條染色 + Slide 正在連接至 Google，請稍後再試。 + 按下清除按鈕會暫時隱藏貼文，但不會永遠隱藏貼文。\n長按按鈕則會把他們永久隱藏。 + 浮動動作按鈕清除動作 + 已關閉通知。 + 在導航列顯示顏色 + 域名過濾 + 文字貼文過濾 + 標題過濾 + 輸入要過濾的關鍵字，中間以逗號分開 + 檢視所有 reddit.com 設定 + 貼文標題字體 + 留言字體 + 在留言頁中裁剪主圖片 + 在畫面捲動至貼文後標記貼文為已讀 + 使用 Chrome Custom Tabs + 備份及還原 主要主題 一般 歷史 @@ -265,35 +347,182 @@ 預設排序 捐款 關於 - 多列 + 多列版面 浮動動作按鈕 留言 過濾 字體 一般 + 外觀 + 其他 + Subreddit 主題及排版 更改主題 - 提文貼文 + 提交貼文 設定 分享透過 登入至 Reddit + 重新排序 Subreddits + Multireddits + 收件匣 + 主題設定 + 建立一個 Multireddit + 版主 + 此金額可以⋯ + 作為一名仍在讀書的開發者，我非常感謝你的慷慨捐贈 ！這些捐款幫助 Slide （免費的）存在 :) + 捐款 + 能讓 + 條廣告不用顯示 + 支持 + 個小時的開發 + 支持 Slide for Reddit + 捐款失敗 :( + 遺憾地，捐款未能完成。請確保你已連接至互聯網後再試一次！感謝你的支持！ + 捐款成功！ + 十分感謝你對 Slide for Reddit 的支持！你的支持對我而言意義重大，如果你遇到什麼問題，不妨發電郵給我，或在 GitHub 上報告。 + 不用客氣！ + 正在緩存貼文 + 請先連至互聯網，重新整理 Subreddit 後再試 + 最後更新於 %1$s + 請連接互聯網，再在選單中選擇「緩存留言」，以在離線時閱覽留言。 返回 + 於外部瀏覽器開啟 + 選擇要增加的 Subreddit + 增加 Subreddit + Subreddit 名稱 + 要移除此 subreddit 嗎？ + 你對此 Subreddit 的訂閱不會取消，但在側面選單中便見不到這個 Subreddit！ + 同步完成 + + %d 小時 + + + %d 分鐘 + + + + 要訂閱 /r/slideforreddit 嗎？ + 你想不想訂閱 /r/slideforreddit，以接收最新消息及報告問題？ + 立刻同步 Subreddit 顏色？ + 你確定要立即同部 Subreddit 的顏色嗎？此這可在設定 → Subreddit 主題中進行。 + Slide 正在認證中 + 正在初始化⋯ + 應該不需要很久⋯ + + /r/%1$s 含有成人內容 + 你已年年滿18歲，並願意看到成人內容嗎？ + 你需要登入才能永久關閉此警告 + 你可以於 設定 → Reddit 設定 → 顯示 NSFW 內容 中關閉此設定 + 同步完成 - " Subreddit 已加上顏色" - 同步完成 - 分享告示 + + 獵奇 + 載入更多留言 + 以多種顏色標示不同層次留言 + 使用音量按鈕在留言間移動 + 取消與 SYNCCIT 連接 + 授權碼 + 使用者名稱 + 你肯定要移除此 Synccit 帳戶嗎？ + 正在與 Syccit 認證 + 已成功連接！ + Synccit 已啟動 + 認證不成功 + 請確定使用者名稱和授權碼正確。 + 連接 Synccit + 縮圖排右 + 分享貼文 + Subreddit 過濾 + Subreddit 主題 + 選擇 + 選擇要修改的 Subreddit 顏色同步 Slide 會嘗試取得 Subreddit 版主所設定的「主要顏色」，並不會影響已設定顏色的 Subreddit。 + 隱藏已看過的貼文 + 提交新的貼文 + 已停用 + 使用內建瀏覽器 + 使用外部瀏覽器 + 完全摺疊留言 + 同時會關閉留言動畫 + 預設摺疊下層留言 + 列表 + 圖片顯示於卡片中間 卡片 + 只顯示縮圖 + 在畫面上任何位置滑動退出 + 按箭嘴以顯示動作列 + 長按以顯示動作列 + 總時顯示動作列 + Subreddit 內容過濾 + 分享留言連結 + 過濾此內容 + 顯示在上次瀏覽後新留言的數目 + 找不到影片 + 在載入影片時發生錯誤 + Subreddit 標籤頁 + 無 Subreddit 標籤頁 + 留言窗格 + 摺疊下層留言 + 開啟內容 + 檢舉 + 檢舉原因 + 已發送檢舉報告 + + 在橫向時顯示 %d 列 + + 流動數據及 Wi-Fi + 流動數據 + 永不 + 強制顯示整個留言頁 + 此貼文已被鎖定，你不能對它投票或留言。 + 卡片背景 + Subreddit 名稱 + 在文字貼文中隱藏主圖片 + 確定你在最後一個畫面試沒有按「拒絕」，然後再試 + 總是顯示 + 永不顯示 + 顯示每個 Subreddit 設定 + 滑動瀏覽 + 由畫面左端滑動以退出。\n\n這動作在圖片、GIF、圖片集、設定等都適用！ + 載入較低品質的圖片 + 檢視種類 + 瀏覽器 + 交換長按及短按動作 + 我年滿18歲，並想看 NSFW 的內容 + 顯示模式 + 否則，載入高品質圖片 + 在可能時載入較低品質的圖片 + 在此 Subreddit 中總示顯示大圖片 + 圖片模式 + 展開工具列選單 + 在 Subreddit 工具列上顯示更多選項 貼文染色模式 - 只在 Multireddits、Frontpage 及 All 染色 + 縮圖模式 + 動作列模式 + 只在 Multireddits、Frontpage 及 All 顯示顏色 + 縮小內容資料文字 + 強制使用外部瀏覽器 + 選擇使用外部瀏覽器開啟的域名 + 顯示域名資訊 + 把回應發送至收件匣 + 節省數據 + 顯示文字貼文首段 + 檢視 + 開啟留言 + 預覽 + 預設留言排序 + 增加了對比的 AMOLED [已刪除] - 立刻同步 Subreddit 顏色？ - 你確定要立即同部 Subreddit 的顏色嗎？此這可在設定 → Subreddit 主題中進行。 + 檢視更多留言 + 文字貼文 + 取消隱藏貼文 + 已取消隱藏貼文 + 使用其他 App 開啟 From 6f70fb5664e7e3b65ebfd2782d220e28b5968980 Mon Sep 17 00:00:00 2001 From: nxt3 Date: Fri, 15 Apr 2016 18:08:34 -0400 Subject: [PATCH 007/188] Grayed out items when logged out --- .../redditslide/Activities/Settings.java | 1 + .../Activities/SettingsGeneral.java | 1 + .../Activities/SettingsReddit.java | 42 ++++++++++++------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Settings.java b/app/src/main/java/me/ccrama/redditslide/Activities/Settings.java index 8b180d7a4c..32a8a11ea9 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Settings.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Settings.java @@ -324,6 +324,7 @@ public void onClick(View v) { }); } else { findViewById(R.id.reddit_settings).setEnabled(false); + findViewById(R.id.reddit_settings).setAlpha((float) 0.25); } } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java index e1939f0ebd..13d24ad7d8 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsGeneral.java @@ -293,6 +293,7 @@ public void onClick(View v) { }); } else { findViewById(R.id.notifications).setEnabled(false); + findViewById(R.id.notifications).setAlpha((float) 0.25); } ((TextView) findViewById(R.id.sorting_current)).setText(Reddit.getSortingStrings(getBaseContext())[Reddit.getSortingId("")]); diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsReddit.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsReddit.java index aed05fde16..e5747ce430 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsReddit.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsReddit.java @@ -37,14 +37,14 @@ public class SettingsReddit extends BaseActivityAnim { public void onPause() { super.onPause(); if(editor != null) - new AsyncTask() { - @Override - protected Void doInBackground(Void... params) { - new AccountManager(Authentication.reddit).updatePreferences(editor); + new AsyncTask() { + @Override + protected Void doInBackground(Void... params) { + new AccountManager(Authentication.reddit).updatePreferences(editor); - return null; - } - }.execute(); + return null; + } + }.execute(); } @@ -78,30 +78,40 @@ protected Void doInBackground(Void... params) { protected void onPostExecute(Void aVoid) { { final SwitchCompat thumbnails = (SwitchCompat) findViewById(R.id.nsfwcontent); - thumbnails.setChecked(Boolean.parseBoolean(prefs.data("over_18"))); + thumbnails.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { editor.setArgs("over_18", String.valueOf(isChecked)); Reddit.over18 = isChecked; + + if (isChecked) { + (findViewById(R.id.nsfwrpev)).setEnabled(true); + ((SwitchCompat) findViewById(R.id.nsfwrpev)).setChecked(Boolean.parseBoolean(prefs.data("no_profanity"))); + } else { + ((SwitchCompat) findViewById(R.id.nsfwrpev)).setChecked(true); + (findViewById(R.id.nsfwrpev)).setEnabled(false); + } } }); - } { final SwitchCompat thumbnails = (SwitchCompat) findViewById(R.id.nsfwrpev); - if (((SwitchCompat) findViewById(R.id.nsfwcontent)).isChecked()) { + + if (!((SwitchCompat) findViewById(R.id.nsfwcontent)).isChecked()) { + thumbnails.setChecked(true); thumbnails.setEnabled(false); } else { thumbnails.setChecked(Boolean.parseBoolean(prefs.data("no_profanity"))); - thumbnails.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - editor.setArgs("no_profanity", String.valueOf(isChecked)); - } - }); } + + thumbnails.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + editor.setArgs("no_profanity", String.valueOf(isChecked)); + } + }); } //Thumbnail type From 549ac8ff1c769e42523156503cfab6daf7332790 Mon Sep 17 00:00:00 2001 From: ccrama Date: Fri, 15 Apr 2016 15:58:58 -0500 Subject: [PATCH 008/188] Switched to correct menu code in Inbox, Added mark all as read option, Fixed filtering content in the main view not filtering all posts out, Other bugfixes --- .../ccrama/redditslide/Activities/Inbox.java | 65 ++++++++++++++----- .../redditslide/Activities/ModQueue.java | 3 - .../redditslide/Fragments/CommentPage.java | 28 +++----- .../ccrama/redditslide/OfflineSubreddit.java | 10 ++- .../PopulateSubmissionViewHolder.java | 29 ++++++--- app/src/main/res/layout/activity_inbox.xml | 2 - app/src/main/res/menu/menu_inbox.xml | 22 +++++++ app/src/main/res/values/strings.xml | 2 + 8 files changed, 110 insertions(+), 51 deletions(-) create mode 100644 app/src/main/res/menu/menu_inbox.xml diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java b/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java index 7671e29448..6ea6e34ecc 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java @@ -1,6 +1,7 @@ package me.ccrama.redditslide.Activities; import android.content.Intent; +import android.os.AsyncTask; import android.os.Bundle; import android.support.design.widget.TabLayout; import android.support.v4.app.Fragment; @@ -8,9 +9,15 @@ import android.support.v4.app.FragmentStatePagerAdapter; import android.support.v4.view.ViewPager; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.View; import android.view.animation.LinearInterpolator; +import net.dean.jraw.managers.InboxManager; + +import me.ccrama.redditslide.Authentication; import me.ccrama.redditslide.ColorPreferences; import me.ccrama.redditslide.ContentGrabber; import me.ccrama.redditslide.Fragments.InboxPage; @@ -24,6 +31,48 @@ public class Inbox extends BaseActivityAnim { public Inbox.OverviewPagerAdapter adapter; + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.menu_inbox, menu); + + // if (mShowInfoButton) menu.findItem(R.id.action_info).setVisible(true); + // else menu.findItem(R.id.action_info).setVisible(false); + + return true; + } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int id = item.getItemId(); + + if (id == android.R.id.home) { + onBackPressed(); + } + if (id == R.id.notifs) { + LayoutInflater inflater = getLayoutInflater(); + final View dialoglayout = inflater.inflate(R.layout.inboxfrequency, null); + SettingsGeneral.setupNotificationSettings(dialoglayout, Inbox.this); + } + if(id == R.id.compose){ + Intent i = new Intent(Inbox.this, Sendmessage.class); + startActivity(i); + } + if(id == R.id.read){ + new AsyncTask() { + @Override + protected Void doInBackground(Void... params) { + new InboxManager(Authentication.reddit).setAllRead(); + return null; + } + + @Override + protected void onPostExecute(Void aVoid) { + adapter.notifyDataSetChanged(); + } + }.execute(); + } + return super.onOptionsItemSelected(item); + } @Override public void onCreate(Bundle savedInstance) { overrideSwipeFromAnywhere(); @@ -43,14 +92,6 @@ public void onCreate(Bundle savedInstance) { tabs.setupWithViewPager(pager); - findViewById(R.id.notifs).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - LayoutInflater inflater = getLayoutInflater(); - final View dialoglayout = inflater.inflate(R.layout.inboxfrequency, null); - SettingsGeneral.setupNotificationSettings(dialoglayout, Inbox.this); - } - }); pager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { @@ -70,13 +111,7 @@ public void onPageScrollStateChanged(int state) { } }); - findViewById(R.id.compose).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent i = new Intent(Inbox.this, Sendmessage.class); - startActivity(i); - } - }); + } public class OverviewPagerAdapter extends FragmentStatePagerAdapter { diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/ModQueue.java b/app/src/main/java/me/ccrama/redditslide/Activities/ModQueue.java index 4e278720b7..e76e919264 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/ModQueue.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/ModQueue.java @@ -61,9 +61,6 @@ public void onPageScrollStateChanged(int state) { findViewById(R.id.header).setBackgroundColor(Palette.getDefaultColor()); pager.setAdapter(new OverviewPagerAdapter(getSupportFragmentManager())); tabs.setupWithViewPager(pager); - - findViewById(R.id.compose).setVisibility(View.GONE); - findViewById(R.id.notifs).setVisibility(View.GONE); } public class OverviewPagerAdapter extends FragmentStatePagerAdapter { diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/CommentPage.java b/app/src/main/java/me/ccrama/redditslide/Fragments/CommentPage.java index 30b5345e42..3f71569835 100644 --- a/app/src/main/java/me/ccrama/redditslide/Fragments/CommentPage.java +++ b/app/src/main/java/me/ccrama/redditslide/Fragments/CommentPage.java @@ -25,7 +25,6 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.view.ViewTreeObserver; import android.view.WindowManager; import android.widget.EditText; import android.widget.FrameLayout; @@ -162,28 +161,19 @@ public void onClick(View v) { mSwipeRefreshLayout.setRefreshing(true); toSubtract++; - headerHeight = header.getMeasuredHeight() - (subtractHeight.getHeight() * toSubtract); - if (headerHeight <= 0) { - header.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - headerHeight = header.getMeasuredHeight() - (subtractHeight.getHeight() * toSubtract); - if (adapter != null) - adapter.notifyItemChanged(0); - header.getViewTreeObserver().removeOnGlobalLayoutListener(this); - } - }); - } else { - if (adapter != null) - adapter.notifyItemChanged(0); - } + v.findViewById(R.id.loadall).setVisibility(View.GONE); + + headerHeight = header.getHeight(); + + if (adapter != null) + adapter.notifyDataSetChanged(); + //avoid crashes when load more is clicked before loading is finished if (comments.mLoadData != null) comments.mLoadData.cancel(true); comments = new SubmissionComments(fullname, CommentPage.this, mSwipeRefreshLayout); comments.setSorting(CommentSort.CONFIDENCE); loadMore = false; - v.findViewById(R.id.loadall).setVisibility(View.GONE); } }); @@ -489,7 +479,7 @@ public boolean onMenuItemClick(MenuItem item) { PopulateSubmissionViewHolder.openGif(getActivity(), adapter.submission); break; case VIDEO: - if(Reddit.videoPlugin){ + if (Reddit.videoPlugin) { try { Intent sharingIntent = new Intent(Intent.ACTION_SEND); sharingIntent.setClassName("ccrama.me.slideyoutubeplugin", @@ -752,7 +742,7 @@ public void onClick(DialogInterface dialogInterface, int i) { builder.setTitle(R.string.sorting_choose); Resources res = getActivity().getBaseContext().getResources(); builder.setSingleChoiceItems( - new String[] { + new String[]{ res.getString(R.string.sorting_best), res.getString(R.string.sorting_top), res.getString(R.string.sorting_new), diff --git a/app/src/main/java/me/ccrama/redditslide/OfflineSubreddit.java b/app/src/main/java/me/ccrama/redditslide/OfflineSubreddit.java index 510a0de965..ec66903bdb 100644 --- a/app/src/main/java/me/ccrama/redditslide/OfflineSubreddit.java +++ b/app/src/main/java/me/ccrama/redditslide/OfflineSubreddit.java @@ -139,14 +139,18 @@ public void clearPost(Submission s) { Submission savedSubmission; public void hide(int index) { + hide(index, true); + } + public void hide(int index, boolean save) { if (submissions != null) { savedSubmission = submissions.get(index); submissions.remove(index); - savedIndex = index; - writeToMemory(); + if(save) { + savedIndex = index; + writeToMemory(); + } } } - public void unhideLast() { if (submissions != null && savedSubmission != null) { submissions.add(savedIndex, savedSubmission); diff --git a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java index 76857712d7..cb9239244e 100644 --- a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java @@ -88,6 +88,7 @@ import me.ccrama.redditslide.Visuals.Palette; import me.ccrama.redditslide.Vote; import me.ccrama.redditslide.util.CustomTabUtil; +import me.ccrama.redditslide.util.LogUtil; import me.ccrama.redditslide.util.NetworkUtil; import me.ccrama.redditslide.util.SubmissionParser; @@ -400,17 +401,27 @@ public void onClick(DialogInterface dialog, int which) { if (filtered) { e.apply(); - final int pos = posts.indexOf(submission); - final T t = posts.get(pos); - posts.remove(pos); - Hidden.setHidden(t); - final OfflineSubreddit s; - if (baseSub != null) { - s = OfflineSubreddit.getSubreddit(baseSub); - s.hide(pos); + PostMatch.domains = null; + PostMatch.subreddits = null; + ArrayList toRemove = new ArrayList<>(); + for(Contribution s : posts){ + if(s instanceof Submission && PostMatch.doesMatch((Submission)s)){ + toRemove.add(s); + LogUtil.v("Matching with " + ((Submission) s).getDomain()); + } } - recyclerview.getAdapter().notifyItemRemoved(pos + 1); + OfflineSubreddit s = OfflineSubreddit.getSubreddit(baseSub); + + for(Contribution remove : toRemove){ + final int pos = posts.indexOf(remove); + posts.remove(pos); + if (baseSub != null) { + s.hide(pos, false); + } + s.writeToMemory(); + recyclerview.getAdapter().notifyDataSetChanged(); + } } } diff --git a/app/src/main/res/layout/activity_inbox.xml b/app/src/main/res/layout/activity_inbox.xml index 8138df7689..e45797e350 100644 --- a/app/src/main/res/layout/activity_inbox.xml +++ b/app/src/main/res/layout/activity_inbox.xml @@ -47,8 +47,6 @@ android:id="@+id/notifs" android:layout_width="48dp" android:layout_height="48dp" - - android:layout_gravity="end|center_vertical" android:background="?android:selectableItemBackground" android:paddingBottom="12dp" diff --git a/app/src/main/res/menu/menu_inbox.xml b/app/src/main/res/menu/menu_inbox.xml new file mode 100644 index 0000000000..d48acc86d8 --- /dev/null +++ b/app/src/main/res/menu/menu_inbox.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 826a8ccb3a..69412814f0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -711,4 +711,6 @@ Open externally Vertical album view Download album + YouTube + Compose message \ No newline at end of file From 6d72d228315785597eb6d8413f1d422ab0bfc66b Mon Sep 17 00:00:00 2001 From: ccrama Date: Fri, 15 Apr 2016 16:08:50 -0500 Subject: [PATCH 009/188] Fixed the popup colors in some activities, Fixed some crashes in the inbox screen --- .../redditslide/Activities/Discover.java | 3 ++- .../ccrama/redditslide/Activities/Inbox.java | 22 ++++++++++++++---- .../ccrama/redditslide/Activities/Search.java | 7 +++++- .../redditslide/Activities/Website.java | 2 ++ app/src/main/res/layout/activity_inbox.xml | 23 ------------------- app/src/main/res/menu/menu_inbox.xml | 3 +-- 6 files changed, 28 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java b/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java index 120c0a3bf0..4f73a192db 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Discover.java @@ -85,7 +85,8 @@ public void onCreate(Bundle savedInstance) { applyColorTheme(""); setContentView(R.layout.activity_multireddits); - setupAppBar(R.id.toolbar, R.string.discover_title, true, false); + setupAppBar(R.id.toolbar, "Discover", true, false); + mToolbar.setPopupTheme(new ColorPreferences(this).getFontStyle().getBaseId()); findViewById(R.id.header).setBackgroundColor(Palette.getDefaultColor()); tabs = (TabLayout) findViewById(R.id.sliding_tabs); diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java b/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java index 6ea6e34ecc..e3f80e36d8 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java @@ -41,6 +41,9 @@ public boolean onCreateOptionsMenu(Menu menu) { return true; } + + boolean changed; + @Override public boolean onOptionsItemSelected(MenuItem item) { int id = item.getItemId(); @@ -53,26 +56,33 @@ public boolean onOptionsItemSelected(MenuItem item) { final View dialoglayout = inflater.inflate(R.layout.inboxfrequency, null); SettingsGeneral.setupNotificationSettings(dialoglayout, Inbox.this); } - if(id == R.id.compose){ + if (id == R.id.compose) { Intent i = new Intent(Inbox.this, Sendmessage.class); startActivity(i); } - if(id == R.id.read){ + if (id == R.id.read) { + changed = false; new AsyncTask() { @Override protected Void doInBackground(Void... params) { - new InboxManager(Authentication.reddit).setAllRead(); + try { + new InboxManager(Authentication.reddit).setAllRead(); + changed = true; + } catch (Exception ignored) { + } return null; } @Override protected void onPostExecute(Void aVoid) { - adapter.notifyDataSetChanged(); + if (changed) + adapter.notifyDataSetChanged(); } }.execute(); } return super.onOptionsItemSelected(item); } + @Override public void onCreate(Bundle savedInstance) { overrideSwipeFromAnywhere(); @@ -81,6 +91,7 @@ public void onCreate(Bundle savedInstance) { applyColorTheme(""); setContentView(R.layout.activity_inbox); setupAppBar(R.id.toolbar, R.string.title_inbox, true, true); + mToolbar.setPopupTheme(new ColorPreferences(this).getFontStyle().getBaseId()); TabLayout tabs = (TabLayout) findViewById(R.id.sliding_tabs); tabs.setTabMode(TabLayout.MODE_SCROLLABLE); @@ -88,7 +99,8 @@ public void onCreate(Bundle savedInstance) { ViewPager pager = (ViewPager) findViewById(R.id.content_view); findViewById(R.id.header).setBackgroundColor(Palette.getDefaultColor()); - pager.setAdapter(new OverviewPagerAdapter(getSupportFragmentManager())); + adapter = new OverviewPagerAdapter(getSupportFragmentManager()); + pager.setAdapter(adapter); tabs.setupWithViewPager(pager); diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Search.java b/app/src/main/java/me/ccrama/redditslide/Activities/Search.java index 70fb4de3b1..58bfec12c0 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Search.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Search.java @@ -4,7 +4,6 @@ import android.os.Bundle; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.RecyclerView; -import me.ccrama.redditslide.Views.CatchStaggeredGridLayoutManager;; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -19,12 +18,16 @@ import me.ccrama.redditslide.Adapters.ContributionAdapter; import me.ccrama.redditslide.Adapters.SubredditSearchPosts; +import me.ccrama.redditslide.ColorPreferences; import me.ccrama.redditslide.R; import me.ccrama.redditslide.Reddit; +import me.ccrama.redditslide.Views.CatchStaggeredGridLayoutManager; import me.ccrama.redditslide.Views.PreCachingLayoutManager; import me.ccrama.redditslide.Visuals.Palette; import me.ccrama.redditslide.handler.ToolbarScrollHideHandler; +; + public class Search extends BaseActivityAnim { @@ -209,6 +212,8 @@ public void onClick(View v) { onBackPressed(); //Simulate a system's "Back" button functionality. } }); + mToolbar.setPopupTheme(new ColorPreferences(this).getFontStyle().getBaseId()); + getSupportActionBar().setSubtitle(Reddit.getSortingStringsSearch(getBaseContext())[Reddit.getSortingIdSearch(this)]); final RecyclerView rv = ((RecyclerView) findViewById(R.id.vertical_content)); final PreCachingLayoutManager mLayoutManager; diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Website.java b/app/src/main/java/me/ccrama/redditslide/Activities/Website.java index 1095852525..94ec5103ed 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Website.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Website.java @@ -16,6 +16,7 @@ import java.net.URI; import java.net.URISyntaxException; +import me.ccrama.redditslide.ColorPreferences; import me.ccrama.redditslide.R; import me.ccrama.redditslide.Reddit; import me.ccrama.redditslide.Visuals.Palette; @@ -91,6 +92,7 @@ public void onCreate(Bundle savedInstanceState) { setSupportActionBar((Toolbar) findViewById(R.id.toolbar)); setupAppBar(R.id.toolbar, "", true, subredditColor, R.id.appbar); + mToolbar.setPopupTheme(new ColorPreferences(this).getFontStyle().getBaseId()); p = (ProgressBar) findViewById(R.id.progress); v = (WebView) findViewById(R.id.web); diff --git a/app/src/main/res/layout/activity_inbox.xml b/app/src/main/res/layout/activity_inbox.xml index e45797e350..6860689c0b 100644 --- a/app/src/main/res/layout/activity_inbox.xml +++ b/app/src/main/res/layout/activity_inbox.xml @@ -32,29 +32,6 @@ android:background="#00000000" android:clipToPadding="false"> - - - - - + app:showAsAction="never" /> From b6b69d633e326a3c359ccfa9a66a1cb3f80f65c6 Mon Sep 17 00:00:00 2001 From: ccrama Date: Fri, 15 Apr 2016 16:12:30 -0500 Subject: [PATCH 010/188] Final fixes to inbox --- app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java b/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java index e3f80e36d8..83a8b1b5f9 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java @@ -69,6 +69,7 @@ protected Void doInBackground(Void... params) { new InboxManager(Authentication.reddit).setAllRead(); changed = true; } catch (Exception ignored) { + ignored.printStackTrace(); } return null; } From 3491f00b208860f04a8aaca9ae0e548e738fff16 Mon Sep 17 00:00:00 2001 From: ccrama Date: Fri, 15 Apr 2016 17:19:52 -0500 Subject: [PATCH 011/188] Fixed the SideArrayAdapter replicating items, Made it order based on subscribed > history > all other subs --- .../redditslide/Activities/MainActivity.java | 2 +- .../Adapters/ContributionAdapter.java | 29 ++++++++++++-- .../Adapters/SideArrayAdapter.java | 39 ++++--------------- .../PopulateSubmissionViewHolder.java | 2 +- .../ccrama/redditslide/UserSubscriptions.java | 21 ++++++++-- 5 files changed, 53 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java index 16617f036d..6ec682ea1c 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java @@ -1632,7 +1632,7 @@ public void onClick(View v) { } }); - sideArrayAdapter = new SideArrayAdapter(this, copy, copy, UserSubscriptions.getHistory(), UserSubscriptions.getAllSubreddits(this)); + sideArrayAdapter = new SideArrayAdapter(this, copy, UserSubscriptions.getAllSubreddits(this)); drawerSubList.setAdapter(sideArrayAdapter); e.setOnFocusChangeListener(new View.OnFocusChangeListener() { diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/ContributionAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/ContributionAdapter.java index a845e3ea77..eb753cfff9 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/ContributionAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/ContributionAdapter.java @@ -9,10 +9,15 @@ import android.content.DialogInterface; import android.content.Intent; import android.graphics.Color; +import android.graphics.Typeface; import android.os.AsyncTask; import android.support.design.widget.Snackbar; import android.support.v7.widget.RecyclerView; import android.text.Html; +import android.text.SpannableStringBuilder; +import android.text.Spanned; +import android.text.style.ForegroundColorSpan; +import android.text.style.StyleSpan; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -40,6 +45,7 @@ import me.ccrama.redditslide.OpenRedditLink; import me.ccrama.redditslide.R; import me.ccrama.redditslide.Reddit; +import me.ccrama.redditslide.SettingValues; import me.ccrama.redditslide.SubmissionViews.PopulateSubmissionViewHolder; import me.ccrama.redditslide.TimeUtils; import me.ccrama.redditslide.Views.CreateCardView; @@ -345,11 +351,28 @@ public void onClick(View v) { holder.score.setTextColor(holder.time.getCurrentTextColor()); } } + String spacer = mContext.getString(R.string.submission_properties_seperator); + SpannableStringBuilder titleString = new SpannableStringBuilder(); + String timeAgo = TimeUtils.getTimeAgo(comment.getCreated().getTime(), mContext); String time = ((timeAgo == null || timeAgo.isEmpty()) ? "just now" : timeAgo); //some users were crashing here time = time + (((comment.getEditDate() != null) ? " (edit " + TimeUtils.getTimeAgo(comment.getEditDate().getTime(), mContext) + ")" : "")); - holder.time.setText(time); + titleString.append(time); + titleString.append(spacer); + + if (comment.getSubredditName() != null) { + String subname = comment.getSubredditName(); + SpannableStringBuilder subreddit = new SpannableStringBuilder(" /r/" + subname + " "); + if ((SettingValues.colorSubName && Palette.getColor(subname) != Palette.getDefaultColor())) { + subreddit.setSpan(new ForegroundColorSpan(Palette.getColor(subname)), 0, subreddit.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + subreddit.setSpan(new StyleSpan(Typeface.BOLD), 0, subreddit.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + } + + titleString.append(subreddit); + } + + holder.time.setText(titleString); setViews(comment.getDataNode().get("body_html").asText(), comment.getSubredditName(), holder); if (comment.getTimesGilded() > 0) { @@ -358,8 +381,8 @@ public void onClick(View v) { } else if (holder.gild.getVisibility() == View.VISIBLE) holder.gild.setVisibility(View.GONE); - if(comment.getSubmissionTitle() != null) - holder.title.setText(Html.fromHtml(comment.getSubmissionTitle())); + if (comment.getSubmissionTitle() != null) + holder.title.setText(Html.fromHtml(comment.getSubmissionTitle())); else holder.title.setText(Html.fromHtml(comment.getAuthor())); diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SideArrayAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SideArrayAdapter.java index e1b49e847c..3fb47286a2 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SideArrayAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SideArrayAdapter.java @@ -13,6 +13,7 @@ import android.widget.TextView; import java.util.ArrayList; +import java.util.List; import me.ccrama.redditslide.Activities.MainActivity; import me.ccrama.redditslide.Activities.SubredditView; @@ -25,30 +26,17 @@ * Created by ccrama on 8/17/2015. */ public class SideArrayAdapter extends ArrayAdapter { + private final List objects; private Filter filter; public ArrayList baseItems; public ArrayList fitems; public boolean openInSubView = true; - public ArrayList history; - public ArrayList user; - public ArrayList allSubs; - - public SideArrayAdapter(Context context, ArrayList objects, ArrayList userSubs, ArrayList historySubs, ArrayList allSubs) { + public SideArrayAdapter(Context context, ArrayList objects, ArrayList allSubreddits) { super(context, 0, objects); - this.allSubs = allSubs; - this.history = historySubs; - this.user = userSubs; - - for(String s : this.user){ - history.remove(s); - this.allSubs.remove(s); - } - for(String s : this.history){ - this.allSubs.remove(s); - } + this.objects = new ArrayList<>(allSubreddits); filter = new SubFilter(); - fitems = new ArrayList<>(objects); + fitems = new ArrayList<>(objects); baseItems = new ArrayList<>(objects); } @@ -123,21 +111,10 @@ protected FilterResults performFiltering(CharSequence constraint) { results.count = list.size(); } else { openInSubView = true; + final ArrayList list = new ArrayList<>(objects); final ArrayList nlist = new ArrayList<>(); - for (String sub : user) { - if (sub.contains(prefix)) - nlist.add(sub); - if (sub.equals(prefix)) - openInSubView = false; - } - for (String sub : history) { - if (sub.contains(prefix)) - nlist.add(sub); - if (sub.equals(prefix)) - openInSubView = false; - } - for (String sub : allSubs) { + for (String sub : list) { if (sub.contains(prefix)) nlist.add(sub); if (sub.equals(prefix)) @@ -169,4 +146,4 @@ protected void publishResults(CharSequence constraint, FilterResults results) { } } } -} +} \ No newline at end of file diff --git a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java index cb9239244e..2a3fac9fb0 100644 --- a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java @@ -319,7 +319,7 @@ public void showBottomSheet(final Activity mContext, fi b.sheet(12, report, mContext.getString(R.string.btn_report)); } } - if (submission.getSelftext() != null && !submission.getSelftext().isEmpty()) { + if (submission.getSelftext() != null && !submission.getSelftext().isEmpty() && full) { b.sheet(25, copy, "Copy selftext"); } boolean hidden = submission.isHidden(); diff --git a/app/src/main/java/me/ccrama/redditslide/UserSubscriptions.java b/app/src/main/java/me/ccrama/redditslide/UserSubscriptions.java index 2b8497d232..272b931c20 100644 --- a/app/src/main/java/me/ccrama/redditslide/UserSubscriptions.java +++ b/app/src/main/java/me/ccrama/redditslide/UserSubscriptions.java @@ -248,11 +248,24 @@ public static MultiReddit getMultiredditByDisplayName(String displayName) { //Gets user subscriptions + top 500 subs + subs in history public static ArrayList getAllSubreddits(Context c) { ArrayList finalReturn = new ArrayList<>(); + ArrayList history = getHistory(); + ArrayList defaults = getDefaults(c); finalReturn.addAll(getSubscriptions(c)); - finalReturn.removeAll(getHistory()); - finalReturn.addAll(getHistory()); - finalReturn.removeAll(getDefaults(c)); - finalReturn.addAll(getDefaults(c)); + for(String s : finalReturn){ + if(history.contains(s)){ + history.remove(s); + } + if(defaults.contains(s)){ + defaults.remove(s); + } + } + for(String s : history){ + if(defaults.contains(s)){ + defaults.remove(s); + } + } + finalReturn.addAll(history); + finalReturn.addAll(defaults); return finalReturn; } From e5f9246f26fd9d50b60180f8cdeb42be5ef07f4f Mon Sep 17 00:00:00 2001 From: ccrama Date: Fri, 15 Apr 2016 17:25:14 -0500 Subject: [PATCH 012/188] Fixed duplicate strings --- app/src/main/res/values/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 69412814f0..ef520babce 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -711,6 +711,5 @@ Open externally Vertical album view Download album - YouTube Compose message \ No newline at end of file From f0c7c9a56761a53aa4b83493192c1fb189b4baa5 Mon Sep 17 00:00:00 2001 From: ccrama Date: Fri, 15 Apr 2016 17:29:12 -0500 Subject: [PATCH 013/188] Fixed some more missing strings --- app/src/main/res/menu/menu_inbox.xml | 2 +- app/src/main/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/menu/menu_inbox.xml b/app/src/main/res/menu/menu_inbox.xml index 1bfd2b2445..cc389eec36 100644 --- a/app/src/main/res/menu/menu_inbox.xml +++ b/app/src/main/res/menu/menu_inbox.xml @@ -12,7 +12,7 @@ Vertical album view Download album Compose message + Mark all as read \ No newline at end of file From f253fbe6ff125f54020d24501b04e96cbdf22d5e Mon Sep 17 00:00:00 2001 From: ccrama Date: Fri, 15 Apr 2016 17:37:25 -0500 Subject: [PATCH 014/188] Fixed some bugs --- .../java/me/ccrama/redditslide/Activities/MainActivity.java | 1 - .../java/me/ccrama/redditslide/Adapters/HistoryPosts.java | 5 +---- app/src/main/res/layout/drawer_loggedin.xml | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java index 6ec682ea1c..d0606b2d9f 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java @@ -1352,7 +1352,6 @@ public void onClick(View view) { MainActivity.this.startActivityForResult(inte, INBOX_RESULT); } }); - header.findViewById(R.id.mod).setVisibility(View.GONE); headerMain = header; diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/HistoryPosts.java b/app/src/main/java/me/ccrama/redditslide/Adapters/HistoryPosts.java index fbefd6f494..5d9cd6dce0 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/HistoryPosts.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/HistoryPosts.java @@ -95,14 +95,11 @@ public void onPostExecute(ArrayList submissions) { adapter.notifyDataSetChanged(); } - } else if (submissions != null) { + } else { // end of submissions nomore = true; adapter.notifyDataSetChanged(); - } else if (!nomore) { - // error - adapter.setError(true); } refreshLayout.setRefreshing(false); } diff --git a/app/src/main/res/layout/drawer_loggedin.xml b/app/src/main/res/layout/drawer_loggedin.xml index a2df0014fc..d1a0b7938a 100644 --- a/app/src/main/res/layout/drawer_loggedin.xml +++ b/app/src/main/res/layout/drawer_loggedin.xml @@ -249,6 +249,7 @@ android:id="@+id/mod" android:layout_width="match_parent" android:layout_height="48dp" + android:visibility="gone" android:background="?android:selectableItemBackground" android:orientation="horizontal" android:paddingStart="0dp"> From 53bbcf607d6bf54eef627c1974b0737b41603b96 Mon Sep 17 00:00:00 2001 From: ccrama Date: Fri, 15 Apr 2016 17:41:20 -0500 Subject: [PATCH 015/188] Fixed bug opening moderation before it's loaded --- .../me/ccrama/redditslide/Activities/MainActivity.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java index d0606b2d9f..3208f9cccf 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java @@ -1353,6 +1353,7 @@ public void onClick(View view) { } }); + headerMain = header; if (runAfterLoad == null) { @@ -2679,8 +2680,10 @@ protected void onPostExecute(Void aVoid) { headerMain.findViewById(R.id.mod).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Intent inte = new Intent(MainActivity.this, ModQueue.class); - MainActivity.this.startActivity(inte); + if(UserSubscriptions.modOf != null && !UserSubscriptions.modOf.isEmpty()) { + Intent inte = new Intent(MainActivity.this, ModQueue.class); + MainActivity.this.startActivity(inte); + } } }); } From fc0e20829948a2faf98578cfee52205ac2f80e00 Mon Sep 17 00:00:00 2001 From: ccrama Date: Fri, 15 Apr 2016 17:54:01 -0500 Subject: [PATCH 016/188] Updated version number --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 9887b67ee8..4d369bcfa7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,7 +27,7 @@ android { applicationId "me.ccrama.redditslide" targetSdkVersion 23 generatedDensities = [] - versionCode 165 + versionCode 166 multiDexEnabled = true versionName androidGitVersion.name() } From 6c25ab20fa6326d3acb41810a3d3998eeec616e9 Mon Sep 17 00:00:00 2001 From: Alex Macleod Date: Sat, 16 Apr 2016 00:08:05 +0100 Subject: [PATCH 017/188] Changelog to 5.1.7 --- CHANGELOG.md | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01e19b477c..28e743bf22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,67 @@ +5.1.7 / 2016-04-15 +================== + + * 'Go to subreddit' now sorts by subscribed items first, then history, then suggestions + * Added download and open externally button to albums + * Added history for direct comment links + * Added mark all as read option to the inbox + * Added support for right to left languages + * Always show big previews if it's a media type link + * Better handling of image previews + * Changed TextViews to Buttons in edit comment view + * Deeper integration with the Slide video plugin (always open with that if possible, despite external settings) + * Fixed bug opening moderation before it's loaded + * Fixed crash scrolling in Shadowbox + * Fixed embedded links not loading + * Fixed filtering content in the main view not filtering all posts out + * Fixed Go to subreddit not working correctly with mixed/upper case input + * Fixed graphical issues with text selection in reply area and edit comment + * Fixed images getting out of order in comma separated Imgur album + * Fixed opening links with capitalised schemes (Https rather than https) + * Fixed some shadowbox crashes + * Fixed tab highlight color on non-submission pages, Bug fixes + * Follow Reddit's comment sorting selection order + * If a item has only been gilded once, '1' is no longer shown next to the star + * Moved Settings back to bottom in drawer + * New bottom sheet on album images for better readability and UX + * Reddit live links now open in an internal browser + * Settings that aren't applicable are now shown as disabled rather than disappear + * Sidebar buttons now use subreddit's accent + * Some shadowbox gif loading fixes + * Tag external links with the application name that opens them + * Updated translations + +5.1.6 / 2016-04-12 +================== + + * Added a history section of the profile which has a list of all previously visited links + * Added an option for a right-handed comment menu + * Added support for a 'guest' account and reordering subreddits as a non logged-in user + * Added support for comma separated Imgur albums + * Added support for single link spoilers (without spoiler text) + * Fixed a crash getting multireddits + * Fixed any reddit links containing "t3" not opening + * Fixed negative scores when downvoting + * Fixed not loading Imgur links + * Fixed synccit posts showing as unread upon a cold boot until a refresh was performed + * Improved layout of FAB's for tablets + * Improved settings organization + * Improved the layout for replying to comments/submissions + * Made HasSeen.addSeen store the current time for an ordered History screen + * Made the subreddit list stick between a logged out state and when the user logs in for the first time + * Made the theme colors extend to popups and dialogs + * Tweaked the layout for listing accounts + + 5.1.5 / 2016-04-11 + ================== + + * Added support for modmail checks + * Fixed collapsing comments becoming uncollapsed + * Fixed crashing KitKat loading in drawables by downgrading Gradle and the appcompat versions + * Hide NSFW selftext previews + * Some memory usage improvements to the MediaView + 5.1.4 / 2016-04-10 ================== From 07dde6f0e7bf9dcf9b617621573a922b093c879b Mon Sep 17 00:00:00 2001 From: Controless Date: Fri, 15 Apr 2016 16:57:25 -0700 Subject: [PATCH 018/188] Update CommentAdapter.java Adds a space before the controversial cross sign so that it's separated from pt/pts. --- .../java/me/ccrama/redditslide/Adapters/CommentAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapter.java index 6339eb9d2f..7d757c319e 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapter.java @@ -741,7 +741,7 @@ public void doScoreText(CommentViewHolder holder, Comment comment, int offset) { score.setSpan(new ForegroundColorSpan(scoreColor), 0, score.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); titleString.append(score); - titleString.append((comment.isControversial() ? "†" : "")); + titleString.append((comment.isControversial() ? " †" : "")); titleString.append(spacer); String timeAgo = TimeUtils.getTimeAgo(comment.getCreated().getTime(), mContext); @@ -2989,4 +2989,4 @@ protected void onPostExecute(Void aVoid) { b.show(); } -} \ No newline at end of file +} From f6e8988c9638bcedd70a0c0360dfa5df6f22ede4 Mon Sep 17 00:00:00 2001 From: Controless Date: Fri, 15 Apr 2016 16:58:02 -0700 Subject: [PATCH 019/188] Update CommentAdapterSearch.java Adds a space before the controversial cross sign so that it's separated from pt/pts. --- .../me/ccrama/redditslide/Adapters/CommentAdapterSearch.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterSearch.java b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterSearch.java index 05a93f1282..66d14c76e9 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterSearch.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterSearch.java @@ -115,7 +115,7 @@ public void doScoreText(CommentViewHolder holder, Comment comment, int offset) { titleString.append(score); if (!scoreText.contains("[")) titleString.append(mContext.getResources().getQuantityString(R.plurals.points, comment.getScore())); - titleString.append((comment.isControversial() ? "†" : "")); + titleString.append((comment.isControversial() ? " †" : "")); titleString.append(spacer); String timeAgo = TimeUtils.getTimeAgo(comment.getCreated().getTime(), mContext); @@ -322,4 +322,4 @@ protected void publishResults(CharSequence constraint, FilterResults results) { } -} \ No newline at end of file +} From 3e2ba8c86cc644f2c646dd0a9f1fb4af5012f22e Mon Sep 17 00:00:00 2001 From: ccrama Date: Fri, 15 Apr 2016 22:28:52 -0500 Subject: [PATCH 020/188] Fixed some issues with album buttons being stuck to the top, Fixed crash with a 0 length thumbnail set value --- app/build.gradle | 15 ++++++--------- .../ccrama/redditslide/Activities/AlbumPager.java | 9 +++++++-- .../redditslide/Activities/SettingsTheme.java | 4 ++++ .../redditslide/Adapters/SubredditPosts.java | 2 +- app/src/main/res/layout/album_image_pager.xml | 12 +++++------- build.gradle | 2 +- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4d369bcfa7..3ad5d51404 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,13 +20,10 @@ android { // Translations are crowd-sourced disable 'MissingTranslation' } - aaptOptions { - additionalParameters "--no-version-vectors" - } + defaultConfig { applicationId "me.ccrama.redditslide" targetSdkVersion 23 - generatedDensities = [] versionCode 166 multiDexEnabled = true versionName androidGitVersion.name() @@ -97,18 +94,18 @@ dependencies { transitive = true } compile 'com.jakewharton:process-phoenix:1.0.2' - compile 'com.android.support:design:23.2.1' + compile 'com.android.support:design:23.3.0' compile 'com.koushikdutta.ion:ion:2.1.6' compile 'uz.shift:colorpicker:0.5@aar' - compile 'com.android.support:customtabs:23.2.0' - compile 'com.android.support:recyclerview-v7:23.2.0' - compile 'com.android.support:appcompat-v7:23.2.1' + compile 'com.android.support:customtabs:23.3.0' + compile 'com.android.support:recyclerview-v7:23.3.0' + compile 'com.android.support:appcompat-v7:23.3.0' compile 'com.github.rey5137:material:1.2.1' compile 'jp.wasabeef:recyclerview-animators:2.0.0' withGPlayCompile 'com.google.android.gms:play-services-drive:8.4.0' compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4' compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.4.1' - compile 'com.android.support:cardview-v7:23.2.0' + compile 'com.android.support:cardview-v7:23.3.0' compile 'com.cocosw:bottomsheet:1.3.0@aar' compile 'org.apache.commons:commons-lang3:3.4' compile 'com.github.johnkil.android-robototextview:robototextview:2.4.3' diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java b/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java index 515542c436..d55118f76a 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/AlbumPager.java @@ -47,6 +47,7 @@ import com.nostra13.universalimageloader.core.listener.ImageLoadingListener; import com.nostra13.universalimageloader.core.listener.ImageLoadingProgressListener; import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener; +import com.sothree.slidinguppanel.SlidingUpPanelLayout; import org.jetbrains.annotations.NotNull; @@ -584,7 +585,9 @@ public void onProgressUpdate(String imageUri, View view, int current, int total) } if (title.isEmpty() && description.isEmpty()) { rootView.findViewById(R.id.panel).setVisibility(View.GONE); - rootView.findViewById(R.id.margin).setVisibility(View.GONE); + SlidingUpPanelLayout.LayoutParams params = (SlidingUpPanelLayout.LayoutParams) (rootView.findViewById(R.id.margin)).getLayoutParams(); + params.setMargins(0,0,0,0); + rootView.findViewById(R.id.margin).setLayoutParams(params); } else if (title.isEmpty()) { ((SpoilerRobotoTextView) rootView.findViewById(R.id.title)).setTextHtml(description); } else { @@ -607,7 +610,9 @@ public void onProgressUpdate(String imageUri, View view, int current, int total) } if (title.isEmpty() && description.isEmpty()) { rootView.findViewById(R.id.panel).setVisibility(View.GONE); - rootView.findViewById(R.id.margin).setVisibility(View.GONE); + SlidingUpPanelLayout.LayoutParams params = (SlidingUpPanelLayout.LayoutParams) (rootView.findViewById(R.id.margin)).getLayoutParams(); + params.setMargins(0,0,0,0); + rootView.findViewById(R.id.margin).setLayoutParams(params); } else if (title.isEmpty()) { ((SpoilerRobotoTextView) rootView.findViewById(R.id.title)).setTextHtml(description); } else { diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsTheme.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsTheme.java index edcb387883..0d85104cd7 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsTheme.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsTheme.java @@ -1,6 +1,7 @@ package me.ccrama.redditslide.Activities; import android.content.Intent; +import android.graphics.Color; import android.os.Build; import android.os.Bundle; import android.support.v4.content.ContextCompat; @@ -374,6 +375,9 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { SettingValues.colorNavBar = isChecked; SettingValues.prefs.edit().putBoolean(SettingValues.PREF_COLOR_NAV_BAR, isChecked).apply(); themeSystemBars(""); + if(!isChecked){ + getWindow().setNavigationBarColor(Color.TRANSPARENT); + } } }); diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditPosts.java b/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditPosts.java index 4ef011be3b..0fbbc96c99 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditPosts.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/SubredditPosts.java @@ -80,7 +80,7 @@ public void loadPhotos(List submissions) { if (type == ContentType.Type.IMAGE || type == ContentType.Type.SELF || (submission.getThumbnailType() == Submission.ThumbnailType.URL)) { if (type == ContentType.Type.IMAGE) { - if (((!NetworkUtil.isConnectedWifi(c) && SettingValues.lowResMobile) || SettingValues.lowResAlways) && submission.getThumbnails() != null && submission.getThumbnails().getVariations() != null) { + if (((!NetworkUtil.isConnectedWifi(c) && SettingValues.lowResMobile) || SettingValues.lowResAlways) && submission.getThumbnails() != null && submission.getThumbnails().getVariations() != null && submission.getThumbnails().getVariations().length > 0) { int length = submission.getThumbnails().getVariations().length; url = Html.fromHtml(submission.getThumbnails().getVariations()[length / 2].getUrl()).toString(); //unescape url characters diff --git a/app/src/main/res/layout/album_image_pager.xml b/app/src/main/res/layout/album_image_pager.xml index 6b69c43be2..3915e81714 100644 --- a/app/src/main/res/layout/album_image_pager.xml +++ b/app/src/main/res/layout/album_image_pager.xml @@ -13,6 +13,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + android:id="@+id/margin" + android:layout_marginBottom="48dp" android:orientation="vertical"> + /> @@ -63,11 +65,7 @@ android:indeterminate="false" android:max="100" android:progress="0" /> - + diff --git a/build.gradle b/build.gradle index cab793bd0b..fda087b7fe 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From 304530e07150342f45b63c6e9b9cca187ab4b7f3 Mon Sep 17 00:00:00 2001 From: ccrama Date: Fri, 15 Apr 2016 22:41:50 -0500 Subject: [PATCH 021/188] Fixed some bugs with data saving mode --- .../java/me/ccrama/redditslide/Activities/SettingsData.java | 2 ++ .../ccrama/redditslide/SubmissionViews/HeaderImageLinkView.java | 2 +- .../SubmissionViews/PopulateSubmissionViewHolder.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsData.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsData.java index 025efe3e76..58d0fb5a84 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsData.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsData.java @@ -50,7 +50,9 @@ public boolean onMenuItemClick(MenuItem item) { switch (item.getItemId()) { case R.id.never: SettingValues.lowResMobile = false; + SettingValues.lowResAlways = false; SettingValues.prefs.edit().putBoolean(SettingValues.PREF_LOW_RES_MOBILE, false).apply(); + SettingValues.prefs.edit().putBoolean(SettingValues.PREF_LOW_RES_ALWAYS, false).apply(); break; case R.id.mobile: SettingValues.lowResMobile = true; diff --git a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/HeaderImageLinkView.java b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/HeaderImageLinkView.java index 832ec73b8d..544e1fdb07 100644 --- a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/HeaderImageLinkView.java +++ b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/HeaderImageLinkView.java @@ -180,7 +180,7 @@ public void doImageAndText(Submission submission, boolean full, String baseSub) thumbImage2.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.web)); } else if (type == ContentType.Type.IMAGE) { - if (((!NetworkUtil.isConnectedWifi(getContext()) && SettingValues.lowResMobile) || SettingValues.lowResAlways) && submission.getThumbnails() != null && submission.getThumbnails().getVariations() != null) { + if (((!NetworkUtil.isConnectedWifi(getContext()) && SettingValues.lowResMobile) || SettingValues.lowResAlways) && submission.getThumbnails() != null && submission.getThumbnails().getVariations() != null && submission.getThumbnails().getVariations().length > 0) { int length = submission.getThumbnails().getVariations().length; url = Html.fromHtml(submission.getThumbnails().getVariations()[length / 2].getUrl()).toString(); //unescape url characters diff --git a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java index 2a3fac9fb0..a29f74cdbf 100644 --- a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java @@ -222,7 +222,7 @@ public static void openImage(Activity contextActivity, Submission submission) { String previewUrl; url = submission.getUrl(); - if (SettingValues.loadImageLq && ((!NetworkUtil.isConnectedWifi(contextActivity) && SettingValues.lowResMobile) || SettingValues.lowResAlways) && submission.getThumbnails() != null && submission.getThumbnails().getVariations() != null) { + if (SettingValues.loadImageLq && ((!NetworkUtil.isConnectedWifi(contextActivity) && SettingValues.lowResMobile) || SettingValues.lowResAlways) && submission.getThumbnails() != null && submission.getThumbnails().getVariations() != null && submission.getThumbnails().getVariations().length > 0) { int length = submission.getThumbnails().getVariations().length; previewUrl = Html.fromHtml(submission.getThumbnails().getVariations()[length / 2].getUrl()).toString(); //unescape url characters myIntent.putExtra(MediaView.EXTRA_LQ, true); From ccaa34485a3ac670ebf3b4bf03bd2be001f7eec1 Mon Sep 17 00:00:00 2001 From: ccrama Date: Fri, 15 Apr 2016 23:11:39 -0500 Subject: [PATCH 022/188] Added a light font option to comments, Can now click links in selftext previews --- .../redditslide/Activities/SettingsFont.java | 14 +++++++++++++- .../PopulateSubmissionViewHolder.java | 8 +++++++- .../redditslide/Visuals/FontPreferences.java | 1 + app/src/main/res/layout/activity_settings_font.xml | 9 ++++++++- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsFont.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsFont.java index eec93b2f84..2f1120542a 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsFont.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsFont.java @@ -92,6 +92,10 @@ public boolean onMenuItemClick(MenuItem item) { ((RobotoRadioButton) findViewById(R.id.ccond)).setChecked(true); break; + case Light: + ((RobotoRadioButton) findViewById(R.id.clight)).setChecked(true); + + break; } @@ -122,7 +126,15 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { } } }); - + ((RobotoRadioButton) findViewById(R.id.clight)).setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + if (isChecked) { + SettingsTheme.changed = true; + new FontPreferences(SettingsFont.this).setCommentFont(FontPreferences.FontTypeComment.Light); + } + } + }); switch (new FontPreferences(this).getFontTypeTitle()) { case Regular: diff --git a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java index a29f74cdbf..e4ba26ddc8 100644 --- a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java @@ -1685,7 +1685,13 @@ public boolean onLongClick(View v) { mContext, new FontPreferences(mContext).getFontTypeComment().getTypeface()); holder.body.setTypeface(typeface); - holder.body.setTextHtml(Html.fromHtml(text.substring(0, text.contains("\n") ? text.indexOf("\n") : text.length()))); + holder.body.setTextHtml(Html.fromHtml(text.substring(0, text.contains("\n") ? text.indexOf("\n") : text.length())), "none "); + holder.body.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + holder.itemView.callOnClick(); + } + }); if (holder.body.getText().toString().trim().isEmpty()) { holder.body.setVisibility(View.GONE); } diff --git a/app/src/main/java/me/ccrama/redditslide/Visuals/FontPreferences.java b/app/src/main/java/me/ccrama/redditslide/Visuals/FontPreferences.java index be4c577698..0e73f3a5cf 100644 --- a/app/src/main/java/me/ccrama/redditslide/Visuals/FontPreferences.java +++ b/app/src/main/java/me/ccrama/redditslide/Visuals/FontPreferences.java @@ -118,6 +118,7 @@ public String getTitle() { public enum FontTypeComment { Slab(RobotoTypefaceManager.Typeface.ROBOTO_SLAB_REGULAR, "Slab"), Condensed(RobotoTypefaceManager.Typeface.ROBOTO_CONDENSED_REGULAR, "Condensed"), + Light(RobotoTypefaceManager.Typeface.ROBOTO_LIGHT, "Light"), Regular(RobotoTypefaceManager.Typeface.ROBOTO_REGULAR, "Regular"); private final int typeface; diff --git a/app/src/main/res/layout/activity_settings_font.xml b/app/src/main/res/layout/activity_settings_font.xml index d161a40d82..610c436a2f 100644 --- a/app/src/main/res/layout/activity_settings_font.xml +++ b/app/src/main/res/layout/activity_settings_font.xml @@ -115,7 +115,14 @@ android:background="?android:selectableItemBackground" android:text="@string/settings_font_condensed" app:typeface="roboto_condensed_regular" /> - + Date: Sat, 16 Apr 2016 00:46:29 -0500 Subject: [PATCH 023/188] Fixed some bugs --- .../java/me/ccrama/redditslide/Adapters/InboxAdapter.java | 2 -- .../SubmissionViews/PopulateSubmissionViewHolder.java | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Adapters/InboxAdapter.java b/app/src/main/java/me/ccrama/redditslide/Adapters/InboxAdapter.java index ae3a7a29c8..278a22667d 100644 --- a/app/src/main/java/me/ccrama/redditslide/Adapters/InboxAdapter.java +++ b/app/src/main/java/me/ccrama/redditslide/Adapters/InboxAdapter.java @@ -97,7 +97,6 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { if (i == SPACER) { View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.spacer, viewGroup, false); return new SpacerViewHolder(v); - } else if (i == TOP_LEVEL) { View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.top_level_message, viewGroup, false); return new MessageViewHolder(v); @@ -267,7 +266,6 @@ public void onClick(View v) { setViews(comment.getDataNode().get("body_html").asText(), "FORCE_LINK_CLICK", messageViewHolder); - } if (viewHolder instanceof SpacerViewHolder) { viewHolder.itemView.findViewById(R.id.height).setLayoutParams(new LinearLayout.LayoutParams(viewHolder.itemView.getWidth(), ((Activity) (mContext)).findViewById(R.id.header).getHeight())); diff --git a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java index e4ba26ddc8..4b21ffe3e7 100644 --- a/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java +++ b/app/src/main/java/me/ccrama/redditslide/SubmissionViews/PopulateSubmissionViewHolder.java @@ -1692,6 +1692,13 @@ public void onClick(View v) { holder.itemView.callOnClick(); } }); + holder.body.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + holder.menu.callOnClick(); + return true; + } + }); if (holder.body.getText().toString().trim().isEmpty()) { holder.body.setVisibility(View.GONE); } From 2d075fab44daf2b64101f1491ca112fe5f7045b8 Mon Sep 17 00:00:00 2001 From: ccrama Date: Sat, 16 Apr 2016 00:49:45 -0500 Subject: [PATCH 024/188] Changed 'View' on the update snackbar to 'Changelog' --- .../java/me/ccrama/redditslide/Activities/MainActivity.java | 2 +- app/src/main/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java index 3208f9cccf..c037c106ae 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java @@ -365,7 +365,7 @@ protected void onPostExecute(final Submission s) { Reddit.appRestart.edit().putString("title", s.getTitle()).apply(); Reddit.appRestart.edit().putString("url", s.getUrl()).apply(); - Snackbar.make(pager, s.getTitle(), Snackbar.LENGTH_INDEFINITE).setAction(R.string.btn_view, new View.OnClickListener() { + Snackbar.make(pager, s.getTitle(), Snackbar.LENGTH_INDEFINITE).setAction(R.string.btn_changelog, new View.OnClickListener() { @Override public void onClick(View v) { Intent i = new Intent(MainActivity.this, Announcement.class); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 03ca7ec141..e3ef4c9bab 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -713,4 +713,5 @@ Download album Compose message Mark all as read + Changelog \ No newline at end of file From 70b39bf5e83c1a9829a05e74b195e03c716e39eb Mon Sep 17 00:00:00 2001 From: Thomas Lu Date: Sat, 16 Apr 2016 13:11:17 +0200 Subject: [PATCH 025/188] replace google+ link with link to the subreddit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d8d4cdcdba..a3b4ffe972 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Slide is currently available on the Play store. There is an active community for Slide on the -[the Google+ page](https://plus.google.com/communities/100681783215868345226), +[/r/slideforreddit](https://www.reddit.com/r/slideforreddit/) subreddit, which anybody is welcome to join. ## Contributing From a23e199be1bf67e2a8a2043bcdae599ae70f67ec Mon Sep 17 00:00:00 2001 From: Alex Macleod Date: Sat, 16 Apr 2016 13:31:12 +0100 Subject: [PATCH 026/188] I18n for font sizes, inbox tabs, moderation tabs --- .../ccrama/redditslide/Activities/Inbox.java | 2 +- .../redditslide/Activities/ModQueue.java | 6 +-- .../redditslide/Activities/SettingsFont.java | 46 +++++++++++++------ .../me/ccrama/redditslide/ContentGrabber.java | 17 ++++--- .../redditslide/Visuals/FontPreferences.java | 36 +++++++-------- app/src/main/res/values/strings.xml | 13 ++++++ app/src/main/res/values/style.xml | 11 ----- 7 files changed, 78 insertions(+), 53 deletions(-) diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java b/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java index 83a8b1b5f9..ed47f41a34 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/Inbox.java @@ -158,7 +158,7 @@ public int getCount() { @Override public CharSequence getPageTitle(int position) { - return ContentGrabber.InboxValue.values()[position].getDisplayName(); + return getString(ContentGrabber.InboxValue.values()[position].getDisplayName()); } } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/ModQueue.java b/app/src/main/java/me/ccrama/redditslide/Activities/ModQueue.java index e76e919264..02868a4820 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/ModQueue.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/ModQueue.java @@ -151,10 +151,10 @@ public CharSequence getPageTitle(int position) { return getString(R.string.mod_mail_unread); } else if (position == 1) { return getString(R.string.mod_mail); - } else if (position == 3) { - return "Unmoderated"; } else if (position == 2) { - return "modqueue"; + return getString(R.string.mod_modqueue); + } else if (position == 3) { + return getString(R.string.mod_unmoderated); } else { return UserSubscriptions.modOf.get(position - 4); } diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsFont.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsFont.java index 2f1120542a..e6fb5967fa 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsFont.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsFont.java @@ -17,6 +17,24 @@ * Created by l3d00m on 11/13/2015. */ public class SettingsFont extends BaseActivityAnim { + private static String getFontName(int resource) { + switch (resource) { + case R.string.font_size_larger: + return "Larger"; + case R.string.font_size_large: + return "Large"; + case R.string.font_size_medium: + return "Medium"; + case R.string.font_size_small: + return "Small"; + case R.string.font_size_smaller: + return "Smaller"; + case R.string.font_size_tiny: + return "Tiny"; + default: + return "Medium"; + } + } public void onCreate(Bundle savedInstanceState) { @@ -31,17 +49,18 @@ public void onCreate(Bundle savedInstanceState) { @Override public void onClick(View v) { PopupMenu popup = new PopupMenu(SettingsFont.this, v); - popup.getMenu().add("Larger"); - popup.getMenu().add("Large"); - popup.getMenu().add("Medium"); - popup.getMenu().add("Small"); - popup.getMenu().add("Smaller"); + popup.getMenu().add(0, R.string.font_size_larger, 0, R.string.font_size_larger); + popup.getMenu().add(0, R.string.font_size_large, 0, R.string.font_size_large); + popup.getMenu().add(0, R.string.font_size_medium, 0, R.string.font_size_medium); + popup.getMenu().add(0, R.string.font_size_small, 0, R.string.font_size_small); + popup.getMenu().add(0, R.string.font_size_smaller, 0, R.string.font_size_smaller); //registering popup with OnMenuItemClickListener popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { - new FontPreferences(SettingsFont.this).setCommentFontStyle(FontPreferences.FontStyleComment.valueOf(item.getTitle().toString())); + new FontPreferences(SettingsFont.this).setCommentFontStyle( + FontPreferences.FontStyleComment.valueOf(getFontName(item.getItemId()))); colorComment.setText(new FontPreferences(SettingsFont.this).getCommentFontStyle().getTitle()); SettingsTheme.changed = true; return true; @@ -57,18 +76,19 @@ public boolean onMenuItemClick(MenuItem item) { @Override public void onClick(View v) { PopupMenu popup = new PopupMenu(SettingsFont.this, v); - popup.getMenu().add("Larger"); - popup.getMenu().add("Large"); - popup.getMenu().add("Medium"); - popup.getMenu().add("Small"); - popup.getMenu().add("Smaller"); - popup.getMenu().add("Tiny"); + popup.getMenu().add(0, R.string.font_size_larger, 0, R.string.font_size_larger); + popup.getMenu().add(0, R.string.font_size_large, 0, R.string.font_size_large); + popup.getMenu().add(0, R.string.font_size_medium, 0, R.string.font_size_medium); + popup.getMenu().add(0, R.string.font_size_small, 0, R.string.font_size_small); + popup.getMenu().add(0, R.string.font_size_smaller, 0, R.string.font_size_smaller); + popup.getMenu().add(0, R.string.font_size_tiny, 0, R.string.font_size_tiny); //registering popup with OnMenuItemClickListener popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { - new FontPreferences(SettingsFont.this).setPostFontStyle(FontPreferences.FontStyle.valueOf(item.getTitle().toString())); + new FontPreferences(SettingsFont.this).setPostFontStyle( + FontPreferences.FontStyle.valueOf(getFontName(item.getItemId()))); colorPost.setText(new FontPreferences(SettingsFont.this).getPostFontStyle().getTitle()); SettingsTheme.changed = true; return true; diff --git a/app/src/main/java/me/ccrama/redditslide/ContentGrabber.java b/app/src/main/java/me/ccrama/redditslide/ContentGrabber.java index 227c20786f..57addd43b5 100644 --- a/app/src/main/java/me/ccrama/redditslide/ContentGrabber.java +++ b/app/src/main/java/me/ccrama/redditslide/ContentGrabber.java @@ -8,19 +8,24 @@ public class ContentGrabber { /*Inbox Data*/ public enum InboxValue { - INBOX("Inbox"), UNREAD("Unread"), MESSAGES("Messages"), SENT("Sent"), MENTIONS("Mentions"); - final String displayName; + INBOX(R.string.mail_tab_inbox), + UNREAD(R.string.mail_tab_unread), + MESSAGES(R.string.mail_tab_messages), + SENT(R.string.mail_tab_sent), + MENTIONS(R.string.mail_tab_mentions); - InboxValue(String s) { - this.displayName = s; + private final int displayName; + + InboxValue(int resource) { + this.displayName = resource; } - public String getDisplayName() { + public int getDisplayName() { return displayName; } public String getWhereName() { - return displayName.toLowerCase(); + return this.name().toLowerCase(); } } diff --git a/app/src/main/java/me/ccrama/redditslide/Visuals/FontPreferences.java b/app/src/main/java/me/ccrama/redditslide/Visuals/FontPreferences.java index 0e73f3a5cf..a8681621af 100644 --- a/app/src/main/java/me/ccrama/redditslide/Visuals/FontPreferences.java +++ b/app/src/main/java/me/ccrama/redditslide/Visuals/FontPreferences.java @@ -63,51 +63,49 @@ public void setTitleFont(FontTypeTitle style) { edit().putString(FONT_TITLE, style.name()).commit(); } public enum FontStyle { - Tiny(R.style.FontStyle_TinyPost, "Tiny"), - Smaller(R.style.FontStyle_SmallerPost, "Smaller"), - Small(R.style.FontStyle_SmallPost, "Small"), - Medium(R.style.FontStyle_MediumPost, "Medium"), - Large(R.style.FontStyle_LargePost, "Large"), - Larger(R.style.FontStyle_LargerPost, "Larger"), - Largest(R.style.FontStyle_LargestPost, "Largest"); + Tiny(R.style.FontStyle_TinyPost, R.string.font_size_tiny), + Smaller(R.style.FontStyle_SmallerPost, R.string.font_size_smaller), + Small(R.style.FontStyle_SmallPost, R.string.font_size_small), + Medium(R.style.FontStyle_MediumPost, R.string.font_size_medium), + Large(R.style.FontStyle_LargePost, R.string.font_size_large), + Larger(R.style.FontStyle_LargerPost, R.string.font_size_larger); private final int resId; - private final String title; + private final int title; public int getResId() { return resId; } - public String getTitle() { + public int getTitle() { return title; } - FontStyle(int resId, String title) { + FontStyle(int resId, int title) { this.resId = resId; this.title = title; } } public enum FontStyleComment { - Smaller(R.style.FontStyle_SmallerComment, "Smaller"), - Small(R.style.FontStyle_SmallComment, "Small"), - Medium(R.style.FontStyle_MediumComment, "Medium"), - Large(R.style.FontStyle_LargeComment, "Large"), - Larger(R.style.FontStyle_LargerComment, "Larger"), - Largest(R.style.FontStyle_LargestComment, "Largest"); + Smaller(R.style.FontStyle_SmallerComment, R.string.font_size_smaller), + Small(R.style.FontStyle_SmallComment, R.string.font_size_small), + Medium(R.style.FontStyle_MediumComment, R.string.font_size_medium), + Large(R.style.FontStyle_LargeComment, R.string.font_size_large), + Larger(R.style.FontStyle_LargerComment, R.string.font_size_larger); private final int resId; - private final String title; + private final int title; public int getResId() { return resId; } - public String getTitle() { + public int getTitle() { return title; } - FontStyleComment(int resId, String title) { + FontStyleComment(int resId, int title) { this.resId = resId; this.title = title; } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e3ef4c9bab..7b90336e2e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -59,6 +59,12 @@ Font size + Larger + Large + Medium + Small + Smaller + Tiny @@ -232,6 +238,11 @@ + Inbox + Unread + Messages + Sent + Mentions %1$s wrote… Recipient Subject @@ -325,6 +336,8 @@ Mod mail Mod mail unread + Modqueue + Unmoderated Reports Do you really want to approve this post? Post approved diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml index b5614caba1..41430d983b 100644 --- a/app/src/main/res/values/style.xml +++ b/app/src/main/res/values/style.xml @@ -346,23 +346,12 @@ 16sp - - - - - - - + + + - - -