diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 6a7fc55..22f7a5b 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index d0ff257..f5d307d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { applicationId "com.tommasoberlose.anotherwidget" minSdkVersion 23 targetSdkVersion 29 - versionCode 54 - versionName "2.0.3" + versionCode 58 + versionName "2.0.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -43,6 +43,7 @@ android { kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() } + packagingOptions { exclude 'META-INF/DEPENDENCIES' } diff --git a/app/release/app-release.aab b/app/release/app-release.aab new file mode 100644 index 0000000..d66b2ef Binary files /dev/null and b/app/release/app-release.aab differ diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/AWApplication.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/AWApplication.kt index fb7731b..287b723 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/AWApplication.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/AWApplication.kt @@ -3,6 +3,7 @@ package com.tommasoberlose.anotherwidget import android.app.Application import androidx.appcompat.app.AppCompatDelegate import com.chibatching.kotpref.Kotpref +import com.google.firebase.crashlytics.FirebaseCrashlytics import com.tommasoberlose.anotherwidget.global.Preferences import io.realm.Realm import io.realm.RealmConfiguration @@ -11,6 +12,9 @@ class AWApplication : Application() { override fun onCreate() { super.onCreate() + // Firebase crashlitycs + FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(!BuildConfig.DEBUG) + // Preferences Kotpref.init(this) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/ChooseApplicationActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/ChooseApplicationActivity.kt index 885544f..c1233b3 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/ChooseApplicationActivity.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/ChooseApplicationActivity.kt @@ -6,6 +6,7 @@ import com.tommasoberlose.anotherwidget.R import android.content.Intent import android.content.pm.ApplicationInfo import android.content.pm.ResolveInfo +import android.util.Log import android.view.View import android.widget.ImageView import androidx.appcompat.app.AppCompatActivity @@ -111,18 +112,26 @@ class ChooseApplicationActivity : AppCompatActivity() { } }) + +// viewModel.filterSettingsApp.observe(this, Observer { +// action_filter.alpha = if (it) 1f else 0.5f +// }) } private fun setupListener() { action_back.setOnClickListener { onBackPressed() } + +// action_filter.setOnClickListener { +// viewModel.toggleFilter() +// } } private fun saveApp(app: ResolveInfo) { val resultIntent = Intent() resultIntent.putExtra(Constants.RESULT_APP_NAME, app.loadLabel(pm)) - resultIntent.putExtra(Constants.RESULT_APP_PACKAGE, app.resolvePackageName) + resultIntent.putExtra(Constants.RESULT_APP_PACKAGE, app.activityInfo.packageName) setResult(Activity.RESULT_OK, resultIntent) finish() } diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt index 8d8d898..4243576 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt @@ -148,6 +148,11 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh preview.layoutParams = layoutParams } }.start() + } else { + clock.layoutParams = clock.layoutParams.apply { + height = RelativeLayout.LayoutParams.WRAP_CONTENT + } + clock.measure(0, 0) } widget_bitmap.setImageBitmap(bitmap) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockSettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockSettingsFragment.kt index a543da9..c8f1a52 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockSettingsFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockSettingsFragment.kt @@ -108,7 +108,7 @@ class ClockSettingsFragment : Fragment() { action_clock_text_size.setOnClickListener { val dialog = BottomSheetMenu(requireContext(), header = getString(R.string.settings_clock_text_size_title)).setSelectedValue(Preferences.clockTextSize) - (46 downTo 28).filter { it % 2 == 0 }.forEach { + (46 downTo 12).filter { it % 2 == 0 }.forEach { dialog.addItem("${it}sp", it.toFloat()) } dialog.addOnSelectItemListener { value -> diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralSettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralSettingsFragment.kt index 01dfff8..9ebfd86 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralSettingsFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralSettingsFragment.kt @@ -123,7 +123,7 @@ class GeneralSettingsFragment : Fragment() { private fun setupListener() { action_main_text_size.setOnClickListener { val dialog = BottomSheetMenu(requireContext(), header = getString(R.string.title_main_text_size)).setSelectedValue(Preferences.textMainSize) - (32 downTo 20).filter { it % 2 == 0 }.forEach { + (32 downTo 10).filter { it % 2 == 0 }.forEach { dialog.addItem("${it}sp", it.toFloat()) } dialog.addOnSelectItemListener { value -> @@ -133,7 +133,7 @@ class GeneralSettingsFragment : Fragment() { action_second_text_size.setOnClickListener { val dialog = BottomSheetMenu(requireContext(), header = getString(R.string.title_second_text_size)).setSelectedValue(Preferences.textSecondSize) - (24 downTo 12).filter { it % 2 == 0 }.forEach { + (28 downTo 10).filter { it % 2 == 0 }.forEach { dialog.addItem("${it}sp", it.toFloat()) } dialog.addOnSelectItemListener { value -> diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt index 7a1a832..1ce1824 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt @@ -4,6 +4,7 @@ import android.Manifest import android.app.Activity import android.content.Intent import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/app/src/main/res/drawable-hdpi/round_filter_list.png b/app/src/main/res/drawable-hdpi/round_filter_list.png index 1690f23..480ff8e 100644 Binary files a/app/src/main/res/drawable-hdpi/round_filter_list.png and b/app/src/main/res/drawable-hdpi/round_filter_list.png differ diff --git a/app/src/main/res/drawable-hdpi/round_filter_list_black_18.png b/app/src/main/res/drawable-hdpi/round_filter_list_black_18.png new file mode 100644 index 0000000..3c84e34 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_filter_list_black_18.png differ diff --git a/app/src/main/res/drawable-hdpi/round_filter_list_black_36.png b/app/src/main/res/drawable-hdpi/round_filter_list_black_36.png new file mode 100644 index 0000000..57342ca Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_filter_list_black_36.png differ diff --git a/app/src/main/res/drawable-hdpi/round_filter_list_black_48.png b/app/src/main/res/drawable-hdpi/round_filter_list_black_48.png new file mode 100644 index 0000000..0ca55a3 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_filter_list_black_48.png differ diff --git a/app/src/main/res/drawable-mdpi/round_filter_list.png b/app/src/main/res/drawable-mdpi/round_filter_list.png index 5e83811..cbd5ac1 100644 Binary files a/app/src/main/res/drawable-mdpi/round_filter_list.png and b/app/src/main/res/drawable-mdpi/round_filter_list.png differ diff --git a/app/src/main/res/drawable-mdpi/round_filter_list_black_18.png b/app/src/main/res/drawable-mdpi/round_filter_list_black_18.png new file mode 100644 index 0000000..7ccba25 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_filter_list_black_18.png differ diff --git a/app/src/main/res/drawable-mdpi/round_filter_list_black_36.png b/app/src/main/res/drawable-mdpi/round_filter_list_black_36.png new file mode 100644 index 0000000..480ff8e Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_filter_list_black_36.png differ diff --git a/app/src/main/res/drawable-mdpi/round_filter_list_black_48.png b/app/src/main/res/drawable-mdpi/round_filter_list_black_48.png new file mode 100644 index 0000000..0b16e6d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_filter_list_black_48.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_filter_list.png b/app/src/main/res/drawable-xhdpi/round_filter_list.png index 38c246b..0b16e6d 100644 Binary files a/app/src/main/res/drawable-xhdpi/round_filter_list.png and b/app/src/main/res/drawable-xhdpi/round_filter_list.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_filter_list_black_18.png b/app/src/main/res/drawable-xhdpi/round_filter_list_black_18.png new file mode 100644 index 0000000..480ff8e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_filter_list_black_18.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_filter_list_black_36.png b/app/src/main/res/drawable-xhdpi/round_filter_list_black_36.png new file mode 100644 index 0000000..0ca55a3 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_filter_list_black_36.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_filter_list_black_48.png b/app/src/main/res/drawable-xhdpi/round_filter_list_black_48.png new file mode 100644 index 0000000..8fad1ee Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_filter_list_black_48.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_filter_list.png b/app/src/main/res/drawable-xxhdpi/round_filter_list.png index 7b33cc0..0ca55a3 100644 Binary files a/app/src/main/res/drawable-xxhdpi/round_filter_list.png and b/app/src/main/res/drawable-xxhdpi/round_filter_list.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_filter_list_black_18.png b/app/src/main/res/drawable-xxhdpi/round_filter_list_black_18.png new file mode 100644 index 0000000..57342ca Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_filter_list_black_18.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_filter_list_black_36.png b/app/src/main/res/drawable-xxhdpi/round_filter_list_black_36.png new file mode 100644 index 0000000..e3331a3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_filter_list_black_36.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_filter_list_black_48.png b/app/src/main/res/drawable-xxhdpi/round_filter_list_black_48.png new file mode 100644 index 0000000..c65a486 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_filter_list_black_48.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_filter_list.png b/app/src/main/res/drawable-xxxhdpi/round_filter_list.png index c4785ec..8fad1ee 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/round_filter_list.png and b/app/src/main/res/drawable-xxxhdpi/round_filter_list.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_filter_list_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_filter_list_black_18.png new file mode 100644 index 0000000..0ca55a3 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_filter_list_black_18.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_filter_list_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_filter_list_black_36.png new file mode 100644 index 0000000..c65a486 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_filter_list_black_36.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_filter_list_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_filter_list_black_48.png new file mode 100644 index 0000000..754f867 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_filter_list_black_48.png differ diff --git a/app/src/main/res/layout/activity_choose_application.xml b/app/src/main/res/layout/activity_choose_application.xml index 1c53100..04f72a1 100644 --- a/app/src/main/res/layout/activity_choose_application.xml +++ b/app/src/main/res/layout/activity_choose_application.xml @@ -44,6 +44,17 @@ android:text="@string/action_choose_application" android:gravity="center" style="@style/AnotherWidget.Main.Title"/> + + android:versionCode="56" + android:versionName="2.0.4" > + android:versionCode="56" + android:versionName="2.0.4" > +6 android:versionCode="56" +7 android:versionName="2.0.4" > 8 9 + android:versionCode="56" + android:versionName="2.0.4" > + android:versionCode="56" + android:versionName="2.0.4" >