Skip to content

Commit

Permalink
App: Bump version 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
imkiva committed Feb 15, 2018
1 parent 2393776 commit f8c18d0
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "io.neoterm"
minSdkVersion rootProject.ext.android.MIN_SDK_VERSION
targetSdkVersion rootProject.ext.android.TARGET_SDK_VERSION
versionCode 33
versionName "2.0.0-GM"
versionCode 34
versionName "2.0.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
resConfigs "zh-rCN", "zh-rTW"
externalNativeBuild {
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import android.view.inputmethod.InputMethodManager
import android.widget.ImageButton
import de.mrapp.android.tabswitcher.*
import io.neoterm.App
import io.neoterm.BuildConfig
import io.neoterm.R
import io.neoterm.backend.TerminalSession
import io.neoterm.component.profile.ProfileComponent
Expand Down Expand Up @@ -513,6 +514,15 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
}

private fun addXSession() {
if (!BuildConfig.DEBUG) {
AlertDialog.Builder(this)
.setTitle(R.string.error)
.setMessage(R.string.sorry_for_development)
.setPositiveButton(android.R.string.yes, null)
.show()
return
}

if (!tabSwitcher.isSwitcherShown) {
toggleSwitcher(showSwitcher = true, easterEgg = false)
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
<string name="input_new_source_repo">输入仓库名</string>
<string name="error_new_source_url">URL 不能为空</string>
<string name="error_new_source_repo">仓库 不能为空</string>
<string name="sorry_for_development">本功能仍在开发中,所以只能在 DEBUG 构建版本下使用。\n若想尝鲜,请尝试联系开发者来成为测试者。</string>

<string-array name="color_item_names">
<item>背景色</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
<string name="input_new_source_repo">Enter new Repo</string>
<string name="error_new_source_url">URL cannot be empty</string>
<string name="error_new_source_repo">Repo cannot be empty</string>
<string name="sorry_for_development">This feature is still under development so it is only available on DEBUG builds.\n</string>

<string name="default_source_url">http://janyo.pw:82/kiva/neoterm</string>

Expand Down

0 comments on commit f8c18d0

Please sign in to comment.