0
0
Fork 0
mirror of https://github.com/YTVanced/VancedManager synced 2024-11-26 05:05:15 +00:00

Merge pull request #7 from X1nto/master

Some Relative fixes and added app launcher icon
This commit is contained in:
Tornike Khintibidze 2020-03-22 21:50:44 +04:00 committed by GitHub
commit 363a6bd4c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 354 additions and 273 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@ -7,20 +7,18 @@
android:layout_height="match_parent"
tools:context=".ui.home.HomeFragment">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/imageView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/imageView2"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginStart="15dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="15dp"
android:layout_marginTop="178dp"
android:layout_marginEnd="14dp"
android:layout_marginBottom="433dp"
android:src="@drawable/rectangle_3" />
<ImageView
@ -30,23 +28,25 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginStart="15dp"
android:layout_marginTop="36dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="575dp"
android:src="@drawable/rectangle_3" />
<ImageView
android:id="@+id/imageView6"
android:layout_width="wrap_content"
android:layout_height="382dp"
android:layout_below="@+id/imageView4"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginStart="15dp"
android:layout_marginTop="32dp"
android:layout_marginTop="312dp"
android:layout_marginEnd="14dp"
android:layout_marginBottom="9dp"
android:layout_marginBottom="10dp"
android:src="@drawable/rectangle_4" />
<ImageView
@ -55,22 +55,27 @@
android:layout_height="wrap_content"
android:layout_alignTop="@+id/imageView6"
android:layout_alignEnd="@+id/imageView6"
android:layout_alignBottom="@+id/imageView6"
android:layout_alignParentStart="true"
android:layout_marginStart="23dp"
android:layout_marginTop="48dp"
android:layout_marginEnd="7dp"
android:src="@drawable/rectangle_6" />
android:layout_marginBottom="253dp"
android:src="@drawable/rectangle_6"
android:contentDescription="TODO" />
<TextView
android:id="@+id/textView"
android:layout_width="141dp"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/imageView6"
android:layout_alignBottom="@+id/imageView6"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_marginStart="27dp"
android:layout_marginTop="12dp"
android:layout_marginTop="14dp"
android:layout_marginEnd="243dp"
android:layout_marginBottom="363dp"
android:fontFamily="@font/exo_bold"
android:text="@string/useful_links"
android:textSize="22sp" />
@ -80,12 +85,14 @@
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="165dp"
android:layout_height="wrap_content"
android:layout_above="@+id/imageView8"
android:layout_below="@+id/imageView7"
android:layout_alignStart="@+id/imageView6"
android:layout_alignTop="@+id/imageView6"
android:layout_alignEnd="@+id/imageView6"
android:layout_alignBottom="@+id/imageView6"
android:layout_marginStart="17dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="9dp"
android:layout_marginTop="167dp"
android:layout_marginEnd="200dp"
android:layout_marginBottom="144dp"
android:background="@drawable/rectangle_5"
android:text="@string/support_us_"
android:textAllCaps="false"
@ -95,14 +102,14 @@
android:id="@+id/button2"
android:layout_width="165dp"
android:layout_height="wrap_content"
android:layout_above="@+id/imageView8"
android:layout_below="@+id/imageView7"
android:layout_alignStart="@+id/imageView6"
android:layout_alignTop="@+id/imageView6"
android:layout_alignEnd="@+id/imageView6"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_alignBottom="@+id/imageView6"
android:layout_marginStart="192dp"
android:layout_marginTop="167dp"
android:layout_marginEnd="17dp"
android:layout_marginBottom="10dp"
android:layout_toEndOf="@+id/button"
android:layout_marginBottom="144dp"
android:background="@drawable/rectangle_8"
android:text="@string/website_text"
android:textAllCaps="false"
@ -112,24 +119,28 @@
android:id="@+id/imageView8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/imageView6"
android:layout_alignBottom="@+id/imageView6"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_marginStart="31dp"
android:layout_marginEnd="32dp"
android:layout_marginBottom="14dp"
android:layout_marginStart="34dp"
android:layout_marginTop="276dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="36dp"
android:src="@drawable/rectangle_7" />
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_alignStart="@+id/imageView2"
android:layout_alignTop="@+id/imageView2"
android:layout_alignEnd="@+id/imageView2"
android:layout_alignBottom="@+id/imageView2"
android:layout_marginStart="51dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="103dp"
android:layout_marginEnd="250dp"
android:layout_marginBottom="81dp"
android:layout_toStartOf="@+id/imageView9"
android:fontFamily="@font/exo_bold"
android:text="@string/vanced"
android:textColor="#1490D7"
@ -139,10 +150,12 @@
android:id="@+id/textView11"
android:layout_width="88dp"
android:layout_height="wrap_content"
android:layout_alignStart="@+id/imageView2"
android:layout_alignTop="@+id/imageView2"
android:layout_alignEnd="@+id/imageView2"
android:layout_alignBottom="@+id/imageView2"
android:layout_marginStart="12dp"
android:layout_alignParentStart="true"
android:layout_marginStart="27dp"
android:layout_marginTop="41dp"
android:layout_marginEnd="281dp"
android:layout_marginBottom="46dp"
android:fontFamily="@font/exo_semibold"
@ -154,9 +167,11 @@
android:layout_width="99dp"
android:layout_height="34dp"
android:layout_alignStart="@+id/imageView2"
android:layout_alignTop="@+id/imageView2"
android:layout_alignEnd="@+id/imageView2"
android:layout_alignBottom="@+id/imageView2"
android:layout_marginStart="12dp"
android:layout_marginTop="70dp"
android:layout_marginEnd="270dp"
android:layout_marginBottom="16dp"
android:fontFamily="@font/exo_semibold"
@ -166,13 +181,15 @@
<Button
android:id="@+id/button3"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="101dp"
android:layout_height="51dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@+id/imageView2"
android:layout_alignTop="@+id/imageView2"
android:layout_alignEnd="@+id/imageView2"
android:layout_alignBottom="@+id/imageView2"
android:layout_marginStart="268dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="22dp"
android:layout_marginEnd="26dp"
android:layout_marginBottom="70dp"
android:fontFamily="@font/exo_semibold"
android:text="@string/install"
@ -184,35 +201,41 @@
android:id="@+id/imageView9"
android:layout_width="42dp"
android:layout_height="34dp"
android:layout_alignStart="@+id/imageView2"
android:layout_alignTop="@+id/imageView2"
android:layout_alignEnd="@+id/imageView2"
android:layout_alignBottom="@+id/imageView2"
android:layout_marginStart="235dp"
android:layout_marginTop="11dp"
android:layout_marginEnd="-18dp"
android:layout_marginEnd="105dp"
android:layout_marginBottom="75dp"
android:layout_toStartOf="@+id/button3"
android:src="@drawable/outline_cloud_download_24" />
<ImageView
android:id="@+id/imageView10"
android:layout_width="42dp"
android:layout_height="34dp"
android:layout_alignStart="@+id/imageView4"
android:layout_alignTop="@+id/imageView4"
android:layout_alignEnd="@+id/imageView4"
android:layout_alignBottom="@+id/imageView4"
android:layout_marginStart="235dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="-9dp"
android:layout_marginEnd="105dp"
android:layout_marginBottom="74dp"
android:layout_toStartOf="@+id/button7"
android:src="@drawable/outline_cloud_download_24" />
<TextView
android:id="@+id/textView13"
android:layout_width="wrap_content"
android:layout_height="34dp"
android:layout_alignStart="@+id/imageView4"
android:layout_alignTop="@+id/imageView4"
android:layout_alignEnd="@+id/imageView4"
android:layout_alignBottom="@+id/imageView4"
android:layout_marginStart="51dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="252dp"
android:layout_marginEnd="224dp"
android:layout_marginBottom="79dp"
android:fontFamily="@font/exo_bold"
android:text="@string/microg"
@ -224,9 +247,11 @@
android:layout_width="78dp"
android:layout_height="wrap_content"
android:layout_alignStart="@+id/imageView4"
android:layout_alignTop="@+id/imageView4"
android:layout_alignEnd="@+id/imageView4"
android:layout_alignBottom="@+id/imageView4"
android:layout_marginStart="12dp"
android:layout_marginTop="46dp"
android:layout_marginEnd="286dp"
android:layout_marginBottom="41dp"
android:fontFamily="@font/exo_semibold"
@ -237,12 +262,14 @@
android:id="@+id/textView15"
android:layout_width="91dp"
android:layout_height="wrap_content"
android:layout_alignStart="@+id/imageView4"
android:layout_alignTop="@+id/imageView4"
android:layout_alignEnd="@+id/imageView4"
android:layout_alignBottom="@+id/imageView4"
android:layout_alignParentStart="true"
android:layout_marginStart="28dp"
android:layout_marginEnd="255dp"
android:layout_marginBottom="11dp"
android:layout_marginStart="12dp"
android:layout_marginTop="77dp"
android:layout_marginEnd="256dp"
android:layout_marginBottom="10dp"
android:fontFamily="@font/exo_semibold"
android:text="@string/installed"
android:textSize="22sp" />
@ -252,11 +279,13 @@
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@+id/imageView4"
android:layout_alignTop="@+id/imageView4"
android:layout_alignEnd="@+id/imageView4"
android:layout_alignBottom="@+id/imageView4"
android:layout_marginStart="268dp"
android:layout_marginTop="1dp"
android:layout_marginEnd="27dp"
android:layout_marginEnd="26dp"
android:layout_marginBottom="63dp"
android:fontFamily="@font/exo_semibold"
android:text="@string/install"
@ -283,17 +312,65 @@
android:id="@+id/imageView11"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_alignStart="@+id/imageView4"
android:layout_alignTop="@+id/imageView4"
android:layout_alignEnd="@+id/imageView4"
android:layout_alignBottom="@+id/imageView4"
android:layout_marginStart="238dp"
android:layout_marginTop="46dp"
android:layout_marginEnd="-7dp"
android:layout_marginEnd="108dp"
android:layout_marginBottom="38dp"
android:layout_toStartOf="@+id/button8"
android:src="@drawable/ic_settings_black_24dp" />
</RelativeLayout>
<TextView
android:id="@+id/textView3"
android:layout_width="127dp"
android:layout_height="wrap_content"
android:layout_alignStart="@+id/button"
android:layout_alignTop="@+id/button"
android:layout_alignEnd="@+id/button"
android:layout_alignBottom="@+id/button"
android:layout_marginStart="7dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="31dp"
android:layout_marginBottom="58dp"
android:fontFamily="@font/exo_bold"
android:text="@string/brave_browser"
android:textColor="#ffffff"
android:textSize="18sp" />
<TextView
android:id="@+id/textView5"
android:layout_width="240dp"
android:layout_height="23dp"
android:layout_alignStart="@+id/imageView7"
android:layout_alignTop="@+id/imageView7"
android:layout_alignEnd="@+id/imageView7"
android:layout_alignBottom="@+id/imageView7"
android:layout_marginStart="20dp"
android:layout_marginTop="3dp"
android:layout_marginEnd="107dp"
android:layout_marginBottom="83dp"
android:fontFamily="@font/exo_bold"
android:text="@string/vanced_medias"
android:textColor="#ffffff"
android:textSize="18sp" />
<TextView
android:id="@+id/textView6"
android:layout_width="110dp"
android:layout_height="25dp"
android:layout_alignStart="@+id/imageView8"
android:layout_alignTop="@+id/imageView8"
android:layout_alignEnd="@+id/imageView8"
android:layout_alignBottom="@+id/imageView8"
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="223dp"
android:layout_marginBottom="68dp"
android:fontFamily="@font/exo_bold"
android:text="@string/github_link"
android:textColor="#ffffff"
android:textSize="18sp" />
</androidx.core.widget.NestedScrollView>
</RelativeLayout>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#000000</color>
</resources>

View file

@ -9,7 +9,7 @@
<string name="n_a">N/A</string>
<string name="microg">MicroG</string>
<string name="settings">Settings</string>
<string name="github_link">GitHub links</string>
<string name="github_link">GitHub projects</string>
<string name="vanced_medias">Vanced on Social Medias</string>
<string name="website">Website</string>
<string name="discord">Discord</string>