helcel/beans
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 4 Wiki Activity

Compare commits

base: helcel:6e5e5c944f26b06c4a0c7f9feaf0da70b20cff72
Branches Tags
helcel:main
helcel:1.0c
helcel:1.0b
helcel:1.0aa
helcel:1.0a
helcel:1.0-rc1
helcel:0.1a-rc3
helcel:0.1a-rc2
helcel:0.1a-rc1
..
compare: helcel:c0cc1e5649cf0a9aac1fed256e231cd932e4a78c
Branches Tags
helcel:main
helcel:1.0c
helcel:1.0b
helcel:1.0aa
helcel:1.0a
helcel:1.0-rc1
helcel:0.1a-rc3
helcel:0.1a-rc2
helcel:0.1a-rc1

No commits in common. "6e5e5c944f26b06c4a0c7f9feaf0da70b20cff72" and "c0cc1e5649cf0a9aac1fed256e231cd932e4a78c" have entirely different histories.
6e5e5c944f ... c0cc1e5649

22 changed files with 80 additions and 388 deletions
Show Stats Expand all files Collapse all files

4
app/build.gradle
View File

@ -5,12 +5,12 @@ plugins {
android {
namespace 'net.helcel.beendroid'
compileSdk 34
compileSdk 33
defaultConfig {
applicationId 'net.helcel.beendroid'
minSdk 28
targetSdk 34
targetSdk 33
versionCode 1
versionName "1.0"

17
app/src/main/AndroidManifest.xml
View File

@ -16,21 +16,14 @@
>
<activity
android:name=".activity.MainActivity"
android:exported="true" >
android:exported="true"
android:theme="@style/Theme.Beendroid.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".activity.SettingsActivity"
android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>

55
app/src/main/java/net/helcel/beendroid/activity/FoldingListAdapter.kt
View File

@ -1,24 +1,17 @@
package net.helcel.beendroid.activity
import android.content.Context
import android.graphics.Color
import android.graphics.Typeface
import android.graphics.drawable.ColorDrawable
import android.util.Log
import android.util.TypedValue
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import androidx.appcompat.content.res.AppCompatResources.getDrawable
import androidx.appcompat.content.res.AppCompatResources
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.button.MaterialButton
import com.google.android.material.checkbox.MaterialCheckBox
import net.helcel.beendroid.R
import net.helcel.beendroid.countries.GeoLoc
import net.helcel.beendroid.countries.LocType
import net.helcel.beendroid.countries.Visited
import java.util.*
@ -68,14 +61,15 @@ class FoldingListAdapter(
private val visited: Visited,
) : RecyclerView.ViewHolder(itemView) {
private val textView: TextView
//private val expand: MaterialButton
private val expand: ImageView
private val checkBox: MaterialCheckBox
private val subItemView: View
private val list: RecyclerView
init {
textView = itemView.findViewById(R.id.textView)
//expand = itemView.findViewById(R.id.expand)
expand = itemView.findViewById(R.id.expand)
expand.setImageDrawable(AppCompatResources.getDrawable(ctx,R.drawable.chevron_right_solid))
checkBox = itemView.findViewById(R.id.checkBox)
subItemView = itemView.findViewById(R.id.sub_item)
list = itemView.findViewById(R.id.list_list)
@ -83,42 +77,13 @@ class FoldingListAdapter(
}
fun bind(el: Pair<GeoLoc, Boolean>, parentLambda: () -> Unit) {
//expand.rotation = if(el.second) 90f else 0f
expand.rotation = if(el.second) 90f else 0f
subItemView.visibility = if (el.second) View.VISIBLE else View.GONE
//expand.visibility = if(!el.first.isEnd) View.VISIBLE else View.INVISIBLE
expand.visibility = if(!el.first.isEnd) View.VISIBLE else View.GONE
textView.text = el.first.fullName
if (el.first.type == LocType.GROUP) {
textView.setTypeface(null, Typeface.BOLD)
val colorGrayTyped = TypedValue()
ctx.theme.resolveAttribute(android.R.attr.textColorTertiary, colorGrayTyped, true)
val color = Color.valueOf(colorGrayTyped.data)
textView.setBackgroundColor(Color.valueOf(color.red(), color.green(), color.blue(), 0.5f).toArgb())
checkBox.visibility = View.INVISIBLE
el.first.children.apply {
val nbCountries = this.size
val nbVisited = this.map { if (visited.visited(it)) 1 else 0 }.reduce{ a, b -> (a + b) }
val ratio = nbVisited.toFloat() / nbCountries.toFloat()
val percentage = (ratio * 100).toInt()
textView.text = "${textView.text as String} (${percentage}%)"
}
} else {
val colorBackgroundTyped = TypedValue()
ctx.theme.resolveAttribute(android.R.attr.colorBackground, colorBackgroundTyped, true)
textView.backgroundTintList = null
textView.background = ColorDrawable(colorBackgroundTyped.data)
textView.isActivated = false
val layoutParam = checkBox.layoutParams
layoutParam.width = 125
checkBox.layoutParams = layoutParam
checkBox.visibility = View.VISIBLE
}
checkBox.checkedState =
if (visited.visited(el.first)) MaterialCheckBox.STATE_CHECKED
if(visited.visited(el.first)) MaterialCheckBox.STATE_CHECKED
else if (el.first.children.any { visited.visited(it) }) MaterialCheckBox.STATE_INDETERMINATE
else MaterialCheckBox.STATE_UNCHECKED
@ -128,13 +93,13 @@ class FoldingListAdapter(
fun addListeners(expandLambda: ()->Boolean, visitedLambda: (Boolean)->Unit) {
textView.setOnClickListener { expandLambda() }
textView.setOnClickListener { checkBox.toggle() }
checkBox.addOnCheckedStateChangedListener { _, e ->
visitedLambda(e == MaterialCheckBox.STATE_CHECKED)
}
//textView.setOnLongClickListener{ checkBox.toggle(); true }
//expand.setOnClickListener { expandLambda() }
textView.setOnLongClickListener{ expandLambda() }
expand.setOnClickListener { expandLambda() }
}
}

63
app/src/main/java/net/helcel/beendroid/activity/MainActivity.kt
View File

@ -1,20 +1,9 @@
package net.helcel.beendroid.activity
import android.content.Intent
import android.content.SharedPreferences
import android.graphics.Bitmap
import android.graphics.Canvas
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.os.Bundle
import android.util.Log
import android.util.TypedValue
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.MenuProvider
import androidx.preference.PreferenceManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.caverock.androidsvg.RenderOptions
@ -28,8 +17,6 @@ import net.helcel.beendroid.svg.PSVGWrapper
class MainActivity : AppCompatActivity() {
private lateinit var sharedPreferences: SharedPreferences
private lateinit var map : SVGImageView
private lateinit var list : RecyclerView
@ -43,70 +30,26 @@ class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
// Create action bar
val colorPrimaryTyped = TypedValue()
theme.resolveAttribute(android.R.attr.colorPrimary, colorPrimaryTyped, true)
supportActionBar?.setBackgroundDrawable(ColorDrawable(colorPrimaryTyped.data))
canvas.drawRGB(255, 255, 255)
// Fetch shared preferences to restore app theme upon startup
sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
SettingsFragment.setTheme(this, sharedPreferences.getString(getString(R.string.key_theme), getString(R.string.system)))
// Create menu in action bar
addMenuProvider(object : MenuProvider {
override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
menuInflater.inflate(R.menu.menu_main, menu)
}
override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
return when (menuItem.itemId) {
R.id.action_edit -> {
// TODO: Enable editing selected countries
true
}
R.id.action_settings -> {
// Open settings
startActivity(Intent(this@MainActivity, SettingsActivity::class.java))
true
}
else -> {
false
}
}
}
})
// Restore visited countries
visited = Visited(this)
visited.load()
// Wrap lists of countries
psvg = PSVGWrapper(this)
css = CSSWrapper(visited)
// Populate map from list of countries
setContentView(R.layout.activity_main)
map = findViewById(R.id.map)
map.setImageBitmap(bitmap)
refreshMap()
// Populate list below the map
list = findViewById(R.id.list)
list.layoutManager = LinearLayoutManager(this, RecyclerView.VERTICAL, false)
list.adapter = FoldingListAdapter(this, World.WWW.children, visited) { refreshMap() }
}
private fun refreshMap(){
// Set or reset background (replaces canvas.drawColor(0, 0, 0))
val colorBackgroundTyped = TypedValue()
theme.resolveAttribute(android.R.attr.colorBackground, colorBackgroundTyped, true)
canvas.drawColor(colorBackgroundTyped.data)
// Render all countries and visited ones
psvg.getFill().renderToCanvas(canvas, RenderOptions.create().css(css.get()))
// Render all contours in the same color as the background to make them much clearer
psvg.getDraw().renderToCanvas(canvas)
psvg.get().renderToCanvas(canvas,RenderOptions.create().css(css.get()))
}
}

39
app/src/main/java/net/helcel/beendroid/activity/SettingsActivity.kt
View File

@ -1,39 +0,0 @@
package net.helcel.beendroid.activity
import android.graphics.drawable.ColorDrawable
import android.content.Intent
import android.os.Bundle
import android.os.PersistableBundle
import android.util.TypedValue
import android.view.MenuItem
import androidx.activity.addCallback
import androidx.appcompat.app.AppCompatActivity
import net.helcel.beendroid.R
class SettingsActivity: AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
// Bind activity to XML layout with fragment view
setContentView(R.layout.activity_settings)
// Create action bar
val colorPrimaryTyped = TypedValue()
theme.resolveAttribute(android.R.attr.colorPrimary, colorPrimaryTyped, true)
supportActionBar?.setBackgroundDrawable(ColorDrawable(colorPrimaryTyped.data))
supportActionBar?.title = getString(R.string.action_settings)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
// Populate activity with settings fragment
supportFragmentManager.beginTransaction()
.replace(R.id.fragment_view, SettingsFragment())
.commit()
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
// Configure on back pressed
finish()
return super.onOptionsItemSelected(item)
}
}

54
app/src/main/java/net/helcel/beendroid/activity/SettingsFragment.kt
View File

@ -1,54 +0,0 @@
package net.helcel.beendroid.activity
import android.content.Context
import android.graphics.drawable.ColorDrawable
import android.os.Bundle
import android.util.TypedValue
import androidx.appcompat.app.AppCompatDelegate
import androidx.preference.ListPreference
import androidx.preference.PreferenceFragmentCompat
import net.helcel.beendroid.R
class SettingsFragment: PreferenceFragmentCompat() {
private lateinit var themePreference: ListPreference
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.fragment_settings, rootKey)
// Select Light/Dark/System Mode
themePreference = findPreference(getString(R.string.key_theme))!!
themePreference.setOnPreferenceChangeListener { _, key ->
setTheme(requireContext(), key as String)
}
}
companion object {
fun setTheme(context: Context, key: String?): Boolean {
when (key) {
context.getString(R.string.system) -> {
// Set SYSTEM Theme
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
return true
}
context.getString(R.string.light) -> {
// Set LIGHT Theme
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
return true
}
context.getString(R.string.dark) -> {
// Set DARK Theme
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
return true
}
else -> {
return false
}
}
}
}
}

6
app/src/main/java/net/helcel/beendroid/countries/Visited.kt
View File

@ -10,13 +10,13 @@ class Visited(ctx: Context) {
fun load() {
Group.entries.forEach {
Group.values().forEach {
locs[it] = pref.getBoolean(it.code, false)
}
Country.entries.forEach {
Country.values().forEach {
locs[it] = pref.getBoolean(it.code, false)
}
State.entries.forEach {
State.values().forEach {
locs[it] = pref.getBoolean(it.code, false)
}
editor.apply()

7
app/src/main/java/net/helcel/beendroid/svg/CSSWrapper.kt
View File

@ -1,23 +1,20 @@
package net.helcel.beendroid.svg
import android.util.TypedValue
import net.helcel.beendroid.countries.Visited
import net.helcel.beendroid.countries.World
class CSSWrapper(private val visited: Visited) {
private val colorPrimary = "#0187FF"
fun get() : String {
return listOf(World.WWW.children
.filter { visited.visited(it)}
.map { ".${it.code}{fill:$colorPrimary;}"}
.map { ".${it.code}{fill:blue;}"}
.fold(""){acc, s-> acc + s},
World.WWW.children
.filter { !visited.visited(it) }
.map { cg -> cg.children
.filter { visited.visited(it) }
.map { ".${it.code}{fill:$colorPrimary;}"}
.map { ".${it.code}{fill:blue;}"}
.fold(""){acc, s-> acc + s}
}.fold(""){acc,s->acc+s},
).fold(""){acc,s-> acc+s}

29
app/src/main/java/net/helcel/beendroid/svg/PSVGWrapper.kt
View File

@ -1,12 +1,7 @@
package net.helcel.beendroid.svg
import android.content.Context
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.util.Log
import android.util.TypedValue
import com.caverock.androidsvg.SVG
import net.helcel.beendroid.R
import net.helcel.beendroid.countries.Country
import net.helcel.beendroid.countries.GeoLoc
import net.helcel.beendroid.countries.World
@ -16,20 +11,8 @@ class PSVGWrapper(ctx: Context) {
private val cm = HashMap<GeoLoc, PSVGLoader>()
private var fm = ""
private val colorForeground: String
private val colorBackground: String
init {
val colorSecondaryTyped = TypedValue()
ctx.theme.resolveAttribute(android.R.attr.textColorTertiary, colorSecondaryTyped, true)
colorForeground = "\"#${Integer.toHexString(colorSecondaryTyped.data).subSequence(2, 8)}\""
val colorBackgroundTyped = TypedValue()
ctx.theme.resolveAttribute(android.R.attr.colorBackground, colorBackgroundTyped, true)
colorBackground = "\"#${Integer.toHexString(colorBackgroundTyped.data).subSequence(2, 8)}\""
Country.entries.forEach {
Country.values().forEach {
cm[it] = PSVGLoader(ctx, it, Level.ZERO).load()
}
build()
@ -48,12 +31,12 @@ class PSVGWrapper(ctx: Context) {
}.fold("") { acc, e -> acc + e }
}
fun getFill(): SVG {
return SVG.getFromString("<svg id=\"map\" xmlns=\"http://www.w3.org/2000/svg\" width=\"1200\" height=\"1200\" x=\"0\" y=\"0\" fill=${colorForeground}>$fm</svg>")
fun get(): SVG {
return SVG.getFromString("<svg id=\"map\" xmlns=\"http://www.w3.org/2000/svg\" width=\"1200\" height=\"1200\" x=\"0\" y=\"0\" >$fm</svg>")
}
fun getDraw(): SVG {
return SVG.getFromString("<svg id=\"map\" xmlns=\"http://www.w3.org/2000/svg\" width=\"1200\" height=\"1200\" x=\"0\" y=\"0\" fill-opacity=\"0\" stroke=${colorBackground}>$fm</svg>")
}
}

2
app/src/main/res/drawable/chevron.xml → app/src/main/res/drawable/chevron_right_solid.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="320"
android:viewportHeight="512">
<path
android:fillColor="?attr/colorOnBackground"
android:fillColor="#FFFFFFFF"
android:pathData="M310.6,233.4c12.5,12.5 12.5,32.8 0,45.3l-192,192c-12.5,12.5 -32.8,12.5 -45.3,0s-12.5,-32.8 0,-45.3L242.7,256 73.4,86.6c-12.5,-12.5 -12.5,-32.8 0,-45.3s32.8,-12.5 45.3,0l192,192z"/>
</vector>

10
app/src/main/res/drawable/edit.xml
View File

@ -1,10 +0,0 @@
<vector
android:height="24dp"
android:viewportHeight="24"
android:viewportWidth="24"
android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android">
<path
android:fillColor="@color/white"
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
</vector>

11
app/src/main/res/drawable/palette.xml
View File

@ -1,11 +0,0 @@
<vector
android:height="24dp"
android:viewportHeight="24"
android:viewportWidth="24"
android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android" >
<path
android:fillColor="?attr/colorPrimary"
android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10c1.38,0 2.5,-1.12 2.5,-2.5c0,-0.61 -0.23,-1.2 -0.64,-1.67c-0.08,-0.1 -0.13,-0.21 -0.13,-0.33c0,-0.28 0.22,-0.5 0.5,-0.5H16c3.31,0 6,-2.69 6,-6C22,6.04 17.51,2 12,2zM17.5,13c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5C19,12.33 18.33,13 17.5,13zM14.5,9C13.67,9 13,8.33 13,7.5C13,6.67 13.67,6 14.5,6S16,6.67 16,7.5C16,8.33 15.33,9 14.5,9zM5,11.5C5,10.67 5.67,10 6.5,10S8,10.67 8,11.5C8,12.33 7.33,13 6.5,13S5,12.33 5,11.5zM11,7.5C11,8.33 10.33,9 9.5,9S8,8.33 8,7.5C8,6.67 8.67,6 9.5,6S11,6.67 11,7.5z" />
</vector>

10
app/src/main/res/layout/activity_main.xml
View File

@ -2,11 +2,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:theme="@style/Theme.Beendroid"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<com.caverock.androidsvg.SVGImageView
<com.caverock.androidsvg.SVGImageView
android:id="@+id/map"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -16,8 +15,7 @@
<androidx.core.widget.NestedScrollView
android:id="@+id/sv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
android:layout_height="wrap_content"
android:layout_weight="1">
<androidx.recyclerview.widget.RecyclerView

16
app/src/main/res/layout/activity_settings.xml
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:theme="@style/Theme.Beendroid"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activity.SettingsActivity">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

65
app/src/main/res/layout/item_list.xml
View File

@ -9,61 +9,54 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.button.MaterialButton
android:id="@+id/textView"
android:layout_width="0dp"
android:layout_height="50dp"
app:cornerRadius="0dp"
android:gravity="start|center_vertical"
android:textColor="?attr/colorOnBackground"
android:textAllCaps="false"
android:textAppearance="?attr/textAppearanceBody2"
android:clickable="true"
android:focusable="true"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:insetTop="4dp"
android:insetBottom="4dp"
app:layout_constraintBottom_toBottomOf="@id/text2checkbox"
app:layout_constraintEnd_toStartOf="@id/text2checkbox"
<ImageView
android:id="@+id/expand"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription=">"
android:scaleX="0.5"
android:scaleY="0.5"
android:visibility="visible"
app:layout_constraintEnd_toStartOf="@+id/textView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="1.0" />
<Space
android:id="@+id/text2checkbox"
android:layout_width="0.01dp"
android:layout_height="50dp"
android:gravity="start|center_vertical"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/textView"
app:layout_constraintEnd_toStartOf="@id/checkBox"
app:layout_constraintStart_toEndOf="@id/textView" />
tools:ignore="HardcodedText" />
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/checkBox"
android:layout_width="0.01dp"
android:layout_height="50dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:checkedState="indeterminate"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@id/textView"
app:layout_constraintBottom_toBottomOf="@+id/textView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toEndOf="@id/textView"
app:layout_constraintTop_toTopOf="@id/textView"
app:layout_constraintStart_toEndOf="@+id/textView"
app:layout_constraintTop_toTopOf="@+id/textView"
app:layout_constraintVertical_bias="0.5" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/textView"
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="start|center_vertical"
android:textColor="@color/design_default_color_on_primary"
app:layout_constraintBottom_toBottomOf="@id/checkBox"
app:layout_constraintEnd_toStartOf="@+id/checkBox"
app:layout_constraintStart_toEndOf="@+id/expand"
app:layout_constraintTop_toTopOf="@+id/expand"
app:layout_constraintVertical_bias="1.0" />
<LinearLayout
android:id="@+id/sub_item"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="0dp"
android:layout_marginStart="32dp"
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/checkBox">
app:layout_constraintTop_toBottomOf="@+id/checkBox">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_list"

11
app/src/main/res/menu/menu_main.xml
View File

@ -1,16 +1,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="net.helcel.beendroid.activity.MainActivity" >
<item
android:id="@+id/action_edit"
android:orderInCategory="100"
android:icon="@drawable/edit"
android:visible="false"
android:title="@string/action_edit"
app:showAsAction="ifRoom" />
tools:context="net.helcel.beendroid.activity.MainActivity">
<item
android:id="@+id/action_settings"
android:orderInCategory="100"

8
app/src/main/res/values-night/themes.xml
View File

@ -1,9 +1,5 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="Theme.Beendroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<item name="colorPrimary">@color/teal_700</item>
<item name="android:colorPrimary">@color/teal_700</item>
<item name="android:textColorTertiary">@color/darkgray</item>
<style name="Theme.Beendroid" parent="Theme.Material3.DayNight.NoActionBar">
<item name="android:statusBarColor">?attr/colorPrimary</item>
<item name="colorAccent">?attr/colorPrimary</item>
</style>
</resources>
</resources>

8
app/src/main/res/values/arrays.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="entries_theme" >
<item>@string/system</item>
<item>@string/light</item>
<item>@string/dark</item>
</string-array>
</resources>

13
app/src/main/res/values/colors.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03AFFF</color>
<color name="teal_700">#FF0187FF</color>
<color name="yellowish">#FFFFDD00</color>
<color name="black">#FF000000</color>
<color name="darkgray">#FF555555</color>
<color name="lightgray">#FFBBBBBB</color>
<color name="white">#FFFFFFFF</color>
</resources>

8
app/src/main/res/values/en.xml
View File

@ -1,12 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">BeenDroid</string>
<string name="app_name">Beendroid</string>
<string name="action_settings">Settings</string>
<string name="action_edit">Edit</string>
<string name="welcome">Welcome!</string>
<string name="change_lang">Change language</string>
<string name="key_theme">App theme</string>
<string name="system">Same as system</string>
<string name="light">Light theme</string>
<string name="dark">Dark theme</string>
</resources>

15
app/src/main/res/values/themes.xml
View File

@ -1,9 +1,14 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="Theme.Beendroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<item name="colorPrimary">@color/teal_700</item>
<item name="android:colorPrimary">@color/teal_700</item>
<item name="android:textColorTertiary">@color/lightgray</item>
<style name="Theme.Beendroid" parent="Theme.Material3.DayNight.NoActionBar">
<item name="android:statusBarColor">?attr/colorPrimary</item>
<item name="colorAccent">?attr/colorPrimary</item>
</style>
<style name="Theme.Beendroid.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Theme.Beendroid.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="Theme.Beendroid.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
</resources>

17
app/src/main/res/xml/fragment_settings.xml
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
android:theme="@style/Theme.Beendroid">
<ListPreference
app:enabled="true"
app:key="@string/key_theme"
app:icon="@drawable/palette"
app:title="@string/key_theme"
app:useSimpleSummaryProvider="true"
app:entries="@array/entries_theme"
app:entryValues="@array/entries_theme"
app:defaultValue="@string/system" />
</PreferenceScreen>