Skip to content

Commit 989b249

Browse files
utsanjanutsanjan
committed
UI/UX-Updates
1 parent 9d07cfc commit 989b249

9 files changed

Lines changed: 56 additions & 14 deletions

File tree

‎.idea/vcs.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/release/app-release.apk‎

523 KB
Binary file not shown.

‎app/src/main/java/com/dopesatan/tsunami/MainActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void checkConnection() {
8383
public void run() {
8484
overlay_relative.setVisibility(View.GONE);
8585
}
86-
}, 10000);
86+
}, 14000);
8787
Toast.makeText(MainActivity.this, "Welcome to Tsunami", Toast.LENGTH_LONG).show();
8888
}
8989
else if(mobileNetwork.isConnected()){
@@ -95,7 +95,7 @@ else if(mobileNetwork.isConnected()){
9595
public void run() {
9696
overlay_relative.setVisibility(View.GONE);
9797
}
98-
}, 10000);
98+
}, 14000);
9999
Toast.makeText(MainActivity.this, "Welcome to Tsunami", Toast.LENGTH_LONG).show();
100100
}
101101
else{

‎app/src/main/java/com/dopesatan/tsunami/SplashScreenActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ protected void onCreate(Bundle savedInstanceState) {
1616
EasySplashScreen config = new EasySplashScreen(SplashScreenActivity.this)
1717
.withFullScreen()
1818
.withTargetActivity(MainActivity.class)
19-
.withSplashTimeOut(5000)
19+
.withSplashTimeOut(3000)
2020
.withBackgroundColor(Color.parseColor("#0D101E"))
2121
.withLogo(R.mipmap.splash_foreground);
2222

‎app/src/main/res/drawable/bomb.gif‎

3.47 MB
Loading

‎app/src/main/res/drawable/branding.png‎

6.03 KB
Loading

‎app/src/main/res/drawable/infotxt.png‎

13.7 KB
Loading

‎app/src/main/res/drawable/loading.png‎

-11.1 KB
Binary file not shown.

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,40 +33,66 @@
3333
android:background="@color/teal_200"
3434
android:id="@+id/overlay_relative">
3535

36+
<pl.droidsonroids.gif.GifImageView
37+
android:id="@+id/bomb"
38+
android:layout_width="130dp"
39+
android:layout_height="130dp"
40+
android:layout_centerHorizontal="true"
41+
android:layout_marginBottom="-20dp"
42+
android:paddingLeft="20dp"
43+
android:layout_above="@+id/loadingLogo"
44+
android:src="@drawable/bomb" />
45+
3646
<ImageView
3747
android:id="@+id/loadingLogo"
38-
android:layout_width="180dp"
39-
android:layout_height="150dp"
48+
android:layout_width="150dp"
49+
android:layout_height="140dp"
4050
android:layout_centerHorizontal="true"
4151
android:layout_centerVertical="true"
42-
android:src="@drawable/loading" />
52+
android:src="@drawable/infotxt" />
53+
54+
<LinearLayout
55+
android:layout_width = "wrap_content"
56+
android:layout_height = "wrap_content"
57+
android:orientation="horizontal"
58+
android:layout_centerHorizontal="true"
59+
android:layout_marginBottom="200px"
60+
android:layout_alignParentBottom="true">
61+
62+
<ImageView
63+
android:id="@+id/branding"
64+
android:layout_width="100dp"
65+
android:layout_height="wrap_content"
66+
android:layout_centerHorizontal="true"
67+
android:layout_centerVertical="true"
68+
android:src="@drawable/branding" />
69+
70+
</LinearLayout>
4371

4472
</RelativeLayout>
4573

4674
<RelativeLayout
4775
android:layout_width="match_parent"
4876
android:layout_height="match_parent"
4977
android:id="@+id/relativeLayout"
50-
android:background="@color/teal_200"
51-
android:visibility="gone">
78+
android:background="@color/teal_200">
5279

5380
<pl.droidsonroids.gif.GifImageView
5481
android:id="@+id/noConnectionLogo"
5582
android:layout_width="300dp"
5683
android:layout_height="300dp"
57-
android:layout_alignParentTop="true"
5884
android:layout_centerHorizontal="true"
59-
android:layout_marginTop="130dp"
60-
android:src="@drawable/no_internet" />
85+
android:src="@drawable/no_internet"
86+
android:layout_above="@+id/txtNoConnection"/>
6187

6288
<TextView
6389
android:layout_width="match_parent"
6490
android:layout_height="wrap_content"
6591
android:text="No Internet Connection"
6692
android:textColor="#FFFFFF"
67-
android:layout_below="@+id/noConnectionLogo"
93+
android:layout_centerVertical="true"
6894
android:textSize="25sp"
69-
android:layout_marginTop="-60px"
95+
android:layout_marginTop="-70px"
7096
android:textAlignment="center"
7197
android:textStyle="bold"
7298
android:id="@+id/txtNoConnection"/>
@@ -77,13 +103,23 @@
77103
android:layout_height="40dp"
78104
android:layout_below="@+id/txtNoConnection"
79105
android:layout_centerHorizontal="true"
80-
android:layout_marginTop="60dp"
106+
android:layout_marginTop="40dp"
81107
android:background="@drawable/button"
82108
android:text="Retry"
83109
android:fontFamily="sans-serif-medium"
84110
android:textColor="#FFFFFF"
85111
android:textSize="15sp" />
86112

113+
<ImageView
114+
android:id="@+id/brand"
115+
android:layout_width="100dp"
116+
android:layout_height="wrap_content"
117+
android:layout_centerHorizontal="true"
118+
android:layout_centerVertical="true"
119+
android:src="@drawable/branding"
120+
android:layout_marginBottom="200px"
121+
android:layout_alignParentBottom="true" />
122+
87123
</RelativeLayout>
88124

89125
</RelativeLayout>

0 commit comments

Comments
 (0)