resolve merge conflicts
This commit is contained in:
5
app/src/main/res/drawable/download_csv.xml
Normal file
5
app/src/main/res/drawable/download_csv.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<vector android:height="24dp" android:tint="@color/primary"
|
||||
android:viewportHeight="24" android:viewportWidth="24"
|
||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="@color/primary" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
|
||||
</vector>
|
||||
@@ -18,11 +18,24 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/downloadCSV"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="32dp"
|
||||
android:visibility="gone"
|
||||
android:backgroundTint="@color/primary"
|
||||
android:contentDescription="@string/downloadcsv"
|
||||
android:src="@drawable/download_csv"
|
||||
app:elevation="1dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/internetNotAvailableCL"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:visibility="visible"
|
||||
android:visibility="gone"
|
||||
android:padding="24dp">
|
||||
|
||||
<TextView
|
||||
@@ -31,6 +44,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:layout_marginTop="24dp"
|
||||
android:text="@string/internet_not_available_please_enter_the_user_id_manually"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -117,7 +131,7 @@
|
||||
android:id="@+id/internetAvailableCL"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:visibility="gone"
|
||||
android:visibility="visible"
|
||||
android:padding="24dp">
|
||||
|
||||
<TextView
|
||||
|
||||
@@ -189,6 +189,8 @@
|
||||
<string name="user_id_error_message">उपयोगकर्ता आईडी 18 अंकों की होनी चाहिए और कृपया रक्त समूह का चयन करें</string>
|
||||
<string name="upload_db_registration_title">डीबी टेस्ट अपलोड करें</string>
|
||||
<string name="upload_db_registration_message">क्या आप स्थानीय डीबी टेस्ट को क्लाउड पर अपलोड करना चाहते हैं?</string>
|
||||
<string name="download_db_registration_title">डाउनलोड डीबी टेस्ट</string>
|
||||
<string name="download_db_registration_message">क्या आप लोकल डीबी टेस्ट्स को सीएसवी प्रारूप में डाउनलोड करना चाहते हैं?</string>
|
||||
<string name="upload">अपलोड</string>
|
||||
<string name="cancel">रद्द करें</string>
|
||||
<string name="upload_success_message">अपलोड सफलता पूर्वक हुआ</string>
|
||||
@@ -266,4 +268,5 @@
|
||||
<string name="ok">ठीक है</string>
|
||||
<string name="deviceinfo">डिवाइस जानकारी</string>
|
||||
|
||||
<string name="downloadcsv">सीएसवी डाउनलोड करें</string>
|
||||
</resources>
|
||||
@@ -188,6 +188,8 @@
|
||||
<string name="user_id_error_message">ಬಳಕೆದಾರ ಐಡಿ 18 ಅಂಕಗಳಿರಬೇಕು ಮತ್ತು ದಯವಿಟ್ಟು ರಕ್ತ ಗುಂಪುವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
|
||||
<string name="upload_db_registration_title">ಸ್ಥಾನಿಕ DB ಪರೀಕ್ಷೆಗಳನ್ನು ಅಪ್ಲೋಡ್ ಮಾಡಿ</string>
|
||||
<string name="upload_db_registration_message">ನೀವು ಸ್ಥಾನಿಕ DB ಪರೀಕ್ಷೆಗಳನ್ನು ಕ್ಲೌಡ್ಗೆ ಅಪ್ಲೋಡ್ ಮಾಡಲು ಬಯಸುತ್ತೀರಾ?</string>
|
||||
<string name="download_db_registration_title">ಡೌನ್ಲೋಡ್ ಡಿಬಿ ಟೆಸ್ಟ್ಗಳು</string>
|
||||
<string name="download_db_registration_message">ನೀವು ಲೋಕಲ್ ಡಿಬಿ ಟೆಸ್ಟ್ಗಳನ್ನು CSV ಆಕರದಲ್ಲಿ ಡೌನ್ಲೋಡ್ ಮಾಡಲು ಬಯಸುತ್ತೀರಾ?</string>
|
||||
<string name="upload">ಅಪ್ಲೋಡ್ ಮಾಡಿ</string>
|
||||
<string name="cancel">ರದ್ದು ಮಾಡಿ</string>
|
||||
<string name="upload_success_message">ಯಶಸ್ವಿಯಾಗಿ ಅಪ್ಲೋಡ್ ಮಾಡಲಾಗಿದೆ</string>
|
||||
@@ -265,6 +267,7 @@
|
||||
<string name="app_language">ಅಪ್ಲಿಕೇಶನ್ ಭಾಷೆ</string>
|
||||
<string name="add_blood_group">ರಕ್ತ ಗುಂಡನ್ನು ಸೇರಿಸಿ</string>
|
||||
<string name="ok">ಸರಿ</string>
|
||||
<!-- Add translations for other strings -->
|
||||
<string name="downloadcsv">CSV ಡೌನ್ಲೋಡ್ ಮಾಡಿ</string>
|
||||
<!-- Add translations for other strings -->
|
||||
|
||||
</resources>
|
||||
@@ -191,6 +191,8 @@
|
||||
<string name="user_id_error_message">User ID should be 18 digits and please select the blood group</string>
|
||||
<string name="upload_db_registration_title">Upload DB Tests</string>
|
||||
<string name="upload_db_registration_message">Do you want to upload the local DB tests to the cloud?</string>
|
||||
<string name="download_db_registration_title">Download DB Tests</string>
|
||||
<string name="download_db_registration_message">Do you want to download the local DB tests in CSV format?</string>
|
||||
<string name="upload">Upload</string>
|
||||
<string name="cancel">Cancel</string>
|
||||
|
||||
@@ -271,4 +273,5 @@
|
||||
<string name="select_language">Select your preferred language</string>
|
||||
<string name="app_language">App Language</string>
|
||||
<string name="ok">OK</string>
|
||||
<string name="downloadcsv">Download CSV</string>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user