Skip to content

Commit 500e43a

Browse files
ejaz4ejaz4
committed
🐛
1 parent 6e43cf2 commit 500e43a

File tree

8 files changed

+58
-7
lines changed

8 files changed

+58
-7
lines changed

‎.idea/misc.xml‎

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

‎app/src/main/java/co/dothq/browser/WelcomeActivity.kt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,21 @@ import androidx.appcompat.app.AppCompatActivity
55
import android.os.Bundle
66
import android.widget.Button
77
import android.widget.LinearLayout
8+
import android.widget.TextView
89
import co.dothq.browser.util.defaultProfile
10+
import java.util.*
911

1012
class WelcomeActivity : AppCompatActivity() {
1113
override fun onCreate(savedInstanceState: Bundle?) {
1214
super.onCreate(savedInstanceState)
1315
setContentView(R.layout.activity_welcome)
1416

17+
val year = Calendar.getInstance().get(Calendar.YEAR);
18+
19+
val copyrightInfo = findViewById<TextView>(R.id.copyrightText)
20+
21+
copyrightInfo.text = "© ${year.toString()} Dot HQ"
22+
1523
val startButton = findViewById<LinearLayout>(R.id.startButton)
1624
startButton.setOnClickListener {
1725
defaultProfile().applyDefaultPreferences(applicationContext);

‎app/src/main/res/drawable/input_layout.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
<stroke android:width="0dp" android:color="?colorPrimaryVariant" />
55
<corners android:radius="10dp"/>
66
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
7-
</shape>
7+
</shape>

‎app/src/main/res/drawable/input_layout_normal.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3+
<solid android:color="?colorPrimaryVariant"/>
4+
<stroke android:width="0dp" android:color="?colorPrimaryVariant" />
5+
<corners android:radius="10dp"/>
6+
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
7+
</shape>

‎app/src/main/res/drawable/input_layout_pressed.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3+
<solid android:color="?colorPrimaryVariant"/>
4+
<stroke android:width="0dp" android:color="@color/white" />
5+
<corners android:radius="10dp"/>
6+
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
7+
</shape>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<LinearLayout
2525
android:layout_width="match_parent"
2626
android:layout_height="match_parent"
27-
android:background="@drawable/input_layout"
27+
android:background="@drawable/input_layout_normal"
2828
android:orientation="horizontal">
2929

3030
<TextView

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

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
tools:context=".WelcomeActivity">
88

99
<LinearLayout
10+
android:id="@+id/linearLayout"
1011
android:layout_width="match_parent"
1112
android:layout_height="match_parent"
1213
android:background="?colorPrimary"
14+
android:foregroundGravity="bottom"
1315
android:gravity="center"
1416
android:orientation="vertical"
1517
tools:layout_editor_absoluteX="1dp"
@@ -19,12 +21,25 @@
1921
android:id="@+id/textView"
2022
android:layout_width="match_parent"
2123
android:layout_height="wrap_content"
24+
android:layout_marginBottom="10sp"
2225
android:text="Dot Browser"
2326
android:textAlignment="center"
2427
android:textColor="?colorSecondary"
2528
android:textSize="27sp"
2629
android:textStyle="bold" />
2730

31+
<TextView
32+
android:id="@+id/textView2"
33+
android:layout_width="match_parent"
34+
android:layout_height="wrap_content"
35+
android:layout_marginBottom="10sp"
36+
android:paddingStart="20sp"
37+
android:paddingEnd="20sp"
38+
android:text="The privacy-centric, modern web browser that fights for your privacy when browsing the internet."
39+
android:textAlignment="center"
40+
android:textColor="?colorSecondary"
41+
android:textSize="16sp" />
42+
2843
<LinearLayout
2944
android:id="@+id/startButton"
3045
android:layout_width="wrap_content"
@@ -45,12 +60,24 @@
4560
android:textColor="@color/white" />
4661
</LinearLayout>
4762

63+
</LinearLayout>
64+
65+
<LinearLayout
66+
android:layout_width="match_parent"
67+
android:layout_height="wrap_content"
68+
android:layout_marginBottom="40dp"
69+
android:orientation="horizontal"
70+
app:layout_constraintBottom_toBottomOf="@+id/linearLayout"
71+
app:layout_constraintEnd_toEndOf="parent"
72+
app:layout_constraintStart_toStartOf="parent">
73+
4874
<TextView
49-
android:id="@+id/textView2"
50-
android:layout_width="match_parent"
75+
android:id="@+id/copyrightText"
76+
android:layout_width="wrap_content"
5177
android:layout_height="wrap_content"
52-
android:text="// Todo: this welcome screen"
53-
android:textAlignment="center"
54-
android:textColor="?colorSecondary" />
78+
android:layout_weight="1"
79+
android:text="© 2021 Dot HQ"
80+
android:textAlignment="center" />
5581
</LinearLayout>
82+
5683
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/values/themes.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@
1616

1717
</style>
1818
<string name="mode">Day</string>
19+
<color name="colorPrimaryVariantDark">@color/gray_4</color>
1920
</resources>

0 commit comments

Comments
 (0)