From 48c5fc59e3bb4d469445329f09c85979cdd8135c Mon Sep 17 00:00:00 2001 From: Carl Vuorinen Date: Fri, 8 Mar 2019 20:51:20 +0200 Subject: [PATCH] Add notifications icon to navigation drawer + notifications activity --- Habitica/AndroidManifest.xml | 7 ++++ .../res/drawable-mdpi/menu_notifications.webp | Bin 0 -> 164 bytes .../drawable-xhdpi/menu_notifications.webp | Bin 0 -> 222 bytes .../drawable-xxhdpi/menu_notifications.webp | Bin 0 -> 292 bytes .../res/layout/activity_notifications.xml | 33 +++++++++++++++++ Habitica/res/layout/drawer_main.xml | 35 ++++++++++++++++-- Habitica/res/navigation/navigation.xml | 5 +++ Habitica/res/values/strings.xml | 1 + .../habitica/components/AppComponent.java | 3 ++ .../ui/activities/NotificationsActivity.kt | 29 +++++++++++++++ .../ui/fragments/NavigationDrawerFragment.kt | 2 + 11 files changed, 112 insertions(+), 3 deletions(-) create mode 100644 Habitica/res/drawable-mdpi/menu_notifications.webp create mode 100644 Habitica/res/drawable-xhdpi/menu_notifications.webp create mode 100644 Habitica/res/drawable-xxhdpi/menu_notifications.webp create mode 100644 Habitica/res/layout/activity_notifications.xml create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index f6c45879c..926e9f9f5 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -64,6 +64,13 @@ android:pathPattern="/settings/.*"/> + + ;Na=(7MMAOZ_0KmydXSb!P{Ujl8KnV)|(0wVga zux%S;%<#tWr3#Ydq8g509}4z_LPJV1F9KsT{EPDq^e-<;TVSJf9KQ5$n-3)k(0sc6 Sa3FC#f4Mp$yC+oxsSSY>5kEBm literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xhdpi/menu_notifications.webp b/Habitica/res/drawable-xhdpi/menu_notifications.webp new file mode 100644 index 0000000000000000000000000000000000000000..91a0ab36178dcea5ab2d498dabcaafa96a8273a5 GIT binary patch literal 222 zcmV<403rWUNk&H200012MM6+kP&iD<0000lC%_31uQ31fKmUpvNm7%`$6p2mC*T5b zL_q>Wa8bcP2m&TP7y=K*LjVE6wvi-7b4<_wn}4py;Jp>me+F*bHj1paxA#2)VBvmf zi02LrfH-LarvRH`3=1@gaL4s_i6P`3*Uk1eXiQx9NvmTRN-U_Yi@u^R=GKCVpJlUo z-|xKtLH+;oT2!$w)d=kDNS7yrXvCGeh5~5)PhZ!z{GT?j@O7ol+td*c_|mb^by4YP YCJ30PxM>EXsN*C04uuJDtvMC~0FT{f4gdfE literal 0 HcmV?d00001 diff --git a/Habitica/res/drawable-xxhdpi/menu_notifications.webp b/Habitica/res/drawable-xxhdpi/menu_notifications.webp new file mode 100644 index 0000000000000000000000000000000000000000..e87fc73726520c593d0f4b6de7707c8877776af8 GIT binary patch literal 292 zcmV+<0o(pkNk&E-0RRA3MM6+kP&iBw0RR9mJHQSQ?;wy(?l0Z4nE&}#7)g>DyL;Ql zHUOG|LcxGRVS#`FF@ZQh`~zIzpde7-p}`>_07;S@MN&31GwA;htp=4eynBe~KLfXo z6m6Pg#(4t_Ni%OG$Tl|#PJ|;VFop-Cl~h=|d2|+{w_) zWGEp_Nruz&)(3C=jATNq6z$*gHt9p(A literal 0 HcmV?d00001 diff --git a/Habitica/res/layout/activity_notifications.xml b/Habitica/res/layout/activity_notifications.xml new file mode 100644 index 000000000..0f608d4d1 --- /dev/null +++ b/Habitica/res/layout/activity_notifications.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/drawer_main.xml b/Habitica/res/layout/drawer_main.xml index 0dac86e80..2e1aad976 100644 --- a/Habitica/res/layout/drawer_main.xml +++ b/Habitica/res/layout/drawer_main.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="64dp" android:paddingLeft="16dp" - android:paddingRight="16dp" + android:paddingRight="1dp" android:layout_marginTop="16dp" android:gravity="center_vertical" android:orientation="horizontal"> @@ -58,10 +58,39 @@ + + + + + + Open Settings It seems like you have the Developer option \“Don\'t keep Activities\” active. Currently this option causes issues with the habitica app, so we suggest disabling it. Messages + Notifications Frequently Asked Questions Special Because you subscribe to Habitica, you can purchase a number of Gems each month using Gold. diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java index 07de5c536..996add909 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java @@ -27,6 +27,7 @@ import com.habitrpg.android.habitica.ui.activities.IntroActivity; import com.habitrpg.android.habitica.ui.activities.LoginActivity; import com.habitrpg.android.habitica.ui.activities.MainActivity; import com.habitrpg.android.habitica.ui.activities.MaintenanceActivity; +import com.habitrpg.android.habitica.ui.activities.NotificationsActivity; import com.habitrpg.android.habitica.ui.activities.GroupInviteActivity; import com.habitrpg.android.habitica.ui.activities.PrefsActivity; import com.habitrpg.android.habitica.ui.activities.ReportMessageActivity; @@ -133,6 +134,8 @@ public interface AppComponent { void inject(PrefsActivity prefsActivity); + void inject(NotificationsActivity notificationsActivity); + void inject(SetupActivity setupActivity); void inject(SkillTasksActivity skillTasksActivity); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt new file mode 100644 index 000000000..b1b4e8185 --- /dev/null +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt @@ -0,0 +1,29 @@ +package com.habitrpg.android.habitica.ui.activities + +import android.os.Bundle +import com.habitrpg.android.habitica.R +import com.habitrpg.android.habitica.components.AppComponent +import kotlinx.android.synthetic.main.activity_notifications.* + +class NotificationsActivity : BaseActivity() { + + override fun getLayoutResId(): Int = R.layout.activity_notifications + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + setupToolbar(toolbar) + } + + override fun injectActivity(component: AppComponent?) { + component?.inject(this) + } + + override fun onSupportNavigateUp(): Boolean { + if (supportFragmentManager.backStackEntryCount > 0) { + onBackPressed() + return true + } + return super.onSupportNavigateUp() + } +} diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt index 5ca92abc9..5c9531386 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt @@ -97,6 +97,7 @@ class NavigationDrawerFragment : DialogFragment() { messagesBadge.visibility = View.GONE settingsBadge.visibility = View.GONE + notificationsBadge.visibility = View.GONE /* Reenable this once the boss art can be displayed correctly. @@ -192,6 +193,7 @@ class NavigationDrawerFragment : DialogFragment() { messagesButtonWrapper.setOnClickListener { setSelection(R.id.inboxFragment) } settingsButtonWrapper.setOnClickListener { setSelection(R.id.prefsActivity) } + notificationsButtonWrapper.setOnClickListener { setSelection(R.id.notificationsActivity) } } override fun onDestroy() {