nyancrimew/PlayerAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing Bug report and change log activities

Browse source
This commit is contained in:
Prathamesh More 2021-10-25 20:04:36 +05:30
parent ef903bdf42
commit aca697f6ff
8 changed files with 47 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt
View file

@ -77,7 +77,6 @@ open class BugReportActivity : AbsThemeActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityBugReportBinding.inflate(layoutInflater) binding = ActivityBugReportBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
setStatusbarColorAuto()
setTaskDescriptionColorAuto() setTaskDescriptionColorAuto()
initViews() initViews()

6
app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt
View file

@ -56,9 +56,9 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC
backupViewModel.loadBackups() backupViewModel.loadBackups()
} }
} }
positiveButton(R.string.action_rename) positiveButton(android.R.string.ok)
negativeButton(R.string.action_cancel) 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() ).show()
} }
} }
positiveButton(R.string.action_rename) positiveButton(android.R.string.ok)
negativeButton(R.string.action_cancel) negativeButton(R.string.action_cancel)
setTitle(R.string.action_rename) setTitle(R.string.action_rename)
} }

2
app/src/main/res/layout/activity_bug_report.xml
View file

@ -8,12 +8,12 @@
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fitsSystemWindows="true"
app:liftOnScroll="true"> app:liftOnScroll="true">
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
style="@style/Toolbar" style="@style/Toolbar"
android:background="@color/transparent"
app:layout_collapseMode="pin" app:layout_collapseMode="pin"
app:navigationIcon="@drawable/ic_keyboard_backspace_black" app:navigationIcon="@drawable/ic_keyboard_backspace_black"
app:title="@string/report_bug" app:title="@string/report_bug"

95
app/src/main/res/layout/activity_whats_new.xml
View file

@ -1,67 +1,54 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:background="?attr/colorSurface"
android:fitsSystemWindows="true">
<code.name.monkey.retromusic.views.StatusBarView
android:id="@+id/status_bar" <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/tgFab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:text="@string/view_on_telegram"
app:icon="@drawable/ic_telegram_white" />
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:background="?attr/colorSurface" android:background="@android:color/transparent"
tools:ignore="UnusedAttribute" /> android:elevation="0dp"
app:elevation="0dp"
app:liftOnScroll="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
app:layout_collapseMode="pin"
app:navigationIcon="@drawable/ic_keyboard_backspace_black"
app:title="@string/whats_new"
app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorSurface"> app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<code.name.monkey.retromusic.views.LollipopFixedWebView
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton android:id="@+id/webView"
android:id="@+id/tgFab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:text="@string/view_on_telegram"
app:icon="@drawable/ic_telegram_white" />
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent" android:scrollbars="none"
android:elevation="0dp" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
app:elevation="0dp"
app:liftOnScroll="true">
<com.google.android.material.appbar.MaterialToolbar </androidx.core.widget.NestedScrollView>
android:id="@+id/toolbar" </androidx.coordinatorlayout.widget.CoordinatorLayout>
style="@style/Toolbar"
app:layout_collapseMode="pin"
app:navigationIcon="@drawable/ic_keyboard_backspace_black"
app:title="@string/whats_new"
app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<code.name.monkey.retromusic.views.LollipopFixedWebView
android:id="@+id/webView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</LinearLayout>

1
app/src/main/res/values-night/styles.xml
View file

@ -33,6 +33,5 @@
<item name="floatingActionButtonStyle"> <item name="floatingActionButtonStyle">
@style/Widget.MaterialComponents.FloatingActionButton @style/Widget.MaterialComponents.FloatingActionButton
</item> </item>
<item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
</style> </style>
</resources> </resources>

1
app/src/main/res/values-v31/styles.xml
View file

@ -7,6 +7,7 @@
<item name="materialButtonStyle">@style/MaterialButtonTheme</item> <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
<item name="android:statusBarColor">@color/transparent</item> <item name="android:statusBarColor">@color/transparent</item>
<item name="android:navigationBarColor">@color/transparent</item> <item name="android:navigationBarColor">@color/transparent</item>
<item name="android:enforceNavigationBarContrast">false</item>
</style> </style>
<style name="BottomSheetStyle" parent="Widget.Material3.BottomSheet"> <style name="BottomSheetStyle" parent="Widget.Material3.BottomSheet">

1
app/src/main/res/values/strings.xml
View file

@ -515,4 +515,5 @@
<string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string> <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
<string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string> <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
<string name="restore_message">Do you want to restore backup?</string> <string name="restore_message">Do you want to restore backup?</string>
<string name="title_new_backup">New Backup</string>
</resources> </resources>

3
appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATHActivity.kt
View file

@ -1,10 +1,7 @@
package code.name.monkey.appthemehelper package code.name.monkey.appthemehelper
import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import androidx.annotation.StyleRes
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
/** /**