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

Merge pull request #38 from finnmglas/feature/further-actions

Browse source 
Feature/further actions
This commit is contained in:
Finn M Glas 2020-05-27 15:28:21 +02:00 • committed by GitHub
commit 9d691910b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 76 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/finnmglas/launcher/ChooseActivity.kt
View file

@ -8,7 +8,6 @@ import android.view.WindowManager
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.finnmglas.launcher.choose.AppsRecyclerAdapter
import com.finnmglas.launcher.extern.*
import kotlinx.android.synthetic.main.activity_choose.*

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

@ -175,7 +175,14 @@ class MainActivity : AppCompatActivity(),
return true
}
override fun onLongPress(event: MotionEvent) { openSettings() }
override fun onLongPress(event: MotionEvent) {
launchApp(longClickApp, this)
}
override fun onDoubleTap(event: MotionEvent): Boolean {
launchApp(doubleClickApp, this)
return false
}
// Tooltip
override fun onSingleTapConfirmed(event: MotionEvent): Boolean {
@ -213,7 +220,6 @@ class MainActivity : AppCompatActivity(),
/* TODO: Remove those. For now they are necessary
* because this inherits from GestureDetector.OnGestureListener */
override fun onDoubleTap(event: MotionEvent): Boolean { return false }
override fun onDoubleTapEvent(event: MotionEvent): Boolean { return false }
override fun onDown(event: MotionEvent): Boolean { return false }
override fun onScroll(e1: MotionEvent, e2: MotionEvent, dX: Float, dY: Float): Boolean { return false }

16
app/src/main/java/com/finnmglas/launcher/extern/Functions.kt vendored
View file

@ -29,6 +29,8 @@ var rightApp = ""
var leftApp = ""
var volumeUpApp = ""
var volumeDownApp = ""
var doubleClickApp = ""
var longClickApp = ""
var calendarApp = ""
var clockApp = ""
@ -40,10 +42,10 @@ var vibrantColor = 0
/** REQUEST CODES */
val REQUEST_PICK_IMAGE = 1
val REQUEST_CHOOSE_APP = 2
val REQUEST_UNINSTALL = 3
val REQUEST_PERMISSION_STORAGE = 4
const val REQUEST_PICK_IMAGE = 1
const val REQUEST_CHOOSE_APP = 2
const val REQUEST_UNINSTALL = 3
const val REQUEST_PERMISSION_STORAGE = 4
/** Animate */
@ -210,6 +212,9 @@ fun loadSettings(sharedPref : SharedPreferences){
volumeUpApp = sharedPref.getString("action_volumeUpApp", "").toString()
volumeDownApp = sharedPref.getString("action_volumeDownApp", "").toString()
doubleClickApp = sharedPref.getString("action_doubleClickApp", "").toString()
longClickApp = sharedPref.getString("action_longClickApp", "").toString()
calendarApp = sharedPref.getString("action_calendarApp", "").toString()
clockApp = sharedPref.getString("action_clockApp", "").toString()
@ -269,6 +274,9 @@ fun resetSettings(sharedPref : SharedPreferences, context: Context) : MutableLis
editor.putString("action_volumeDownApp", chosenVolumeDownPackage)
defaultList.add(chosenVolumeDownName)
editor.putString("action_doubleClickApp", "")
editor.putString("action_longClickApp", "")
val (_, chosenClockPackage) = pickDefaultApp(
"action_clockApp",
context

4
app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentApps.kt
View file

@ -41,6 +41,8 @@ class SettingsFragmentApps : Fragment() {
setButtonColor(fragment_settings_apps_choose_right_btn, vibrantColor)
setButtonColor(fragment_settings_apps_choose_vol_up_btn, vibrantColor)
setButtonColor(fragment_settings_apps_choose_vol_down_btn, vibrantColor)
setButtonColor(fragment_settings_apps_choose_double_click_btn, vibrantColor)
setButtonColor(fragment_settings_apps_choose_long_click_btn, vibrantColor)
setButtonColor(fragment_settings_apps_btn, vibrantColor)
setButtonColor(fragment_settings_apps_install_btn, vibrantColor)
@ -53,6 +55,8 @@ class SettingsFragmentApps : Fragment() {
fragment_settings_apps_choose_right_btn.setOnClickListener{ chooseApp("rightApp") }
fragment_settings_apps_choose_vol_up_btn.setOnClickListener{ chooseApp("volumeUpApp")}
fragment_settings_apps_choose_vol_down_btn.setOnClickListener{ chooseApp("volumeDownApp")}
fragment_settings_apps_choose_double_click_btn.setOnClickListener { chooseApp("doubleClickApp") }
fragment_settings_apps_choose_long_click_btn.setOnClickListener { chooseApp("longClickApp") }
// App management buttons
fragment_settings_apps_btn.setOnClickListener{

1
app/src/main/res/layout/activity_firststartup.xml
View file

@ -65,7 +65,6 @@
android:layout_height="wrap_content"
android:gravity="center"
android:onClick="clickAnywhere"
android:textColor="#ccc"
android:textSize="64sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

46
app/src/main/res/layout/fragment_settings_apps.xml
View file

@ -157,6 +157,52 @@
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<TextView
android:id="@+id/fragment_settings_apps_choose_double_click_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="10sp"
android:paddingRight="10sp"
android:text="@string/settings_choose_double_click"
android:textSize="20sp" />
<Button
android:id="@+id/fragment_settings_apps_choose_double_click_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_choose_btn"
android:textAllCaps="false" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
<TextView
android:id="@+id/fragment_settings_apps_choose_long_click_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="10sp"
android:paddingRight="10sp"
android:text="@string/settings_choose_long_click"
android:textSize="20sp" />
<Button
android:id="@+id/fragment_settings_apps_choose_long_click_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_choose_btn"
android:textAllCaps="false" />
</TableRow>
</TableLayout>
<Button

2
app/src/main/res/values-de/strings.xml
View file

@ -21,6 +21,8 @@
<string name="settings_choose_right">Rechtswischen</string>
<string name="settings_choose_vol_up">Lautstärke +</string>
<string name="settings_choose_vol_down">Lautstärke -</string>
<string name="settings_choose_double_click">Doppelklick</string>
<string name="settings_choose_long_click">Langer Klick</string>
<string name="settings_choose_btn">App wählen</string>
<string name="settings_select_launcher">Launcher wählen</string>

2
app/src/main/res/values-fr/strings.xml
View file

@ -21,6 +21,8 @@
<string name="settings_choose_right">Balayez droit</string>
<string name="settings_choose_vol_up">Monter volume</string>
<string name="settings_choose_vol_down">Baisser volume</string>
<string name="settings_choose_double_click">Double clic</string>
<string name="settings_choose_long_click">Clic long</string>
<string name="settings_choose_btn">Choisir App</string>
<string name="settings_select_launcher">Choisir Launcher</string>

2
app/src/main/res/values/strings.xml
View file

@ -29,6 +29,8 @@
<string name="settings_choose_right">Swipe Right</string>
<string name="settings_choose_vol_up">Volume Up</string>
<string name="settings_choose_vol_down">Volume Down</string>
<string name="settings_choose_double_click">Double Click</string>
<string name="settings_choose_long_click">Long Click</string>
<string name="settings_choose_btn">Choose App</string>
<string name="settings_select_launcher">Select Launcher</string>