Browse Source

Added menu to privacy policy

main
M66B 6 years ago
parent
commit
313ef5eddd
43 changed files with 29 additions and 2 deletions
  1. +16
    -0
      app/src/main/java/eu/faircode/email/ActivityView.java
  2. BIN
      app/src/main/res/drawable-hdpi/baseline_account_box_black_18.png
  3. BIN
      app/src/main/res/drawable-hdpi/baseline_account_box_black_24.png
  4. BIN
      app/src/main/res/drawable-hdpi/baseline_account_box_black_36.png
  5. BIN
      app/src/main/res/drawable-hdpi/baseline_account_box_black_48.png
  6. BIN
      app/src/main/res/drawable-hdpi/baseline_account_box_white_18.png
  7. BIN
      app/src/main/res/drawable-hdpi/baseline_account_box_white_24.png
  8. BIN
      app/src/main/res/drawable-hdpi/baseline_account_box_white_36.png
  9. BIN
      app/src/main/res/drawable-hdpi/baseline_account_box_white_48.png
  10. BIN
      app/src/main/res/drawable-mdpi/baseline_account_box_black_18.png
  11. BIN
      app/src/main/res/drawable-mdpi/baseline_account_box_black_24.png
  12. BIN
      app/src/main/res/drawable-mdpi/baseline_account_box_black_36.png
  13. BIN
      app/src/main/res/drawable-mdpi/baseline_account_box_black_48.png
  14. BIN
      app/src/main/res/drawable-mdpi/baseline_account_box_white_18.png
  15. BIN
      app/src/main/res/drawable-mdpi/baseline_account_box_white_24.png
  16. BIN
      app/src/main/res/drawable-mdpi/baseline_account_box_white_36.png
  17. BIN
      app/src/main/res/drawable-mdpi/baseline_account_box_white_48.png
  18. BIN
      app/src/main/res/drawable-xhdpi/baseline_account_box_black_18.png
  19. BIN
      app/src/main/res/drawable-xhdpi/baseline_account_box_black_24.png
  20. BIN
      app/src/main/res/drawable-xhdpi/baseline_account_box_black_36.png
  21. BIN
      app/src/main/res/drawable-xhdpi/baseline_account_box_black_48.png
  22. BIN
      app/src/main/res/drawable-xhdpi/baseline_account_box_white_18.png
  23. BIN
      app/src/main/res/drawable-xhdpi/baseline_account_box_white_24.png
  24. BIN
      app/src/main/res/drawable-xhdpi/baseline_account_box_white_36.png
  25. BIN
      app/src/main/res/drawable-xhdpi/baseline_account_box_white_48.png
  26. BIN
      app/src/main/res/drawable-xxhdpi/baseline_account_box_black_18.png
  27. BIN
      app/src/main/res/drawable-xxhdpi/baseline_account_box_black_24.png
  28. BIN
      app/src/main/res/drawable-xxhdpi/baseline_account_box_black_36.png
  29. BIN
      app/src/main/res/drawable-xxhdpi/baseline_account_box_black_48.png
  30. BIN
      app/src/main/res/drawable-xxhdpi/baseline_account_box_white_18.png
  31. BIN
      app/src/main/res/drawable-xxhdpi/baseline_account_box_white_24.png
  32. BIN
      app/src/main/res/drawable-xxhdpi/baseline_account_box_white_36.png
  33. BIN
      app/src/main/res/drawable-xxhdpi/baseline_account_box_white_48.png
  34. BIN
      app/src/main/res/drawable-xxxhdpi/baseline_account_box_black_18.png
  35. BIN
      app/src/main/res/drawable-xxxhdpi/baseline_account_box_black_24.png
  36. BIN
      app/src/main/res/drawable-xxxhdpi/baseline_account_box_black_36.png
  37. BIN
      app/src/main/res/drawable-xxxhdpi/baseline_account_box_black_48.png
  38. BIN
      app/src/main/res/drawable-xxxhdpi/baseline_account_box_white_18.png
  39. BIN
      app/src/main/res/drawable-xxxhdpi/baseline_account_box_white_24.png
  40. BIN
      app/src/main/res/drawable-xxxhdpi/baseline_account_box_white_36.png
  41. BIN
      app/src/main/res/drawable-xxxhdpi/baseline_account_box_white_48.png
  42. +10
    -0
      app/src/main/res/drawable/baseline_account_box_24.xml
  43. +3
    -2
      app/src/main/res/values/strings.xml

+ 16
- 0
app/src/main/java/eu/faircode/email/ActivityView.java View File

@ -115,6 +115,9 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
case R.string.menu_operations: case R.string.menu_operations:
onMenuOperations(); onMenuOperations();
break; break;
case R.string.menu_privacy:
onMenuPrivacy();
break;
case R.string.menu_faq: case R.string.menu_faq:
onMenuFAQ(); onMenuFAQ();
break; break;
@ -155,6 +158,9 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
if (PreferenceManager.getDefaultSharedPreferences(ActivityView.this).getBoolean("debug", false)) if (PreferenceManager.getDefaultSharedPreferences(ActivityView.this).getBoolean("debug", false))
drawerArray.add(new DrawerItem(ActivityView.this, R.drawable.baseline_list_24, R.string.menu_operations)); drawerArray.add(new DrawerItem(ActivityView.this, R.drawable.baseline_list_24, R.string.menu_operations));
if (getIntentPrivacy().resolveActivity(getPackageManager()) != null)
drawerArray.add(new DrawerItem(ActivityView.this, R.drawable.baseline_account_box_24, R.string.menu_privacy));
if (getIntentFAQ().resolveActivity(getPackageManager()) != null) if (getIntentFAQ().resolveActivity(getPackageManager()) != null)
drawerArray.add(new DrawerItem(ActivityView.this, R.drawable.baseline_question_answer_24, R.string.menu_faq)); drawerArray.add(new DrawerItem(ActivityView.this, R.drawable.baseline_question_answer_24, R.string.menu_faq));
@ -379,6 +385,12 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
} }
} }
private Intent getIntentPrivacy() {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse("https://email.faircode.eu/privacy/"));
return intent;
}
private Intent getIntentFAQ() { private Intent getIntentFAQ() {
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse("https://github.com/M66B/open-source-email/blob/master/FAQ.md")); intent.setData(Uri.parse("https://github.com/M66B/open-source-email/blob/master/FAQ.md"));
@ -409,6 +421,10 @@ public class ActivityView extends ActivityBase implements FragmentManager.OnBack
fragmentTransaction.commit(); fragmentTransaction.commit();
} }
private void onMenuPrivacy() {
startActivity(getIntentPrivacy());
}
private void onMenuFAQ() { private void onMenuFAQ() {
startActivity(getIntentFAQ()); startActivity(getIntentFAQ());
} }


BIN
app/src/main/res/drawable-hdpi/baseline_account_box_black_18.png View File

Before After
Width: 27  |  Height: 27  |  Size: 253 B

BIN
app/src/main/res/drawable-hdpi/baseline_account_box_black_24.png View File

Before After
Width: 36  |  Height: 36  |  Size: 238 B

BIN
app/src/main/res/drawable-hdpi/baseline_account_box_black_36.png View File

Before After
Width: 54  |  Height: 54  |  Size: 325 B

BIN
app/src/main/res/drawable-hdpi/baseline_account_box_black_48.png View File

Before After
Width: 72  |  Height: 72  |  Size: 449 B

BIN
app/src/main/res/drawable-hdpi/baseline_account_box_white_18.png View File

Before After
Width: 27  |  Height: 27  |  Size: 256 B

BIN
app/src/main/res/drawable-hdpi/baseline_account_box_white_24.png View File

Before After
Width: 36  |  Height: 36  |  Size: 241 B

BIN
app/src/main/res/drawable-hdpi/baseline_account_box_white_36.png View File

Before After
Width: 54  |  Height: 54  |  Size: 333 B

BIN
app/src/main/res/drawable-hdpi/baseline_account_box_white_48.png View File

Before After
Width: 72  |  Height: 72  |  Size: 456 B

BIN
app/src/main/res/drawable-mdpi/baseline_account_box_black_18.png View File

Before After
Width: 18  |  Height: 18  |  Size: 163 B

BIN
app/src/main/res/drawable-mdpi/baseline_account_box_black_24.png View File

Before After
Width: 24  |  Height: 24  |  Size: 192 B

BIN
app/src/main/res/drawable-mdpi/baseline_account_box_black_36.png View File

Before After
Width: 36  |  Height: 36  |  Size: 238 B

BIN
app/src/main/res/drawable-mdpi/baseline_account_box_black_48.png View File

Before After
Width: 48  |  Height: 48  |  Size: 320 B

BIN
app/src/main/res/drawable-mdpi/baseline_account_box_white_18.png View File

Before After
Width: 18  |  Height: 18  |  Size: 163 B

BIN
app/src/main/res/drawable-mdpi/baseline_account_box_white_24.png View File

Before After
Width: 24  |  Height: 24  |  Size: 194 B

BIN
app/src/main/res/drawable-mdpi/baseline_account_box_white_36.png View File

Before After
Width: 36  |  Height: 36  |  Size: 241 B

BIN
app/src/main/res/drawable-mdpi/baseline_account_box_white_48.png View File

Before After
Width: 48  |  Height: 48  |  Size: 325 B

BIN
app/src/main/res/drawable-xhdpi/baseline_account_box_black_18.png View File

Before After
Width: 36  |  Height: 36  |  Size: 238 B

BIN
app/src/main/res/drawable-xhdpi/baseline_account_box_black_24.png View File

Before After
Width: 48  |  Height: 48  |  Size: 320 B

BIN
app/src/main/res/drawable-xhdpi/baseline_account_box_black_36.png View File

Before After
Width: 72  |  Height: 72  |  Size: 449 B

BIN
app/src/main/res/drawable-xhdpi/baseline_account_box_black_48.png View File

Before After
Width: 96  |  Height: 96  |  Size: 579 B

BIN
app/src/main/res/drawable-xhdpi/baseline_account_box_white_18.png View File

Before After
Width: 36  |  Height: 36  |  Size: 241 B

BIN
app/src/main/res/drawable-xhdpi/baseline_account_box_white_24.png View File

Before After
Width: 48  |  Height: 48  |  Size: 325 B

BIN
app/src/main/res/drawable-xhdpi/baseline_account_box_white_36.png View File

Before After
Width: 72  |  Height: 72  |  Size: 456 B

BIN
app/src/main/res/drawable-xhdpi/baseline_account_box_white_48.png View File

Before After
Width: 96  |  Height: 96  |  Size: 594 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_account_box_black_18.png View File

Before After
Width: 54  |  Height: 54  |  Size: 325 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_account_box_black_24.png View File

Before After
Width: 72  |  Height: 72  |  Size: 449 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_account_box_black_36.png View File

Before After
Width: 108  |  Height: 108  |  Size: 591 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_account_box_black_48.png View File

Before After
Width: 144  |  Height: 144  |  Size: 845 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_account_box_white_18.png View File

Before After
Width: 54  |  Height: 54  |  Size: 333 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_account_box_white_24.png View File

Before After
Width: 72  |  Height: 72  |  Size: 456 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_account_box_white_36.png View File

Before After
Width: 108  |  Height: 108  |  Size: 603 B

BIN
app/src/main/res/drawable-xxhdpi/baseline_account_box_white_48.png View File

Before After
Width: 144  |  Height: 144  |  Size: 859 B

BIN
app/src/main/res/drawable-xxxhdpi/baseline_account_box_black_18.png View File

Before After
Width: 72  |  Height: 72  |  Size: 449 B

BIN
app/src/main/res/drawable-xxxhdpi/baseline_account_box_black_24.png View File

Before After
Width: 96  |  Height: 96  |  Size: 579 B

BIN
app/src/main/res/drawable-xxxhdpi/baseline_account_box_black_36.png View File

Before After
Width: 144  |  Height: 144  |  Size: 845 B

BIN
app/src/main/res/drawable-xxxhdpi/baseline_account_box_black_48.png View File

Before After
Width: 192  |  Height: 192  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable-xxxhdpi/baseline_account_box_white_18.png View File

Before After
Width: 72  |  Height: 72  |  Size: 456 B

BIN
app/src/main/res/drawable-xxxhdpi/baseline_account_box_white_24.png View File

Before After
Width: 96  |  Height: 96  |  Size: 594 B

BIN
app/src/main/res/drawable-xxxhdpi/baseline_account_box_white_36.png View File

Before After
Width: 144  |  Height: 144  |  Size: 859 B

BIN
app/src/main/res/drawable-xxxhdpi/baseline_account_box_white_48.png View File

Before After
Width: 192  |  Height: 192  |  Size: 1.2 KiB

+ 10
- 0
app/src/main/res/drawable/baseline_account_box_24.xml View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M3,5v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2L5,3c-1.11,0 -2,0.9 -2,2zM15,9c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3 1.34,-3 3,-3 3,1.34 3,3zM6,17c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v1L6,18v-1z"/>
</vector>

+ 3
- 2
app/src/main/res/values/strings.xml View File

@ -32,8 +32,9 @@
<string name="title_notification_failed">\'%1$s\' failed</string> <string name="title_notification_failed">\'%1$s\' failed</string>
<string name="menu_setup">Setup</string> <string name="menu_setup">Setup</string>
<string name="menu_operations">Operations</string>
<string name="menu_faq">FAQ</string>
<string name="menu_operations">Pending operations</string>
<string name="menu_privacy">Privacy policy</string>
<string name="menu_faq">Frequently asked questions</string>
<string name="menu_about">About</string> <string name="menu_about">About</string>
<string name="title_eula">End-user license agreement</string> <string name="title_eula">End-user license agreement</string>


Loading…
Cancel
Save