Merge pull request #158 from TeamAmaze/feature-147

147: change video player and image viewer backgrounds to dark; fix po…
TeamAmaze · Dec 26, 2023 · 743edce · 743edce
2 parents cdaf186 + f227845
commit 743edce
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 9 deletions.
diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
@@ -0,0 +1,45 @@
+name: Android Build CI
+
+on:
+  push:
+    branches:
+      - '*'
+      - '!master'
+      - '!release/*'
+concurrency:
+  group: build-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check_spotless:
+    name: Check spotless
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: "temurin"
+          java-version: 11
+      - name: Check formatting using spotless
+        uses: gradle/[email protected]
+        with:
+          arguments: spotlessCheck
+  build:
+    name: Build debug
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: "temurin"
+          java-version: 11
+      - name: Build with Gradle
+        uses: gradle/[email protected]
+        with:
+          arguments: assembledebug --stacktrace
+        env:
+          TZ: UTC
diff --git a/.github/workflows/android-main.yml b/.github/workflows/android-main.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Build with Gradle
         uses: gradle/[email protected]
         with:
-          arguments: assembledebug
+          arguments: assembledebug --stacktrace
         env:
           TZ: UTC
       - name: Publish on Telegram

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -57,7 +57,6 @@
             android:theme="@style/Theme.AmazeFileUtilities"
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity"
-            android:launchMode="singleInstance"
             >
             <nav-graph android:value="@navigation/mobile_navigation" />
             <intent-filter>
@@ -96,7 +95,6 @@
             android:name=".image_viewer.ImageViewerActivity"
             android:label="@string/image_viewer"
             android:theme="@style/Theme.AmazeFileUtilities.FullScreen.Dark"
-            android:launchMode="singleInstance"
             android:exported="true"
             >
             <intent-filter
@@ -114,7 +112,6 @@
             android:name=".image_viewer.editor.EditImageActivity"
             android:label="@string/image_editor"
             android:theme="@style/Theme.AmazeFileUtilities.FullScreen.Dark"
-            android:launchMode="singleInstance"
             android:exported="true"
             >
             <intent-filter
@@ -161,7 +158,6 @@
             android:label="@string/video_player"
             android:supportsPictureInPicture="true"
             android:resizeableActivity="true"
-            android:launchMode="singleInstance"
             android:taskAffinity="com.amaze.fileutilitiespip"
             android:theme="@style/Theme.AmazeFileUtilities.FullScreen.Dark"
             android:exported="true">
@@ -198,7 +194,7 @@
             android:exported="true"
             android:label="@string/docx_viewer"
             android:theme="@style/Theme.AmazeFileUtilities"
-            android:launchMode="singleInstance">
+            >
             <intent-filter
                 android:label="@string/docx_viewer"
                 tools:ignore="AppLinkUrlError">
@@ -214,7 +210,7 @@
             android:name=".home_page.ui.options.AboutActivity"
             android:exported="true"
             android:theme="@style/Custom.Dialog.Dark"
-            android:launchMode="singleInstance">
+            >
         </activity>
 
         <activity android:name="com.amaze.fileutilities.crash_report.ErrorActivity"
@@ -229,7 +225,6 @@
             android:theme="@style/Theme.AmazeFileUtilities.Dark"
             android:configChanges=""
             android:label="@string/settings"
-            android:launchMode="singleInstance"
             android:exported="true"
             />
         <activity

diff --git a/app/src/main/java/com/amaze/fileutilities/home_page/ui/analyse/AnalyseFragment.kt b/app/src/main/java/com/amaze/fileutilities/home_page/ui/analyse/AnalyseFragment.kt
@@ -22,6 +22,7 @@ package com.amaze.fileutilities.home_page.ui.analyse
 
 import android.content.Intent
 import android.content.SharedPreferences
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -482,6 +483,7 @@ class AnalyseFragment : AbstractMediaFileInfoOperationsFragment() {
                 if (!isUsageStatsPermissionGranted()) {
                     unusedAppsPreview.loadRequireElevatedPermission({
                         val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
+                        intent.data = Uri.parse("package:${requireActivity().packageName}")
                         startActivity(intent)
                     }, {
                         reloadFragment()
@@ -508,12 +510,14 @@ class AnalyseFragment : AbstractMediaFileInfoOperationsFragment() {
                 if (!isUsageStatsPermissionGranted()) {
                     mostUsedAppsPreview.loadRequireElevatedPermission({
                         val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
+                        intent.data = Uri.parse("package:${requireActivity().packageName}")
                         startActivity(intent)
                     }, {
                         reloadFragment()
                     })
                     leastUsedAppsPreview.loadRequireElevatedPermission({
                         val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
+                        intent.data = Uri.parse("package:${requireActivity().packageName}")
                         startActivity(intent)
                     }, {
                         reloadFragment()
@@ -556,6 +560,7 @@ class AnalyseFragment : AbstractMediaFileInfoOperationsFragment() {
             ) {
                 networkIntensiveAppsPreview.loadRequireElevatedPermission({
                     val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
+                    intent.data = Uri.parse("package:${requireActivity().packageName}")
                     startActivity(intent)
                 }, {
                     reloadFragment()

diff --git a/app/src/main/res/drawable/button_curved_selected.xml b/app/src/main/res/drawable/button_curved_selected.xml
@@ -5,7 +5,7 @@
             <solid android:color="@color/white"/>
             <stroke android:width="0dp" android:color="#B1BCBE" />
             <corners android:radius="@dimen/material_generic"/>
-            <padding android:left="@dimen/eight_dp" android:top="0dp" android:right="@dimen/eight_dp" android:bottom="0dp" />
+<!--            <padding android:left="@dimen/eight_dp" android:top="0dp" android:right="@dimen/eight_dp" android:bottom="0dp" />-->
         </shape>
     </item>
     <item android:drawable="@drawable/ripple_curved_16" />

diff --git a/app/src/main/res/drawable/popup_item_background.xml b/app/src/main/res/drawable/popup_item_background.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<item>
+    <shape
+        android:shape="rectangle">
+        <corners
+            android:topLeftRadius="@dimen/material_generic"
+            android:topRightRadius="@dimen/material_generic"
+            android:bottomLeftRadius="@dimen/material_generic"
+            android:bottomRightRadius="@dimen/material_generic"
+            />
+        <solid android:color="@color/navy_blue_alt" />
+    </shape>
+</item>
+<item android:drawable="@drawable/ripple_curved_16_trans_70" />
+</layer-list>
diff --git a/app/src/main/res/drawable/ripple_curved_16_trans_70.xml b/app/src/main/res/drawable/ripple_curved_16_trans_70.xml
@@ -0,0 +1,17 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:color="@color/highlight_yellow_70"
+    tools:targetApi="lollipop">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/highlight_yellow_70" />
+<!--            <corners android:radius="@dimen/round_corner" />-->
+            <corners
+                android:topLeftRadius="@dimen/material_generic"
+                android:topRightRadius="@dimen/material_generic"
+                android:bottomLeftRadius="@dimen/material_generic"
+                android:bottomRightRadius="@dimen/material_generic"
+                />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
@@ -4,5 +4,6 @@
         <item name="android:windowLayoutInDisplayCutoutMode">always</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowBackground">@color/black</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -63,6 +63,7 @@
     <style name="Theme.AmazeFileUtilities.FullScreen.Dark" parent="Theme.AmazeFileUtilities.Dark">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowBackground">@color/black</item>
     </style>
 
     <style name="BottomNavigationTheme" parent="Theme.AppCompat.Light">
@@ -86,6 +87,8 @@
         <item name="android:textColor">@color/white</item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
         <item name="android:gravity">center_vertical</item>
+        <item name="android:itemBackground">@drawable/popup_item_background</item>
+        <item name="itemBackground">@drawable/popup_item_background</item>
     </style>
 
     <style name="Custom.Dialog.Dark" parent="Theme.AppCompat.Dialog.Alert">