update commons to 4.6.5

This commit is contained in:
tibbi 2018-08-10 22:47:33 +02:00
parent 858d0490e0
commit 404a1945b7
6 changed files with 25 additions and 28 deletions

View File

@ -41,7 +41,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:4.3.2' implementation 'com.simplemobiletools:commons:4.6.5'
} }
Properties props = new Properties() Properties props = new Properties()

View File

@ -19,13 +19,7 @@
<activity <activity
android:name=".activities.SplashActivity" android:name=".activities.SplashActivity"
android:theme="@style/SplashTheme"> android:theme="@style/SplashTheme"/>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".activities.MainActivity"/> <activity android:name=".activities.MainActivity"/>
@ -59,19 +53,6 @@
android:authorities="com.simplemobiletools.commons.provider" android:authorities="com.simplemobiletools.commons.provider"
android:exported="true"/> android:exported="true"/>
<!-- Do not append ".Orange" to the default alias "name", it would remove the old homescreen launcher of users at upgrade -->
<activity-alias
android:name=".activities.SplashActivity"
android:enabled="true"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher"
android:targetActivity=".activities.SplashActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Red" android:name=".activities.SplashActivity.Red"
android:enabled="false" android:enabled="false"
@ -254,6 +235,18 @@
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias
android:name=".activities.SplashActivity.Orange"
android:enabled="true"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher"
android:targetActivity=".activities.SplashActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Deep_orange" android:name=".activities.SplashActivity.Deep_orange"
android:enabled="false" android:enabled="false"

View File

@ -49,7 +49,7 @@ class MainActivity : SimpleActivity() {
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons) FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)
) )
startAboutActivity(R.string.app_name, 0, BuildConfig.VERSION_NAME, faqItems) startAboutActivity(R.string.app_name, 0, BuildConfig.VERSION_NAME, faqItems, false)
} }
private fun checkWhatsNewDialog() { private fun checkWhatsNewDialog() {

View File

@ -71,7 +71,7 @@ class SettingsActivity : SimpleActivity() {
val appId = BuildConfig.APPLICATION_ID val appId = BuildConfig.APPLICATION_ID
getAppIconColors().forEachIndexed { index, color -> getAppIconColors().forEachIndexed { index, color ->
toggleAppIconColor(appId, index, false) toggleAppIconColor(appId, index, color, false)
} }
} }
} }

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView <ScrollView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/settings_scrollview" android:id="@+id/settings_scrollview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -52,7 +53,8 @@
android:clickable="false" android:clickable="false"
android:paddingLeft="@dimen/medium_margin" android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:text="@string/use_english_language"/> android:text="@string/use_english_language"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout> </RelativeLayout>
@ -75,7 +77,8 @@
android:clickable="false" android:clickable="false"
android:paddingLeft="@dimen/medium_margin" android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:text="@string/avoid_whats_new"/> android:text="@string/avoid_whats_new"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout> </RelativeLayout>
@ -98,7 +101,8 @@
android:clickable="false" android:clickable="false"
android:paddingLeft="@dimen/medium_margin" android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin" android:paddingStart="@dimen/medium_margin"
android:text="@string/hide_launcher_icon"/> android:text="@string/hide_launcher_icon"
app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

View File

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.2.50' ext.kotlin_version = '1.2.60'
repositories { repositories {
jcenter() jcenter()
@ -9,7 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.3' classpath 'com.android.tools.build:gradle:3.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong