Skip to content

Commit c6b81f4

Browse files
tibbitibbi
committed
reuse some resources from the Commons lib
1 parent 9585c39 commit c6b81f4

File tree

26 files changed

+27
-736
lines changed

26 files changed

+27
-736
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
}
3333

3434
dependencies {
35-
compile 'com.simplemobiletools:commons:2.1.6'
35+
compile 'com.simplemobiletools:commons:2.1.7'
3636
compile 'com.facebook.stetho:stetho:1.4.1'
3737
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3838
}

‎app/src/main/kotlin/com/simplemobiletools/notes/MyWidgetProvider.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class MyWidgetProvider : AppWidgetProvider() {
2525

2626
override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
2727
initVariables(context)
28-
val defaultColor = context.resources.getColor(R.color.dark_grey)
28+
val defaultColor = Color.BLACK
2929
val newBgColor = mPrefs.getInt(WIDGET_BG_COLOR, defaultColor)
3030
val newTextColor = mPrefs.getInt(WIDGET_TEXT_COLOR, Color.WHITE)
3131

‎app/src/main/kotlin/com/simplemobiletools/notes/activities/AboutActivity.kt‎

Lines changed: 0 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,9 @@
11
package com.simplemobiletools.notes.activities
22

3-
import android.content.ActivityNotFoundException
4-
import android.content.Intent
5-
import android.net.Uri
63
import android.os.Bundle
7-
import android.text.Html
8-
import android.text.method.LinkMovementMethod
9-
import android.view.View
10-
import com.simplemobiletools.notes.BuildConfig
11-
import com.simplemobiletools.notes.R
12-
import kotlinx.android.synthetic.main.activity_about.*
13-
import java.util.*
144

155
class AboutActivity : SimpleActivity() {
166
override fun onCreate(savedInstanceState: Bundle?) {
177
super.onCreate(savedInstanceState)
18-
setContentView(R.layout.activity_about)
19-
20-
setupEmail()
21-
setupMoreApps()
22-
setupCopyright()
23-
setupRateUs()
24-
setupInvite()
25-
setupLicense()
26-
setupDonate()
27-
setupFacebook()
28-
setupGPlus()
29-
}
30-
31-
private fun setupEmail() {
32-
val email = getString(R.string.email)
33-
val appName = getString(R.string.app_name)
34-
val href = "<a href=\"mailto:$email?subject=$appName\">$email</a>"
35-
about_email.text = Html.fromHtml(href)
36-
about_email.movementMethod = LinkMovementMethod.getInstance()
37-
}
38-
39-
private fun setupMoreApps() {
40-
about_more_apps.setOnClickListener {
41-
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/dev?id=9070296388022589266")))
42-
}
43-
}
44-
45-
private fun setupCopyright() {
46-
val versionName = BuildConfig.VERSION_NAME
47-
val year = Calendar.getInstance().get(Calendar.YEAR)
48-
val copyrightText = String.format(getString(R.string.copyright), versionName, year)
49-
about_copyright.text = copyrightText
50-
}
51-
52-
private fun setupRateUs() {
53-
if (config.isFirstRun) {
54-
about_rate_us.visibility = View.GONE
55-
} else {
56-
about_rate_us.setOnClickListener {
57-
val uri = Uri.parse("market://details?id=$packageName")
58-
try {
59-
startActivity(Intent(Intent.ACTION_VIEW, uri))
60-
} catch (ignored: ActivityNotFoundException) {
61-
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getStoreUrl())))
62-
}
63-
}
64-
}
65-
}
66-
67-
fun setupInvite() {
68-
about_invite.setOnClickListener {
69-
val text = String.format(getString(R.string.share_text), getString(R.string.app_name), getStoreUrl())
70-
Intent().apply {
71-
action = Intent.ACTION_SEND
72-
putExtra(Intent.EXTRA_SUBJECT, getString(R.string.app_name))
73-
putExtra(Intent.EXTRA_TEXT, text)
74-
type = "text/plain"
75-
startActivity(Intent.createChooser(this, getString(R.string.invite_via)))
76-
}
77-
}
788
}
79-
80-
fun setupLicense() {
81-
about_license.setOnClickListener {
82-
val intent = Intent(applicationContext, LicenseActivity::class.java)
83-
startActivity(intent)
84-
}
85-
}
86-
87-
fun setupDonate() {
88-
about_donate.setOnClickListener {
89-
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("http://simplemobiletools.github.io/donate")))
90-
}
91-
}
92-
93-
fun setupFacebook() {
94-
about_facebook.setOnClickListener {
95-
var link = "https://www.facebook.com/simplemobiletools"
96-
try {
97-
packageManager.getPackageInfo("com.facebook.katana", 0)
98-
link = "fb://page/150270895341774"
99-
} catch (ignored: Exception) {
100-
}
101-
102-
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(link)))
103-
}
104-
}
105-
106-
fun setupGPlus() {
107-
about_gplus.setOnClickListener {
108-
val link = "https://plus.google.com/communities/104880861558693868382"
109-
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(link)))
110-
}
111-
}
112-
113-
private fun getStoreUrl() = "https://play.google.com/store/apps/details?id=$packageName"
1149
}

‎app/src/main/kotlin/com/simplemobiletools/notes/activities/LicenseActivity.kt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,11 @@ package com.simplemobiletools.notes.activities
33
import android.content.Intent
44
import android.net.Uri
55
import android.os.Bundle
6-
import com.simplemobiletools.notes.R
7-
import kotlinx.android.synthetic.main.activity_license.*
86

97
class LicenseActivity : SimpleActivity() {
108

119
override fun onCreate(savedInstanceState: Bundle?) {
1210
super.onCreate(savedInstanceState)
13-
setContentView(R.layout.activity_license)
14-
15-
license_kotlin_title.setOnClickListener { openUrl(R.string.kotlin_url) }
16-
license_ambilwarna_title.setOnClickListener { openUrl(R.string.ambilwarna_url) }
17-
license_filepicker_title.setOnClickListener { openUrl(R.string.filepicker_url) }
18-
license_stetho_title.setOnClickListener { openUrl(R.string.stetho_url) }
1911
}
2012

2113
private fun openUrl(id: Int) {

‎app/src/main/kotlin/com/simplemobiletools/notes/activities/SimpleActivity.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ open class SimpleActivity : AppCompatActivity() {
1212

1313
override fun onCreate(savedInstanceState: Bundle?) {
1414
config = Config.newInstance(applicationContext)
15-
setTheme(if (config.isDarkTheme) R.style.AppTheme_Dark else R.style.AppTheme)
1615
super.onCreate(savedInstanceState)
1716
}
1817

‎app/src/main/kotlin/com/simplemobiletools/notes/activities/WidgetConfigureActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class WidgetConfigureActivity : AppCompatActivity() {
6262
}
6363
updateBackgroundColor()
6464

65-
mTextColor = prefs.getInt(WIDGET_TEXT_COLOR, resources.getColor(R.color.colorPrimary))
65+
mTextColor = prefs.getInt(WIDGET_TEXT_COLOR, resources.getColor(R.color.color_primary))
6666
updateTextColor()
6767
}
6868

‎app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ import com.simplemobiletools.notes.fragments.NoteFragment
1010
import com.simplemobiletools.notes.models.Note
1111

1212
class NotesPagerAdapter(fm: FragmentManager, private val notes: List<Note>) : FragmentStatePagerAdapter(fm) {
13-
var fragments: SparseArray<NoteFragment>
14-
15-
init {
16-
fragments = SparseArray(5)
17-
}
13+
var fragments: SparseArray<NoteFragment> = SparseArray(5)
1814

1915
override fun getCount() = notes.size
2016

‎app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import com.simplemobiletools.notes.*
99

1010
fun Context.getTextSize() =
1111
when (Config.newInstance(this).fontSize) {
12-
FONT_SIZE_SMALL -> resources.getDimension(R.dimen.small_text_size)
13-
FONT_SIZE_LARGE -> resources.getDimension(R.dimen.large_text_size)
14-
FONT_SIZE_EXTRA_LARGE -> resources.getDimension(R.dimen.extra_large_text_size)
15-
else -> resources.getDimension(R.dimen.medium_text_size)
12+
FONT_SIZE_SMALL -> resources.getDimension(R.dimen.smaller_text_size)
13+
FONT_SIZE_LARGE -> resources.getDimension(R.dimen.big_text_size)
14+
FONT_SIZE_EXTRA_LARGE -> resources.getDimension(R.dimen.extra_big_text_size)
15+
else -> resources.getDimension(R.dimen.bigger_text_size)
1616
}
1717

1818
fun Context.getTextGravity() =

‎app/src/main/res/layout/activity_about.xml‎

Lines changed: 0 additions & 125 deletions
This file was deleted.

0 commit comments

Comments
 (0)