Skip to content
This repository was archived by the owner on Jun 5, 2022. It is now read-only.

Commit 4cbddbe

Browse files
jpelgromjpelgrom
committed
Textual updates: copyright year, license, privacy information
 - Removed year from copyright in about dialog - Removed license information for Firebase JobDispatcher which is no longer used (directly) - Added privacy information to signup process (general and notifications) and user settings (notifications) to make data usage more transparent
1 parent c3ecc39 commit 4cbddbe

File tree

9 files changed

+106
-14
lines changed

9 files changed

+106
-14
lines changed

‎app/src/main/java/nl/jpelgrm/movienotifier/ui/settings/AccountNotificationsFragment.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class AccountNotificationsFragment extends Fragment {
3737
@BindView(R.id.error) TextView error;
3838

3939
@BindView(R.id.types) LinearLayout types;
40+
@BindView(R.id.privacy) LinearLayout privacy;
4041

4142
@BindView(R.id.go) Button go;
4243

@@ -69,12 +70,9 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
6970

7071
getTypes();
7172

72-
go.setOnClickListener(new View.OnClickListener() {
73-
@Override
74-
public void onClick(View view) {
75-
error.setVisibility(View.GONE);
76-
save();
77-
}
73+
go.setOnClickListener(view1 -> {
74+
error.setVisibility(View.GONE);
75+
save();
7876
});
7977
}
8078

@@ -91,9 +89,11 @@ public void onResponse(Call<List<NotificationType>> call, Response<List<Notifica
9189
updateTypesList();
9290

9391
error.setVisibility(View.GONE);
92+
privacy.setVisibility(View.VISIBLE);
9493
} else {
9594
error.setText(ErrorUtil.getErrorMessage(getContext(), response));
9695
error.setVisibility(View.VISIBLE);
96+
privacy.setVisibility(View.GONE);
9797
}
9898
}
9999

@@ -106,6 +106,7 @@ public void onFailure(Call<List<NotificationType>> call, Throwable t) {
106106

107107
error.setText(ErrorUtil.getErrorMessage(getContext(), null));
108108
error.setVisibility(View.VISIBLE);
109+
privacy.setVisibility(View.GONE);
109110
}
110111
});
111112
}

‎app/src/main/java/nl/jpelgrm/movienotifier/ui/settings/SettingsAccountOverviewFragment.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public class SettingsAccountOverviewFragment extends Fragment {
5353

5454
@BindView(R.id.notifications) LinearLayout notificationsWrapper;
5555
@BindView(R.id.notificationsEmpty) TextView notificationsEmpty;
56+
@BindView(R.id.notificationsPrivacy) LinearLayout notificationsPrivacy;
5657
@BindView(R.id.notificationTypes) LinearLayout notificationsList;
5758

5859
private User user;
@@ -207,6 +208,7 @@ public void run() {
207208
notificationsWrapper.setVisibility(View.VISIBLE);
208209
notificationsList.setVisibility(typeList.size() > 0 ? View.VISIBLE : View.GONE);
209210
notificationsEmpty.setVisibility(typeList.size() > 0 ? View.GONE : View.VISIBLE);
211+
notificationsPrivacy.setVisibility(typeList.size() > 0 ? View.VISIBLE : View.GONE);
210212
}
211213

212214
private void editDetail(SettingsAccountUpdateFragment.UpdateMode mode) {
@@ -417,6 +419,7 @@ public void onResponse(Call<List<NotificationType>> call, Response<List<Notifica
417419
notificationsWrapper.setVisibility(user != null ? View.VISIBLE : View.GONE);
418420
notificationsList.setVisibility(View.GONE);
419421
notificationsEmpty.setVisibility(View.VISIBLE);
422+
notificationsPrivacy.setVisibility(View.GONE);
420423
}
421424
}
422425

@@ -428,6 +431,7 @@ public void onFailure(Call<List<NotificationType>> call, Throwable t) {
428431
notificationsWrapper.setVisibility(user != null ? View.VISIBLE : View.GONE);
429432
notificationsList.setVisibility(View.GONE);
430433
notificationsEmpty.setVisibility(View.VISIBLE);
434+
notificationsPrivacy.setVisibility(View.GONE);
431435
}
432436
});
433437
}

‎app/src/main/res/drawable-night/ic_info.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:fillColor="#BDBDBD"
8+
android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
9+
</vector>

‎app/src/main/res/drawable/ic_info.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:fillColor="#676767"
8+
android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
9+
</vector>

‎app/src/main/res/layout/fragment_account_add.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,28 @@
115115

116116
</com.google.android.material.textfield.TextInputLayout>
117117

118+
<LinearLayout
119+
android:id="@+id/privacy"
120+
android:layout_width="match_parent"
121+
android:layout_height="wrap_content"
122+
android:minHeight="?attr/listPreferredItemHeightSmall"
123+
android:paddingTop="8dp"
124+
android:paddingBottom="8dp"
125+
android:layout_marginTop="16dp">
126+
127+
<androidx.appcompat.widget.AppCompatImageView
128+
android:layout_width="24dp"
129+
android:layout_height="24dp"
130+
android:layout_marginEnd="16dp"
131+
app:srcCompat="@drawable/ic_info"/>
132+
133+
<TextView
134+
android:layout_width="match_parent"
135+
android:layout_height="wrap_content"
136+
android:text="@string/user_privacy_general"/>
137+
138+
</LinearLayout>
139+
118140
<Button
119141
android:id="@+id/go"
120142
android:layout_width="match_parent"

‎app/src/main/res/layout/fragment_account_notifications.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
34
xmlns:tools="http://schemas.android.com/tools"
45
android:layout_width="match_parent"
56
android:layout_height="match_parent">
@@ -59,6 +60,32 @@
5960
android:layout_height="wrap_content"
6061
android:orientation="vertical"/>
6162

63+
<LinearLayout
64+
android:id="@+id/privacy"
65+
android:layout_width="match_parent"
66+
android:layout_height="wrap_content"
67+
android:minHeight="?attr/listPreferredItemHeightSmall"
68+
android:paddingStart="?attr/listPreferredItemPaddingLeft"
69+
android:paddingEnd="?attr/listPreferredItemPaddingRight"
70+
android:paddingTop="8dp"
71+
android:paddingBottom="8dp"
72+
android:layout_marginTop="16dp"
73+
android:visibility="gone"
74+
tools:visibility="visible">
75+
76+
<androidx.appcompat.widget.AppCompatImageView
77+
android:layout_width="24dp"
78+
android:layout_height="24dp"
79+
android:layout_marginEnd="16dp"
80+
app:srcCompat="@drawable/ic_info"/>
81+
82+
<TextView
83+
android:layout_width="match_parent"
84+
android:layout_height="wrap_content"
85+
android:text="@string/user_privacy_notifications"/>
86+
87+
</LinearLayout>
88+
6289
<Button
6390
android:id="@+id/go"
6491
android:layout_width="match_parent"

‎app/src/main/res/layout/fragment_settings_account_overview.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,31 @@
212212
android:layout_height="wrap_content"
213213
android:orientation="vertical"/>
214214

215+
<LinearLayout
216+
android:id="@+id/notificationsPrivacy"
217+
android:layout_width="match_parent"
218+
android:layout_height="wrap_content"
219+
android:minHeight="?attr/listPreferredItemHeightSmall"
220+
android:paddingStart="?attr/listPreferredItemPaddingLeft"
221+
android:paddingEnd="?attr/listPreferredItemPaddingRight"
222+
android:paddingTop="8dp"
223+
android:paddingBottom="8dp"
224+
android:visibility="gone"
225+
tools:visibility="visible">
226+
227+
<androidx.appcompat.widget.AppCompatImageView
228+
android:layout_width="24dp"
229+
android:layout_height="24dp"
230+
android:layout_marginEnd="32dp"
231+
app:srcCompat="@drawable/ic_info"/>
232+
233+
<TextView
234+
android:layout_width="match_parent"
235+
android:layout_height="wrap_content"
236+
android:text="@string/user_privacy_notifications"/>
237+
238+
</LinearLayout>
239+
215240
</LinearLayout>
216241

217242
</LinearLayout>

‎app/src/main/res/layout/fragment_settings_licenses.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@
3737
app:licenseNotice="Copyright 2013 Jake Wharton"
3838
app:licenseLicense="@string/license_apache" />
3939

40-
<nl.jpelgrm.movienotifier.ui.view.LicenseTextView
41-
android:layout_width="match_parent"
42-
android:layout_height="wrap_content"
43-
app:licenseTitle="Firebase JobDispatcher"
44-
app:licenseNotice="Copyright 2016 Google Inc."
45-
app:licenseLicense="@string/license_apache" />
46-
4740
<nl.jpelgrm.movienotifier.ui.view.LicenseTextView
4841
android:layout_width="match_parent"
4942
android:layout_height="wrap_content"

‎app/src/main/res/values/strings.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<string name="settings_about_title">About</string>
3131
<string name="settings_about_name">Movie Notifier Android</string>
3232
<string name="settings_about_version">Version %1$s, build %2$s</string>
33-
<string name="settings_about_copyright">App © 2017 Joris Pelgröm\nService © 2017 Sijmen Huizenga</string>
33+
<string name="settings_about_copyright">App © Joris Pelgröm\nService © Sijmen Huizenga</string>
3434
<string name="settings_about_github"><a href='https://github.com/jpelgrom/Movie-Notifier-Android'>View source code</a></string>
3535

3636
<string name="account_start_title">Hi there!</string>
@@ -153,6 +153,8 @@
153153
<string name="user_settings_update_name_success">Username updated</string>
154154
<string name="user_settings_update_email_success">Email address updated</string>
155155
<string name="user_settings_update_phone_success">Phone number updated</string>
156+
<string name="user_privacy_general">Your data is stored securely and will only be used to allow you to use Movie Notifier. You can update or delete your account at any time in the app.</string>
157+
<string name="user_privacy_notifications">Your email address or phone number is only shared with the notification service when a notification is sent. No data is shared when there aren\'t any notifications or if you haven\'t turned the notification service on.</string>
156158

157159
<string name="error_login_401">Your username and/or password is incorrect.</string>
158160
<string name="error_watchers_400">Sorry, please try again.</string>

0 commit comments

Comments
 (0)