Merge branch 'remove-app_sharing' into 'master' (2b4b8e80) · Commits · e / os / App Lounge

app/build.gradle

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,8 +10,8 @@ android {
		applicationId "foundation.e.apps"
		minSdkVersion 21
		targetSdkVersion 27
		versionCode 6
		versionName "1.1.3"
		versionCode 7
		versionName "1.1.4"
		testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
		}
		buildTypes {

+4 −4

Original line number	Diff line number	Diff line
		@@ -144,8 +144,8 @@ class ApplicationActivity :
		}

		override fun onOptionsItemSelected(item: MenuItem?): Boolean {
		when {
		item?.itemId == R.id.action_share -> {
		when (item?.itemId) {
		/*R.id.action_share -> {
		if (::application.isInitialized) {
		val shareIntent = Intent().apply {
		action = Intent.ACTION_SEND
		@@ -154,8 +154,8 @@ class ApplicationActivity :
		}
		startActivity(shareIntent)
		}
		}
		item?.itemId == android.R.id.home -> {
		}*/
		android.R.id.home -> {
		finish()
		}
		else -> {

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,11 +20,11 @@
		<menu xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto">

		<item
		<!--<item
		android:id="@+id/action_share"
		android:icon="@drawable/ic_action_share"
		android:orderInCategory="1"
		android:title="@string/action_share"
		app:showAsAction="ifRoom" />
		app:showAsAction="ifRoom" />-->

		</menu>
		No newline at end of file