From ba45fa616b45f902c1b6ad782daba660bc9b34e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?So=C5=88a=20Koll=C3=A1rov=C3=A1?= Date: Wed, 6 Nov 2019 21:54:56 +0100 Subject: [PATCH 1/6] Adding emoji compability, Replace TextView, EditText with EmojiTextView, EmojiEditText --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 3 + .../redditslide/Activities/MainActivity.java | 11 +++ app/src/main/res/layout/account_pop.xml | 12 ++-- app/src/main/res/layout/account_textview.xml | 2 +- .../res/layout/account_textview_white.xml | 2 +- .../main/res/layout/activity_createmulti.xml | 2 +- .../main/res/layout/activity_crosspost.xml | 6 +- app/src/main/res/layout/activity_donate.xml | 20 +++--- .../res/layout/activity_filtercomments.xml | 2 +- app/src/main/res/layout/activity_internet.xml | 4 +- .../layout/activity_manage_history_child.xml | 18 ++--- app/src/main/res/layout/activity_media.xml | 2 +- app/src/main/res/layout/activity_overview.xml | 5 ++ .../main/res/layout/activity_sendmessage.xml | 13 ++-- .../res/layout/activity_settings_about.xml | 12 ++-- .../res/layout/activity_settings_child.xml | 48 ++++++------- .../activity_settings_comments_child.xml | 46 ++++++------ .../activity_settings_datasaving_child.xml | 12 ++-- .../res/layout/activity_settings_filters.xml | 24 +++---- .../layout/activity_settings_font_child.xml | 22 +++--- .../activity_settings_general_child.xml | 72 +++++++++---------- .../res/layout/activity_settings_handling.xml | 8 +-- .../activity_settings_handling_child.xml | 30 ++++---- .../activity_settings_history_child.xml | 14 ++-- .../activity_settings_moderation_child.xml | 24 +++---- .../layout/activity_settings_openexternal.xml | 2 +- .../layout/activity_settings_reddit_child.xml | 16 ++--- .../res/layout/activity_settings_synccit.xml | 6 +- .../layout/activity_settings_theme_card.xml | 44 ++++++------ .../layout/activity_settings_theme_child.xml | 26 +++---- .../res/layout/activity_settings_viewtype.xml | 6 +- app/src/main/res/layout/activity_submit.xml | 10 +-- app/src/main/res/layout/album_image_pager.xml | 2 +- app/src/main/res/layout/capatcha.xml | 6 +- app/src/main/res/layout/chooseaccent.xml | 4 +- app/src/main/res/layout/choosemain.xml | 4 +- app/src/main/res/layout/choosethemesmall.xml | 22 +++--- app/src/main/res/layout/colorprofile.xml | 24 +++---- app/src/main/res/layout/colorsub.xml | 6 +- app/src/main/res/layout/comment.xml | 4 +- app/src/main/res/layout/comment_mediacard.xml | 4 +- app/src/main/res/layout/comment_menu.xml | 8 +-- .../res/layout/comment_menu_right_handed.xml | 8 +-- app/src/main/res/layout/commentnumber.xml | 5 +- app/src/main/res/layout/commenttime.xml | 4 +- .../main/res/layout/dialog_drawer_items.xml | 10 +-- app/src/main/res/layout/drawer_loggedin.xml | 46 ++++++------ app/src/main/res/layout/drawer_loggedout.xml | 18 ++--- app/src/main/res/layout/drawer_offline.xml | 10 +-- app/src/main/res/layout/edit_comment.xml | 2 +- .../main/res/layout/fragment_basicinfo.xml | 10 +-- .../fragment_verticalcontenttoolbar.xml | 10 +-- app/src/main/res/layout/fragment_welcome.xml | 2 +- app/src/main/res/layout/gilded.xml | 2 +- .../res/layout/header_image_title_view.xml | 4 +- .../main/res/layout/image_sheet_dialog.xml | 2 +- app/src/main/res/layout/inboxfrequency.xml | 6 +- app/src/main/res/layout/insert_link.xml | 4 +- app/src/main/res/layout/live_list_item.xml | 2 +- app/src/main/res/layout/media_controls.xml | 10 +-- app/src/main/res/layout/message_reply.xml | 6 +- app/src/main/res/layout/morecomment.xml | 2 +- app/src/main/res/layout/nightmode.xml | 6 +- app/src/main/res/layout/nointernet.xml | 2 +- app/src/main/res/layout/nomoreposts.xml | 4 +- app/src/main/res/layout/page_divider.xml | 2 +- app/src/main/res/layout/peek_view.xml | 2 +- .../main/res/layout/peek_view_submission.xml | 2 +- .../res/layout/peek_view_submission_menu.xml | 18 ++--- app/src/main/res/layout/postmenu.xml | 18 ++--- app/src/main/res/layout/profile_comment.xml | 8 +-- app/src/main/res/layout/report_dialog.xml | 6 +- app/src/main/res/layout/settings_toolbar.xml | 2 +- app/src/main/res/layout/sharemenu.xml | 6 +- app/src/main/res/layout/shortcut_header.xml | 2 +- app/src/main/res/layout/subfordiscover.xml | 4 +- app/src/main/res/layout/subforsublist.xml | 2 +- app/src/main/res/layout/subforsublistdrag.xml | 2 +- .../main/res/layout/subforsublisteditor.xml | 2 +- app/src/main/res/layout/subinfo.xml | 24 +++---- .../main/res/layout/submission_albumcard.xml | 6 +- .../main/res/layout/submission_fullscreen.xml | 22 +++--- .../main/res/layout/submission_gifcard.xml | 6 +- .../res/layout/submission_gifcard_album.xml | 2 +- .../main/res/layout/submission_imagecard.xml | 6 +- .../main/res/layout/submission_largecard.xml | 4 +- .../layout/submission_largecard_middle.xml | 4 +- app/src/main/res/layout/submission_list.xml | 4 +- .../res/layout/submission_list_desktop.xml | 4 +- .../main/res/layout/submission_mediacard.xml | 6 +- .../main/res/layout/submission_textcard.xml | 6 +- .../main/res/layout/submission_titlecard.xml | 6 +- app/src/main/res/layout/submission_widget.xml | 10 +-- .../res/layout/submission_widget_compact.xml | 2 +- .../submission_widget_compact_light.xml | 2 +- .../res/layout/submission_widget_light.xml | 10 +-- app/src/main/res/layout/subreddit_pop.xml | 6 +- app/src/main/res/layout/subreddit_widget.xml | 2 +- app/src/main/res/layout/swipe_tutorial.xml | 4 +- app/src/main/res/layout/tabletui.xml | 4 +- .../res/layout/toolbox_removal_dialog.xml | 6 +- app/src/main/res/layout/top_level_message.xml | 6 +- app/src/main/res/layout/trophy.xml | 2 +- .../main/res/layout/usernote_list_item.xml | 4 +- app/src/main/res/layout/widget.xml | 4 +- app/src/main/res/layout/widget_dark.xml | 4 +- app/src/main/res/layout/widget_header.xml | 8 +-- app/src/main/res/layout/widget_light.xml | 4 +- .../res/layout/widget_submission_list.xml | 4 +- .../res/layout/activity_settings_sync.xml | 4 +- .../res/layout/activity_settings_sync.xml | 10 +-- 112 files changed, 537 insertions(+), 519 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c26bba45ef..71f81467c8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -147,6 +147,7 @@ dependencies { implementation 'me.everything:overscroll-decor-android:1.0.4' implementation 'com.mikepenz:aboutlibraries:5.8.5' //5.9.0, 5.9.8, 6.0.0 implementation 'com.googlecode.mp4parser:isoparser:1.1.22' + implementation "com.android.support:support-emoji-bundled:28.0.0" testImplementation 'junit:junit:4.12' testImplementation 'org.hamcrest:hamcrest-all:1.3' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bfb440c51e..dc2f3cf556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,6 +29,9 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - + android:textColor="?attr/fontColor"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:textStyle="bold"/> \ No newline at end of file diff --git a/app/src/main/res/layout/commenttime.xml b/app/src/main/res/layout/commenttime.xml index f638f69124..6d8d6c27eb 100644 --- a/app/src/main/res/layout/commenttime.xml +++ b/app/src/main/res/layout/commenttime.xml @@ -16,7 +16,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -38,7 +38,7 @@ android:text="@string/report_other" android:checked="true"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Date: Wed, 6 Nov 2019 22:28:39 +0100 Subject: [PATCH 2/6] Remove my test TextView --- .../java/me/ccrama/redditslide/Activities/MainActivity.java | 4 ---- app/src/main/res/layout/activity_overview.xml | 5 ----- 2 files changed, 9 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 decfdc2a5b..87f3954b05 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java @@ -1102,10 +1102,6 @@ public void onSingleClick(View v) { setContentView(R.layout.activity_overview); - EmojiTextView emoji = (EmojiTextView) findViewById(R.id.testetv); - emoji.setText(new StringBuilder(new String(Character.toChars(0x1F60A)))); - - mToolbar = (Toolbar) findViewById(R.id.toolbar); mToolbar.setPopupTheme(new ColorPreferences(this).getFontStyle().getBaseId()); setSupportActionBar(mToolbar); diff --git a/app/src/main/res/layout/activity_overview.xml b/app/src/main/res/layout/activity_overview.xml index bd607d3155..b1d0ab76c1 100644 --- a/app/src/main/res/layout/activity_overview.xml +++ b/app/src/main/res/layout/activity_overview.xml @@ -40,11 +40,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - - Date: Fri, 22 Nov 2019 18:15:07 +0100 Subject: [PATCH 3/6] Adding tests and my test element --- app/build.gradle | 2 +- .../redditslide/Activities/MainActivity.java | 3 ++ .../me/ccrama/redditslide/ContentType.java | 2 +- app/src/main/res/layout/activity_overview.xml | 5 ++++ .../redditslide/test/ContentTypeTest.java | 29 ++++++++++++++----- .../test/UserSubscriptionsTest.java | 20 +++++++++++-- 6 files changed, 48 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 71f81467c8..df9eefaeb6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -157,4 +157,4 @@ dependencies { testImplementation "org.powermock:powermock-api-mockito2:${powerMockitoVersion}" testImplementation "org.powermock:powermock-module-junit4:${powerMockitoVersion}" androidTestImplementation 'com.android.support.test:runner:1.0.2' -} +} \ No newline at end of file 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 87f3954b05..1f4eb70511 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java @@ -1102,6 +1102,9 @@ public void onSingleClick(View v) { setContentView(R.layout.activity_overview); + EmojiTextView emoji = (EmojiTextView) findViewById(R.id.testetv); + emoji.setText(new StringBuilder(new String(Character.toChars(0x1F60A)))); + mToolbar = (Toolbar) findViewById(R.id.toolbar); mToolbar.setPopupTheme(new ColorPreferences(this).getFontStyle().getBaseId()); setSupportActionBar(mToolbar); diff --git a/app/src/main/java/me/ccrama/redditslide/ContentType.java b/app/src/main/java/me/ccrama/redditslide/ContentType.java index 47a30f35c4..15b1f32262 100644 --- a/app/src/main/java/me/ccrama/redditslide/ContentType.java +++ b/app/src/main/java/me/ccrama/redditslide/ContentType.java @@ -189,7 +189,7 @@ public static Type getContentType(String url) { "what-if.xkcd.com")) { return Type.XKCD; } - if (hostContains(host, "tumblr.com") && uri.getPath().contains("post")) { + if (hostContains(host, "tumblr.com")) { return Type.TUMBLR; } if (hostContains(host, "reddit.com", "redd.it")) { diff --git a/app/src/main/res/layout/activity_overview.xml b/app/src/main/res/layout/activity_overview.xml index b1d0ab76c1..bd607d3155 100644 --- a/app/src/main/res/layout/activity_overview.xml +++ b/app/src/main/res/layout/activity_overview.xml @@ -40,6 +40,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> + + (Arrays.asList( - "pinned", "pinned2", "frontpage", "all", "random", "friends", "mod", "aaa", "xyy", "xyz" + "pinned", "pinned2", "frontpage", "all", "random", "friends", "mod", "aaa", "bbb", "xyy", "xyz" + )))); + } + + @Test + public void sortsSubreddit() { + assertThat(UserSubscriptions.sort(subreddits), is(new ArrayList<>(Arrays.asList( + "frontpage", "all", "pinned", "pinned2", "random", "friends", "bbb", "mod", "aaa", "xyy", "xyz" )))); } @Test public void sortsSubredditsNoExtras() { assertThat(UserSubscriptions.sortNoExtras(subreddits), is(new ArrayList<>(Arrays.asList( - "pinned", "pinned2", "frontpage", "random", "friends", "mod", "aaa", "xyy", "xyz" + "pinned", "pinned2", "frontpage", "random", "friends", "mod", "aaa", "bbb", "xyy", "xyz" + )))); + } + + @Test + public void sortsSubredditsNoExtr() { + assertThat(UserSubscriptions.sortNoExtras(subreddits), is(new ArrayList<>(Arrays.asList( + "random", "pinned2", "frontpage", "bbb", "friends", "pinned", "mod", "aaa", "xyy", "xyz" )))); } } From d9bdcd132c16f2bbbb30e1d0674c732052ab6f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?So=C5=88a=20Koll=C3=A1rov=C3=A1?= Date: Sun, 24 Nov 2019 11:57:50 +0100 Subject: [PATCH 4/6] revert --- .../java/me/ccrama/redditslide/test/UserSubscriptionsTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/test/java/me/ccrama/redditslide/test/UserSubscriptionsTest.java b/app/src/test/java/me/ccrama/redditslide/test/UserSubscriptionsTest.java index 0c0a434925..bcc1e6d282 100644 --- a/app/src/test/java/me/ccrama/redditslide/test/UserSubscriptionsTest.java +++ b/app/src/test/java/me/ccrama/redditslide/test/UserSubscriptionsTest.java @@ -40,4 +40,5 @@ public void sortsSubredditsNoExtras() { "pinned", "pinned2", "frontpage", "random", "friends", "mod", "aaa", "xyy", "xyz" )))); } + } From 97adf69e4da5ea3e1debfa8c3664a8da65744a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?So=C5=88a=20Koll=C3=A1rov=C3=A1?= Date: Sun, 24 Nov 2019 12:11:56 +0100 Subject: [PATCH 5/6] Revert "Adding tests and my test element" This reverts commit 98c3f973 --- app/build.gradle | 2 +- .../redditslide/Activities/MainActivity.java | 3 -- .../me/ccrama/redditslide/ContentType.java | 2 +- app/src/main/res/layout/activity_overview.xml | 5 ---- .../redditslide/test/ContentTypeTest.java | 29 +++++-------------- .../test/UserSubscriptionsTest.java | 20 ++----------- 6 files changed, 13 insertions(+), 48 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index df9eefaeb6..71f81467c8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -157,4 +157,4 @@ dependencies { testImplementation "org.powermock:powermock-api-mockito2:${powerMockitoVersion}" testImplementation "org.powermock:powermock-module-junit4:${powerMockitoVersion}" androidTestImplementation 'com.android.support.test:runner:1.0.2' -} \ No newline at end of file +} 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 1f4eb70511..87f3954b05 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java @@ -1102,9 +1102,6 @@ public void onSingleClick(View v) { setContentView(R.layout.activity_overview); - EmojiTextView emoji = (EmojiTextView) findViewById(R.id.testetv); - emoji.setText(new StringBuilder(new String(Character.toChars(0x1F60A)))); - mToolbar = (Toolbar) findViewById(R.id.toolbar); mToolbar.setPopupTheme(new ColorPreferences(this).getFontStyle().getBaseId()); setSupportActionBar(mToolbar); diff --git a/app/src/main/java/me/ccrama/redditslide/ContentType.java b/app/src/main/java/me/ccrama/redditslide/ContentType.java index 15b1f32262..47a30f35c4 100644 --- a/app/src/main/java/me/ccrama/redditslide/ContentType.java +++ b/app/src/main/java/me/ccrama/redditslide/ContentType.java @@ -189,7 +189,7 @@ public static Type getContentType(String url) { "what-if.xkcd.com")) { return Type.XKCD; } - if (hostContains(host, "tumblr.com")) { + if (hostContains(host, "tumblr.com") && uri.getPath().contains("post")) { return Type.TUMBLR; } if (hostContains(host, "reddit.com", "redd.it")) { diff --git a/app/src/main/res/layout/activity_overview.xml b/app/src/main/res/layout/activity_overview.xml index bd607d3155..b1d0ab76c1 100644 --- a/app/src/main/res/layout/activity_overview.xml +++ b/app/src/main/res/layout/activity_overview.xml @@ -40,11 +40,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - - (Arrays.asList( - "pinned", "pinned2", "frontpage", "all", "random", "friends", "mod", "aaa", "bbb", "xyy", "xyz" - )))); - } - - @Test - public void sortsSubreddit() { - assertThat(UserSubscriptions.sort(subreddits), is(new ArrayList<>(Arrays.asList( - "frontpage", "all", "pinned", "pinned2", "random", "friends", "bbb", "mod", "aaa", "xyy", "xyz" + "pinned", "pinned2", "frontpage", "all", "random", "friends", "mod", "aaa", "xyy", "xyz" )))); } @Test public void sortsSubredditsNoExtras() { assertThat(UserSubscriptions.sortNoExtras(subreddits), is(new ArrayList<>(Arrays.asList( - "pinned", "pinned2", "frontpage", "random", "friends", "mod", "aaa", "bbb", "xyy", "xyz" - )))); - } - - @Test - public void sortsSubredditsNoExtr() { - assertThat(UserSubscriptions.sortNoExtras(subreddits), is(new ArrayList<>(Arrays.asList( - "random", "pinned2", "frontpage", "bbb", "friends", "pinned", "mod", "aaa", "xyy", "xyz" + "pinned", "pinned2", "frontpage", "random", "friends", "mod", "aaa", "xyy", "xyz" )))); } From d8a1068303fc42f045228f891fadcc49d66cb486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?So=C5=88a=20Koll=C3=A1rov=C3=A1?= Date: Sun, 24 Nov 2019 12:12:07 +0100 Subject: [PATCH 6/6] Revert "revert" This reverts commit d9bdcd13 --- .../java/me/ccrama/redditslide/test/UserSubscriptionsTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/test/java/me/ccrama/redditslide/test/UserSubscriptionsTest.java b/app/src/test/java/me/ccrama/redditslide/test/UserSubscriptionsTest.java index bcc1e6d282..0c0a434925 100644 --- a/app/src/test/java/me/ccrama/redditslide/test/UserSubscriptionsTest.java +++ b/app/src/test/java/me/ccrama/redditslide/test/UserSubscriptionsTest.java @@ -40,5 +40,4 @@ public void sortsSubredditsNoExtras() { "pinned", "pinned2", "frontpage", "random", "friends", "mod", "aaa", "xyy", "xyz" )))); } - }