Revert "Use system accent color" (6a1ed7e7) · Commits · e / os / App Lounge

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

+5 −67

Original line number	Diff line number	Diff line
		@@ -19,24 +19,15 @@ package foundation.e.apps

		//import androidx.fragment.app.ListFragment


		import android.annotation.SuppressLint
		import android.content.*
		import android.content.pm.PackageManager
		import android.content.res.ColorStateList
		import android.graphics.Color
		import android.os.Bundle
		import android.os.Handler
		import android.preference.PreferenceManager
		import android.util.TypedValue
		import android.view.MenuItem
		import android.widget.Toast
		import androidx.annotation.ColorInt
		import androidx.annotation.ColorRes
		import androidx.appcompat.app.AppCompatActivity
		import androidx.appcompat.view.ContextThemeWrapper
		import androidx.core.content.ContextCompat
		import androidx.core.graphics.drawable.DrawableCompat
		import androidx.fragment.app.Fragment
		import com.google.android.material.bottomnavigation.BottomNavigationItemView
		import com.google.android.material.bottomnavigation.BottomNavigationMenuView
		@@ -69,25 +60,21 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
		private val codeRequestPermissions = 9527
		var doubleBackToExitPressedOnce = false;
		private var isReceiverRegistered = false
		var accentColorOS = 0



		companion object {
		lateinit var mActivity: MainActivity
		var sharedPreferences : SharedPreferences?=null
		val sharedPrefFile = "kotlinsharedpreference"
		}



		override fun onCreate(savedInstanceState: Bundle?) {
		super.onCreate(savedInstanceState)
		//ThemeColors(this);
		setContentView(R.layout.activity_main)
		mActivity = this
		disableCategoryIfOpenSource()


		bottom_navigation_view.setOnNavigationItemSelectedListener{
		if (selectFragment(it.itemId,it)) {
		disableCategoryIfOpenSource()
		@@ -114,28 +101,6 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
		}
		setupLangReceiver()
		applicationManagerServiceConnection.bindService(this)

		getAccentColor();
		bottom_navigation_view_color()
		}

		private fun bottom_navigation_view_color() {
		val iconsColorStates =
		ColorStateList(arrayOf(intArrayOf(-android.R.attr.state_checked),
		intArrayOf(android.R.attr.state_checked)), intArrayOf(
		Color.parseColor("#C4CFD9"),
		accentColorOS
		))

		val textColorStates = ColorStateList(arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)), intArrayOf(
		Color.parseColor("#C4CFD9"),
		accentColorOS

		))

		bottom_navigation_view.setItemIconTintList(iconsColorStates)
		bottom_navigation_view.setItemTextColor(textColorStates)

		}

		private fun initialiseUpdatesWorker() {
		@@ -150,9 +115,9 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
		}

		private fun initialiseFragments(applicationManager: ApplicationManager) {
		homeFragment.initialise(applicationManager, accentColorOS)
		searchFragment.initialise(applicationManager, accentColorOS)
		updatesFragment.initialise(applicationManager, accentColorOS)
		homeFragment.initialise(applicationManager)
		searchFragment.initialise(applicationManager)
		updatesFragment.initialise(applicationManager)
		}

		override fun onNavigationItemSelected(item: MenuItem): Boolean {
		@@ -178,28 +143,17 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
		return "any"
		}

		fun tintMenuIcon(context: Context, item: MenuItem, @ColorRes color: Int) {
		val normalDrawable = item.icon
		val wrapDrawable = DrawableCompat.wrap(normalDrawable)

		DrawableCompat.setTint(wrapDrawable, ContextCompat.getColor(context, color))//context.resources.getColor(color))
		item.icon = wrapDrawable
		}

		private fun selectFragment(fragmentId: Int, item: MenuItem?): Boolean {

		when (fragmentId) {

		R.id.menu_home -> {
		item?.setIcon(R.drawable.ic_menu_home)
		showFragment(homeFragment)

		return true
		}
		R.id.menu_categories -> {
		item?.setIcon(R.drawable.ic_menu_categories)
		showFragment(CategoriesFragment())

		return true
		}
		R.id.menu_search -> {
		@@ -310,20 +264,4 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
		}
		}, 2000)
		}

		/*
		* get Accent color from OS
		*
		* */
		private fun getAccentColor() {

		val typedValue = TypedValue()
		val contextThemeWrapper = ContextThemeWrapper(this,
		android.R.style.Theme_DeviceDefault)
		contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,
		typedValue, true)
		@ColorInt val color = typedValue.data
		accentColorOS=color;
		}

		}

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

+1 −22

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,10 +39,8 @@ 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
		@@ -93,7 +90,7 @@ class ApplicationActivity :
		private var imageMargin = 0
		private var defaultElevation = 0f
		private val sharedPrefFile = "kotlinsharedpreference"
		var accentColorOS = 0


		override fun onCreate(savedInstanceState: Bundle?) {
		super.onCreate(savedInstanceState)
		@@ -116,14 +113,6 @@ class ApplicationActivity :
		this.applicationPackageName = applicationPackageName!!
		applicationManagerServiceConnection.bindService(this)
		}

		getAccentColor()
		app_install.setTextColor(Color.parseColor("#ffffff"))
		app_install.setBackgroundColor(accentColorOS)
		app_category.setTextColor(accentColorOS)
		app_expand_description.setTextColor(accentColorOS)


		}


		@@ -760,14 +749,4 @@ class ApplicationActivity :
		applicationManagerServiceConnection.unbindService(this)
		}
		}

		private fun getAccentColor() {
		val typedValue = TypedValue()
		val contextThemeWrapper = ContextThemeWrapper(this,
		android.R.style.Theme_DeviceDefault)
		contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,
		typedValue, true)
		@ColorInt val color = typedValue.data
		accentColorOS=color;
		}
		}

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

+49 −73

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ import kotlinx.android.synthetic.main.install_button_layout.view.*
		import java.lang.Exception


		class ApplicationViewHolder(private val activity: Activity, private val view: View, accentColorOS: Int) :
		class ApplicationViewHolder(private val activity: Activity, private val view: View) :
		RecyclerView.ViewHolder(view),
		ApplicationStateListener,
		Downloader.DownloadProgressCallback,
		@@ -67,7 +67,6 @@ class ApplicationViewHolder(private val activity: Activity, private val view: Vi
		private var application: Application? = null
		private val applicationViewModel = ApplicationViewModel()
		private var downloader: Downloader? = null
		var accentColorOS = accentColorOS;

		init {
		pwa_icon.visibility=View.GONE
		@@ -77,12 +76,6 @@ class ApplicationViewHolder(private val activity: Activity, private val view: Vi
		applicationViewModel.onApplicationClick(view.context, application!!)
		}
		}


		installButton.setTextColor(Color.parseColor("#ffffff"))
		if (0 != this.accentColorOS) {
		installButton.setBackgroundColor(this.accentColorOS)
		}
		installButton?.setOnClickListener {
		if (application?.fullData != null &&
		application!!.fullData!!.getLastVersion() == null) {
		@@ -94,7 +87,8 @@ class ApplicationViewHolder(private val activity: Activity, private val view: Vi

		}else if(application?.searchAppsBasicData!=null &&application?.searchAppsBasicData!!.is_pwa){
		application?.pwaInstall(activity)
		} else {
		}
		else {
		application?.buttonClicked(activity, activity)
		}
		}
		@@ -153,19 +147,13 @@ class ApplicationViewHolder(private val activity: Activity, private val view: Vi

		override fun stateChanged(state: State) {
		Execute({}, {

		// installButton.setBackgroundResource(R.drawable.app_install_border_simple)
		installButton.setBackgroundResource(R.drawable.app_install_border_simple)
		installButton?.text = activity.getString(state.installButtonTextId)

		when (state) {

		State.NOT_DOWNLOADED ->{
		if (0 != this.accentColorOS) {
		installButton.setTextColor(this.accentColorOS)
		} else {

		installButton.setTextColor(Color.parseColor("#0088ED"))
		}
		installButton.setBackgroundResource(R.drawable.app_install_border_simple)
		installButton.isEnabled = true
		}
		@@ -174,25 +162,15 @@ class ApplicationViewHolder(private val activity: Activity, private val view: Vi

		installButton?.isEnabled =
		Common.appHasLaunchActivity(activity, application!!.packageName)
		if (0 != this.accentColorOS) {
		installButton!!.setBackgroundColor(this.accentColorOS)
		} else {
		installButton!!.setBackgroundResource(R.drawable.app_install_border)
		}
		installButton.setTextColor(Color.parseColor("#FAFAFA"))

		installButton!!.setBackgroundResource(R.drawable.app_install_border)
		}
		State.INSTALLING -> {
		installButton?.isEnabled = false
		}
		State.NOT_UPDATED -> {
		installButton.setTextColor(Color.parseColor("#FAFAFA"))
		//installButton!!.setBackgroundResource(R.drawable.app_install_border)
		if (0 != this.accentColorOS) {
		installButton!!.setBackgroundColor(this.accentColorOS)
		} else {
		installButton!!.setBackgroundResource(R.drawable.app_install_border)
		}
		installButton?.isEnabled = true
		}
		else -> {
		@@ -200,7 +178,6 @@ class ApplicationViewHolder(private val activity: Activity, private val view: Vi
		installButton?.isEnabled = true
		}
		}

		})
		}

		@@ -227,5 +204,4 @@ class ApplicationViewHolder(private val activity: Activity, private val view: Vi
		downloader?.removeListener(this)
		downloader = null
		}

		}

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

+5 −16

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ class SmallApplicationViewHolder(private val activity: Activity, private val vie
		BasicData.IconLoaderCallback,
		PwasBasicData.IconLoaderCallback{


		private val icon: ImageView = view.app_icon
		private val title: TextView = view.app_title
		private val installButton: Button = view.app_install
		@@ -68,7 +67,6 @@ class SmallApplicationViewHolder(private val activity: Activity, private val vie
		applicationViewModel.onApplicationClick(view.context, application!!)
		}
		}

		installButton.setOnClickListener {
		if (application?.fullData != null &&
		application!!.fullData!!.getLastVersion() == null) {
		@@ -84,6 +82,7 @@ class SmallApplicationViewHolder(private val activity: Activity, private val vie
		}
		}
		}

		fun createApplicationView(app: Application) {
		if(app.basicData!=null) {
		this.application?.removeListener(this)
		@@ -117,14 +116,11 @@ class SmallApplicationViewHolder(private val activity: Activity, private val vie
		installButton.text = activity.getString(state.installButtonTextId)
		installButton.clearAnimation()
		installButton.clearFocus();
		var color = application?.getAccentColor(activity);
		when (state) {

		State.NOT_DOWNLOADED ->{
		installButton.setTextColor(Color.parseColor("#0088ED"))
		installButton.setBackgroundResource(R.drawable.app_install_border_simple)
		if (color != null) {

		installButton.setTextColor(color)
		};
		installButton.isEnabled = true
		}

		@@ -132,10 +128,7 @@ class SmallApplicationViewHolder(private val activity: Activity, private val vie
		installButton.isEnabled =
		Common.appHasLaunchActivity(activity, application!!.packageName)
		installButton.setTextColor(Color.parseColor("#FAFAFA"))
		if (color != null) {
		//installButton!!.setBackgroundResource(R.drawable.app_install_border)
		installButton.setBackgroundColor(color)
		};
		installButton!!.setBackgroundResource(R.drawable.app_install_border)
		}
		State.INSTALLING -> {
		installButton.isEnabled = false
		@@ -144,11 +137,7 @@ class SmallApplicationViewHolder(private val activity: Activity, private val vie
		}
		State.NOT_UPDATED -> {
		installButton.setTextColor(Color.parseColor("#FAFAFA"))
		// installButton!!.setBackgroundResource(R.drawable.app_install_border)
		if (color != null) {
		//installButton!!.setBackgroundResource(R.drawable.app_install_border)
		installButton.setBackgroundColor(color)
		};
		installButton!!.setBackgroundResource(R.drawable.app_install_border)
		installButton.isEnabled = true
		}
		else -> {

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

+43 −55

Original line number	Diff line number	Diff line
		@@ -18,15 +18,11 @@
		package foundation.e.apps.application.model

		import android.Manifest
		import android.R
		import android.app.Activity
		import android.app.DownloadManager
		import android.content.Context
		import android.content.Intent
		import android.content.pm.PackageManager
		import android.util.TypedValue
		import androidx.annotation.ColorInt
		import androidx.appcompat.view.ContextThemeWrapper
		import foundation.e.apps.MainActivity.Companion.mActivity
		import foundation.e.apps.pwa.PwaInstaller
		import foundation.e.apps.XAPK.XAPKFile
		@@ -44,6 +40,8 @@ class Application(val packageName: String, private val applicationManager: Appli
		DownloaderInterface, InstallerInterface{




		private val uses = AtomicInteger(0)
		private val info = ApplicationInfo(packageName)
		private val stateManager = StateManager(info, this, applicationManager)
		@@ -81,13 +79,16 @@ class Application(val packageName: String, private val applicationManager: Appli
		fun checkForStateUpdate(context: Context) {
		if (basicData != null) {
		stateManager.find(context, basicData!!)
		} else if (searchAppsBasicData != null) {
		}
		else if(searchAppsBasicData !=null){
		if(searchAppsBasicData!!.is_pwa){
		// stateManager.pwaFind()
		} else {
		}
		else{
		stateManager.searchAppsFind(context, searchAppsBasicData!!)
		}
		} else if (pwabasicdata != null) {
		}
		else if(pwabasicdata!=null){
		// stateManager.pwaFind()
		}
		}
		@@ -212,18 +213,15 @@ class Application(val packageName: String, private val applicationManager: Appli

		override fun onDownloadComplete(context: Context, status: Int) {
		if (status == DownloadManager.STATUS_SUCCESSFUL) {
		if (basicData?.packageName == Constants.MICROG_PACKAGE) {
		installSystemApp(context)
		} else {
		Execute({
		AppDownloadedRequest(basicData!!.id,fullData!!.getLastVersion()?.apkArchitecture).request()
		}, {})
		if(info.isXapk(fullData!!,basicData)){
		isInstalling=true
		XAPKFile(info.getxApkFile(context,basicData!!),this)
		} else {
		install(context)
		}
		else {
		install(context)
		}
		} else {
		synchronized(blocker) {
		@@ -232,7 +230,8 @@ class Application(val packageName: String, private val applicationManager: Appli
		if(basicData!=null) {
		info.getApkFile(context, basicData!!).delete()
		applicationManager.stopInstalling(context, this)
		} else {
		}
		else{
		applicationManager.stopInstalling(context, this)
		}
		}
		@@ -273,12 +272,16 @@ class Application(val packageName: String, private val applicationManager: Appli
		fun assertFullData(context: Context): Error? {
		if (fullData != null) {
		return null
		} else if (pwabasicdata != null) {
		}
		else if(pwabasicdata != null){
		return findPwaFullData(context)
		} else if (searchAppsBasicData != null) {
		}

		else if(searchAppsBasicData!=null){
		if(searchAppsBasicData!!.is_pwa){
		return findSearchResultPwaFulldata(context)
		} else {
		}
		else{
		findSearchAppsFullData(context)
		}
		}
		@@ -336,7 +339,6 @@ class Application(val packageName: String, private val applicationManager: Appli
		}
		return error
		}

		private fun findSearchAppsFullData(context: Context): Error? {
		if (searchAppsBasicData == null) {
		val error = findBasicData(context)
		@@ -426,6 +428,7 @@ class Application(val packageName: String, private val applicationManager: Appli
		}



		fun loadIcon(iconLoaderCallback: BasicData.IconLoaderCallback) {
		basicData?.loadIconAsync(this, iconLoaderCallback)
		}
		@@ -471,19 +474,4 @@ class Application(val packageName: String, private val applicationManager: Appli
		Pwaupdate(pwaFullData.pwabasicdata, context)
		pwaFullData.pwabasicdata = pwabasicdata!!
		}

		/*
		* get Accent color from OS
		*
		*/
		fun getAccentColor(context: Context): Int {
		val typedValue = TypedValue()
		val contextThemeWrapper = ContextThemeWrapper(context,
		R.style.Theme_DeviceDefault)
		contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,
		typedValue, true)
		@ColorInt val color = typedValue.data
		return color;

		}
		}