diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c2a8776..15a772e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,7 +25,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="LockedOrientationActivity"> - + diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt index 50dbad2..59befaf 100755 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt @@ -30,6 +30,7 @@ object Preferences : KotprefModel() { var customLocationLon by stringPref(key = "PREF_CUSTOM_LOCATION_LON", default = "") var customLocationAdd by stringPref(key = "PREF_CUSTOM_LOCATION_ADD", default = "") var dateFormat by stringPref(default = "") + var isDateCapitalize by booleanPref(default = false) var weatherRefreshPeriod by intPref(key = "PREF_WEATHER_REFRESH_PERIOD", default = 1) var showUntil by intPref(key = "PREF_SHOW_UNTIL", default = 1) var calendarAppName by stringPref(key = "PREF_CALENDAR_APP_NAME", default = "") diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt index b30b6bc..ddc7e0a 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt @@ -4,6 +4,7 @@ import android.Manifest import android.content.ContentUris import android.content.Context import android.provider.CalendarContract +import android.util.Log import com.tommasoberlose.anotherwidget.services.EventListenerJob import com.tommasoberlose.anotherwidget.db.EventRepository import com.tommasoberlose.anotherwidget.models.Event @@ -61,6 +62,7 @@ object CalendarHelper { for (instance in instances) { try { val e = provider.getEvent(instance.eventId) + Log.d("ciao", "evento: $e") if (e != null && !e.deleted && instance.begin <= limit.timeInMillis && (Preferences.calendarAllDay || !e.allDay) && !getFilteredCalendarIdList().contains( e.calendarId ) && (Preferences.showDeclinedEvents || e.selfAttendeeStatus.toInt() != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/DateHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/DateHelper.kt index 9fda22d..1539736 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/DateHelper.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/DateHelper.kt @@ -12,27 +12,30 @@ import java.util.* object DateHelper { fun getDateText(context: Context, date: Calendar): String { return if (Preferences.dateFormat != "") { - try { + val text = try { SimpleDateFormat(Preferences.dateFormat, Locale.getDefault()).format(date.time) } catch (e: Exception) { getDefaultDateText(context, date) } + if (Preferences.isDateCapitalize) text.getCapWordString() else text } else { val flags: Int = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH - "%s, %s".format( + val text = "%s, %s".format( SimpleDateFormat("EEEE", Locale.getDefault()).format(date.time), DateUtils.formatDateTime(context, date.timeInMillis, flags) ) + if (Preferences.isDateCapitalize) text.getCapWordString() else text } } fun getDefaultDateText(context: Context, date: Calendar): String { val flags: Int = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH - return "%s, %s".format( + val text = "%s, %s".format( SimpleDateFormat("EEEE", Locale.getDefault()).format(date.time), DateUtils.formatDateTime(context, date.timeInMillis, flags) ) + return if (Preferences.isDateCapitalize) text.getCapWordString() else text } } \ No newline at end of file diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WidgetHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WidgetHelper.kt index de30152..728b92e 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WidgetHelper.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WidgetHelper.kt @@ -3,6 +3,7 @@ package com.tommasoberlose.anotherwidget.helpers import android.appwidget.AppWidgetManager import android.content.Context import android.content.res.Configuration.ORIENTATION_PORTRAIT +import android.util.Log import com.google.firebase.crashlytics.FirebaseCrashlytics import com.tommasoberlose.anotherwidget.db.EventRepository import com.tommasoberlose.anotherwidget.global.Preferences @@ -24,19 +25,9 @@ object WidgetHelper { return widthInPx to heightInPx } - private fun getWidgetWidth(isPortrait: Boolean, widgetId: Int): Int = - if (isPortrait) { - getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH) - } else { - getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH) - } + private fun getWidgetWidth(isPortrait: Boolean, widgetId: Int): Int = getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH) - private fun getWidgetHeight(isPortrait: Boolean, widgetId: Int): Int = - if (isPortrait) { - getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT) - } else { - getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT) - } + private fun getWidgetHeight(isPortrait: Boolean, widgetId: Int): Int = getWidgetSizeInDp(widgetId, AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT) private fun getWidgetSizeInDp(widgetId: Int, key: String): Int = appWidgetManager.getAppWidgetOptions(widgetId).getInt(key, 0) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomDateActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomDateActivity.kt index db536f1..a643052 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomDateActivity.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomDateActivity.kt @@ -18,7 +18,9 @@ import com.tommasoberlose.anotherwidget.databinding.ActivityCustomDateBinding import com.tommasoberlose.anotherwidget.global.Preferences import com.tommasoberlose.anotherwidget.helpers.DateHelper import com.tommasoberlose.anotherwidget.ui.viewmodels.CustomDateViewModel +import com.tommasoberlose.anotherwidget.utils.getCapWordString import com.tommasoberlose.anotherwidget.utils.openURI +import com.tommasoberlose.anotherwidget.utils.toast import kotlinx.android.synthetic.main.activity_custom_date.* import kotlinx.android.synthetic.main.activity_custom_location.action_back import kotlinx.android.synthetic.main.activity_custom_location.list_view @@ -78,7 +80,7 @@ class CustomDateActivity : AppCompatActivity() { } delay(200) - val text = if (dateFormat != "") { + var text = if (dateFormat != "") { try { SimpleDateFormat(dateFormat, Locale.getDefault()).format(DATE.time) } catch (e: Exception) { @@ -88,6 +90,10 @@ class CustomDateActivity : AppCompatActivity() { "__" } + if (Preferences.isDateCapitalize) { + text = text.getCapWordString() + } + withContext(Dispatchers.Main) { action_save.isVisible = text != ERROR_STRING loader.visibility = View.INVISIBLE @@ -96,6 +102,11 @@ class CustomDateActivity : AppCompatActivity() { } }) + + viewModel.isDateCapitalize.observe(this, Observer { + viewModel.dateInput.value = viewModel.dateInput.value + binding.isdCapitalizeEnabled = it + }) } private fun setupListener() { @@ -108,6 +119,15 @@ class CustomDateActivity : AppCompatActivity() { finish() } + action_capitalize.setOnClickListener { + Preferences.isDateCapitalize = !Preferences.isDateCapitalize + } + + action_capitalize.setOnLongClickListener { + toast(getString(R.string.action_capitalize_the_date)) + true + } + action_date_format_info.setOnClickListener { openURI("https://developer.android.com/reference/java/text/SimpleDateFormat") } diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt index d075ce1..33a1996 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt @@ -14,6 +14,7 @@ import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.RelativeLayout import androidx.core.animation.addListener import androidx.core.app.NotificationManagerCompat @@ -291,21 +292,27 @@ class MainFragment : Fragment(), SharedPreferences.OnSharedPreferenceChangeList activity?.let { act -> val wallpaper = act.getCurrentWallpaper() widget_bg.setImageDrawable(if (it) wallpaper else null) - widget_bg.layoutParams = widget_bg.layoutParams.apply { + if (wallpaper != null) { + widget_bg.layoutParams = + (widget_bg.layoutParams as ViewGroup.MarginLayoutParams).apply { - val metrics = DisplayMetrics() - act.windowManager.defaultDisplay.getMetrics(metrics) + val metrics = DisplayMetrics() + act.windowManager.defaultDisplay.getMetrics(metrics) - var newHeight = metrics.heightPixels - var newWidth = (wallpaper?.intrinsicWidth ?: 1) * metrics.heightPixels / (wallpaper?.intrinsicHeight ?: 1) + val dimensions: Pair = if (wallpaper.intrinsicWidth >= wallpaper.intrinsicHeight) { + metrics.heightPixels to (wallpaper.intrinsicWidth) * metrics.heightPixels / (wallpaper.intrinsicHeight) + } else { + metrics.widthPixels to (wallpaper.intrinsicHeight) * metrics.widthPixels / (wallpaper.intrinsicWidth) + } - if (newWidth < metrics.widthPixels) { - newWidth = metrics.widthPixels - newHeight = (wallpaper?.intrinsicHeight ?: 1) * metrics.widthPixels / (wallpaper?.intrinsicWidth ?: 1) - } + setMargins( + if (dimensions.first >= dimensions.second) (-80).toPixel(requireContext()) else 0, + (-80).toPixel(requireContext()), 0, 0 + ) - height = newHeight - width = newWidth + width = dimensions.first + height = dimensions.second + } } } }) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/CustomDateViewModel.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/CustomDateViewModel.kt index 537881e..f116b46 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/CustomDateViewModel.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/CustomDateViewModel.kt @@ -3,8 +3,10 @@ package com.tommasoberlose.anotherwidget.ui.viewmodels import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData +import com.chibatching.kotpref.livedata.asLiveData import com.tommasoberlose.anotherwidget.global.Preferences class CustomDateViewModel(application: Application) : AndroidViewModel(application) { val dateInput: MutableLiveData = MutableLiveData(if (Preferences.dateFormat == "") "EEEE, MMM dd" else Preferences.dateFormat) + val isDateCapitalize = Preferences.asLiveData(Preferences::isDateCapitalize) } \ No newline at end of file diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt index 21ba6ef..487896f 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt @@ -12,6 +12,7 @@ import android.graphics.Color import android.graphics.Typeface import android.os.Bundle import android.text.format.DateUtils +import android.util.Log import android.util.TypedValue import android.view.View import android.widget.ImageView @@ -34,6 +35,7 @@ import java.lang.Exception import java.text.DateFormat import java.util.* import java.util.concurrent.TimeUnit +import kotlin.math.min class MainWidget : AppWidgetProvider() { @@ -84,9 +86,10 @@ class MainWidget : AppWidgetProvider() { appWidgetId: Int) { val displayMetrics = Resources.getSystem().displayMetrics val width = displayMetrics.widthPixels + val height = displayMetrics.heightPixels val dimensions = WidgetHelper.WidgetSizeProvider(context, appWidgetManager).getWidgetsSize(appWidgetId) - generateWidgetView(context, appWidgetId, appWidgetManager, dimensions.first - 8.toPixel(context) /*width - 16.toPixel(context)*/) + generateWidgetView(context, appWidgetId, appWidgetManager, min(dimensions.first - 8.toPixel(context), min(width, height) - 16.toPixel(context))) } private fun generateWidgetView(context: Context, appWidgetId: Int, appWidgetManager: AppWidgetManager, w: Int) { @@ -498,8 +501,8 @@ class MainWidget : AppWidgetProvider() { } else { v.second_row_icon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.round_today)) if (!nextEvent.allDay) { - val startHour = DateFormat.getTimeInstance(DateFormat.SHORT).format(nextEvent.startDate) - val endHour = DateFormat.getTimeInstance(DateFormat.SHORT).format(nextEvent.endDate) + val startHour = DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault()).format(nextEvent.startDate) + val endHour = DateFormat.getTimeInstance(DateFormat.SHORT, Locale.getDefault()).format(nextEvent.endDate) var dayDiff = TimeUnit.MILLISECONDS.toDays(nextEvent.endDate - nextEvent.startDate) diff --git a/app/src/main/res/drawable-hdpi/round_format_size.png b/app/src/main/res/drawable-hdpi/round_format_size.png new file mode 100644 index 0000000..77261fe Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_format_size.png differ diff --git a/app/src/main/res/drawable-hdpi/round_format_size_black_24.png b/app/src/main/res/drawable-hdpi/round_format_size_black_24.png new file mode 100644 index 0000000..d715d5d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_format_size_black_24.png differ diff --git a/app/src/main/res/drawable-hdpi/round_format_size_black_36.png b/app/src/main/res/drawable-hdpi/round_format_size_black_36.png new file mode 100644 index 0000000..ccbc7b5 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_format_size_black_36.png differ diff --git a/app/src/main/res/drawable-hdpi/round_format_size_black_48.png b/app/src/main/res/drawable-hdpi/round_format_size_black_48.png new file mode 100644 index 0000000..9d5cfae Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_format_size_black_48.png differ diff --git a/app/src/main/res/drawable-hdpi/round_keyboard_capslock.png b/app/src/main/res/drawable-hdpi/round_keyboard_capslock.png new file mode 100644 index 0000000..e6e2d37 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_keyboard_capslock.png differ diff --git a/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_18.png b/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_18.png new file mode 100644 index 0000000..37e8d23 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_18.png differ diff --git a/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_24.png b/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_24.png new file mode 100644 index 0000000..1354428 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_24.png differ diff --git a/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_36.png b/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_36.png new file mode 100644 index 0000000..eaed861 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_keyboard_capslock_black_36.png differ diff --git a/app/src/main/res/drawable-mdpi/round_format_size.png b/app/src/main/res/drawable-mdpi/round_format_size.png new file mode 100644 index 0000000..8040bff Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_format_size.png differ diff --git a/app/src/main/res/drawable-mdpi/round_format_size_black_24.png b/app/src/main/res/drawable-mdpi/round_format_size_black_24.png new file mode 100644 index 0000000..9dbecfd Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_format_size_black_24.png differ diff --git a/app/src/main/res/drawable-mdpi/round_format_size_black_36.png b/app/src/main/res/drawable-mdpi/round_format_size_black_36.png new file mode 100644 index 0000000..d715d5d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_format_size_black_36.png differ diff --git a/app/src/main/res/drawable-mdpi/round_format_size_black_48.png b/app/src/main/res/drawable-mdpi/round_format_size_black_48.png new file mode 100644 index 0000000..ba8c109 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_format_size_black_48.png differ diff --git a/app/src/main/res/drawable-mdpi/round_keyboard_capslock.png b/app/src/main/res/drawable-mdpi/round_keyboard_capslock.png new file mode 100644 index 0000000..b6d8286 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_keyboard_capslock.png differ diff --git a/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_18.png b/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_18.png new file mode 100644 index 0000000..55a30c0 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_18.png differ diff --git a/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_24.png b/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_24.png new file mode 100644 index 0000000..c8748d9 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_24.png differ diff --git a/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_36.png b/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_36.png new file mode 100644 index 0000000..1354428 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_keyboard_capslock_black_36.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_format_size.png b/app/src/main/res/drawable-xhdpi/round_format_size.png new file mode 100644 index 0000000..d715d5d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_format_size.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_format_size_black_24.png b/app/src/main/res/drawable-xhdpi/round_format_size_black_24.png new file mode 100644 index 0000000..ba8c109 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_format_size_black_24.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_format_size_black_36.png b/app/src/main/res/drawable-xhdpi/round_format_size_black_36.png new file mode 100644 index 0000000..9d5cfae Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_format_size_black_36.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_format_size_black_48.png b/app/src/main/res/drawable-xhdpi/round_format_size_black_48.png new file mode 100644 index 0000000..9c5e968 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_format_size_black_48.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_keyboard_capslock.png b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock.png new file mode 100644 index 0000000..5a52683 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_18.png b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_18.png new file mode 100644 index 0000000..1354428 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_18.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_24.png b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_24.png new file mode 100644 index 0000000..b6d8286 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_24.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_36.png b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_36.png new file mode 100644 index 0000000..e6e2d37 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_keyboard_capslock_black_36.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_format_size.png b/app/src/main/res/drawable-xxhdpi/round_format_size.png new file mode 100644 index 0000000..ccbc7b5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_format_size.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_format_size_black_24.png b/app/src/main/res/drawable-xxhdpi/round_format_size_black_24.png new file mode 100644 index 0000000..9d5cfae Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_format_size_black_24.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_format_size_black_36.png b/app/src/main/res/drawable-xxhdpi/round_format_size_black_36.png new file mode 100644 index 0000000..98f1b10 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_format_size_black_36.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_format_size_black_48.png b/app/src/main/res/drawable-xxhdpi/round_format_size_black_48.png new file mode 100644 index 0000000..a91f885 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_format_size_black_48.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock.png b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock.png new file mode 100644 index 0000000..9658371 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_18.png b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_18.png new file mode 100644 index 0000000..eaed861 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_18.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_24.png b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_24.png new file mode 100644 index 0000000..e6e2d37 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_24.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_36.png b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_36.png new file mode 100644 index 0000000..58bbb97 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_keyboard_capslock_black_36.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_format_size.png b/app/src/main/res/drawable-xxxhdpi/round_format_size.png new file mode 100644 index 0000000..9d5cfae Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_format_size.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_format_size_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_format_size_black_24.png new file mode 100644 index 0000000..9c5e968 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_format_size_black_24.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_format_size_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_format_size_black_36.png new file mode 100644 index 0000000..a91f885 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_format_size_black_36.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_format_size_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_format_size_black_48.png new file mode 100644 index 0000000..09e6cff Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_format_size_black_48.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock.png b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock.png new file mode 100644 index 0000000..bb99075 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_18.png new file mode 100644 index 0000000..e6e2d37 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_18.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_24.png new file mode 100644 index 0000000..5a52683 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_24.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_36.png new file mode 100644 index 0000000..9658371 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_keyboard_capslock_black_36.png differ diff --git a/app/src/main/res/drawable/round_format_size_24.xml b/app/src/main/res/drawable/round_format_size_24.xml new file mode 100644 index 0000000..90e46a3 --- /dev/null +++ b/app/src/main/res/drawable/round_format_size_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/round_keyboard_capslock_24.xml b/app/src/main/res/drawable/round_keyboard_capslock_24.xml new file mode 100644 index 0000000..5ccc102 --- /dev/null +++ b/app/src/main/res/drawable/round_keyboard_capslock_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/activity_custom_date.xml b/app/src/main/res/layout/activity_custom_date.xml index 790c1a5..4129067 100644 --- a/app/src/main/res/layout/activity_custom_date.xml +++ b/app/src/main/res/layout/activity_custom_date.xml @@ -5,6 +5,9 @@ + - + android:layout_height="wrap_content"> + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ff8d561..cd9f5fd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -233,4 +233,5 @@ Icon pack Default Minimal + Capitalize the date