Remove DAVdroid specific UI elements (eaab08e7) · Commits · e / os / AccountManager

app/src/main/java/at/bitfire/davdroid/ui/DefaultAccountsDrawerHandler.kt

+2 −33

Original line number	Diff line number	Diff line
		@@ -10,24 +10,15 @@ package at.bitfire.davdroid.ui

		import android.app.Activity
		import android.content.Intent
		import android.net.Uri
		import android.view.Menu
		import android.view.MenuItem
		import at.bitfire.davdroid.App
		import at.bitfire.davdroid.BuildConfig
		import at.bitfire.davdroid.R
		import at.bitfire.davdroid.settings.ISettings

		class DefaultAccountsDrawerHandler : IAccountsDrawerHandler {

		companion object {
		private const val BETA_FEEDBACK_URI = "mailto:support@davdroid.com?subject=${BuildConfig.APPLICATION_ID}/${BuildConfig.VERSION_NAME} feedback (${BuildConfig.VERSION_CODE})"
		}


		override fun onSettingsChanged(settings: ISettings?, menu: Menu) {
		if (BuildConfig.VERSION_NAME.contains("-beta") \|\| BuildConfig.VERSION_NAME.contains("-rc"))
		menu.findItem(R.id.nav_beta_feedback).isVisible = true
		// TODO Provide option for beta feedback
		}

		override fun onNavigationItemSelected(activity: Activity, item: MenuItem): Boolean {
		@@ -36,28 +27,6 @@ class DefaultAccountsDrawerHandler: IAccountsDrawerHandler {
		activity.startActivity(Intent(activity, AboutActivity::class.java))
		R.id.nav_app_settings ->
		activity.startActivity(Intent(activity, AppSettingsActivity::class.java))
		R.id.nav_beta_feedback -> {
		val intent = Intent(Intent.ACTION_SENDTO, Uri.parse(BETA_FEEDBACK_URI))
		if (activity.packageManager.resolveActivity(intent, 0) != null)
		activity.startActivity(intent)
		}
		R.id.nav_twitter ->
		activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://twitter.com/davdroidapp")))
		R.id.nav_website ->
		activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.homepage_url))))
		R.id.nav_manual ->
		activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.homepage_url))
		.buildUpon().appendEncodedPath("manual/").build()))
		R.id.nav_faq ->
		activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.homepage_url))
		.buildUpon().appendEncodedPath("faq/").build()))
		R.id.nav_forums ->
		activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.homepage_url))
		.buildUpon().appendEncodedPath("forums/").build()))
		R.id.nav_donate ->
		//if (BuildConfig.FLAVOR != App.FLAVOR_GOOGLE_PLAY)
		activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(activity.getString(R.string.homepage_url))
		.buildUpon().appendEncodedPath("donate/").build()))
		else ->
		return false
		}

app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.kt

+0 −15

Original line number	Diff line number	Diff line
		@@ -8,14 +8,9 @@

		package at.bitfire.davdroid.ui.setup

		import android.content.Intent
		import android.net.Uri
		import android.os.Bundle
		import android.support.v7.app.AppCompatActivity
		import android.view.Menu
		import android.view.MenuItem
		import at.bitfire.davdroid.R
		import java.util.*

		/**
		* Activity to initially connect to a server and create an account.
		@@ -71,11 +66,6 @@ class LoginActivity : AppCompatActivity() {
		}
		}

		override fun onCreateOptionsMenu(menu: Menu): Boolean {
		menuInflater.inflate(R.menu.activity_login, menu)
		return true
		}

		override fun onOptionsItemSelected(item: MenuItem?): Boolean {
		when {
		item?.itemId == android.R.id.home -> {
		@@ -86,9 +76,4 @@ class LoginActivity : AppCompatActivity() {
		return false
		}


		fun showHelp(item: MenuItem) {
		startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.login_help_url))))
		}

		}

app/src/main/res/menu/activity_accounts_drawer.xml

+4 −48

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		<?xml version="1.0" encoding="utf-8"?><!--
		~ Copyright © Ricki Hirner (bitfire web engineering).
		~ All rights reserved. This program and the accompanying materials
		~ are made available under the terms of the GNU Public License v3.0
		@@ -7,58 +6,15 @@
		~ http://www.gnu.org/licenses/gpl.html
		-->

		<menu xmlns:tools="http://schemas.android.com/tools"
		xmlns:android="http://schemas.android.com/apk/res/android">
		<menu xmlns:android="http://schemas.android.com/apk/res/android">

		<item
		android:id="@+id/nav_about"
		android:icon="@drawable/ic_info_dark"
		android:title="@string/navigation_drawer_about" />

		<item
		android:id="@+id/nav_beta_feedback"
		android:icon="@drawable/ic_forum_dark"
		android:title="@string/navigation_drawer_beta_feedback"
		android:visible="false"/>

		<item
		android:id="@+id/nav_app_settings"
		android:icon="@drawable/ic_settings_dark"
		android:title="@string/navigation_drawer_settings" />

		<item android:title="@string/navigation_drawer_news_updates">
		<menu>
		<item
		android:id="@+id/nav_twitter"
		android:icon="@drawable/twitter"
		android:title="\@davdroidapp"
		tools:ignore="HardcodedText"/>
		</menu>
		</item>

		<item android:title="@string/navigation_drawer_external_links">
		<menu>
		<item
		android:id="@+id/nav_website"
		android:icon="@drawable/ic_home_dark"
		android:title="@string/navigation_drawer_website"/>
		<item
		android:id="@+id/nav_manual"
		android:icon="@drawable/ic_info_dark"
		android:title="@string/navigation_drawer_manual"/>
		<item
		android:id="@+id/nav_faq"
		android:icon="@drawable/ic_help_dark"
		android:title="@string/navigation_drawer_faq"/>
		<item
		android:id="@+id/nav_forums"
		android:icon="@drawable/ic_forum_dark"
		android:title="@string/navigation_drawer_forums"/>
		<item
		android:id="@+id/nav_donate"
		android:icon="@drawable/ic_attach_money_dark"
		android:title="@string/navigation_drawer_donate"/>
		</menu>
		</item>

		</menu>

app/src/main/res/menu/activity_login.xml

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright © Ricki Hirner (bitfire web engineering).
		~ All rights reserved. This program and the accompanying materials
		~ are made available under the terms of the GNU Public License v3.0
		~ which accompanies this distribution, and is available at
		~ http://www.gnu.org/licenses/gpl.html
		-->

		<menu xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto">

		<item
		android:id="@+id/help"
		android:title="@string/help"
		android:icon="@drawable/ic_help_action"
		app:showAsAction="always"
		android:onClick="showHelp">
		</item>

		</menu>

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -25,12 +25,10 @@
		<string name="address_books_authority">at.bitfire.davdroid.addressbooks</string>
		<string name="address_books_authority_title">Address books</string>
		<string name="email_authority">io.eelo.mail.provider.AppContentProvider</string>
		<string name="help">Help</string>
		<string name="manage_accounts">Manage accounts</string>
		<string name="please_wait">Please wait …</string>
		<string name="send">Send</string>
		<string name="homepage_url">https://www.davdroid.com/?pk_campaign=davdroid-app</string>
		<string name="beta_feedback_url">https://forums.bitfire.at/category/9/beta-test-discussion?pk_campaign=davdroid-app</string>

		<string name="notification_channel_debugging">Debugging</string>
		<string name="notification_channel_general">Other important messages</string>
		@@ -142,7 +140,6 @@
		<string name="account_install_icsdroid">Install ICSdroid</string>

		<!-- AddAccountActivity -->
		<string name="login_help_url">https://www.davdroid.com/tested-with/?pk_campaign=davdroid-app</string>
		<string name="login_eelo_title">Login with an /e/ account</string>
		<string name="login_title">Add account</string>
		<string name="login_type_email">Login with email address</string>