Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release37' into 'master' 

Release37

See merge request pixeldroid/PixelDroid!607
This commit is contained in:
Matthieu 2024-08-31 16:18:15 +00:00
parent 37eb888537 4e283340bb
commit 0ca6b27cd3
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -46,7 +46,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 34 targetSdkVersion 34
versionCode 36 versionCode 37
versionName "1.0.beta" + versionCode versionName "1.0.beta" + versionCode
//TODO add resConfigs("en", "fr", "ja",...) ? //TODO add resConfigs("en", "fr", "ja",...) ?
@ -257,7 +257,7 @@ dependencies {
implementation 'io.reactivex.rxjava3:rxandroid:3.0.2' implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
implementation 'com.github.connyduck:sparkbutton:4.1.0' implementation 'com.github.connyduck:sparkbutton:4.1.0'
implementation 'org.pixeldroid.pixeldroid:android-media-editor:3.1' implementation 'org.pixeldroid.pixeldroid:android-media-editor:4.0'
implementation project(path: ':scrambler') implementation project(path: ':scrambler')
implementation project(path: ':pixel_common') implementation project(path: ':pixel_common')

5
app/src/main/java/org/pixeldroid/app/main/MainActivity.kt
View File

@ -73,7 +73,6 @@ import org.pixeldroid.app.posts.feeds.uncachedFeeds.UncachedPostsFragment
import org.pixeldroid.app.profile.ProfileActivity import org.pixeldroid.app.profile.ProfileActivity
import org.pixeldroid.app.searchDiscover.SearchDiscoverFragment import org.pixeldroid.app.searchDiscover.SearchDiscoverFragment
import org.pixeldroid.app.settings.SettingsActivity import org.pixeldroid.app.settings.SettingsActivity
import org.pixeldroid.app.settings.SettingsActivity.SettingsFragment
import org.pixeldroid.app.settings.TutorialSettingsDialog.Companion.START_TUTORIAL import org.pixeldroid.app.settings.TutorialSettingsDialog.Companion.START_TUTORIAL
import org.pixeldroid.app.utils.BaseActivity import org.pixeldroid.app.utils.BaseActivity
import org.pixeldroid.app.utils.Tab import org.pixeldroid.app.utils.Tab
@ -704,7 +703,9 @@ class MainActivity : BaseActivity() {
} }
} } } }
Tab.SEARCH_DISCOVER_FEED -> { { SearchDiscoverFragment() } } Tab.SEARCH_DISCOVER_FEED -> { { SearchDiscoverFragment() } }
Tab.CREATE_FEED -> { { CameraFragment() } } Tab.CREATE_FEED -> { { CameraFragment().apply {
arguments = Bundle().apply { putInt(START_TUTORIAL, intent.getIntExtra(START_TUTORIAL, -1)) }
} } }
Tab.NOTIFICATIONS_FEED -> { { NotificationsFragment() } } Tab.NOTIFICATIONS_FEED -> { { NotificationsFragment() } }
Tab.PUBLIC_FEED -> { { Tab.PUBLIC_FEED -> { {
PostFeedFragment<PublicFeedStatusDatabaseEntity>() PostFeedFragment<PublicFeedStatusDatabaseEntity>()

3
app/src/main/java/org/pixeldroid/app/postCreation/PostCreationActivity.kt
View File

@ -16,6 +16,7 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.pixeldroid.app.R import org.pixeldroid.app.R
import org.pixeldroid.app.databinding.ActivityPostCreationBinding import org.pixeldroid.app.databinding.ActivityPostCreationBinding
import org.pixeldroid.app.settings.TutorialSettingsDialog.Companion.START_TUTORIAL
import org.pixeldroid.app.utils.BaseActivity import org.pixeldroid.app.utils.BaseActivity
class PostCreationActivity : BaseActivity() { class PostCreationActivity : BaseActivity() {
@ -66,7 +67,7 @@ class PostCreationActivity : BaseActivity() {
navController = navHostFragment.navController navController = navHostFragment.navController
navController.setGraph(R.navigation.post_creation_graph) navController.setGraph(R.navigation.post_creation_graph)
lifecycleScope.launch { if(intent.getBooleanExtra(START_TUTORIAL, false)) lifecycleScope.launch {
var targetCamera = findViewById<View>(R.id.toggleStoryPost) var targetCamera = findViewById<View>(R.id.toggleStoryPost)
while (targetCamera == null) { while (targetCamera == null) {
targetCamera = findViewById(R.id.toggleStoryPost) targetCamera = findViewById(R.id.toggleStoryPost)