Skip to content

Commit

Permalink
chore: temporarily removed the chat and adjust the color of the top a…
Browse files Browse the repository at this point in the history
…pp bar
  • Loading branch information
Ruan625Br committed Apr 6, 2024
1 parent 93e8f87 commit 8981dd8
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 4 additions & 12 deletions app/src/main/java/com/etb/filemanager/fragment/RecentFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ import com.etb.filemanager.R
import com.etb.filemanager.activity.MainActivity
import com.etb.filemanager.activity.SettingsActivity
import com.etb.filemanager.compose.core.navigation.CategoryListRoute
import com.etb.filemanager.compose.core.navigation.ChatRoute
import com.etb.filemanager.compose.feature.presentation.HomeScreen
import com.etb.filemanager.files.extensions.applyBackgroundFromPreferences
import com.etb.filemanager.files.util.fileProviderUri
Expand All @@ -52,10 +51,12 @@ import com.etb.filemanager.manager.util.MaterialDialogUtils
import com.etb.filemanager.settings.preference.AboutFragment
import com.etb.filemanager.ui.view.ModalBottomSheetAddCategory
import com.google.android.material.card.MaterialCardView
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
import com.google.android.material.progressindicator.CircularProgressIndicator
import com.google.android.material.progressindicator.LinearProgressIndicator
import kotlinx.coroutines.*
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.nio.file.Path
import kotlin.io.path.pathString

Expand All @@ -69,7 +70,6 @@ class RecentFragment : Fragment(), ItemListener {
private lateinit var cBaseItem: MaterialCardView
private lateinit var btnAddCategory: Button
private lateinit var adapter: CategoryFileModelAdapter
private lateinit var fabChat: ExtendedFloatingActionButton


override fun onCreateView(
Expand All @@ -88,7 +88,6 @@ class RecentFragment : Fragment(), ItemListener {
cRecentImg = view.findViewById(R.id.cRecentImage)
btnAddCategory = view.findViewById(R.id.btnAddCategory)
cInternalStorage = view.findViewById(R.id.cInternalStorage)
fabChat = view.findViewById(R.id.fab_chat)

val mnAbout = view.findViewById<ImageView>(R.id.mn_about)
val aboutFragment = AboutFragment()
Expand Down Expand Up @@ -162,13 +161,6 @@ class RecentFragment : Fragment(), ItemListener {
startActivity(settingsIntent)
}
btnAddCategory.setOnClickListener { showBottomSheetAddCategory() }

fabChat.setOnClickListener {
val intent = Intent(requireActivity(), HomeScreen::class.java).apply {
putExtra("startDestination", ChatRoute)
}
startActivity(intent)
}
}

private fun openListFiles() {
Expand Down
8 changes: 0 additions & 8 deletions app/src/main/res/layout-land/fragment_recent.xml
Original file line number Diff line number Diff line change
Expand Up @@ -338,14 +338,6 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>

<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/fab_chat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ChatSphere"
android:layout_marginVertical="16dp"
app:layout_constraintStart_toStartOf="@id/cInternalStorage"
app:layout_constraintTop_toBottomOf="@id/cInternalStorage" />

<com.google.android.material.card.MaterialCardView
android:id="@+id/cCategoryItem"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_home.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimaryContainer"
app:liftOnScroll="true">
app:liftOnScroll="false">

<com.google.android.material.appbar.MaterialToolbar
android:layout_width="match_parent"
Expand Down
8 changes: 0 additions & 8 deletions app/src/main/res/layout/fragment_recent.xml
Original file line number Diff line number Diff line change
Expand Up @@ -432,12 +432,4 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</ScrollView>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/fab_chat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
android:text="ChatSphere"
android:layout_margin="16dp"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit 8981dd8

Please sign in to comment.