mirror of
https://github.com/TeamAmaze/AmazeFileManager.git
synced 2026-10-17 05:08:00 +08:00
Merge pull request #1554 from EmmanuelMess/update-androidx
Debug version name is now "Amaze Debug" and other fixes
This commit is contained in:
+2
-2
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
compileSdkVersion 28
|
||||
buildToolsVersion '27.0.3'
|
||||
|
||||
dexOptions {
|
||||
jumboMode = true
|
||||
@@ -39,6 +38,7 @@ android {
|
||||
|
||||
buildTypes {
|
||||
debug {
|
||||
applicationIdSuffix ".debug"
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
|
||||
testProguardFile 'tests-proguard.cfg'
|
||||
@@ -84,7 +84,7 @@ android {
|
||||
}
|
||||
|
||||
ext {
|
||||
supportLibVersion = '27.1.1'
|
||||
supportLibVersion = '28.0.0'
|
||||
robolectricVersion = '3.8'
|
||||
glideVersion = '4.8.0'
|
||||
sshjVersion = '0.26.0'
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="appbar_name" translatable="false">Amaze Debug</string>
|
||||
</resources>
|
||||
@@ -45,16 +45,16 @@
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
tools:replace="android:label"
|
||||
android:label="Amaze"
|
||||
android:label="@string/appbar_name"
|
||||
android:banner="@drawable/about_header">
|
||||
|
||||
<activity
|
||||
android:label="Amaze"
|
||||
android:label="@string/appbar_name"
|
||||
android:launchMode="singleInstance"
|
||||
android:name=".activities.MainActivity"
|
||||
android:theme="@style/appCompatLight">
|
||||
|
||||
<intent-filter>
|
||||
<intent-filter android:label="@string/appbar_name">
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
|
||||
@@ -212,7 +212,7 @@
|
||||
</receiver>
|
||||
|
||||
<provider
|
||||
android:authorities="com.amaze.filemanager.FILE_PROVIDER"
|
||||
android:authorities="${applicationId}.FILE_PROVIDER"
|
||||
android:name=".utils.GenericFileProvider"
|
||||
android:exported="false"
|
||||
android:grantUriPermissions="true">
|
||||
|
||||
@@ -2,6 +2,8 @@ package com.amaze.filemanager.utils;
|
||||
|
||||
import android.support.v4.content.FileProvider;
|
||||
|
||||
import com.amaze.filemanager.BuildConfig;
|
||||
|
||||
/**
|
||||
* Created by Vishal on 20-08-2017.
|
||||
*
|
||||
@@ -10,6 +12,6 @@ import android.support.v4.content.FileProvider;
|
||||
|
||||
public class GenericFileProvider extends FileProvider {
|
||||
|
||||
public static final String PROVIDER_NAME = "com.amaze.filemanager.FILE_PROVIDER";
|
||||
public static final String PROVIDER_NAME = BuildConfig.APPLICATION_ID + ".FILE_PROVIDER";
|
||||
|
||||
}
|
||||
|
||||
@@ -115,5 +115,7 @@
|
||||
|
||||
<!-- Warning error for InputTextLayout -->
|
||||
<color name="warningColor">#ffe082</color>
|
||||
<!-- Error error for InputTextLayout -->
|
||||
<color name="error_color_material">#F4511E</color>
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user