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

removed fa icons

Browse source
This commit is contained in:
Josia Pietsch 2024-07-05 05:30:44 +02:00
parent 717c32cb53
commit c8ad40250b
Signed by: jrpie
GPG key ID: E70B571D66986A2D
27 changed files with 101 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/src/main/assets/fontawesome/fa-brands-400.ttf
View file

Binary file not shown.

BIN
app/src/main/assets/fontawesome/fa-regular-400.ttf
View file

Binary file not shown.

BIN
app/src/main/assets/fontawesome/fa-solid-900.ttf
View file

Binary file not shown.

54
app/src/main/java/de/jrpie/android/launcher/libraries/FontAwesome.kt
View file

@ -1,54 +0,0 @@
package de.jrpie.android.launcher.libraries // replace with your package
// On GitHub: https://github.com/finnmglas/fontawesome-android
import android.content.Context
import android.graphics.Typeface
import android.util.AttributeSet
import androidx.appcompat.widget.AppCompatTextView
import de.jrpie.android.launcher.R
/** [FontAwesome] is just a type of TextView with special functions:
*
* `setText(str)` can be used to change the icon
* `setIconType(Int)` changes the FontAwesome style ("solid", "regular" or "brand")
* `setTextColor(Int)` changes the color
* `setTextSize(Int, Float)` changes the icon size
*/
class FontAwesome : AppCompatTextView {
var type = "" // "solid", "regular" or "brand"
constructor(context: Context?, attrs: AttributeSet?, defStyle: Int)
: super(context, attrs, defStyle) { init(attrs) }
constructor(context: Context?, attrs: AttributeSet?)
: super(context, attrs) { init(attrs) }
constructor(context: Context?)
: super(context) { init(null) }
private fun init(attrs: AttributeSet?) {
if (attrs != null) {
val a = context!!.obtainStyledAttributes(attrs,
R.styleable.FontAwesome
)
if (a.hasValue(R.styleable.FontAwesome_type))
type = a.getString(R.styleable.FontAwesome_type)!!
a.recycle()
if (type == "") type = "solid"
}
setIconType(type)
}
// Useful if you want to change between a regular and solid icon (example: star)
fun setIconType(iconType : String){
type = iconType
typeface = when (type) {
"regular" -> Typeface.createFromAsset(context!!.assets,"fontawesome/fa-regular-400.ttf")
"solid" -> Typeface.createFromAsset(context!!.assets,"fontawesome/fa-solid-900.ttf")
"brands" -> Typeface.createFromAsset(context!!.assets,"fontawesome/fa-brands-400.ttf")
else -> Typeface.createFromAsset(context!!.assets,"fontawesome/fa-solid-900.ttf")
}
}
}

2
app/src/main/java/de/jrpie/android/launcher/list/ListActivity.kt
View file

@ -76,7 +76,7 @@ class ListActivity : AppCompatActivity(), UIObject {
}
override fun applyTheme() {
list_close.setTextColor(vibrantColor)
// list_close.setTextColor(vibrantColor)
list_tabs.setSelectedTabIndicatorColor(vibrantColor)
}

3
app/src/main/java/de/jrpie/android/launcher/list/apps/AppsRecyclerAdapter.kt
View file

@ -15,7 +15,6 @@ import android.widget.PopupMenu
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import de.jrpie.android.launcher.*
import de.jrpie.android.launcher.libraries.FontAwesome
import de.jrpie.android.launcher.list.intendedChoosePause
import java.util.*
import kotlin.collections.ArrayList
@ -39,7 +38,7 @@ class AppsRecyclerAdapter(val activity: Activity,
View.OnClickListener {
var textView: TextView = itemView.findViewById(R.id.list_apps_row_name)
var img: ImageView = itemView.findViewById(R.id.list_apps_row_icon) as ImageView
var menuDots: FontAwesome = itemView.findViewById(R.id.list_apps_row_menu)
var menuDots: ImageView = itemView.findViewById(R.id.list_apps_row_menu)
override fun onClick(v: View) {
val pos = adapterPosition

4
app/src/main/java/de/jrpie/android/launcher/list/other/OtherInfo.kt
View file

@ -8,8 +8,8 @@ package de.jrpie.android.launcher.list.other
*
* @param data - a string identifying the thing to be launched
*/
class OtherInfo(label: String, data: String, icon: String) {
class OtherInfo(label: String, data: String, icon: Int) {
var label: CharSequence? = label
var data: CharSequence? = data
var icon: CharSequence? = icon
var icon: Int = icon
}

24
app/src/main/java/de/jrpie/android/launcher/list/other/OtherRecyclerAdapter.kt
View file

@ -6,11 +6,11 @@ import android.os.Build
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import de.jrpie.android.launcher.R
import de.jrpie.android.launcher.REQUEST_CHOOSE_APP
import de.jrpie.android.launcher.libraries.*
import de.jrpie.android.launcher.list.forApp
/**
@ -28,7 +28,7 @@ class OtherRecyclerAdapter(val activity: Activity):
inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView),
View.OnClickListener {
var textView: TextView = itemView.findViewById(R.id.list_other_row_name)
var iconView: FontAwesome = itemView.findViewById(R.id.list_other_row_icon)
var iconView: ImageView = itemView.findViewById(R.id.list_other_row_icon)
override fun onClick(v: View) {
@ -43,10 +43,10 @@ class OtherRecyclerAdapter(val activity: Activity):
override fun onBindViewHolder(viewHolder: ViewHolder, i: Int) {
val otherLabel = othersList[i].label.toString()
val icon = othersList[i].icon.toString()
val icon = othersList[i].icon
viewHolder.textView.text = otherLabel
viewHolder.iconView.text = icon
viewHolder.iconView.setImageResource(icon)
}
override fun getItemCount(): Int { return othersList.size }
@ -62,33 +62,37 @@ class OtherRecyclerAdapter(val activity: Activity):
othersList.add(
OtherInfo(activity.getString(R.string.list_other_settings),
"launcher:settings",
activity.getString(R.string.fas_settings)))
R.drawable.baseline_settings_24)
)
othersList.add(
OtherInfo(activity.getString(R.string.list_other_list),
"launcher:choose",
activity.getString(R.string.fas_bars)))
R.drawable.baseline_menu_24)
)
othersList.add(
OtherInfo(activity.getString(R.string.list_other_volume_up),
"launcher:volumeUp",
activity.getString(R.string.fas_plus)))
R.drawable.baseline_volume_up_24)
)
othersList.add(
OtherInfo(activity.getString(R.string.list_other_volume_down),
"launcher:volumeDown",
activity.getString(R.string.fas_minus)))
R.drawable.baseline_volume_down_24)
)
if (Build.VERSION.SDK_INT >= 19) { // requires Android KitKat +
othersList.add(
OtherInfo(
activity.getString(R.string.list_other_track_next),
"launcher:nextTrack",
activity.getString(R.string.fas_forward)
R.drawable.baseline_skip_next_24
)
)
othersList.add(
OtherInfo(
activity.getString(R.string.list_other_track_previous),
"launcher:previousTrack",
activity.getString(R.string.fas_back)
R.drawable.baseline_skip_previous_24
)
)
}

4
app/src/main/java/de/jrpie/android/launcher/settings/SettingsActivity.kt
View file

@ -62,8 +62,8 @@ class SettingsActivity: AppCompatActivity(), UIObject {
override fun applyTheme() {
// settings_appbar.setBackgroundColor(dominantColor)
settings_system.setTextColor(vibrantColor)
settings_close.setTextColor(vibrantColor)
//settings_system.setTextColor(vibrantColor)
//settings_close.setTextColor(vibrantColor)
settings_tabs.setSelectedTabIndicatorColor(vibrantColor)
}

23
app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActionsRecycler.kt
View file

@ -15,7 +15,6 @@ import android.widget.Button
import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import de.jrpie.android.launcher.libraries.FontAwesome
import de.jrpie.android.launcher.settings.intendedSettingsPause
import java.lang.Exception
@ -60,10 +59,10 @@ class ActionsRecyclerAdapter(val activity: Activity):
inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView),
View.OnClickListener {
var textView: TextView = itemView.findViewById(R.id.settings_actions_row_name)
var fontAwesome: FontAwesome = itemView.findViewById(R.id.settings_actions_row_icon)
var actionIcon: ImageView = itemView.findViewById(R.id.settings_actions_row_icon)
var img: ImageView = itemView.findViewById(R.id.settings_actions_row_icon_img) as ImageView
var chooseButton: Button = itemView.findViewById(R.id.settings_actions_row_button_choose)
var removeAction: FontAwesome = itemView.findViewById(R.id.settings_actions_row_remove)
var removeAction: ImageView = itemView.findViewById(R.id.settings_actions_row_remove)
override fun onClick(v: View) { }
@ -85,7 +84,7 @@ class ActionsRecyclerAdapter(val activity: Activity):
loadSettings() // apply new settings to the app
viewHolder.fontAwesome.visibility = View.INVISIBLE
viewHolder.actionIcon.visibility = View.INVISIBLE
viewHolder.img.visibility = View.INVISIBLE
viewHolder.removeAction.visibility = View.GONE
viewHolder.chooseButton.visibility = View.VISIBLE
@ -96,22 +95,22 @@ class ActionsRecyclerAdapter(val activity: Activity):
if (content!!.startsWith("launcher")) {
// Set fontAwesome icon
viewHolder.fontAwesome.visibility = View.VISIBLE
viewHolder.fontAwesome.setOnClickListener{ chooseApp(actionName.toString()) }
viewHolder.actionIcon.visibility = View.VISIBLE
viewHolder.actionIcon.setOnClickListener{ chooseApp(actionName.toString()) }
when (content.split(":")[1]) {
"settings" ->
viewHolder.fontAwesome.text = activity.getString(R.string.fas_settings)
viewHolder.actionIcon.setImageResource(R.drawable.baseline_settings_24)
"choose" ->
viewHolder.fontAwesome.text = activity.getString(R.string.fas_bars)
viewHolder.actionIcon.setImageResource(R.drawable.baseline_menu_24)
"volumeUp" ->
viewHolder.fontAwesome.text = activity.getString(R.string.fas_plus)
viewHolder.actionIcon.setImageResource(R.drawable.baseline_volume_up_24)
"volumeDown" ->
viewHolder.fontAwesome.text = activity.getString(R.string.fas_minus)
viewHolder.actionIcon.setImageResource(R.drawable.baseline_volume_down_24)
"nextTrack" ->
viewHolder.fontAwesome.text = activity.getString(R.string.fas_forward)
viewHolder.actionIcon.setImageResource(R.drawable.baseline_skip_next_24)
"previousTrack" ->
viewHolder.fontAwesome.text = activity.getString(R.string.fas_back)
viewHolder.actionIcon.setImageResource(R.drawable.baseline_skip_previous_24)
}
} else {
// Set image icon (by packageName)

5
app/src/main/res/drawable/baseline_close_24.xml Normal file
View file

@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
</vector>

5
app/src/main/res/drawable/baseline_menu_24.xml Normal file
View file

@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
</vector>

5
app/src/main/res/drawable/baseline_more_horiz_24.xml Normal file
View file

@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
</vector>

5
app/src/main/res/drawable/baseline_search_24.xml Normal file
View file

@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
</vector>

5
app/src/main/res/drawable/baseline_settings_24.xml Normal file
View file

@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
</vector>

5
app/src/main/res/drawable/baseline_settings_applications_24.xml Normal file
View file

@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM17.25,12c0,0.23 -0.02,0.46 -0.05,0.68l1.48,1.16c0.13,0.11 0.17,0.3 0.08,0.45l-1.4,2.42c-0.09,0.15 -0.27,0.21 -0.43,0.15l-1.74,-0.7c-0.36,0.28 -0.76,0.51 -1.18,0.69l-0.26,1.85c-0.03,0.17 -0.18,0.3 -0.35,0.3h-2.8c-0.17,0 -0.32,-0.13 -0.35,-0.29l-0.26,-1.85c-0.43,-0.18 -0.82,-0.41 -1.18,-0.69l-1.74,0.7c-0.16,0.06 -0.34,0 -0.43,-0.15l-1.4,-2.42c-0.09,-0.15 -0.05,-0.34 0.08,-0.45l1.48,-1.16c-0.03,-0.23 -0.05,-0.46 -0.05,-0.69 0,-0.23 0.02,-0.46 0.05,-0.68l-1.48,-1.16c-0.13,-0.11 -0.17,-0.3 -0.08,-0.45l1.4,-2.42c0.09,-0.15 0.27,-0.21 0.43,-0.15l1.74,0.7c0.36,-0.28 0.76,-0.51 1.18,-0.69l0.26,-1.85c0.03,-0.17 0.18,-0.3 0.35,-0.3h2.8c0.17,0 0.32,0.13 0.35,0.29l0.26,1.85c0.43,0.18 0.82,0.41 1.18,0.69l1.74,-0.7c0.16,-0.06 0.34,0 0.43,0.15l1.4,2.42c0.09,0.15 0.05,0.34 -0.08,0.45l-1.48,1.16c0.03,0.23 0.05,0.46 0.05,0.69z"/>
</vector>

5
app/src/main/res/drawable/baseline_skip_next_24.xml Normal file
View file

@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
</vector>

5
app/src/main/res/drawable/baseline_skip_previous_24.xml Normal file
View file

@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
</vector>

5
app/src/main/res/drawable/baseline_volume_down_24.xml Normal file
View file

@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M18.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM5,9v6h4l5,5V4L9,9H5z"/>
</vector>

5
app/src/main/res/drawable/baseline_volume_up_24.xml Normal file
View file

@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z"/>
</vector>

16
app/src/main/res/layout/list.xml
View file

@ -26,19 +26,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<de.jrpie.android.launcher.libraries.FontAwesome
<ImageView
android:id="@+id/list_settings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:contentDescription="@string/settings"
android:gravity="center"
android:includeFontPadding="true"
android:paddingLeft="16sp"
android:paddingRight="16sp"
android:text="@string/fas_settings"
android:textColor="?attr/colorAccent"
android:textSize="22sp"
android:src="@drawable/baseline_settings_24"
custom:layout_constraintBottom_toBottomOf="parent"
custom:layout_constraintStart_toStartOf="parent"
custom:layout_constraintTop_toTopOf="parent"
@ -58,7 +56,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<de.jrpie.android.launcher.libraries.FontAwesome
<ImageView
android:id="@+id/list_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -68,9 +66,7 @@
android:includeFontPadding="true"
android:paddingLeft="16sp"
android:paddingRight="16sp"
android:text="@string/fa_close_window"
android:textColor="?attr/colorAccent"
android:textSize="22sp"
android:src="@drawable/baseline_close_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
@ -91,8 +87,10 @@
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/list_appbar"
app:layout_constraintVertical_bias="0.0"
custom:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/list_apps.xml
View file

@ -26,8 +26,8 @@
android:iconifiedByDefault="false"
app:iconifiedByDefault="false"
app:queryHint="@string/list_apps_search_hint"
app:searchHintIcon="@android:drawable/ic_menu_search"
app:searchIcon="@android:drawable/ic_menu_search" />
app:searchHintIcon="@drawable/baseline_search_24"
app:searchIcon="@drawable/baseline_search_24" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView

5
app/src/main/res/layout/list_apps_row.xml
View file

@ -33,13 +33,12 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<de.jrpie.android.launcher.libraries.FontAwesome
<ImageView
android:id="@+id/list_apps_row_menu"
android:layout_width="30sp"
android:layout_height="0dp"
android:gravity="center"
android:text="@string/fas_three_dots"
android:textSize="20sp"
android:src="@drawable/baseline_more_horiz_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

3
app/src/main/res/layout/list_other_row.xml
View file

@ -7,12 +7,11 @@
android:layout_height="wrap_content"
android:layout_margin="15sp">
<de.jrpie.android.launcher.libraries.FontAwesome
<ImageView
android:id="@+id/list_other_row_icon"
android:layout_width="35sp"
android:layout_height="35sp"
android:gravity="center"
android:text=""
android:textSize="30sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"

12
app/src/main/res/layout/settings.xml
View file

@ -35,7 +35,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<de.jrpie.android.launcher.libraries.FontAwesome
<ImageView
android:id="@+id/settings_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -44,15 +44,13 @@
android:includeFontPadding="true"
android:paddingLeft="16sp"
android:paddingRight="16sp"
android:text="@string/fa_close_window"
android:textColor="?attr/colorAccent"
android:textSize="22sp"
android:src="@drawable/baseline_close_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
custom:type="solid" />
<de.jrpie.android.launcher.libraries.FontAwesome
<ImageView
android:id="@+id/settings_system"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -61,9 +59,7 @@
android:includeFontPadding="true"
android:paddingLeft="16sp"
android:paddingRight="16sp"
android:text="@string/fas_settings"
android:textColor="?attr/colorAccent"
android:textSize="22sp"
android:src="@drawable/baseline_settings_applications_24"
custom:layout_constraintBottom_toBottomOf="parent"
custom:layout_constraintStart_toStartOf="parent"
custom:layout_constraintTop_toTopOf="parent"

6
app/src/main/res/layout/settings_actions_row.xml
View file

@ -32,7 +32,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<de.jrpie.android.launcher.libraries.FontAwesome
<ImageView
android:id="@+id/settings_actions_row_icon"
android:layout_width="@dimen/app_icon_side"
android:layout_height="@dimen/app_icon_side"
@ -55,12 +55,12 @@
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<de.jrpie.android.launcher.libraries.FontAwesome
<ImageView
android:id="@+id/settings_actions_row_remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8sp"
android:text="@string/fas_times"
android:src="@drawable/baseline_close_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/settings_actions_row_icon_img"

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

@ -185,5 +185,6 @@
<string name="tutorial_finish_title">Let\'s go!</string>
<string name="tutorial_finish_text">You are ready to get started!\n\nI hope this is of great value to you!\n\n- Finn (who made Launcher)</string>
<string name="tutorial_finish_button">Start</string>
<string name="settings">Settings</string>
</resources>