smiuser/arrest-tb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:smileomi18/arrest-tb

Browse Source 
 Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/res/layout/activity_home.xml
	app/src/main/res/layout/head.xml
	app/src/main/res/menu/menu.xml
This commit is contained in:
developerraman
2020-10-27 21:33:32 -07:00
parent 8f2c272dc3 c397b929c3
commit 8792ac30ae
27 changed files with 1283 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/res/layout/activity_home.xml
View File

@@ -70,7 +70,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<in.sminnovations.arresttb.Font_Awesome
<com.ShanMukhaInnovations.ArrestTB.FontAwesome
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
@@ -81,7 +81,7 @@
android:textStyle="normal"
android:fontFamily="sans-serif"
></in.sminnovations.arresttb.Font_Awesome>
></com.ShanMukhaInnovations.ArrestTB.FontAwesome>
<TextView
@@ -119,7 +119,7 @@ android:fontFamily="@font/fontstyle"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<in.sminnovations.arresttb.Font_Awesome
<com.ShanMukhaInnovations.ArrestTB.FontAwesome
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
@@ -130,7 +130,7 @@ android:fontFamily="@font/fontstyle"
android:id="@+id/patient_details"
></in.sminnovations.arresttb.Font_Awesome>
></com.ShanMukhaInnovations.ArrestTB.FontAwesome>
<TextView
android:textSize="14sp"
@@ -173,7 +173,7 @@ android:fontFamily="@font/fontstyle"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<in.sminnovations.arresttb.Font_Awesome
<com.ShanMukhaInnovations.ArrestTB.FontAwesome
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
@@ -184,7 +184,7 @@ android:fontFamily="@font/fontstyle"
android:textSize="40dp"
></in.sminnovations.arresttb.Font_Awesome>
></com.ShanMukhaInnovations.ArrestTB.FontAwesome>
<TextView
android:textSize="14sp"
@@ -219,7 +219,7 @@ android:fontFamily="@font/fontstyle"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<in.sminnovations.arresttb.Font_Awesome
<com.ShanMukhaInnovations.ArrestTB.FontAwesome
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
@@ -230,7 +230,7 @@ android:fontFamily="@font/fontstyle"
android:text="&#xf05a;"
></in.sminnovations.arresttb.Font_Awesome>
></com.ShanMukhaInnovations.ArrestTB.FontAwesome>
<TextView
android:textSize="14sp"

4
app/src/main/res/layout/head.xml
View File

@@ -18,7 +18,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<in.sminnovations.arresttb.Font_Awesome
<com.ShanMukhaInnovations.ArrestTB.FontAwesome
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="50dp"
@@ -27,7 +27,7 @@
android:layout_marginTop="30dp"
android:id="@+id/image"
android:textColor="@android:color/white"
></in.sminnovations.arresttb.Font_Awesome>
></com.ShanMukhaInnovations.ArrestTB.FontAwesome>
<TextView
android:layout_width="wrap_content"