jrpie/launcher
1
0
Fork 0
mirror of https://github.com/jrpie/Launcher.git synced 2025-02-23 14:31:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #41 from finnmglas/feature/select-actions

Browse source 
Feature/select actions 2
This commit is contained in:
Finn M Glas 2020-05-29 18:53:39 +02:00 • committed by GitHub
commit 41ace0a30b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/finnmglas/launcher/MainActivity.kt
View file

@ -176,7 +176,8 @@ class MainActivity : AppCompatActivity(),
} }
override fun onLongPress(event: MotionEvent) { override fun onLongPress(event: MotionEvent) {
launchApp(longClickApp, this) if(longClickApp != "") launchApp(longClickApp, this)
else openSettings()
} }
override fun onDoubleTap(event: MotionEvent): Boolean { override fun onDoubleTap(event: MotionEvent): Boolean {

2
app/src/main/java/com/finnmglas/launcher/settings/actions/ActionsRecyclerAdapter.kt
View file

@ -62,6 +62,7 @@ class ActionsRecyclerAdapter(val activity: Activity):
viewHolder.removeAction.visibility = View.GONE viewHolder.removeAction.visibility = View.GONE
viewHolder.chooseButton.visibility = View.VISIBLE viewHolder.chooseButton.visibility = View.VISIBLE
viewHolder.chooseButton.setOnClickListener{ chooseApp(actionName.toString()) } viewHolder.chooseButton.setOnClickListener{ chooseApp(actionName.toString()) }
if (getSavedTheme(activity) =="custom")
setButtonColor(viewHolder.chooseButton, vibrantColor) setButtonColor(viewHolder.chooseButton, vibrantColor)
} }
@ -70,6 +71,7 @@ class ActionsRecyclerAdapter(val activity: Activity):
viewHolder.removeAction.visibility = View.GONE viewHolder.removeAction.visibility = View.GONE
viewHolder.chooseButton.visibility = View.VISIBLE viewHolder.chooseButton.visibility = View.VISIBLE
viewHolder.chooseButton.setOnClickListener{ chooseApp(actionName.toString()) } viewHolder.chooseButton.setOnClickListener{ chooseApp(actionName.toString()) }
if (getSavedTheme(activity) =="custom")
setButtonColor(viewHolder.chooseButton, vibrantColor) setButtonColor(viewHolder.chooseButton, vibrantColor)
} }
} }