Cleaning and update.

2019-04-06 12:42:25 +02:00 · 2019-04-06 12:42:25 +02:00 · d1dad3e61a
commit d1dad3e61a
parent e5024b0420
6 changed files with 10 additions and 76 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -72,9 +72,6 @@ android {
                    'proguard-rules.pro'
        }
        debug {
-            buildConfigField "String", "LOGIN_URL", appLoginUrl
-            buildConfigField "String", "LOGIN_USERNAME", appLoginUsername
-            buildConfigField "String", "LOGIN_PASSWORD", appLoginPassword
        }
    }
    flavorDimensions "build"
@ -83,11 +80,6 @@ android {
            versionNameSuffix '-github'
            dimension "build"
        }
-        storeConfig {
-            // As jenkins publishes to alpha first, this is the default suffix now.
-            versionNameSuffix '-store'
-            dimension "build"
-        }
    }
 }

@ -102,14 +94,14 @@ dependencies {
    implementation fileTree(include: ['*.jar'], dir: 'libs')
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
    // Android Support
-    implementation "androidx.appcompat:appcompat:$android_version"
+    implementation "androidx.appcompat:appcompat:$androidx_version"
    implementation "com.google.android.material:material:$android_version"
    implementation "androidx.recyclerview:recyclerview:$android_version"
    implementation "androidx.legacy:legacy-support-v4:$android_version"
    implementation "androidx.vectordrawable:vectordrawable:$android_version"
    implementation "androidx.browser:browser:$android_version"
    implementation "androidx.cardview:cardview:$android_version"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha4'

    //multidex
    implementation 'androidx.multidex:multidex:2.0.1'
@ -134,9 +126,6 @@ dependencies {
    implementation 'com.github.bumptech.glide:glide:4.1.1'
    implementation 'com.github.bumptech.glide:okhttp3-integration:4.1.1'

-    // Asking politely users to rate the app
-    implementation 'com.github.stkent:amplify:2.2.0'
-
    // Drawer
    implementation 'co.zsmb:materialdrawer-kt:2.0.1'

@ -161,21 +150,4 @@ dependencies {
    kapt "androidx.room:room-compiler:$room_version"

    implementation "android.arch.work:work-runtime-ktx:$work_version"
-}
-
-
-afterEvaluate {
-    initAppLoginPropertiesIfNeeded()
-}
-
-def initAppLoginPropertiesIfNeeded() {
-    def propertiesFile = file(System.getProperty("user.home") + '/.gradle/gradle.properties')
-    if (!propertiesFile.exists()) {
-        def commentMessage = "This is autogenerated local property from system environment to prevent key to be committed to source control."
-        ant.propertyfile(file: System.getProperty("user.home") + "/.gradle/gradle.properties", comment: commentMessage) {
-            entry(key: "appLoginUrl", value: System.getProperty("appLoginUrl"))
-            entry(key: "appLoginUsername", value: System.getProperty("appLoginUsername"))
-            entry(key: "appLoginPassword", value: System.getProperty("appLoginPassword"))
-        }
-    }
-}
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@ -64,7 +64,6 @@ import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
 import com.ftinc.scoop.Scoop
-import com.github.stkent.amplify.tracking.Amplify
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
 import com.mikepenz.materialdrawer.Drawer
@ -173,9 +172,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
        handleThemeBinding()

        setSupportActionBar(toolBar)
-        if (savedInstanceState == null) {
-            Amplify.getSharedInstance().promptIfReady(promptView)
-        }

        db = Room.databaseBuilder(
            applicationContext,
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
@ -14,9 +14,6 @@ import apps.amine.bou.readerforselfoss.utils.glide.loadMaybeBasicAuth
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.ftinc.scoop.Scoop
-import com.github.stkent.amplify.feedback.DefaultEmailFeedbackCollector
-import com.github.stkent.amplify.feedback.GooglePlayStoreFeedbackCollector
-import com.github.stkent.amplify.tracking.Amplify
 import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
 import com.mikepenz.materialdrawer.util.DrawerImageLoader
 import org.acra.ACRA
@ -25,7 +22,6 @@ import org.acra.annotation.AcraCore
 import org.acra.annotation.AcraDialog
 import org.acra.annotation.AcraHttpSender
 import org.acra.sender.HttpSender
-import java.io.IOException
 import java.util.UUID.randomUUID


@ -48,7 +44,6 @@ class MyApp : MultiDexApplication() {
    override fun onCreate() {
        super.onCreate()
        config = Config(baseContext)
-        initAmplify()

        val prefs = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
        if (prefs.getString("unique_id", "").isEmpty()) {
@ -91,13 +86,6 @@ class MyApp : MultiDexApplication() {

    }

-    private fun initAmplify() {
-        Amplify.initSharedInstance(this)
-            .setPositiveFeedbackCollectors(GooglePlayStoreFeedbackCollector())
-            .setCriticalFeedbackCollectors(DefaultEmailFeedbackCollector(Config.feedbackEmail))
-            .applyAllDefaultRules()
-    }
-
    private fun initDrawerImageLoader() {
        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
            override fun set(
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/background/background.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/background/background.kt
@ -130,7 +130,7 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con
                }
            }
        }
-        return Result.SUCCESS
+        return Result.success()
    }

    private fun <T> doAndReportOnFail(call: Call<T>, action: ActionEntity) {
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@ -8,33 +8,10 @@
    android:fitsSystemWindows="true"
    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <com.github.stkent.amplify.prompt.DefaultLayoutPromptView
-        android:id="@+id/promptView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:prompt_view_user_opinion_question_title="@string/rating_prompt_title"
-        app:prompt_view_user_opinion_question_positive_button_label="@string/rating_prompt_yes"
-        app:prompt_view_user_opinion_question_negative_button_label="@string/rating_prompt_no"
-        app:prompt_view_positive_feedback_question_title="@string/rating_prompt_rating_title"
-        app:prompt_view_positive_feedback_question_positive_button_label="@string/rating_prompt_rating_yes"
-        app:prompt_view_positive_feedback_question_negative_button_label="@string/rating_prompt_rating_no"
-        app:prompt_view_critical_feedback_question_title="@string/rating_prompt_feedback_title"
-        app:prompt_view_critical_feedback_question_positive_button_label="@string/rating_prompt_feedback_yes"
-        app:prompt_view_critical_feedback_question_negative_button_label="@string/rating_prompt_feedback_no"
-        app:prompt_view_thanks_title="@string/rating_prompt_thanks"
-        app:prompt_view_positive_button_background_color="@color/colorPrimary"
-        app:prompt_view_positive_button_text_color="@color/white"
-        app:prompt_view_positive_button_border_color="@color/colorPrimary"
-        app:prompt_view_negative_button_background_color="@color/colorAccent"
-        app:prompt_view_negative_button_border_color="@color/white"
-        app:prompt_view_background_color="?attr/colorAccent"
-        app:prompt_view_thanks_display_time_ms="2000"/>
-
    <androidx.coordinatorlayout.widget.CoordinatorLayout
        android:id="@+id/coordLayout"
        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/promptView">
+        android:layout_height="match_parent">

        <androidx.coordinatorlayout.widget.CoordinatorLayout
            android:id="@+id/intern_coordLayout"
--- a/build.gradle
+++ b/build.gradle
@ -2,11 +2,12 @@

 buildscript {
    ext {
-        kotlin_version = '1.3.0'
+        kotlin_version = '1.3.21'
        android_version = '1.0.0'
+        androidx_version = '1.0.2'
        lifecycle_version = '2.0.0'
-        room_version = '2.1.0-alpha01'
-        work_version = "1.0.0-alpha10"
+        room_version = '2.1.0-alpha06'
+        work_version = "1.0.1-rc01"
    }
    repositories {
        google()
@ -16,7 +17,7 @@ buildscript {
        }
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.2'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }
 }