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

Make clock-apps selectable as actions

Browse source 
Closes #82
This commit is contained in:
Finn M Glas 2020-12-30 23:34:41 +01:00
parent faf50c9e09
commit 9f9a223d6e
No known key found for this signature in database
GPG key ID: 902A30146014DFBF
8 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/com/finnmglas/launcher/Functions.kt
View file

@ -25,7 +25,6 @@ import android.widget.Button
import android.widget.ImageView import android.widget.ImageView
import android.widget.Switch import android.widget.Switch
import android.widget.Toast import android.widget.Toast
import androidx.annotation.RequiresApi
import com.finnmglas.launcher.list.ListActivity import com.finnmglas.launcher.list.ListActivity
import com.finnmglas.launcher.list.apps.AppInfo import com.finnmglas.launcher.list.apps.AppInfo
import com.finnmglas.launcher.list.apps.AppsRecyclerAdapter import com.finnmglas.launcher.list.apps.AppsRecyclerAdapter
@ -54,8 +53,8 @@ const val ACTION_VOL_DOWN = "action_volumeDownApp"
const val ACTION_DOUBLE_CLICK = "action_doubleClickApp" const val ACTION_DOUBLE_CLICK = "action_doubleClickApp"
const val ACTION_LONG_CLICK = "action_longClickApp" const val ACTION_LONG_CLICK = "action_longClickApp"
const val ACTION_CALENDAR = "action_calendarApp" const val ACTION_DATE = "action_dateApp"
const val ACTION_CLOCK = "action_clockApp" const val ACTION_TIME = "action_timeApp"
val ACTIONS = listOf( val ACTIONS = listOf(
ACTION_UP, ACTION_DOUBLE_UP, ACTION_UP, ACTION_DOUBLE_UP,
@ -63,7 +62,7 @@ val ACTIONS = listOf(
ACTION_RIGHT, ACTION_LEFT, ACTION_RIGHT, ACTION_LEFT,
ACTION_VOL_UP, ACTION_VOL_DOWN, ACTION_VOL_UP, ACTION_VOL_DOWN,
ACTION_DOUBLE_CLICK, ACTION_LONG_CLICK, ACTION_DOUBLE_CLICK, ACTION_LONG_CLICK,
ACTION_CALENDAR, ACTION_CLOCK ACTION_DATE, ACTION_TIME
) )
const val PREF_DOMINANT = "custom_dominant" const val PREF_DOMINANT = "custom_dominant"
@ -105,8 +104,8 @@ var volumeDownApp = ""
var doubleClickApp = "" var doubleClickApp = ""
var longClickApp = "" var longClickApp = ""
var calendarApp = "" var timeApp = ""
var clockApp = "" var dateApp = ""
var background : Bitmap? = null var background : Bitmap? = null
@ -440,8 +439,8 @@ fun loadSettings() {
doubleClickApp = launcherPreferences.getString(ACTION_DOUBLE_CLICK, "")!! doubleClickApp = launcherPreferences.getString(ACTION_DOUBLE_CLICK, "")!!
longClickApp = launcherPreferences.getString(ACTION_LONG_CLICK, "")!! longClickApp = launcherPreferences.getString(ACTION_LONG_CLICK, "")!!
calendarApp = launcherPreferences.getString(ACTION_CALENDAR, "")!! dateApp = launcherPreferences.getString(ACTION_DATE, "")!!
clockApp = launcherPreferences.getString(ACTION_CLOCK, "")!! timeApp = launcherPreferences.getString(ACTION_TIME, "")!!
dominantColor = launcherPreferences.getInt(PREF_DOMINANT, 0) dominantColor = launcherPreferences.getInt(PREF_DOMINANT, 0)
vibrantColor = launcherPreferences.getInt(PREF_VIBRANT, 0) vibrantColor = launcherPreferences.getInt(PREF_VIBRANT, 0)
@ -509,8 +508,8 @@ fun pickDefaultApp(action: String, context: Context) : String {
ACTION_VOL_DOWN -> R.array.default_volume_down ACTION_VOL_DOWN -> R.array.default_volume_down
ACTION_DOUBLE_CLICK -> R.array.default_double_click ACTION_DOUBLE_CLICK -> R.array.default_double_click
ACTION_LONG_CLICK -> R.array.default_long_click ACTION_LONG_CLICK -> R.array.default_long_click
ACTION_CLOCK -> R.array.default_clock ACTION_TIME -> R.array.default_time
ACTION_CALENDAR -> R.array.default_left ACTION_DATE -> R.array.default_date
else -> return "" // just prevent crashing on unknown input else -> return "" // just prevent crashing on unknown input
} }

8
app/src/main/java/com/finnmglas/launcher/HomeActivity.kt
View file

@ -262,15 +262,15 @@ class HomeActivity: UIObject, AppCompatActivity(),
home_upper_view.setOnClickListener() { home_upper_view.setOnClickListener() {
when (launcherPreferences.getInt(PREF_DATE_FORMAT, 0)) { when (launcherPreferences.getInt(PREF_DATE_FORMAT, 0)) {
0 -> launch(calendarApp, this) 0 -> launch(dateApp, this)
else -> launch(clockApp,this) else -> launch(timeApp,this)
} }
} }
home_lower_view.setOnClickListener() { home_lower_view.setOnClickListener() {
when (launcherPreferences.getInt(PREF_DATE_FORMAT, 0)) { when (launcherPreferences.getInt(PREF_DATE_FORMAT, 0)) {
0 -> launch(clockApp, this) 0 -> launch(timeApp, this)
else -> launch(calendarApp,this) else -> launch(dateApp,this)
} }
} }
} }

6
app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActionsRecycler.kt
View file

@ -181,6 +181,12 @@ class ActionsRecyclerAdapter(val activity: Activity):
actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_long_click), "longClickApp", actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_long_click), "longClickApp",
longClickApp longClickApp
)) ))
actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_time), "timeApp",
timeApp
))
actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_date), "dateApp",
dateApp
))
} }
/* */ /* */

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

@ -37,6 +37,8 @@
<string name="settings_apps_vol_down">Lautstärke -</string> <string name="settings_apps_vol_down">Lautstärke -</string>
<string name="settings_apps_double_click">Doppelklick</string> <string name="settings_apps_double_click">Doppelklick</string>
<string name="settings_apps_long_click">Langer Klick</string> <string name="settings_apps_long_click">Langer Klick</string>
<string name="settings_apps_date">Datum antippen</string>
<string name="settings_apps_time">Uhr antippen</string>
<string name="settings_apps_choose">App wählen</string> <string name="settings_apps_choose">App wählen</string>

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

@ -47,6 +47,8 @@
<string name="settings_apps_vol_down">Bajar Volumen</string> <string name="settings_apps_vol_down">Bajar Volumen</string>
<string name="settings_apps_double_click">Doble Click</string> <string name="settings_apps_double_click">Doble Click</string>
<string name="settings_apps_long_click">Click Largo</string> <string name="settings_apps_long_click">Click Largo</string>
<string name="settings_apps_date">Toca la fecha</string>
<string name="settings_apps_time">Toca el reloj</string>
<string name="settings_apps_choose">Elegir Aplicación</string> <string name="settings_apps_choose">Elegir Aplicación</string>

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

@ -37,6 +37,8 @@
<string name="settings_apps_vol_down">Baisser volume</string> <string name="settings_apps_vol_down">Baisser volume</string>
<string name="settings_apps_double_click">Double clic</string> <string name="settings_apps_double_click">Double clic</string>
<string name="settings_apps_long_click">Clic long</string> <string name="settings_apps_long_click">Clic long</string>
<string name="settings_apps_date">Touchez date</string>
<string name="settings_apps_time">Touchez horloge</string>
<string name="settings_apps_choose">Choisir App</string> <string name="settings_apps_choose">Choisir App</string>

10
app/src/main/res/values/defaults.xml
View file

@ -81,9 +81,15 @@
<item>launcher:settings</item> <!-- Launcher Settings --> <item>launcher:settings</item> <!-- Launcher Settings -->
</string-array> </string-array>
<!-- Clock --> <!-- Time / Clock -->
<string-array name="default_clock"> <string-array name="default_time">
<item>com.sec.android.app.clockpackage</item> <!-- Android Clock --> <item>com.sec.android.app.clockpackage</item> <!-- Android Clock -->
</string-array> </string-array>
<!-- Date / Calendar (same as left app currently) -->
<string-array name="default_date">
<item>com.google.android.calendar</item> <!-- Google Calendar -->
<item>com.samsung.android.calendar</item> <!-- Samsung Calendar -->
</string-array>
</resources> </resources>

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

@ -45,6 +45,8 @@
<string name="settings_apps_vol_down">Volume Down</string> <string name="settings_apps_vol_down">Volume Down</string>
<string name="settings_apps_double_click">Double Click</string> <string name="settings_apps_double_click">Double Click</string>
<string name="settings_apps_long_click">Long Click</string> <string name="settings_apps_long_click">Long Click</string>
<string name="settings_apps_date">Click on Date</string>
<string name="settings_apps_time">Click on Time</string>
<string name="settings_apps_choose">Choose App</string> <string name="settings_apps_choose">Choose App</string>