Louvorg/ReaderforSelfoss
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed every config string added at build time.

Browse Source
This commit is contained in:
Amine Bou
2018-05-23 20:39:50 +02:00
parent a3a7b78c96
commit 6d24fd9336
8 changed files with 18 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
View File

@@ -5,6 +5,7 @@ import android.content.Intent
import android.content.SharedPreferences
import android.graphics.Color
import android.graphics.drawable.GradientDrawable
import android.net.Uri
import android.os.Bundle
import android.preference.PreferenceManager
import android.support.v4.view.MenuItemCompat
@@ -55,7 +56,6 @@ import com.ashokvarma.bottomnavigation.TextBadgeItem
import com.ftinc.scoop.Scoop
import com.github.stkent.amplify.tracking.Amplify
import com.google.gson.reflect.TypeToken
import com.heinrichreimersoftware.androidissuereporter.IssueReporterLauncher
import com.mikepenz.aboutlibraries.Libs
import com.mikepenz.aboutlibraries.LibsBuilder
import com.mikepenz.materialdrawer.Drawer
@@ -432,17 +432,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
icon = R.drawable.ic_bug_report
iconTintingEnabled = true
onClick { _ ->
IssueReporterLauncher.forTarget(
getString(R.string.report_github_user),
getString(R.string.report_github_repo)
)
.theme(R.style.Theme_App_Light)
.guestToken(BuildConfig.GITHUB_TOKEN)
.minDescriptionLength(20)
.putExtraInfo("Unique ID", settings.getString("unique_id", ""))
.putExtraInfo("From github", BuildConfig.GITHUB_VERSION)
.homeAsUpEnabled(true)
.launch(this@HomeActivity)
val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(Config.trackerUrl))
startActivity(browserIntent)
false
}
}

2
app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
View File

@@ -76,7 +76,7 @@ class MyApp : MultiDexApplication() {
private fun initAmplify() {
Amplify.initSharedInstance(this)
.setPositiveFeedbackCollectors(GooglePlayStoreFeedbackCollector())
.setCriticalFeedbackCollectors(DefaultEmailFeedbackCollector(BuildConfig.FEEDBACK_EMAIL))
.setCriticalFeedbackCollectors(DefaultEmailFeedbackCollector(Config.feedbackEmail))
.applyAllDefaultRules()
}

3
app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
View File

@@ -26,6 +26,7 @@ import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
import apps.amine.bou.readerforselfoss.api.mercury.ParsedContent
import apps.amine.bou.readerforselfoss.api.selfoss.Item
import apps.amine.bou.readerforselfoss.themes.AppColors
import apps.amine.bou.readerforselfoss.utils.Config
import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
@@ -305,7 +306,7 @@ class ArticleFragment : Fragment() {
{ dialog, _ ->
// This won't be translated because it should only be temporary.
val to = BuildConfig.FEEDBACK_EMAIL
val to = Config.feedbackEmail
val subject= "[ReaderForSelfoss MalformedURLException]"
val body= "Please specify the source, item and spout you are using for the url below : \n ${e.message}"
val mailTo = "mailto:" + to + "?&subject=" + Uri.encode(subject) + "&body=" + Uri.encode(body)

6
app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java
View File

@@ -306,7 +306,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
findPreference("trackerLink").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
openUrl(Uri.parse(BuildConfig.TRACKER_URL));
openUrl(Uri.parse(Config.trackerUrl));
return true;
}
});
@@ -314,7 +314,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
findPreference("sourceLink").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
openUrl(Uri.parse(BuildConfig.SOURCE_URL));
openUrl(Uri.parse(Config.sourceUrl));
return false;
}
});
@@ -322,7 +322,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
findPreference("translation").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
openUrl(Uri.parse(BuildConfig.TRANSLATION_URL));
openUrl(Uri.parse(Config.translationUrl));
return false;
}
});

8
app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt
View File

@@ -28,6 +28,14 @@ class Config(c: Context) {
companion object {
const val settingsName = "paramsselfoss"
const val feedbackEmail = "aminecmi@gmail.com"
const val translationUrl = "https://crwd.in/readerforselfoss"
const val sourceUrl = "https://github.com/aminecmi/ReaderforSelfoss"
const val trackerUrl = "https://github.com/aminecmi/ReaderforSelfoss/issues"
fun logoutAndRedirect(
c: Context,
callingActivity: Activity,

7
app/src/main/res/values/styles.xml
View File

@@ -43,11 +43,4 @@
<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>-->
</style>
<style name="Theme.App.Light" parent="Theme.IssueReporter.Light.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:textColorPrimary">@color/md_grey_900</item>
</style>
</resources>