Skip to content

Commit e3e4bb4

Browse files
mezhendosinamezhendosina
authored
v3.0.2 release
2 parents 84085cf + 9db2515 commit e3e4bb4

12 files changed

Lines changed: 40 additions & 38 deletions

File tree

‎app/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ android {
3333
applicationId "com.mezhendosina.sgo.app"
3434
minSdk 24
3535
targetSdk 33
36-
versionCode 36
37-
versionName '3.0.1'
36+
versionCode 37
37+
versionName '3.0.2'
3838

3939
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4040

@@ -87,12 +87,12 @@ dependencies {
8787
implementation fileTree(dir: "libs", include: ["*.aar"])
8888

8989
implementation 'com.google.android.material:material:1.9.0'
90-
implementation 'androidx.core:core-ktx:1.10.1'
90+
implementation 'androidx.core:core-ktx:1.12.0'
9191
implementation 'androidx.appcompat:appcompat:1.6.1'
9292
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
93-
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
94-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
95-
implementation 'androidx.navigation:navigation-fragment-ktx:2.7.0'
93+
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
94+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
95+
implementation 'androidx.navigation:navigation-fragment-ktx:2.7.2'
9696
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
9797
implementation 'androidx.preference:preference-ktx:1.2.1'
9898
implementation 'androidx.fragment:fragment-ktx:1.6.1'

‎app/src/main/java/com/mezhendosina/sgo/app/activities/LoginActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import androidx.navigation.fragment.NavHostFragment
2424
import androidx.navigation.ui.setupWithNavController
2525
import com.mezhendosina.sgo.app.R
2626
import com.mezhendosina.sgo.app.databinding.ContainerLoginBinding
27-
import com.mezhendosina.sgo.app.utils.setupStatusBar
27+
import com.mezhendosina.sgo.app.utils.setupInsets
2828

2929
class LoginActivity : AppCompatActivity() {
3030

@@ -52,7 +52,7 @@ class LoginActivity : AppCompatActivity() {
5252
val navHost =
5353
supportFragmentManager.findFragmentById(R.id.fragmentContainer) as NavHostFragment
5454
navController = navHost.navController
55-
setupStatusBar(binding!!.root)
55+
setupInsets(binding!!.root)
5656
binding!!.toolbar.setupWithNavController(navController)
5757
}
5858

‎app/src/main/java/com/mezhendosina/sgo/app/activities/MainActivity.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import com.google.firebase.ktx.Firebase
3333
import com.mezhendosina.sgo.Singleton
3434
import com.mezhendosina.sgo.app.databinding.ContainerMainActivityBinding
3535
import com.mezhendosina.sgo.app.utils.errorDialog
36-
import com.mezhendosina.sgo.app.utils.setupStatusBar
36+
import com.mezhendosina.sgo.app.utils.setupInsets
3737
import kotlinx.coroutines.CoroutineScope
3838
import kotlinx.coroutines.Dispatchers
3939
import kotlinx.coroutines.launch
@@ -82,7 +82,6 @@ class MainActivity : AppCompatActivity() {
8282

8383
setContentView(binding.root)
8484
CoroutineScope(Dispatchers.IO).launch {
85-
8685
withContext(Dispatchers.Main) {
8786
viewModel.errorMessage.observe(this@MainActivity) {
8887
errorDialog(this@MainActivity, it)
@@ -97,11 +96,11 @@ class MainActivity : AppCompatActivity() {
9796
)
9897
binding.splashScreen.root.visibility = View.GONE
9998
binding.container.visibility = View.VISIBLE
99+
setupInsets(binding.root)
100100
}
101101
}
102102
supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentListener, true)
103103
// onBackPressedDispatcher.addCallback(onBackPressedCallback)
104-
setupStatusBar(binding.container)
105104
}
106105

107106
override fun onRestart() {

‎app/src/main/java/com/mezhendosina/sgo/app/activities/SplashActivity.kt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ import android.os.Bundle
2222
import androidx.appcompat.app.AppCompatDelegate
2323
import com.google.android.material.color.DynamicColors
2424
import com.google.firebase.FirebaseApp
25-
import com.mezhendosina.sgo.Singleton
2625
import com.mezhendosina.sgo.app.BuildConfig
27-
import com.mezhendosina.sgo.app.model.journal.DiaryStyle
2826
import com.mezhendosina.sgo.data.SettingsDataStore
2927
import com.mezhendosina.sgo.data.getValue
3028
import com.mezhendosina.sgo.data.netschool.NetSchoolSingleton
@@ -58,10 +56,6 @@ class SplashActivity : Activity() {
5856

5957
val intent =
6058
if (SettingsDataStore.LOGGED_IN.getValue(this@SplashActivity, false).first()) {
61-
Singleton.diaryStyle.value = SettingsDataStore.DIARY_STYLE.getValue(
62-
this@SplashActivity,
63-
DiaryStyle.AS_CARD
64-
).first()
6559
Intent(this@SplashActivity, MainActivity::class.java)
6660
} else {
6761
Intent(this@SplashActivity, LoginActivity::class.java)

‎app/src/main/java/com/mezhendosina/sgo/app/ui/journalFlow/journalItem/JournalItemFragment.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ class JournalItemFragment : Fragment(R.layout.fragment_item_journal) {
182182
emptyState.root.visibility = View.GONE
183183
} else {
184184
diary.visibility = View.GONE
185+
binding!!.loading.root.visibility = View.GONE
185186
emptyState.root.visibility = View.VISIBLE
186187
}
187188
}

‎app/src/main/java/com/mezhendosina/sgo/app/utils/ActivityUtils.kt‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ package com.mezhendosina.sgo.app.utils
1818

1919
import android.os.Build
2020
import android.view.View
21+
import android.view.ViewGroup.MarginLayoutParams
2122
import android.view.WindowManager
2223
import androidx.appcompat.app.AppCompatActivity
2324
import androidx.core.view.ViewCompat
2425
import androidx.core.view.WindowInsetsCompat
26+
import androidx.core.view.updateLayoutParams
2527

2628

27-
fun AppCompatActivity.setupStatusBar(fragmentContainer: View) {
29+
fun AppCompatActivity.setupInsets(fragmentContainer: View) {
2830
val w = window
2931
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
30-
3132
w.setFlags(
3233
WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
3334
WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
@@ -38,16 +39,23 @@ fun AppCompatActivity.setupStatusBar(fragmentContainer: View) {
3839
val topBarInset = windowInsets.getInsets(WindowInsetsCompat.Type.statusBars())
3940
val insets =
4041
windowInsets.getInsets(WindowInsetsCompat.Type.mandatorySystemGestures())
41-
view.setPadding(
42-
insets.left,
43-
topBarInset.top,
44-
insets.right,
45-
insetsNavigation.bottom
46-
)
47-
windowInsets
42+
43+
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
44+
view.updateLayoutParams<MarginLayoutParams> {
45+
topMargin = insets.top
46+
this.bottomMargin = insetsNavigation.bottom
47+
}
48+
} else {
49+
view.setPadding(
50+
insets.left,
51+
topBarInset.top,
52+
insets.right,
53+
insetsNavigation.bottom
54+
)
55+
}
56+
WindowInsetsCompat.CONSUMED
4857
}
4958
} else {
5059
fragmentContainer.fitsSystemWindows = true
5160
}
52-
5361
}

‎app/src/main/java/com/mezhendosina/sgo/app/utils/Lessons.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ object Lessons {
107107
LessonNameUiEntity("обществознание", R.drawable.lesson_social, "Обществознание"),
108108
LessonNameUiEntity("история", R.drawable.lesson_history, "История"),
109109
LessonNameUiEntity(
110-
"изобразительное искусство",
110+
"изо",
111111
R.drawable.lesson_paint,
112112
"Изобразительное искусство"
113113
),

‎app/src/main/java/com/mezhendosina/sgo/data/netschool/api/login/RetrofitLoginSource.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class RetrofitLoginSource(
4141
wrapRetrofitExceptions(false) {
4242
val schools = loginApi.getSchools(query)
4343

44-
schools.filter { it.name.contains("(МБОУ)|(МКОУ)|(СОШ)|(МАОУ)|(МКШ)|(СУНЦ)|(ШНОР)|(ШВОР)|(ГБПОУ)|(ГКОУ)".toRegex()) }
44+
schools.filter { it.name.contains("(МБОУ)|(МКОУ)|(СОШ)|(МАОУ)|(МКШ)|(СУНЦ)|(ШНОР)|(ШВОР)|(ГБПОУ)|(ГКОУ)|(ГБОУ)".toRegex()) }
4545
}
4646

4747
override suspend fun getData(): GetDataResponseEntity =

‎app/src/main/java/com/mezhendosina/sgo/data/netschool/base/BaseRetrofitSource.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ open class BaseRetrofitSource(retrofitConfig: RetrofitConfig) {
4949
throw ConnectionException(e)
5050
}
5151
} else {
52-
delay(10)
52+
delay(400)
5353
return wrapRetrofitExceptions { block() }
5454
}
5555
}

‎app/src/main/res/values-night/themes.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
<style name="Theme.SGOApp" parent="Theme.Material3.DayNight.NoActionBar">
2626
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
27-
<item name="android:windowTranslucentStatus">true</item>
27+
<!-- <item name="android:windowTranslucentStatus">true</item>-->
2828
<item name="android:windowTranslucentNavigation">true</item>
29-
<item name="android:statusBarColor">@null</item>
29+
<item name="android:statusBarColor">@color/md_theme_dark_background</item>
3030
<item name="android:windowLightStatusBar">false</item>
3131

3232

0 commit comments

Comments
 (0)