{"action":"created","comment":{"url":"https://api.github.com/repos/frostwire/frostwire/pulls/comments/55532311","id":55532311,"diff_hunk":"@@ -48,49 +48,130 @@\n             android:layout_width=\"match_parent\"\n             android:layout_height=\"match_parent\"\n             android:gravity=\"center_horizontal\"\n-            android:text=\"@string/unprotected_connection\" />\n+            android:text=\"@string/connection_header_title\" />\n \n-        <!-- Get VPN Button -->\n+        <TextView\n+            android:id=\"@+id/view_vpn_status_header_un_protected\"\n+            style=\"@style/VPNTitle\"\n+            android:layout_width=\"match_parent\"\n+            android:layout_height=\"match_parent\"\n+            android:gravity=\"center_horizontal\" />\n+\n+        <!-- VPN description text -->\n+        <TextView\n+            android:id=\"@+id/VPNText\"\n+            style=\"@style/VPNText\"\n+            android:layout_width=\"match_parent\"\n+            android:layout_height=\"match_parent\"\n+            android:layout_marginTop=\"18dp\"\n+            android:text=\"@string/unprotected_connections_visibility_bullet_html\" />\n+\n+        <!-- Unprotected connection button -->\n         <Button\n             android:id=\"@+id/view_vpn_status_get_vpn_button\"\n             style=\"@style/GetVPNButton\"\n             android:layout_width=\"wrap_content\"\n             android:layout_height=\"wrap_content\"\n             android:layout_gravity=\"center\"\n-            android:layout_marginBottom=\"15dp\"\n-            android:layout_marginTop=\"15dp\"\n-            android:paddingLeft=\"15dp\"\n-            android:paddingRight=\"15dp\"\n-            android:text=\"@string/protect_my_privacy\" />\n+            android:layout_marginTop=\"30dp\" />\n \n-        <!-- privacy as a human right paragraph -->\n         <TextView\n-            style=\"@style/VPNSubTitle\"\n-            android:layout_width=\"fill_parent\"\n-            android:layout_height=\"wrap_content\"\n-            android:layout_marginTop=\"15dp\"\n-            android:padding=\"0dp\"\n-            android:text=\"@string/your_privacy_is_a_fundamental_right_html\" />\n+            android:id=\"@+id/view_vpn_money_back\"\n+            style=\"@style/VPNSmallText\"\n+            android:layout_width=\"match_parent\"\n+            android:layout_height=\"match_parent\"\n+            android:gravity=\"center_horizontal\" />\n \n-        <!-- explanation about what is open -->\n         <TextView\n-            android:id=\"@+id/VPNText\"\n-            style=\"@style/VPNText\"\n+            android:id=\"@+id/view_vpn_price\"\n+            style=\"@style/VPNSmallText\"\n             android:layout_width=\"match_parent\"\n             android:layout_height=\"match_parent\"\n-            android:layout_marginTop=\"15dp\"\n-            android:text=\"@string/unprotected_connections_visibility_bullet\" />\n+            android:gravity=\"center_horizontal\" />\n+\n+        <!-- Protected connection button -->\n+        <Button\n+            android:id=\"@+id/view_vpn_status_learn_more_button\"\n+            style=\"@style/GetVPNButton\"\n+            android:layout_width=\"wrap_content\"\n+            android:layout_height=\"wrap_content\"\n+            android:layout_gravity=\"center\"\n+            android:layout_marginTop=\"30dp\" />\n+\n+\n+        <ImageView\n+            android:id=\"@+id/imageView\"","path":"android/res/layout/view_vpn_status_detail.xml","position":75,"original_position":75,"commit_id":"06310fed0cb4b0fc5396325c0ef66aa756df016b","original_commit_id":"06310fed0cb4b0fc5396325c0ef66aa756df016b","user":{"login":"gubatron","id":163977,"avatar_url":"https://avatars.githubusercontent.com/u/163977?v=3","gravatar_id":"","url":"https://api.github.com/users/gubatron","html_url":"https://github.com/gubatron","followers_url":"https://api.github.com/users/gubatron/followers","following_url":"https://api.github.com/users/gubatron/following{/other_user}","gists_url":"https://api.github.com/users/gubatron/gists{/gist_id}","starred_url":"https://api.github.com/users/gubatron/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gubatron/subscriptions","organizations_url":"https://api.github.com/users/gubatron/orgs","repos_url":"https://api.github.com/users/gubatron/repos","events_url":"https://api.github.com/users/gubatron/events{/privacy}","received_events_url":"https://api.github.com/users/gubatron/received_events","type":"User","site_admin":false},"body":"does this need an id? if so, please make the name self explanatory, perhaps:\r\n`rename to `view_vpn_status_divider_image_view`. If you are not using this view in your java code, I believe you can just get rid of the id.","created_at":"2016-03-09T15:13:21Z","updated_at":"2016-03-09T15:13:21Z","html_url":"https://github.com/frostwire/frostwire/pull/100#discussion_r55532311","pull_request_url":"https://api.github.com/repos/frostwire/frostwire/pulls/100","_links":{"self":{"href":"https://api.github.com/repos/frostwire/frostwire/pulls/comments/55532311"},"html":{"href":"https://github.com/frostwire/frostwire/pull/100#discussion_r55532311"},"pull_request":{"href":"https://api.github.com/repos/frostwire/frostwire/pulls/100"}}},"pull_request":{"url":"https://api.github.com/repos/frostwire/frostwire/pulls/100","id":62150514,"html_url":"https://github.com/frostwire/frostwire/pull/100","diff_url":"https://github.com/frostwire/frostwire/pull/100.diff","patch_url":"https://github.com/frostwire/frostwire/pull/100.patch","issue_url":"https://api.github.com/repos/frostwire/frostwire/issues/100","number":100,"state":"open","locked":false,"title":"ExpressVPN update","user":{"login":"marcelinkaaa","id":2339972,"avatar_url":"https://avatars.githubusercontent.com/u/2339972?v=3","gravatar_id":"","url":"https://api.github.com/users/marcelinkaaa","html_url":"https://github.com/marcelinkaaa","followers_url":"https://api.github.com/users/marcelinkaaa/followers","following_url":"https://api.github.com/users/marcelinkaaa/following{/other_user}","gists_url":"https://api.github.com/users/marcelinkaaa/gists{/gist_id}","starred_url":"https://api.github.com/users/marcelinkaaa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/marcelinkaaa/subscriptions","organizations_url":"https://api.github.com/users/marcelinkaaa/orgs","repos_url":"https://api.github.com/users/marcelinkaaa/repos","events_url":"https://api.github.com/users/marcelinkaaa/events{/privacy}","received_events_url":"https://api.github.com/users/marcelinkaaa/received_events","type":"User","site_admin":false},"body":"@gubatron here are the initial changes for the suggested improvements to the VPN-detail page. Links also changed. And per suggestion both - learn more and get VPN - are directed to the provider's website. \r\nHave @kad3mlia show you the suggested changes in the email. \r\nThe only thing that is not yet done are the notifications on the transfer screen which I am not sure how to do, if you have some pointers I will be more than happy to try. ","created_at":"2016-03-08T22:49:15Z","updated_at":"2016-03-09T15:13:21Z","closed_at":null,"merged_at":null,"merge_commit_sha":"7850785a050e297f64750c5657309727c6def9e1","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/frostwire/frostwire/pulls/100/commits","review_comments_url":"https://api.github.com/repos/frostwire/frostwire/pulls/100/comments","review_comment_url":"https://api.github.com/repos/frostwire/frostwire/pulls/comments{/number}","comments_url":"https://api.github.com/repos/frostwire/frostwire/issues/100/comments","statuses_url":"https://api.github.com/repos/frostwire/frostwire/statuses/06310fed0cb4b0fc5396325c0ef66aa756df016b","head":{"label":"marcelinkaaa:express-vpn-update","ref":"express-vpn-update","sha":"06310fed0cb4b0fc5396325c0ef66aa756df016b","user":{"login":"marcelinkaaa","id":2339972,"avatar_url":"https://avatars.githubusercontent.com/u/2339972?v=3","gravatar_id":"","url":"https://api.github.com/users/marcelinkaaa","html_url":"https://github.com/marcelinkaaa","followers_url":"https://api.github.com/users/marcelinkaaa/followers","following_url":"https://api.github.com/users/marcelinkaaa/following{/other_user}","gists_url":"https://api.github.com/users/marcelinkaaa/gists{/gist_id}","starred_url":"https://api.github.com/users/marcelinkaaa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/marcelinkaaa/subscriptions","organizations_url":"https://api.github.com/users/marcelinkaaa/orgs","repos_url":"https://api.github.com/users/marcelinkaaa/repos","events_url":"https://api.github.com/users/marcelinkaaa/events{/privacy}","received_events_url":"https://api.github.com/users/marcelinkaaa/received_events","type":"User","site_admin":false},"repo":{"id":45869764,"name":"frostwire","full_name":"marcelinkaaa/frostwire","owner":{"login":"marcelinkaaa","id":2339972,"avatar_url":"https://avatars.githubusercontent.com/u/2339972?v=3","gravatar_id":"","url":"https://api.github.com/users/marcelinkaaa","html_url":"https://github.com/marcelinkaaa","followers_url":"https://api.github.com/users/marcelinkaaa/followers","following_url":"https://api.github.com/users/marcelinkaaa/following{/other_user}","gists_url":"https://api.github.com/users/marcelinkaaa/gists{/gist_id}","starred_url":"https://api.github.com/users/marcelinkaaa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/marcelinkaaa/subscriptions","organizations_url":"https://api.github.com/users/marcelinkaaa/orgs","repos_url":"https://api.github.com/users/marcelinkaaa/repos","events_url":"https://api.github.com/users/marcelinkaaa/events{/privacy}","received_events_url":"https://api.github.com/users/marcelinkaaa/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/marcelinkaaa/frostwire","description":"One repo to join them all.","fork":true,"url":"https://api.github.com/repos/marcelinkaaa/frostwire","forks_url":"https://api.github.com/repos/marcelinkaaa/frostwire/forks","keys_url":"https://api.github.com/repos/marcelinkaaa/frostwire/keys{/key_id}","collaborators_url":"https://api.github.com/repos/marcelinkaaa/frostwire/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/marcelinkaaa/frostwire/teams","hooks_url":"https://api.github.com/repos/marcelinkaaa/frostwire/hooks","issue_events_url":"https://api.github.com/repos/marcelinkaaa/frostwire/issues/events{/number}","events_url":"https://api.github.com/repos/marcelinkaaa/frostwire/events","assignees_url":"https://api.github.com/repos/marcelinkaaa/frostwire/assignees{/user}","branches_url":"https://api.github.com/repos/marcelinkaaa/frostwire/branches{/branch}","tags_url":"https://api.github.com/repos/marcelinkaaa/frostwire/tags","blobs_url":"https://api.github.com/repos/marcelinkaaa/frostwire/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/marcelinkaaa/frostwire/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/marcelinkaaa/frostwire/git/refs{/sha}","trees_url":"https://api.github.com/repos/marcelinkaaa/frostwire/git/trees{/sha}","statuses_url":"https://api.github.com/repos/marcelinkaaa/frostwire/statuses/{sha}","languages_url":"https://api.github.com/repos/marcelinkaaa/frostwire/languages","stargazers_url":"https://api.github.com/repos/marcelinkaaa/frostwire/stargazers","contributors_url":"https://api.github.com/repos/marcelinkaaa/frostwire/contributors","subscribers_url":"https://api.github.com/repos/marcelinkaaa/frostwire/subscribers","subscription_url":"https://api.github.com/repos/marcelinkaaa/frostwire/subscription","commits_url":"https://api.github.com/repos/marcelinkaaa/frostwire/commits{/sha}","git_commits_url":"https://api.github.com/repos/marcelinkaaa/frostwire/git/commits{/sha}","comments_url":"https://api.github.com/repos/marcelinkaaa/frostwire/comments{/number}","issue_comment_url":"https://api.github.com/repos/marcelinkaaa/frostwire/issues/comments{/number}","contents_url":"https://api.github.com/repos/marcelinkaaa/frostwire/contents/{+path}","compare_url":"https://api.github.com/repos/marcelinkaaa/frostwire/compare/{base}...{head}","merges_url":"https://api.github.com/repos/marcelinkaaa/frostwire/merges","archive_url":"https://api.github.com/repos/marcelinkaaa/frostwire/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/marcelinkaaa/frostwire/downloads","issues_url":"https://api.github.com/repos/marcelinkaaa/frostwire/issues{/number}","pulls_url":"https://api.github.com/repos/marcelinkaaa/frostwire/pulls{/number}","milestones_url":"https://api.github.com/repos/marcelinkaaa/frostwire/milestones{/number}","notifications_url":"https://api.github.com/repos/marcelinkaaa/frostwire/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/marcelinkaaa/frostwire/labels{/name}","releases_url":"https://api.github.com/repos/marcelinkaaa/frostwire/releases{/id}","deployments_url":"https://api.github.com/repos/marcelinkaaa/frostwire/deployments","created_at":"2015-11-09T22:02:34Z","updated_at":"2016-01-11T15:40:43Z","pushed_at":"2016-03-08T22:45:44Z","git_url":"git://github.com/marcelinkaaa/frostwire.git","ssh_url":"git@github.com:marcelinkaaa/frostwire.git","clone_url":"https://github.com/marcelinkaaa/frostwire.git","svn_url":"https://github.com/marcelinkaaa/frostwire","homepage":null,"size":72880,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"frostwire:master","ref":"master","sha":"a2ce788e28e33b84832faba7c00dfa788286b19c","user":{"login":"frostwire","id":1341376,"avatar_url":"https://avatars.githubusercontent.com/u/1341376?v=3","gravatar_id":"","url":"https://api.github.com/users/frostwire","html_url":"https://github.com/frostwire","followers_url":"https://api.github.com/users/frostwire/followers","following_url":"https://api.github.com/users/frostwire/following{/other_user}","gists_url":"https://api.github.com/users/frostwire/gists{/gist_id}","starred_url":"https://api.github.com/users/frostwire/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/frostwire/subscriptions","organizations_url":"https://api.github.com/users/frostwire/orgs","repos_url":"https://api.github.com/users/frostwire/repos","events_url":"https://api.github.com/users/frostwire/events{/privacy}","received_events_url":"https://api.github.com/users/frostwire/received_events","type":"User","site_admin":false},"repo":{"id":45490972,"name":"frostwire","full_name":"frostwire/frostwire","owner":{"login":"frostwire","id":1341376,"avatar_url":"https://avatars.githubusercontent.com/u/1341376?v=3","gravatar_id":"","url":"https://api.github.com/users/frostwire","html_url":"https://github.com/frostwire","followers_url":"https://api.github.com/users/frostwire/followers","following_url":"https://api.github.com/users/frostwire/following{/other_user}","gists_url":"https://api.github.com/users/frostwire/gists{/gist_id}","starred_url":"https://api.github.com/users/frostwire/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/frostwire/subscriptions","organizations_url":"https://api.github.com/users/frostwire/orgs","repos_url":"https://api.github.com/users/frostwire/repos","events_url":"https://api.github.com/users/frostwire/events{/privacy}","received_events_url":"https://api.github.com/users/frostwire/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/frostwire/frostwire","description":"An easy to use Cloud Downloader, BitTorrent Client and Media Player. Search, Download, Play, Share","fork":false,"url":"https://api.github.com/repos/frostwire/frostwire","forks_url":"https://api.github.com/repos/frostwire/frostwire/forks","keys_url":"https://api.github.com/repos/frostwire/frostwire/keys{/key_id}","collaborators_url":"https://api.github.com/repos/frostwire/frostwire/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/frostwire/frostwire/teams","hooks_url":"https://api.github.com/repos/frostwire/frostwire/hooks","issue_events_url":"https://api.github.com/repos/frostwire/frostwire/issues/events{/number}","events_url":"https://api.github.com/repos/frostwire/frostwire/events","assignees_url":"https://api.github.com/repos/frostwire/frostwire/assignees{/user}","branches_url":"https://api.github.com/repos/frostwire/frostwire/branches{/branch}","tags_url":"https://api.github.com/repos/frostwire/frostwire/tags","blobs_url":"https://api.github.com/repos/frostwire/frostwire/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/frostwire/frostwire/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/frostwire/frostwire/git/refs{/sha}","trees_url":"https://api.github.com/repos/frostwire/frostwire/git/trees{/sha}","statuses_url":"https://api.github.com/repos/frostwire/frostwire/statuses/{sha}","languages_url":"https://api.github.com/repos/frostwire/frostwire/languages","stargazers_url":"https://api.github.com/repos/frostwire/frostwire/stargazers","contributors_url":"https://api.github.com/repos/frostwire/frostwire/contributors","subscribers_url":"https://api.github.com/repos/frostwire/frostwire/subscribers","subscription_url":"https://api.github.com/repos/frostwire/frostwire/subscription","commits_url":"https://api.github.com/repos/frostwire/frostwire/commits{/sha}","git_commits_url":"https://api.github.com/repos/frostwire/frostwire/git/commits{/sha}","comments_url":"https://api.github.com/repos/frostwire/frostwire/comments{/number}","issue_comment_url":"https://api.github.com/repos/frostwire/frostwire/issues/comments{/number}","contents_url":"https://api.github.com/repos/frostwire/frostwire/contents/{+path}","compare_url":"https://api.github.com/repos/frostwire/frostwire/compare/{base}...{head}","merges_url":"https://api.github.com/repos/frostwire/frostwire/merges","archive_url":"https://api.github.com/repos/frostwire/frostwire/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/frostwire/frostwire/downloads","issues_url":"https://api.github.com/repos/frostwire/frostwire/issues{/number}","pulls_url":"https://api.github.com/repos/frostwire/frostwire/pulls{/number}","milestones_url":"https://api.github.com/repos/frostwire/frostwire/milestones{/number}","notifications_url":"https://api.github.com/repos/frostwire/frostwire/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/frostwire/frostwire/labels{/name}","releases_url":"https://api.github.com/repos/frostwire/frostwire/releases{/id}","deployments_url":"https://api.github.com/repos/frostwire/frostwire/deployments","created_at":"2015-11-03T19:39:53Z","updated_at":"2016-03-07T16:44:20Z","pushed_at":"2016-03-08T22:49:16Z","git_url":"git://github.com/frostwire/frostwire.git","ssh_url":"git@github.com:frostwire/frostwire.git","clone_url":"https://github.com/frostwire/frostwire.git","svn_url":"https://github.com/frostwire/frostwire","homepage":"http://www.frostwire.com","size":73151,"stargazers_count":19,"watchers_count":19,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":27,"mirror_url":null,"open_issues_count":31,"forks":27,"open_issues":31,"watchers":19,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/frostwire/frostwire/pulls/100"},"html":{"href":"https://github.com/frostwire/frostwire/pull/100"},"issue":{"href":"https://api.github.com/repos/frostwire/frostwire/issues/100"},"comments":{"href":"https://api.github.com/repos/frostwire/frostwire/issues/100/comments"},"review_comments":{"href":"https://api.github.com/repos/frostwire/frostwire/pulls/100/comments"},"review_comment":{"href":"https://api.github.com/repos/frostwire/frostwire/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/frostwire/frostwire/pulls/100/commits"},"statuses":{"href":"https://api.github.com/repos/frostwire/frostwire/statuses/06310fed0cb4b0fc5396325c0ef66aa756df016b"}}}}