From a4cf91fba540187e2f361724c7f2b671ec319986 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 3 Aug 2016 13:00:24 -0300 Subject: [PATCH] Use Inheritence for shared Forum and Blog Sharing Code --- briar-android/AndroidManifest.xml | 40 ++- ...ity_share_forum.xml => activity_share.xml} | 0 ...status.xml => activity_sharing_status.xml} | 0 ...n_out.xml => list_item_msg_notice_out.xml} | 0 .../list_item_shareable_invitation_in.xml | 6 +- briar-android/res/menu/blogs_blog_actions.xml | 2 +- briar-android/res/menu/forum_actions.xml | 2 +- briar-android/res/values-pt-rBR/strings.xml | 2 +- briar-android/res/values/strings.xml | 7 +- .../android/ActivityComponent.java | 29 +- .../android/blogs/BlogFragment.java | 14 +- .../android/contact/ContactListFragment.java | 16 +- .../android/contact/ConversationActivity.java | 11 +- .../android/contact/ConversationAdapter.java | 21 +- .../android/forum/ForumActivity.java | 12 +- .../android/forum/ForumListFragment.java | 7 +- .../sharing/ContactSelectorFragment.java | 30 +- .../android/sharing/InvitationsActivity.java | 267 +++--------------- .../sharing/InvitationsBlogActivity.java | 127 +++++++++ .../sharing/InvitationsForumActivity.java | 127 +++++++++ .../android/sharing/ShareActivity.java | 30 +- .../android/sharing/ShareBlogActivity.java | 35 +++ .../sharing/ShareBlogMessageFragment.java | 81 ++++++ .../android/sharing/ShareForumActivity.java | 34 +++ .../sharing/ShareForumMessageFragment.java | 79 ++++++ .../android/sharing/ShareMessageFragment.java | 104 ++----- .../sharing/SharingStatusActivity.java | 64 +---- .../sharing/SharingStatusBlogActivity.java | 37 +++ .../sharing/SharingStatusForumActivity.java | 37 +++ 29 files changed, 755 insertions(+), 466 deletions(-) rename briar-android/res/layout/{activity_share_forum.xml => activity_share.xml} (100%) rename briar-android/res/layout/{activity_forum_sharing_status.xml => activity_sharing_status.xml} (100%) rename briar-android/res/layout/{list_item_introduction_out.xml => list_item_msg_notice_out.xml} (100%) create mode 100644 briar-android/src/org/briarproject/android/sharing/InvitationsBlogActivity.java create mode 100644 briar-android/src/org/briarproject/android/sharing/InvitationsForumActivity.java create mode 100644 briar-android/src/org/briarproject/android/sharing/ShareBlogActivity.java create mode 100644 briar-android/src/org/briarproject/android/sharing/ShareBlogMessageFragment.java create mode 100644 briar-android/src/org/briarproject/android/sharing/ShareForumActivity.java create mode 100644 briar-android/src/org/briarproject/android/sharing/ShareForumMessageFragment.java create mode 100644 briar-android/src/org/briarproject/android/sharing/SharingStatusBlogActivity.java create mode 100644 briar-android/src/org/briarproject/android/sharing/SharingStatusForumActivity.java diff --git a/briar-android/AndroidManifest.xml b/briar-android/AndroidManifest.xml index 7b2c1ceac..df2a916d3 100644 --- a/briar-android/AndroidManifest.xml +++ b/briar-android/AndroidManifest.xml @@ -102,7 +102,7 @@ + + + + + + + + + + + +