Improved design compatibility across screen sizes.
Added dimens.xml files and folders.
This commit is contained in:
parent
e01f4850ca
commit
632e510412
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ScreenshotViewer">
|
||||||
|
<option name="frameScreenshot" value="true" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
|
|
@ -10,8 +10,8 @@ android {
|
||||||
applicationId "com.sultan.plantdatabse"
|
applicationId "com.sultan.plantdatabse"
|
||||||
minSdk 24
|
minSdk 24
|
||||||
targetSdk 34
|
targetSdk 34
|
||||||
versionCode 1
|
versionCode 3
|
||||||
versionName "1.0.25"
|
versionName "1.0.27"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -11,8 +11,8 @@
|
||||||
"type": "SINGLE",
|
"type": "SINGLE",
|
||||||
"filters": [],
|
"filters": [],
|
||||||
"attributes": [],
|
"attributes": [],
|
||||||
"versionCode": 1,
|
"versionCode": 2,
|
||||||
"versionName": "1.0.25",
|
"versionName": "1.0.26",
|
||||||
"outputFile": "app-release.apk"
|
"outputFile": "app-release.apk"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -4,21 +4,29 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical"
|
|
||||||
android:background="@drawable/app_background_14"
|
android:background="@drawable/app_background_14"
|
||||||
tools:context=".MainActivity">
|
tools:context=".MainActivity">
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="100dp"
|
android:layout_width="@dimen/dim_100"
|
||||||
android:layout_height="100dp"
|
android:layout_height="@dimen/dim_100"
|
||||||
android:src="@drawable/bh_logo"
|
android:src="@drawable/bh_logo"
|
||||||
android:layout_margin="10dp"/>
|
android:layout_margin="@dimen/dim_10"/>
|
||||||
|
|
||||||
<com.airbnb.lottie.LottieAnimationView
|
<com.airbnb.lottie.LottieAnimationView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:lottie_autoPlay="true"
|
app:lottie_autoPlay="true"
|
||||||
android:layout_marginTop="-150dp"
|
android:layout_marginTop="@dimen/mdim_150"
|
||||||
app:lottie_loop="true"
|
app:lottie_loop="true"
|
||||||
app:lottie_rawRes="@raw/butterfly"/>
|
app:lottie_rawRes="@raw/butterfly"/>
|
||||||
|
|
||||||
|
|
@ -27,7 +35,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:layout_margin="10dp"
|
android:layout_margin="@dimen/dim_10"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
android:text="messageContent"/>
|
android:text="messageContent"/>
|
||||||
|
|
||||||
|
|
@ -36,7 +44,7 @@
|
||||||
android:text="messageFormat"
|
android:text="messageFormat"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:layout_margin="10dp"
|
android:layout_margin="@dimen/dim_10"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:visibility="gone"/>
|
android:visibility="gone"/>
|
||||||
|
|
||||||
|
|
@ -44,7 +52,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:lottie_autoPlay="true"
|
app:lottie_autoPlay="true"
|
||||||
android:layout_marginTop="-430dp"
|
android:layout_marginTop="@dimen/mdim_430"
|
||||||
app:lottie_loop="true"
|
app:lottie_loop="true"
|
||||||
app:lottie_rawRes="@raw/qr_scan_big_2"/>
|
app:lottie_rawRes="@raw/qr_scan_big_2"/>
|
||||||
|
|
||||||
|
|
@ -53,36 +61,37 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:layout_marginTop="-120dp"
|
android:layout_marginTop="@dimen/mdim_120"
|
||||||
android:backgroundTint="#0F9D58"
|
android:backgroundTint="#0F9D58"
|
||||||
android:text="Scan QR Code"/>
|
android:text="Scan QR Code"
|
||||||
|
android:textSize="@dimen/fs_18"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="@dimen/dim_10"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:textColor="#F44336"
|
android:textColor="#F44336"
|
||||||
android:text="v1.0.25"
|
android:text="v1.0.25"
|
||||||
android:textSize="10sp"/>
|
android:textSize="@dimen/fs_10"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="@dimen/dim_10"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:textColor="#F44336"
|
android:textColor="#F44336"
|
||||||
android:textSize="20sp"
|
android:textSize="@dimen/fs_20"
|
||||||
android:text="Plant Database"/>
|
android:text="Plant Database"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="@dimen/dim_10"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textStyle="normal"
|
android:textStyle="normal"
|
||||||
|
|
@ -91,9 +100,9 @@
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="57dp"
|
android:layout_height="@dimen/dim_57"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="@dimen/dim_10"
|
||||||
android:text="Developed by:\n Sultan Mustafijul Hoque \nEmail: support@niutech.in"
|
android:text="Developed by:\n Sultan Mustafijul Hoque \nEmail: support@niutech.in"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textColor="#090200"
|
android:textColor="#090200"
|
||||||
|
|
@ -101,13 +110,17 @@
|
||||||
android:textStyle="italic" />
|
android:textStyle="italic" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="144dp"
|
android:layout_width="@dimen/dim_144"
|
||||||
android:layout_height="28dp"
|
android:layout_height="@dimen/dim_28"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="@dimen/dim_10"
|
||||||
android:text="© All Rights Reserved!"
|
android:text="© All Rights Reserved!"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textColor="#E91E63"
|
android:textColor="#E91E63"
|
||||||
android:textStyle="italic" />
|
android:textStyle="italic" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
@ -21,8 +21,8 @@
|
||||||
|
|
||||||
<com.airbnb.lottie.LottieAnimationView
|
<com.airbnb.lottie.LottieAnimationView
|
||||||
android:id="@+id/lottieAnimationView"
|
android:id="@+id/lottieAnimationView"
|
||||||
android:layout_width="180dp"
|
android:layout_width="@dimen/dim_180"
|
||||||
android:layout_height="180dp"
|
android:layout_height="@dimen/dim_180"
|
||||||
android:layout_centerInParent="true"
|
android:layout_centerInParent="true"
|
||||||
app:lottie_autoPlay="true"
|
app:lottie_autoPlay="true"
|
||||||
app:lottie_rawRes="@raw/loading2"
|
app:lottie_rawRes="@raw/loading2"
|
||||||
|
|
@ -36,25 +36,26 @@
|
||||||
android:layout_centerHorizontal="true"
|
android:layout_centerHorizontal="true"
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:backgroundTint="#0F9D58"
|
android:backgroundTint="#0F9D58"
|
||||||
android:text="Scan QR Code"/>
|
android:text="Scan QR Code"
|
||||||
|
android:textSize="@dimen/fs_18"/>
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/btnBack"
|
android:id="@+id/btnBack"
|
||||||
android:layout_width="35dp"
|
android:layout_width="@dimen/dim_35"
|
||||||
android:layout_height="35dp"
|
android:layout_height="@dimen/dim_35"
|
||||||
android:background="@drawable/ic_back_24"
|
android:background="@drawable/ic_back_24"
|
||||||
android:layout_alignParentTop="true"
|
android:layout_alignParentTop="true"
|
||||||
android:layout_alignParentStart="true"
|
android:layout_alignParentStart="true"
|
||||||
android:layout_margin="4dp"
|
android:layout_margin="@dimen/dim_4"
|
||||||
android:backgroundTint="@color/black"
|
android:backgroundTint="@color/black"
|
||||||
android:visibility="gone"/>
|
android:visibility="gone"/>
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/btnHome"
|
android:id="@+id/btnHome"
|
||||||
android:layout_width="35dp"
|
android:layout_width="@dimen/dim_35"
|
||||||
android:layout_height="35dp"
|
android:layout_height="@dimen/dim_35"
|
||||||
android:background="@drawable/ic_home_24"
|
android:background="@drawable/ic_home_24"
|
||||||
android:layout_alignParentTop="true"
|
android:layout_alignParentTop="true"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_alignParentEnd="true"
|
||||||
android:layout_margin="4dp"
|
android:layout_margin="@dimen/dim_4"
|
||||||
android:backgroundTint="@color/black"/>
|
android:backgroundTint="@color/black"/>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,8 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||||
|
|
||||||
|
<dimen name="activity_horizontal_margin">64dp</dimen>
|
||||||
|
|
||||||
|
|
||||||
|
</resources>
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue