Merge branch 'update_menu_fix' into 'master' (3e5c1342) · Commits · e / os / App Lounge

app/src/main/AndroidManifest.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,13 @@
		android:launchMode="singleInstance"
		android:theme="@style/AppTheme1"
		android:windowSoftInputMode="adjustResize" />
		<receiver android:name=".MicrogUninstallListener"
		android:enabled="true"
		android:exported="true">
		<intent-filter>
		<action android:name="foundation.e.apps" />
		</intent-filter>
		</receiver>
		</application>

		</manifest>
		No newline at end of file

app/src/main/java/foundation/e/apps/MicrogUninstallListener.kt

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		package foundation.e.apps

		import android.content.BroadcastReceiver
		import android.content.Context
		import android.content.Intent
		import android.util.Log
		import foundation.e.apps.utils.PreferenceStorage

		class MicrogUninstallListener : BroadcastReceiver() {
		override fun onReceive(context: Context, intent: Intent) {
		PreferenceStorage(context).save(context.getString(R.string.prefs_microg_vrsn_installed), false)
		}
		}
		No newline at end of file

app/src/main/java/foundation/e/apps/application/ApplicationActivity.kt

+35 −33

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import android.text.SpannableStringBuilder
		import android.text.method.LinkMovementMethod
		import android.text.style.ForegroundColorSpan
		import android.util.DisplayMetrics
		import android.util.Log
		import android.util.TypedValue
		import android.view.Menu
		import android.view.MenuItem
		@@ -40,14 +39,11 @@ import android.view.View
		import android.widget.ImageView
		import android.widget.LinearLayout
		import android.widget.TextView
		import androidx.annotation.ColorInt
		import androidx.appcompat.app.AlertDialog
		import androidx.appcompat.app.AppCompatActivity
		import androidx.appcompat.view.ContextThemeWrapper
		import androidx.appcompat.widget.Toolbar
		import com.google.android.material.snackbar.Snackbar
		import foundation.e.apps.MainActivity.Companion.sharedPreferences
		import foundation.e.apps.pwa.PwaInstaller
		import foundation.e.apps.R
		import foundation.e.apps.application.model.Application
		import foundation.e.apps.application.model.ApplicationStateListener
		@@ -61,6 +57,7 @@ import foundation.e.apps.applicationmanager.ApplicationManager
		import foundation.e.apps.applicationmanager.ApplicationManagerServiceConnection
		import foundation.e.apps.applicationmanager.ApplicationManagerServiceConnectionCallback
		import foundation.e.apps.categories.category.CategoryActivity
		import foundation.e.apps.pwa.PwaInstaller
		import foundation.e.apps.utils.Common
		import foundation.e.apps.utils.Common.toMiB
		import foundation.e.apps.utils.Constants
		@@ -82,8 +79,6 @@ class ApplicationActivity :
		PwasBasicData.IconLoaderCallback {




		private lateinit var applicationPackageName: String
		private lateinit var application: Application
		private val applicationManagerServiceConnection =
		@@ -360,6 +355,12 @@ class ApplicationActivity :
		} else {
		app_version.text = getString(R.string.not_available)
		}
		// Set app package name.
		if (fullData.packageName.isNotEmpty()) {
		app_package_name.text = fullData.packageName
		} else {
		app_package_name.text = getString(R.string.not_available)
		}

		// Set app update timestamp
		if (fullData.getLastVersion()!!.createdOn.isNotEmpty()) {
		@@ -561,6 +562,7 @@ class ApplicationActivity :
		app_updated_on_layout.visibility = View.GONE
		app_requires.visibility = View.GONE
		app_licence_layout.visibility = View.GONE
		app_package_name_layout.visibility =View.GONE


		application.addListener(this)

app/src/main/java/foundation/e/apps/application/ApplicationViewHolder.kt

+20 −16

Original line number	Diff line number	Diff line
		@@ -161,8 +161,7 @@ var accentColorOS=accentColorOS;
		State.NOT_DOWNLOADED -> {
		if (0 != this.accentColorOS) {
		installButton.setTextColor(this.accentColorOS)
		}
		else{
		} else {

		installButton.setTextColor(Color.parseColor("#0088ED"))
		}
		@@ -176,8 +175,7 @@ var accentColorOS=accentColorOS;
		Common.appHasLaunchActivity(activity, application!!.packageName)
		if (0 != this.accentColorOS) {
		installButton!!.setBackgroundColor(this.accentColorOS)
		}
		else{
		} else {
		installButton!!.setBackgroundResource(R.drawable.app_install_border)
		}
		installButton.setTextColor(Color.parseColor("#FAFAFA"))
		@@ -187,14 +185,20 @@ var accentColorOS=accentColorOS;
		installButton?.isEnabled = false
		}
		State.NOT_UPDATED -> {
		if (application?.packageName == Constants.MICROG_PACKAGE) {
		installButton.setBackgroundResource(R.drawable.app_install_border_simple)
		installButton.text = "Install"
		installButton.setTextColor(this.accentColorOS)
		} else {
		installButton.setTextColor(Color.parseColor("#FAFAFA"))
		//installButton!!.setBackgroundResource(R.drawable.app_install_border)
		if (0 != this.accentColorOS) {
		installButton!!.setBackgroundColor(this.accentColorOS)
		}
		else{
		} else {
		installButton!!.setBackgroundResource(R.drawable.app_install_border)
		}
		}

		installButton?.isEnabled = true
		}
		else -> {

app/src/main/java/foundation/e/apps/application/model/Installer.kt

+5 −7

Original line number	Diff line number	Diff line
		@@ -134,24 +134,22 @@ class Installer(private val packageName: String,
		addAction(Intent.ACTION_PACKAGE_ADDED)
		addDataScheme("package")
		})
		Log.i(TAG, "Registered new broadcast receiver")
		}

		private var receiver = object : BroadcastReceiver() {
		override fun onReceive(p0: Context, p1: Intent) {
		if (p1.action == Intent.ACTION_PACKAGE_ADDED &&
		(p1.data.encodedSchemeSpecificPart == packageName)) {
		override fun onReceive(context: Context, intent: Intent) {
		if (intent.action == Intent.ACTION_PACKAGE_ADDED &&
		(intent.data.encodedSchemeSpecificPart == packageName)) {
		Log.i(TAG, "Broadcast received")
		var path = apk.absolutePath.split("Download")
		//delete all APK file after install
		deleteFileOrDir(path[0] + "Download");

		callback.onInstallationComplete(p0)
		callback.onInstallationComplete(context)

		if (packageName == Constants.MICROG_PACKAGE) {
		PreferenceStorage(p0).save(p0.getString(R.string.prefs_microg_vrsn_installed), true)
		PreferenceStorage(context).save(context.getString(R.string.prefs_microg_vrsn_installed), true)
		}

		}
		}
		}