diff --git a/app/build.gradle b/app/build.gradle index 608bf48..25d0be6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { minSdkVersion 21 targetSdkVersion 29 versionCode 1 - versionName '1.3.4' + versionName '1.3.5' buildConfigField 'String', 'API_IMPL', "\"\"" } diff --git a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/components/BaseBottomSheet.kt b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/components/BaseBottomSheet.kt index d866015..a7169ff 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/components/BaseBottomSheet.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/remotetemperaturecontrol/components/BaseBottomSheet.kt @@ -5,6 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import com.google.android.material.bottomsheet.BottomSheetDialogFragment +import com.smlnskgmail.jaman.remotetemperaturecontrol.R abstract class BaseBottomSheet : BottomSheetDialogFragment() { @@ -29,4 +30,8 @@ abstract class BaseBottomSheet : BottomSheetDialogFragment() { abstract fun getLayoutResId(): Int + override fun getTheme(): Int { + return R.style.AppBottomSheetStyle + } + } diff --git a/app/src/main/res/drawable/bg_bottom_sheet.xml b/app/src/main/res/drawable/bg_bottom_sheet.xml new file mode 100644 index 0000000..0a0ab75 --- /dev/null +++ b/app/src/main/res/drawable/bg_bottom_sheet.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index fb4ab8e..5be8936 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 457ba7e..71973c7 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index 7b7b5f2..ec64b53 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 6012a37..dd005c3 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index ef21cb4..8984e0a 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 30b75cf..6422abc 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 73b8489..c43dc9a 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 621b37c..003ca50 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 2e95110..9936f7f 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 36e30aa..57436b0 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7d0c8ab..9a0e4c0 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,10 @@ - #4db6ac - #00867d + #26a69a + #00766c #64b5f6 - #4DB6AC + #26a69a #212121 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 9e2bd55..e6cd1aa 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -11,4 +11,6 @@ 16sp 18sp 24sp + + 12dp \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0a27def..ee2c22e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,5 +1,4 @@ - + + + diff --git a/build.gradle b/build.gradle index 3d9dce8..0d00b50 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.70' + ext.kotlin_version = '1.3.71' repositories { google() jcenter() diff --git a/media/logo/ic_app.png b/media/logo/ic_app.png index 37fc80c..80a7a14 100644 Binary files a/media/logo/ic_app.png and b/media/logo/ic_app.png differ diff --git a/media/screenshots/screenshot_01.png b/media/screenshots/screenshot_01.png index a8287fe..ee5cb0b 100644 Binary files a/media/screenshots/screenshot_01.png and b/media/screenshots/screenshot_01.png differ diff --git a/media/screenshots/screenshot_02.png b/media/screenshots/screenshot_02.png index f08f610..1fee093 100644 Binary files a/media/screenshots/screenshot_02.png and b/media/screenshots/screenshot_02.png differ