Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dde4c7ac authored by tibbi's avatar tibbi
Browse files

update commons to 4.6.5

parent 023db52f

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ android { 
}



dependencies {

    implementation 'com.simplemobiletools:commons:4.0.22'

    implementation 'com.simplemobiletools:commons:4.6.5'

    implementation 'com.squareup:otto:1.3.8'

    implementation 'com.android.support.constraint:constraint-layout:1.1.0'

    implementation 'com.android.support.constraint:constraint-layout:1.1.2'

}



Properties props = new Properties()

app/src/main/AndroidManifest.xml

+12 −16
Original line number Diff line number Diff line
@@ -29,10 +29,7 @@ 
            android:name=".activities.SplashActivity"

            android:theme="@style/SplashTheme">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>



                <category android:name="android.intent.category.LAUNCHER"/>

            </intent-filter>

        </activity>
@@ -98,19 +95,6 @@ 
            </intent-filter>

        </service>



        <!-- 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

            android:name=".activities.SplashActivity.Red"

            android:enabled="false"
@@ -293,6 +277,18 @@ 
            </intent-filter>

        </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

            android:name=".activities.SplashActivity.Deep_orange"

            android:enabled="false"

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt

+4 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ class MainActivity : SimpleActivity() { 
        }



        setupStroboscope()

        checkAppOnSDCard()

    }



    override fun onResume() {
@@ -132,13 +133,15 @@ class MainActivity : SimpleActivity() { 
    }



    private fun launchAbout() {

        val licenses = LICENSE_OTTO



        val faqItems = arrayListOf(

                FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons),

                FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons),

                FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)

        )



        startAboutActivity(R.string.app_name, LICENSE_OTTO, BuildConfig.VERSION_NAME, faqItems)

        startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)

    }



    private fun setupCameraImpl() {

build.gradle

+2 −2
Original line number Diff line number Diff line 
// Top-level build file where you can add configuration options common to all sub-projects/modules.



buildscript {

    ext.kotlin_version = '1.2.41'

    ext.kotlin_version = '1.2.60'



    repositories {

        jcenter()
@@ -9,7 +9,7 @@ buildscript { 
    }



    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"



        // NOTE: Do not place your application dependencies here; they belong