Mastodon/SubwayTooter-Android-App
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

targetSdkVersion 29

Browse Source
This commit is contained in:
tateisu 2019-08-31 23:33:13 +09:00
parent 0b2fc2b0a2
commit 049b0c122b
23 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/jp/juggler/subwaytooter/ActAbout.kt
View File

@ -40,6 +40,7 @@ class ActAbout : AppCompatActivity() {
super.onCreate(savedInstanceState)
App1.setActivityTheme(this, false)
setContentView(R.layout.act_about)
App1.initEdgeToEdge(this)
Styler.fixHorizontalPadding(findViewById(R.id.svContent))

1
app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt
View File

@ -255,6 +255,7 @@ class ActAccountSetting
this.density = resources.displayMetrics.density
this.handler = Handler()
setContentView(R.layout.act_account_setting)
App1.initEdgeToEdge(this)
val root :View = findViewById(R.id.svContent)

1
app/src/main/java/jp/juggler/subwaytooter/ActAppSetting.kt
View File

@ -47,6 +47,7 @@ class ActAppSetting : AppCompatActivity() {
App1.setActivityTheme(this, false)
setContentView(R.layout.act_app_setting)
App1.initEdgeToEdge(this)
Styler.fixHorizontalPadding2(findViewById(R.id.llContent))
lvList = findViewById(R.id.lvList)

1
app/src/main/java/jp/juggler/subwaytooter/ActAppSettingChild.kt
View File

@ -342,6 +342,7 @@ class ActAppSettingChild : AppCompatActivity()
}
setContentView(layoutId)
App1.initEdgeToEdge(this)
initUI()

1
app/src/main/java/jp/juggler/subwaytooter/ActColumnCustomize.kt
View File

@ -300,6 +300,7 @@ class ActColumnCustomize : AppCompatActivity(), View.OnClickListener, ColorPicke
private fun initUI() {
setContentView(R.layout.act_column_customize)
App1.initEdgeToEdge(this)
Styler.fixHorizontalPadding(findViewById(R.id.svContent))

1
app/src/main/java/jp/juggler/subwaytooter/ActColumnList.kt
View File

@ -83,6 +83,7 @@ class ActColumnList : AppCompatActivity() {
private fun initUI() {
setContentView(R.layout.act_column_list)
App1.initEdgeToEdge(this)
Styler.fixHorizontalPadding2(findViewById(R.id.llContent))

1
app/src/main/java/jp/juggler/subwaytooter/ActFavMute.kt
View File

@ -43,6 +43,7 @@ class ActFavMute : AppCompatActivity() {
private fun initUI() {
setContentView(R.layout.act_word_list)
App1.initEdgeToEdge(this)
Styler.fixHorizontalPadding2(findViewById(R.id.llContent))

1
app/src/main/java/jp/juggler/subwaytooter/ActHighlightWordEdit.kt
View File

@ -104,6 +104,7 @@ class ActHighlightWordEdit
private fun initUI() {
setContentView(R.layout.act_highlight_edit)
App1.initEdgeToEdge(this)
tvName = findViewById(R.id.tvName)
swSound = findViewById(R.id.swSound)

1
app/src/main/java/jp/juggler/subwaytooter/ActHighlightWordList.kt
View File

@ -56,6 +56,7 @@ class ActHighlightWordList : AppCompatActivity(), View.OnClickListener {
private fun initUI() {
setContentView(R.layout.act_highlight_list)
App1.initEdgeToEdge(this)
Styler.fixHorizontalPadding2(findViewById(R.id.llContent))

1
app/src/main/java/jp/juggler/subwaytooter/ActKeywordFilter.kt
View File

@ -126,6 +126,7 @@ class ActKeywordFilter
this.density = resources.displayMetrics.density
setContentView(R.layout.act_keyword_filter)
App1.initEdgeToEdge(this)
Styler.fixHorizontalPadding(findViewById(R.id.svContent))

1
app/src/main/java/jp/juggler/subwaytooter/ActMain.kt
View File

@ -1099,6 +1099,7 @@ class ActMain : AppCompatActivity()
internal fun initUI() {
setContentView(R.layout.act_main)
App1.initEdgeToEdge(this)
quickTootVisibility =
TootVisibility.parseSavedVisibility(Pref.spQuickTootVisibility(pref))

4
app/src/main/java/jp/juggler/subwaytooter/ActMediaViewer.kt
View File

@ -225,6 +225,8 @@ class ActMediaViewer : AppCompatActivity(), View.OnClickListener {
internal fun initUI() {
setContentView(R.layout.act_media_viewer)
App1.initEdgeToEdge(this)
pbvImage = findViewById(R.id.pbvImage)
btnPrevious = findViewById(R.id.btnPrevious)
btnNext = findViewById(R.id.btnNext)
@ -832,7 +834,7 @@ class ActMediaViewer : AppCompatActivity(), View.OnClickListener {
val cd = ClipData(ClipDescription("media URL", mimeType), item)
//クリップボードにデータを格納
cm.primaryClip = cd
cm.setPrimaryClip(cd)
showToast(this, false, R.string.url_is_copied)

1
app/src/main/java/jp/juggler/subwaytooter/ActMutedApp.kt
View File

@ -40,6 +40,7 @@ class ActMutedApp : AppCompatActivity() {
private fun initUI() {
setContentView(R.layout.act_word_list)
App1.initEdgeToEdge(this)
Styler.fixHorizontalPadding2(findViewById(R.id.llContent))

1
app/src/main/java/jp/juggler/subwaytooter/ActMutedPseudoAccount.kt
View File

@ -39,6 +39,7 @@ class ActMutedPseudoAccount : AppCompatActivity() {
private fun initUI() {
setContentView(R.layout.act_word_list)
App1.initEdgeToEdge(this)
Styler.fixHorizontalPadding2(findViewById(R.id.llContent))

1
app/src/main/java/jp/juggler/subwaytooter/ActMutedWord.kt
View File

@ -40,6 +40,7 @@ class ActMutedWord : AppCompatActivity() {
private fun initUI() {
setContentView(R.layout.act_word_list)
App1.initEdgeToEdge(this)
Styler.fixHorizontalPadding2(findViewById(R.id.llContent))

1
app/src/main/java/jp/juggler/subwaytooter/ActNickname.kt
View File

@ -90,6 +90,7 @@ class ActNickname : AppCompatActivity(), View.OnClickListener, ColorPickerDialog
R.string.nickname_and_color
)
setContentView(R.layout.act_nickname)
App1.initEdgeToEdge(this)
Styler.fixHorizontalPadding(findViewById(R.id.llContent))

1
app/src/main/java/jp/juggler/subwaytooter/ActOSSLicense.kt
View File

@ -15,6 +15,7 @@ class ActOSSLicense : AppCompatActivity() {
super.onCreate(savedInstanceState)
App1.setActivityTheme(this, true)
setContentView(R.layout.act_oss_license)
App1.initEdgeToEdge(this)
try {
val tv = findViewById<TextView>(R.id.tvText)

1
app/src/main/java/jp/juggler/subwaytooter/ActPost.kt
View File

@ -1105,6 +1105,7 @@ class ActPost : AppCompatActivity(),
density = resources.displayMetrics.density
setContentView(R.layout.act_post)
App1.initEdgeToEdge(this)
if(Pref.bpPostButtonBarTop(this)) {
val bar = findViewById<View>(R.id.llFooterBar)

5
app/src/main/java/jp/juggler/subwaytooter/ActText.kt
View File

@ -84,9 +84,9 @@ class ActText : AppCompatActivity(), View.OnClickListener {
initUI()
if(savedInstanceState == null) {
val sv = intent.getStringExtra(EXTRA_TEXT)
val sv = intent.getStringExtra(EXTRA_TEXT) ?: ""
val content_start = intent.getIntExtra(EXTRA_CONTENT_START, 0)
val content_end = intent.getIntExtra(EXTRA_CONTENT_END, sv.length)
val content_end = intent.getIntExtra(EXTRA_CONTENT_END, sv.length )
etText.setText(sv)
// Android 9 以降ではフォーカスがないとsetSelectionできない
@ -101,6 +101,7 @@ class ActText : AppCompatActivity(), View.OnClickListener {
internal fun initUI() {
setContentView(R.layout.act_text)
App1.initEdgeToEdge(this)
Styler.fixHorizontalMargin(findViewById(R.id.svFooterBar))
Styler.fixHorizontalMargin(findViewById(R.id.svContent))

15
app/src/main/java/jp/juggler/subwaytooter/App1.kt
View File

@ -12,6 +12,8 @@ import android.database.sqlite.SQLiteOpenHelper
import android.net.Uri
import android.os.Build
import android.util.Log
import android.view.View
import android.view.ViewGroup
import androidx.browser.customtabs.CustomTabsIntent
import com.bumptech.glide.Glide
import com.bumptech.glide.GlideBuilder
@ -627,6 +629,17 @@ class App1 : Application() {
openCustomTab(activity, url)
}
// https://developer.android.com/preview/features/gesturalnav?hl=ja
fun initEdgeToEdge(activity:Activity) {
// if(Build.VERSION.SDK_INT >= 29){
// val viewRoot = activity.findViewById<ViewGroup>(android.R.id.content).getChildAt(0)
// viewRoot.systemUiVisibility = (viewRoot.systemUiVisibility
// or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
// or View.SYSTEM_UI_FLAG_LAYOUT_STABLE)
// viewRoot.setOnApplyWindowInsetsListener { v, insets ->
// insets.consumeSystemWindowInsets()
// }
// }
}
}
}

2
app/src/main/java/jp/juggler/util/UiUtils.kt
View File

@ -265,7 +265,7 @@ fun CharSequence.copyToClipboard(context:Context) {
// Set the clipboard's primary clip.
clipboard.primaryClip = clip
clipboard.setPrimaryClip(clip)
showToast(context, false, R.string.copy_complete)
} catch(ex : Throwable) {

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

@ -1,7 +1,7 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- light theme -->
<style name="AppTheme.Light" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="AppTheme.Light.Base" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="android:windowBackground">@drawable/window_background</item>
<item name="android:textColor">?attr/colorContentText</item>
@ -49,13 +49,7 @@
</style>
<style name="AppTheme.Light.NoActionBar" parent="AppTheme.Light">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<!-- dark theme -->
<style name="AppTheme.Dark" parent="Theme.AppCompat">
<style name="AppTheme.Dark.Base" parent="Theme.AppCompat">
<item name="android:windowBackground">@drawable/window_background</item>
<item name="android:textColor">?attr/colorContentText</item>
@ -106,6 +100,11 @@
</style>
<style name="AppTheme.Light.NoActionBar" parent="AppTheme.Light">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.Dark.NoActionBar" parent="AppTheme.Dark">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>

2
build.gradle
View File

@ -1,7 +1,7 @@
buildscript {
ext.min_sdk_version = 21
ext.target_sdk_version = 28
ext.target_sdk_version = 29
ext.androidx_version= '1.0.0'
ext.appcompat_version='1.0.2'