Skip to content

Commit

Permalink
Merge pull request orgzly-revived#310 from orgzly-revived/release-1.8.26
Browse files Browse the repository at this point in the history
Release 1.8.26
  • Loading branch information
amberin authored Aug 22, 2024
2 parents 63a33e1 + 838dcd6 commit 9a39f3b
Show file tree
Hide file tree
Showing 30 changed files with 898 additions and 887 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {
defaultConfig {
minSdkVersion 21
targetSdkVersion 33
versionCode 214
versionName "1.8.25"
versionCode 217
versionName "1.8.26"
applicationId = "com.orgzlyrevived"
resValue "string", "application_id", "com.orgzlyrevived"

Expand Down
1,100 changes: 550 additions & 550 deletions app/src/androidTest/assets/org/large.org

Large diffs are not rendered by default.

480 changes: 240 additions & 240 deletions app/src/androidTest/assets/org/links-heavy-content.org

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions app/src/androidTest/assets/org/markup-heavy-content.org
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -230,7 +230,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -349,7 +349,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -467,7 +467,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -586,7 +586,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -705,7 +705,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -823,7 +823,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -942,7 +942,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -1061,7 +1061,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -1179,7 +1179,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -1298,7 +1298,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -1417,7 +1417,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -1535,7 +1535,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -1654,7 +1654,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -1773,7 +1773,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -1891,7 +1891,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -2010,7 +2010,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down Expand Up @@ -2129,7 +2129,7 @@ For example, ~(t.gym or t.class) ad.3~ will display notes tagged with
- ~p.b~ - Search for notes with priority =B= (includes notes with no priority if default priority is =B=)
- ~ps.b~ - Search for notes with priority set to =B=

Email us at [[mailto:support@orgzly.com][support@orgzly.com]] and visit [[https://www.orgzly.com][Orgzly.com]].
Email us at [[mailto:support@orgzlyrevived.com][support@orgzlyrevived.com]] and visit [[https://www.orgzlyrevived.com][Orgzlyrevived.com]].

Follow us on [[https://twitter.com/Orgzly][Twitter]], [[https://plus.google.com/+Orgzly][Google+ Page]], [[https://plus.google.com/communities/104387367636243222968][Google+ Community]] and [[https://www.facebook.com/Orgzly][Facebook]].

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class OrgFormatterLinkTest(private val param: Parameter) : OrgFormatterTest() {
Parameter("[[id:a][b]][[id:1][2]]", "b2", listOf(Span(0, 1, IdLinkSpan::class.java), Span(1, 2, IdLinkSpan::class.java))),

// Do not linkify
Parameter("strhttps://www.orgzly.com/", "strhttps://www.orgzly.com/", emptyList()),
Parameter("strhttps://www.orgzlyrevived.com/", "strhttps://www.orgzlyrevived.com/", emptyList()),
Parameter("Need activity with <action android:name=\"android.intent.action.VIEW\"/>", "Need activity with <action android:name=\"android.intent.action.VIEW\"/>", emptyList())
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@ public class OrgFormatterMiscTest extends OrgFormatterTest {
@Test
public void testLinksMultiLine() {
ParseResult spannable = new ParseResult(
"[[https://www.orgzly.com]]\n" +
"[[https://www.orgzly.com]]");
"[[https://www.orgzlyrevived.com]]\n" +
"[[https://www.orgzlyrevived.com]]");

assertThat(spannable.outputString, is("https://www.orgzly.com\nhttps://www.orgzly.com"));
assertThat(spannable.outputString, is("https://www.orgzlyrevived.com\nhttps://www.orgzlyrevived.com"));

assertThat(spannable.foundSpans.length, is(2));

assertThat(spannable.foundSpans[0].start, is(0));
assertThat(spannable.foundSpans[0].end, is(22));
assertThat(spannable.foundSpans[0].end, is(29));
assertThat(spannable.foundSpans[0].span, instanceOf(UrlLinkSpan.class));
assertThat(spannable.foundSpans[0].url, is("https://www.orgzly.com"));
assertThat(spannable.foundSpans[0].url, is("https://www.orgzlyrevived.com"));

assertThat(spannable.foundSpans[1].start, is(23));
assertThat(spannable.foundSpans[1].end, is(45));
assertThat(spannable.foundSpans[1].start, is(30));
assertThat(spannable.foundSpans[1].end, is(59));
assertThat(spannable.foundSpans[0].span, instanceOf(UrlLinkSpan.class));
assertThat(spannable.foundSpans[1].url, is("https://www.orgzly.com"));
assertThat(spannable.foundSpans[1].url, is("https://www.orgzlyrevived.com"));
}

@Test
public void testLinksNamed() {
ParseResult spannable = new ParseResult(
"[[https://www.orgzly.com][Orgzly]]");
"[[https://www.orgzlyrevived.com][Orgzly]]");

assertThat(spannable.outputString, is("Orgzly"));

Expand All @@ -42,7 +42,7 @@ public void testLinksNamed() {
assertThat(spannable.foundSpans[0].start, is(0));
assertThat(spannable.foundSpans[0].end, is(6));
assertThat(spannable.foundSpans[0].span, instanceOf(UrlLinkSpan.class));
assertThat(spannable.foundSpans[0].url, is("https://www.orgzly.com"));
assertThat(spannable.foundSpans[0].url, is("https://www.orgzlyrevived.com"));
}

@Test
Expand Down Expand Up @@ -97,8 +97,8 @@ public void testMailto() {

@Test
public void testPlainLinkWithTrailingSlash() {
ParseResult spannable = new ParseResult("https://www.orgzly.com/");
assertThat(spannable.outputString, is("https://www.orgzly.com/"));
ParseResult spannable = new ParseResult("https://www.orgzlyrevived.com/");
assertThat(spannable.outputString, is("https://www.orgzlyrevived.com/"));
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class SavedSearchesFragment : CommonFragment(), DrawerItem, OnViewHolderClickLis
}

R.id.saved_searches_help -> {
val uri = Uri.parse("https://www.orgzly.com/docs#search")
val uri = Uri.parse("https://www.orgzlyrevived.com/docs#search")
val intent = Intent(Intent.ACTION_VIEW, uri)
startActivity(intent)
}
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/res/layout/dialog_whats_new.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@
android:layout_height="wrap_content" />


<TextView
style="@style/WhatsNewVersion"
android:text="v1.8.26"
tools:ignore="HardcodedText"
android:autoLink="web" />

<com.orgzly.android.ui.views.WhatsNewChange
style="@style/WhatsNewChange"
app:text="Support &lt;a href=&quot;https://www.orgzlyrevived.com/docs#orgc553add&quot;&gt;the .orgzlyignore file&lt;/a&gt; in all repo types" />

<TextView
style="@style/WhatsNewVersion"
android:text="v1.8.25"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/raw-cs-rCZ/orgzly_getting_started.org
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ Priority můžete nastavit v Nastavení. Můžete také nastavit výchozí prior

** Poznámky mohou obsahovat odkazy

Vytočení telefonního čísla (tel:555-0199), poslání textové zprávy (sms:555-0199), email (mailto:support@orgzly.com) nebo webová stránky ([[https://www.orgzly.com][Orgzly.com]]).
Vytočení telefonního čísla (tel:555-0199), poslání textové zprávy (sms:555-0199), email (mailto:support@orgzlyrevived.com) nebo webová stránky ([[https://www.orgzlyrevived.com][Orgzlyrevived.com]]).

Linkovat lze i ostatní poznámky nebo sešity v rámci aplikace.

Navštivte https://www.orgzly.com/help#links pro více informací.
Navštivte https://www.orgzlyrevived.com/docs#links pro více informací.

** Základní typografická zvýraznění jsou podporována

Expand All @@ -75,7 +75,7 @@ Klikněte na zaškrtávací políčko pro odškrtnutí. Klikněte na ikonu nové

Můžete hledat dle stavu, štítku, času plánovaného nebo termínu a podobně.

Navšivte https://www.orgzly.com/help#search pro další podrobnosti.
Navšivte https://www.orgzlyrevived.com/docs#search pro další podrobnosti.

** Hledání je možno uložit pro rychlý přístup

Expand Down
Loading

0 comments on commit 9a39f3b

Please sign in to comment.