diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferTest.kt
index d5dc274d7..3295d1e3e 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferTest.kt
@@ -147,37 +147,35 @@ class LocalFileTransferTest {
@Test
fun showCaseFeature() {
- if (Build.VERSION.SDK_INT != Build.VERSION_CODES.TIRAMISU) {
- shouldShowShowCaseFeatureToUser(true, isResetShowCaseId = true)
- activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply {
- moveToState(Lifecycle.State.RESUMED)
- onActivity {
- handleLocaleChange(
- it,
- "en",
- SharedPreferenceUtil(context)
- )
- it.navigate(R.id.libraryFragment)
- }
+ shouldShowShowCaseFeatureToUser(true, isResetShowCaseId = true)
+ activityScenario = ActivityScenario.launch(KiwixMainActivity::class.java).apply {
+ moveToState(Lifecycle.State.RESUMED)
+ onActivity {
+ handleLocaleChange(
+ it,
+ "en",
+ SharedPreferenceUtil(context)
+ )
+ it.navigate(R.id.libraryFragment)
}
- StandardActions.closeDrawer()
- library {
- assertGetZimNearbyDeviceDisplayed()
- clickFileTransferIcon {
- assertClickNearbyDeviceMessageVisible()
- clickOnGotItButton()
- assertDeviceNameMessageVisible()
- clickOnGotItButton()
- assertNearbyDeviceListMessageVisible()
- clickOnGotItButton()
- assertTransferZimFilesListMessageVisible()
- clickOnGotItButton()
- pressBack()
- assertGetZimNearbyDeviceDisplayed()
- }
- }
- LeakAssertions.assertNoLeaks()
}
+ StandardActions.closeDrawer()
+ library {
+ assertGetZimNearbyDeviceDisplayed()
+ clickFileTransferIcon {
+ assertClickNearbyDeviceMessageVisible()
+ clickOnGotItButton()
+ assertDeviceNameMessageVisible()
+ clickOnGotItButton()
+ assertNearbyDeviceListMessageVisible()
+ clickOnGotItButton()
+ assertTransferZimFilesListMessageVisible()
+ clickOnGotItButton()
+ pressBack()
+ assertGetZimNearbyDeviceDisplayed()
+ }
+ }
+ LeakAssertions.assertNoLeaks()
}
@Test
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferFragment.kt
index 00a172136..f5cf2c60b 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/localFileTransfer/LocalFileTransferFragment.kt
@@ -36,7 +36,6 @@ import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.provider.Settings
-import org.kiwix.kiwixmobile.core.utils.files.Log
import android.view.LayoutInflater
import android.view.Menu
import android.view.MenuInflater
@@ -55,9 +54,9 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import org.kiwix.kiwixmobile.R
-import org.kiwix.kiwixmobile.core.R.string
-import org.kiwix.kiwixmobile.core.R.drawable
import org.kiwix.kiwixmobile.cachedComponent
+import org.kiwix.kiwixmobile.core.R.drawable
+import org.kiwix.kiwixmobile.core.R.string
import org.kiwix.kiwixmobile.core.base.BaseActivity
import org.kiwix.kiwixmobile.core.base.BaseFragment
import org.kiwix.kiwixmobile.core.extensions.ActivityExtensions.popNavigationBackstack
@@ -69,6 +68,7 @@ import org.kiwix.kiwixmobile.core.navigateToAppSettings
import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
import org.kiwix.kiwixmobile.core.utils.dialog.AlertDialogShower
import org.kiwix.kiwixmobile.core.utils.dialog.KiwixDialog
+import org.kiwix.kiwixmobile.core.utils.files.Log
import org.kiwix.kiwixmobile.databinding.FragmentLocalFileTransferBinding
import org.kiwix.kiwixmobile.localFileTransfer.WifiDirectManager.Companion.getDeviceStatus
import org.kiwix.kiwixmobile.localFileTransfer.adapter.WifiP2pDelegate
@@ -193,12 +193,12 @@ class LocalFileTransferFragment :
getString(string.got_it)
)
addSequenceItem(
- fragmentLocalFileTransferBinding?.listPeerDevices,
+ fragmentLocalFileTransferBinding?.nearbyDeviceShowCaseView,
getString(string.nearby_devices_list_message),
getString(string.got_it)
)
addSequenceItem(
- fragmentLocalFileTransferBinding?.recyclerViewTransferFiles,
+ fragmentLocalFileTransferBinding?.fileTransferShowCaseView,
getString(string.transfer_zim_files_list_message),
getString(string.got_it)
)
diff --git a/app/src/main/res/layout/fragment_local_file_transfer.xml b/app/src/main/res/layout/fragment_local_file_transfer.xml
index 4c52f5e4f..e5fae443a 100644
--- a/app/src/main/res/layout/fragment_local_file_transfer.xml
+++ b/app/src/main/res/layout/fragment_local_file_transfer.xml
@@ -35,15 +35,15 @@
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:background="@android:color/transparent"
+ android:contentDescription="@string/device_name"
+ android:gravity="start|center"
+ android:minHeight="@dimen/material_minimum_height_and_width"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:paddingBottom="5dp"
android:textIsSelectable="true"
- android:gravity="start|center"
- android:minHeight="@dimen/material_minimum_height_and_width"
android:textSize="17sp"
android:textStyle="bold"
- android:contentDescription="@string/device_name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -98,6 +98,15 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_available_device" />
+
+
+
+
+ app:layout_constraintTop_toBottomOf="@id/text_view_files_for_transfer"
+ tools:listitem="@layout/item_transfer_list" />
diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
index f570f844b..05f649a50 100644
--- a/core/src/main/res/values/dimens.xml
+++ b/core/src/main/res/values/dimens.xml
@@ -26,4 +26,5 @@
13dp
20dp
400dp
+ 200dp