From aca697f6ff77710ae18132f2041fa47c862aa65e Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Mon, 25 Oct 2021 20:04:36 +0530 Subject: [PATCH] Fixing Bug report and change log activities --- .../activities/bugreport/BugReportActivity.kt | 1 - .../fragments/backup/BackupFragment.kt | 6 +- .../main/res/layout/activity_bug_report.xml | 2 +- .../main/res/layout/activity_whats_new.xml | 95 ++++++++----------- app/src/main/res/values-night/styles.xml | 1 - app/src/main/res/values-v31/styles.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../name/monkey/appthemehelper/ATHActivity.kt | 3 - 8 files changed, 47 insertions(+), 63 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt index a65b135e..ac0ec1ea 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt @@ -77,7 +77,6 @@ open class BugReportActivity : AbsThemeActivity() { super.onCreate(savedInstanceState) binding = ActivityBugReportBinding.inflate(layoutInflater) setContentView(binding.root) - setStatusbarColorAuto() setTaskDescriptionColorAuto() initViews() diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt index ead8c5c2..2415f812 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt @@ -56,9 +56,9 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC backupViewModel.loadBackups() } } - positiveButton(R.string.action_rename) + positiveButton(android.R.string.ok) negativeButton(R.string.action_cancel) - setTitle(R.string.action_rename) + setTitle(R.string.title_new_backup) } } @@ -140,7 +140,7 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC ).show() } } - positiveButton(R.string.action_rename) + positiveButton(android.R.string.ok) negativeButton(R.string.action_cancel) setTitle(R.string.action_rename) } diff --git a/app/src/main/res/layout/activity_bug_report.xml b/app/src/main/res/layout/activity_bug_report.xml index 44f7a497..1b845f50 100644 --- a/app/src/main/res/layout/activity_bug_report.xml +++ b/app/src/main/res/layout/activity_bug_report.xml @@ -8,12 +8,12 @@ - + android:background="?attr/colorSurface" + android:fitsSystemWindows="true"> - + + + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:elevation="0dp" + app:elevation="0dp" + app:liftOnScroll="true"> - + + + + + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> - - - - + android:scrollbars="none" + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" /> - - - - - - - - - - - + + diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 817b47b5..424eb2c9 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -33,6 +33,5 @@ @style/Widget.MaterialComponents.FloatingActionButton - false \ No newline at end of file diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml index 91f9f374..fd8619d1 100644 --- a/app/src/main/res/values-v31/styles.xml +++ b/app/src/main/res/values-v31/styles.xml @@ -7,6 +7,7 @@ @style/MaterialButtonTheme @color/transparent @color/transparent + false