Skip to content

Feature/Moving main url out of strings.xml #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maestromac merged 4 commits into from
May 20, 2019
Merged

Feature/Moving main url out of strings.xml #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a25c5b2
Add buildConfig and resourceValue fields for base-url.
VarunBarad May 4, 2019
cbc6cc7
Replace use of string-resource "main_url" with BuildConfig field "bas…
VarunBarad May 4, 2019
868781f
Remove unused string-resource for main-url.
VarunBarad May 4, 2019
97ac574
Merge branch 'master' into feature/move-main-url-out-of-string-resource
maestromac May 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/main/java/to/dev/dev_android/view/main/view/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import android.os.Bundle
import android.webkit.ValueCallback
import androidx.core.app.ActivityCompat
import to.dev.dev_android.R
import to.dev.dev_android.base.BuildConfig
import to.dev.dev_android.base.activity.BaseActivity
import to.dev.dev_android.databinding.ActivityMainBinding

Expand Down Expand Up @@ -47,7 +48,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), CustomWebChromeClient.
}

private fun navigateToHome() {
binding.webView.loadUrl(resources.getString(R.string.main_url))
binding.webView.loadUrl(BuildConfig.baseUrl)
}

override fun onBackPressed() {
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<resources>
<string name="app_name">DEV Community</string>

<string name="main_url">https://dev.to</string>
</resources>
6 changes: 6 additions & 0 deletions baseui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,15 @@ android {
}

buildTypes {
debug {
resValue("string", "baseUrl", "\"https://dev.to\"")
buildConfigField("String", "baseUrl", "\"https://dev.to\"")
}
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
resValue("string", "baseUrl", "\"https://dev.to\"")
Copy link

@Glennmen Glennmen May 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is resValue needed?

Copy link
Contributor Author

@VarunBarad VarunBarad May 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The resValue has been added so that when in future the baseUrl needs to be referred from resource files, it is already available to do so.

buildConfigField("String", "baseUrl", "\"https://dev.to\"")
Copy link

@Glennmen Glennmen May 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this can be made cleaner with:

Suggested change
buildConfigField("String", "baseUrl", "\"https://dev.to\"")
buildConfigField("String", "baseUrl", '"https://dev.to"')

}
}

Expand Down