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/.*"/> + + + + + + + + + + + + + + \ 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() {