Skip to content

Commit 86f373f

Browse files
HombreTechHombreTech
committed
-> build 17
1 parent 91e3838 commit 86f373f

File tree

5 files changed

+74
-16
lines changed

5 files changed

+74
-16
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ext {
99
compile_sdk = 27
1010
target_sdk = 27
1111
build_tools = '27.0.3'
12-
version_code = 16
12+
version_code = 17
1313
version_name = '0.1.4'
1414

1515
annotations = '16.0.2'
@@ -45,7 +45,7 @@ android {
4545
targetSdkVersion target_sdk
4646
versionCode version_code
4747
versionName version_name
48-
archivesBaseName = "fantlab-${versionName}"
48+
archivesBaseName = "fantlab-${versionName}(${versionCode})"
4949
buildConfigField "String", "REST_URL", '"https://api.fantlab.ru/"'
5050
buildConfigField "String", "API_VERSION", '"0.9.20"'
5151
resValue "string", "VERSION_NAME", "$versionName ($versionCode)"

‎app/src/main/kotlin/ru/fantlab/android/ui/modules/about/AboutActivity.kt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package ru.fantlab.android.ui.modules.about
22

3-
import android.content.Context
43
import android.content.Intent
54
import android.net.Uri
65
import android.os.Bundle
@@ -24,6 +23,7 @@ class AboutActivity : BaseActivity<AboutMvp.View, AboutPresenter>(), AboutMvp.Vi
2423
developersView.setOnClickListener(this)
2524
forumView.setOnClickListener(this)
2625
githubView.setOnClickListener(this)
26+
supportView.setOnClickListener(this)
2727
versionView.setOnClickListener(this)
2828
}
2929

@@ -32,6 +32,7 @@ class AboutActivity : BaseActivity<AboutMvp.View, AboutPresenter>(), AboutMvp.Vi
3232
R.id.developersView -> toTelegram()
3333
R.id.forumView -> SchemeParser.openUrl(this, "https://fantlab.ru/forum/forum2page1/topic10144page1")
3434
R.id.githubView -> SchemeParser.openUrl(this, "https://github.com/FantLab/FantLab-Android")
35+
R.id.supportView -> emailUs()
3536
R.id.versionView -> {}
3637
}
3738
}
@@ -41,4 +42,11 @@ class AboutActivity : BaseActivity<AboutMvp.View, AboutPresenter>(), AboutMvp.Vi
4142
telegram.data = Uri.parse("tg:resolve?domain=ilya_kokhan")
4243
startActivity(Intent.createChooser(telegram, getString(R.string.send_with)))
4344
}
45+
46+
private fun emailUs() {
47+
val intent = Intent(Intent.ACTION_SENDTO)
48+
intent.data = Uri.parse("mailto:");
49+
intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("android@fantlab.ru"))
50+
startActivity(Intent.createChooser(intent, getString(R.string.send_email)))
51+
}
4452
}

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

Lines changed: 57 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
/>
4242

4343
<RelativeLayout
44-
android:id="@+id/developersView"
44+
android:id="@+id/supportView"
4545
android:layout_width="match_parent"
4646
android:layout_height="wrap_content"
47-
android:background="?attr/selectableItemBackground"
47+
android:background="?android:selectableItemBackground"
4848
android:clickable="true"
4949
android:focusable="true"
5050
android:paddingBottom="8dp"
@@ -54,32 +54,32 @@
5454
>
5555

5656
<ru.fantlab.android.ui.widgets.ForegroundImageView
57-
android:id="@+id/developersIcon"
57+
android:id="@+id/supportIcon"
5858
android:layout_width="24dp"
59-
android:layout_height="wrap_content"
59+
android:layout_height="24dp"
6060
android:layout_marginEnd="16dp"
61-
android:src="@drawable/ic_person"
61+
android:src="@drawable/ic_email"
6262
app:tint="?android:attr/textColorSecondary"
6363
style="@style/TextAppearance.AppCompat.Caption"
6464
/>
6565

6666
<ru.fantlab.android.ui.widgets.FontTextView
67-
android:id="@+id/developersTitle"
67+
android:id="@+id/supportTitle"
6868
android:layout_width="wrap_content"
6969
android:layout_height="wrap_content"
70-
android:layout_toEndOf="@+id/developersIcon"
71-
android:text="@string/developers"
70+
android:layout_toEndOf="@+id/supportIcon"
71+
android:text="@string/support"
7272
app:drawableColor="?android:attr/textColorSecondary"
7373
style="@style/TextAppearance.AppCompat"
7474
/>
7575

7676
<ru.fantlab.android.ui.widgets.FontTextView
77-
android:id="@+id/developersText"
77+
android:id="@+id/supportText"
7878
android:layout_width="wrap_content"
7979
android:layout_height="wrap_content"
80-
android:layout_below="@+id/developersTitle"
81-
android:layout_toEndOf="@+id/developersIcon"
82-
android:text="@string/developers_names"
80+
android:layout_below="@+id/supportTitle"
81+
android:layout_toEndOf="@+id/supportIcon"
82+
android:text="@string/support_email"
8383
app:drawableColor="?android:attr/textColorSecondary"
8484
style="@style/TextAppearance.AppCompat.Caption"
8585
/>
@@ -132,6 +132,51 @@
132132

133133
</RelativeLayout>
134134

135+
<RelativeLayout
136+
android:id="@+id/developersView"
137+
android:layout_width="match_parent"
138+
android:layout_height="wrap_content"
139+
android:background="?attr/selectableItemBackground"
140+
android:clickable="true"
141+
android:focusable="true"
142+
android:paddingBottom="8dp"
143+
android:paddingEnd="16dp"
144+
android:paddingStart="16dp"
145+
android:paddingTop="8dp"
146+
>
147+
148+
<ru.fantlab.android.ui.widgets.ForegroundImageView
149+
android:id="@+id/developersIcon"
150+
android:layout_width="24dp"
151+
android:layout_height="wrap_content"
152+
android:layout_marginEnd="16dp"
153+
android:src="@drawable/ic_person"
154+
app:tint="?android:attr/textColorSecondary"
155+
style="@style/TextAppearance.AppCompat.Caption"
156+
/>
157+
158+
<ru.fantlab.android.ui.widgets.FontTextView
159+
android:id="@+id/developersTitle"
160+
android:layout_width="wrap_content"
161+
android:layout_height="wrap_content"
162+
android:layout_toEndOf="@+id/developersIcon"
163+
android:text="@string/developers"
164+
app:drawableColor="?android:attr/textColorSecondary"
165+
style="@style/TextAppearance.AppCompat"
166+
/>
167+
168+
<ru.fantlab.android.ui.widgets.FontTextView
169+
android:id="@+id/developersText"
170+
android:layout_width="wrap_content"
171+
android:layout_height="wrap_content"
172+
android:layout_below="@+id/developersTitle"
173+
android:layout_toEndOf="@+id/developersIcon"
174+
android:text="@string/developers_names"
175+
app:drawableColor="?android:attr/textColorSecondary"
176+
style="@style/TextAppearance.AppCompat.Caption"
177+
/>
178+
179+
</RelativeLayout>
135180

136181
<RelativeLayout
137182
android:id="@+id/githubView"

‎app/src/main/res/values-ru/strings.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,7 @@
170170
<string name="send_with">Связаться в Telegram</string>
171171
<string name="developers">Разработчики</string>
172172
<string name="discuss">Обсудить на форуме</string>
173+
<string name="support">Обратная связь</string>
174+
<string name="send_email">Отправить email</string>
173175

174176
</resources>

‎app/src/main/res/values/strings.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,12 @@
199199
<string name="about_app">About</string>
200200
<string name="send_with">Send with Telegram</string>
201201
<string name="developers">Developers</string>
202-
<string name="developers_names" translatable="false">\@kenrube, \@ilya_kokhan</string>
202+
<string name="developers_names" translatable="false">\kenrube\n\ilyakokhan</string>
203203
<string name="discuss">Discuss on forum</string>
204204
<string name="github" translatable="false">Github</string>
205205
<string name="github_url" translatable="false">https://github.com/FantLab/FantLab-Android</string>
206206
<string name="discuss_url" translatable="false">https://fantlab.ru/forum/forum2page1/topic10144page1</string>
207+
<string name="support">Support</string>
208+
<string name="support_email" translatable="false">android@fantlab.ru</string>
209+
<string name="send_email">Send email</string>
207210
</resources>

0 commit comments

Comments
 (0)