Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'RetroMusicPlayer:dev' into 1216-add-option-to-clear-history

Browse source
This commit is contained in:
66Omar 2022-03-04 14:16:42 +02:00 • committed by GitHub
commit 55dd275e9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 204 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

61
app/src/main/res/layout/activity_permission.xml
View file

@ -29,33 +29,46 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/appNameText" />
<code.name.monkey.retromusic.views.PermissionItem
android:id="@+id/storagePermission"
android:layout_width="0dp"
android:layout_height="wrap_content"
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:fillViewport="true"
app:layout_constraintBottom_toTopOf="@+id/finish"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/divider"
app:permissionButtonTitle="Grant access"
app:permissionIcon="@drawable/ic_sd_storage"
app:permissionTitle="@string/permission_title"
app:permissionTitleNumber="1"
app:permissionTitleSubTitle="@string/permission_summary" />
app:layout_constraintTop_toBottomOf="@+id/divider">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="@integer/permission_orientation">
<code.name.monkey.retromusic.views.PermissionItem
android:id="@+id/storagePermission"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="@integer/permission_layout_weight"
app:permissionButtonTitle="Grant access"
app:permissionIcon="@drawable/ic_sd_storage"
app:permissionTitle="@string/permission_title"
app:permissionTitleNumber="1"
app:permissionTitleSubTitle="@string/permission_summary" />
<code.name.monkey.retromusic.views.PermissionItem
android:id="@+id/audioPermission"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_weight="@integer/permission_layout_weight"
app:permissionButtonTitle="Grant access"
app:permissionIcon="@drawable/ic_phonelink_ring"
app:permissionTitle="@string/ringtone_title"
app:permissionTitleNumber="2"
app:permissionTitleSubTitle="@string/ringtone_summary"
tools:visibility="visible" />
</LinearLayout>
</ScrollView>
<code.name.monkey.retromusic.views.PermissionItem
android:id="@+id/audioPermission"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/storagePermission"
app:permissionButtonTitle="Grant access"
app:permissionIcon="@drawable/ic_phonelink_ring"
app:permissionTitle="@string/ringtone_title"
app:permissionTitleNumber="2"
app:permissionTitleSubTitle="@string/ringtone_summary"
tools:visibility="visible" />
<com.google.android.material.button.MaterialButton
android:id="@+id/finish"

5
app/src/main/res/values-land/integers.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="permission_orientation">0</integer>
<integer name="permission_layout_weight">1</integer>
</resources>

2
app/src/main/res/values-sw600dp/integers.xml
View file

@ -8,4 +8,6 @@
<integer name="max_columns">6</integer>
<integer name="max_columns_land">8</integer>
<integer name="permission_orientation">1</integer>
<integer name="permission_layout_weight">1</integer>
</resources>

2
app/src/main/res/values/integers.xml
View file

@ -10,4 +10,6 @@
<integer name="max_columns_land">6</integer>
<integer name="anim_duration_medium">200</integer>
<integer name="permission_orientation">1</integer>
<integer name="permission_layout_weight">0</integer>
</resources>

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

@ -543,4 +543,5 @@
<string name="you_have_to_select_at_least_one_category">You have to select at least one category.</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="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
</resources>