From f717355519cd857170463a17010ab4163ed06976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Sun, 18 Nov 2018 00:11:30 +0100 Subject: [PATCH] use "messages" everywhere instead of "notifications" --- .../java/com/blackforestbytes/simplecloudnotifier/SCNApp.java | 4 +++- .../simplecloudnotifier/view/AccountFragment.java | 2 +- .../blackforestbytes/simplecloudnotifier/view/TabAdapter.java | 2 +- android/app/src/main/res/values/strings.xml | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java index 35c421a..8fc2f0a 100644 --- a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java +++ b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java @@ -97,4 +97,6 @@ public class SCNApp extends Application implements LifecycleObserver { isBackground = false; } -} \ No newline at end of file +} + +//TODO TabLayout indicator does not corretly animate when directly clicking on tabs \ No newline at end of file diff --git a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/AccountFragment.java b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/AccountFragment.java index 244c12e..e8aed56 100644 --- a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/AccountFragment.java +++ b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/AccountFragment.java @@ -93,7 +93,7 @@ public class AccountFragment extends Fragment builder.setPositiveButton("YES", (dialog, which) -> { CMessageList.inst().clear(); - SCNApp.showToast("Notifications cleared", 1000); + SCNApp.showToast("Messages cleared", 1000); dialog.dismiss(); }); diff --git a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/TabAdapter.java b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/TabAdapter.java index 2d07d4e..b6bbeba 100644 --- a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/TabAdapter.java +++ b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/TabAdapter.java @@ -35,7 +35,7 @@ public class TabAdapter extends FragmentStatePagerAdapter { { switch (position) { - case 0: return "Notifications"; + case 0: return "Messages"; case 1: return "Account"; case 2: return "Settings"; default: return null; diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index bc983a0..8a1c359 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -11,13 +11,13 @@ Icon Fuel QR Code Reset Account - No notifications + No messages not connected reload Priority icon Common Settings Enabled - Remember the last x notifications locally + Remember the last x messages locally Notifications (priority 0 - Low) Notifications (priority 1 - Normal) Notifications (priority 2 - High)