kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-23 04:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor layout & menu files

Browse Source
This commit is contained in:
Aditya-Sood 2019-07-01 21:34:57 +05:30
parent 2968d75ef1
commit 23049ccd4a
8 changed files with 35 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/res/layout/activity_local_file_transfer.xml
View File

@ -48,27 +48,3 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<!--
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".zim_manager.local_file_transfer.LocalFileTransferActivity">
<TextView
android:id="@+id/text_view_file_uris"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="List of file 'content:' URIs"
android:padding="30dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
-->

19
app/src/main/res/layout/fragment_device_list.xml
View File

@ -10,11 +10,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:paddingLeft="5dp"
android:paddingTop="5dp"
android:paddingRight="5dp"
android:paddingBottom="1dp"
android:text="Your Device:"
android:text="@string/your_device"
android:textSize="13sp"
android:textStyle="italic"
app:layout_constraintHorizontal_bias="0.0"
@ -30,10 +31,11 @@
app:layout_constraintTop_toBottomOf="@+id/text_view_your_device"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:text="Device Name"
android:hint="@string/device_name"
android:textStyle="bold"
android:textSize="17sp"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"/>
@ -45,9 +47,10 @@
app:layout_constraintTop_toBottomOf="@+id/text_view_device_name"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:text="Status"
android:hint="@string/device_status"
android:textSize="15sp"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingBottom="5dp"/>
@ -67,7 +70,7 @@
android:id="@+id/text_view_available_device"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="NEARBY DEVICES"
android:text="@string/nearby_devices"
android:gravity="center"
android:textSize="16sp"
android:fontFamily="monospace"
@ -89,18 +92,17 @@
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent">
</ListView>
<TextView
android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="No devices detected\nTap on search button to try again"
android:text="@string/no_devices_found"
android:gravity="center"
android:layout_margin="50dp"
android:textColor="@android:color/black" />
<!--android:visibility="gone"-->
</FrameLayout>
<ProgressBar
@ -114,7 +116,4 @@
app:layout_constraintRight_toRightOf="parent"
android:visibility="gone"/>
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/layout/fragment_transfer_progress.xml
View File

@ -20,12 +20,11 @@
android:layout_marginRight="5dp"
android:layout_marginTop="10dp" />
<!-- TODO: Update blank fragment layout -->
<TextView
android:id="@+id/text_view_files_for_transfer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="FILES FOR TRANSFER"
android:text="@string/files_for_transfer"
android:textSize="16sp"
android:fontFamily="monospace"
android:gravity="center"

3
app/src/main/res/layout/item_transfer_list.xml
View File

@ -10,7 +10,7 @@
android:id="@+id/text_view_file_item_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="File Name"
android:hint="@string/file_name"
android:gravity="center_vertical"
android:textColor="#000000"
android:textSize="14sp"
@ -49,6 +49,7 @@
android:paddingRight="5dp"
android:paddingEnd="5dp"
android:layout_marginRight="12dp"
android:layout_marginEnd="12dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/text_view_file_item_name"
app:layout_constraintRight_toRightOf="parent"

8
app/src/main/res/layout/row_peer_device.xml
View File

@ -10,8 +10,8 @@
android:layout_height="wrap_content"
android:layout_weight="3"
android:gravity="center_vertical"
android:text="Device Name"
android:tooltipText="Device Name"
android:hint="@string/device_name"
android:tooltipText="@string/device_name"
android:textStyle="bold"
android:textSize="17sp"
android:paddingTop="1dp"
@ -25,8 +25,8 @@
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_gravity="center_vertical"
android:text="Status"
android:tooltipText="Device Status"
android:hint="@string/device_status"
android:tooltipText="@string/device_status"
android:textSize="17sp"
android:paddingTop="1dp"
android:paddingLeft="5dp"

13
app/src/main/res/menu/menu_zim_manager.xml
View File

@ -11,17 +11,18 @@
app:iconifiedByDefault="true"
app:showAsAction="always|collapseActionView"/>
<item
android:id="@+id/get_zim_nearby_device"
android:icon="@drawable/ic_baseline_mobile_screen_share_24px"
android:title="Get content from nearby device"
app:showAsAction="always"/>
<item
android:id="@+id/select_language"
android:icon="@drawable/ic_language_white_24dp"
android:title="@string/pref_language_chooser"
android:visible="true"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/get_zim_nearby_device"
android:icon="@drawable/ic_baseline_mobile_screen_share_24px"
android:title="@string/get_content_from_nearby_device"
app:showAsAction="always"/>
</menu>

4
app/src/main/res/menu/wifi_file_share_items.xml
View File

@ -5,12 +5,12 @@
tools:context=".zim_manager.local_file_transfer.LocalFileTransferActivity">
<item android:id="@+id/menu_item_cancel_search"
android:title="Cancel Search"
android:title="@string/cancel_search"
app:showAsAction="always"
android:icon="@drawable/ic_baseline_cancel_24px" />
<item android:id="@+id/menu_item_search_devices"
android:title="Search For Peers"
android:title="@string/search_for_peers"
app:showAsAction="always"
android:icon="@drawable/action_search"/>
</menu>

10
app/src/main/res/values/strings.xml
View File

@ -284,4 +284,14 @@
<string name="error_during_transfer">An error was encountered during transfer</string>
<string name="error_sending">Error sending file</string>
<string name="all_files_transferred">All files transferred</string>
<string name="get_content_from_nearby_device">Get content from nearby device</string>
<string name="cancel_search">Cancel Search</string>
<string name="search_for_peers">Search For Peers</string>
<string name="device_name">Device Name</string>
<string name="device_status">Device Status</string>
<string name="your_device">Your Device:</string>
<string name="nearby_devices">NEARBY DEVICES</string>
<string name="no_devices_found">No devices detected Tap on search button to try again</string>
<string name="files_for_transfer">FILES FOR TRANSFER</string>
<string name="file_name">File Name</string>
</resources>