Skip to content

Commit

Permalink
Merge pull request #810 from ferredoxin/Lagrio-patch-1
Browse files Browse the repository at this point in the history 
Switch to RikkaUI Theme
  • Loading branch information
@NextAlone
NextAlone authored Apr 10, 2021
2 parents de45428 + c766329 commit c82c568
Show file tree
Hide file tree
Showing 5 changed files with 128 additions and 128 deletions.
107 changes: 43 additions & 64 deletions app/src/main/res/layout/main_v2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,62 +29,53 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:padding="16dp">

<LinearLayout

android:id="@+id/mainV2_activationStatusLinearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ic_bg_gradient"
android:gravity="center">
android:layout_marginBottom="16dp"
android:background="@drawable/bg_yellow_solid"
android:orientation="horizontal"
android:gravity="center"
android:paddingLeft="0dp"
android:paddingTop="18dp"
android:paddingRight="0dp"
android:paddingBottom="18dp">

<LinearLayout
<ImageView
android:id="@+id/mainV2_activationStatusIcon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:scaleType="centerCrop"
android:src="@drawable/ic_check_circle" />

android:id="@+id/mainV2_activationStatusLinearLayout"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:background="@drawable/bg_yellow_solid"
android:orientation="horizontal"
android:gravity="center"
android:paddingLeft="0dp"
android:paddingTop="18dp"
android:paddingRight="0dp"
android:paddingBottom="18dp">

<ImageView
android:id="@+id/mainV2_activationStatusIcon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:scaleType="centerCrop"
android:src="@drawable/ic_check_circle" />
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
<TextView
android:id="@+id/mainV2_activationStatusTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">

<TextView
android:id="@+id/mainV2_activationStatusTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="0dp"
android:text="N/A"
android:textColor="@color/whiteTextColor"
android:textSize="16sp" />

<TextView
android:id="@+id/mainV2_activationStatusDesc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="2dp"
android:text="Internal error"
android:textColor="@color/whiteTextColor"
android:textSize="12sp" />
android:layout_margin="0dp"
android:text="N/A"
android:textColor="@color/whiteTextColor"
android:textSize="16sp" />

</LinearLayout>
<TextView
android:id="@+id/mainV2_activationStatusDesc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="2dp"
android:text="Internal error"
android:textColor="@color/whiteTextColor"
android:textSize="12sp" />

</LinearLayout>

Expand All @@ -93,11 +84,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/ic_bg_white"
android:background="@drawable/bg_trans_border_ripple"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
Expand All @@ -115,7 +103,7 @@
android:layout_marginBottom="16dp"
android:scaleType="centerCrop"
android:src="@drawable/ic_info"
app:tint="@color/themeIconColor" />
app:tint="@color/themeColor" />

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -153,11 +141,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/ic_bg_white"
android:background="@drawable/bg_trans_border_ripple"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
Expand All @@ -174,7 +159,7 @@
android:layout_marginRight="16dp"
android:scaleType="centerCrop"
android:src="@drawable/ic_settings"
app:tint="@color/themeIconColor" />
app:tint="@color/themeColor" />

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -232,7 +217,7 @@
android:paddingRight="0dp"
android:paddingBottom="2dp"
android:text="@string/qq"
android:textColor="@color/themeIconColor"
android:textColor="@color/themeColor"
android:textSize="16sp" />

<TextView
Expand All @@ -248,7 +233,7 @@
android:paddingRight="0dp"
android:paddingBottom="2dp"
android:text="@string/tim"
android:textColor="@color/themeIconColor"
android:textColor="@color/themeColor"
android:textSize="16sp" />

<TextView
Expand All @@ -264,7 +249,7 @@
android:paddingRight="0dp"
android:paddingBottom="2dp"
android:text="@string/qq_lite"
android:textColor="@color/themeIconColor"
android:textColor="@color/themeColor"
android:textSize="16sp" />
</LinearLayout>

Expand All @@ -276,9 +261,6 @@
android:id="@+id/mainV2_githubRepo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/bg_trans_border_null_ripple"
android:clickable="true"
Expand Down Expand Up @@ -323,9 +305,6 @@
android:id="@+id/mainV2_help"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/bg_trans_border_null_ripple"
android:clickable="true"
Expand Down
107 changes: 64 additions & 43 deletions app/src/main/res/layout/main_v2_rikkaui.xml → app/src/main/res/layout/main_v2_blues.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,53 +29,62 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="16dp">
android:orientation="vertical">

<LinearLayout
android:id="@+id/mainV2_activationStatusLinearLayout"

android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:background="@drawable/bg_yellow_solid"
android:orientation="horizontal"
android:gravity="center"
android:paddingLeft="0dp"
android:paddingTop="18dp"
android:paddingRight="0dp"
android:paddingBottom="18dp">

<ImageView
android:id="@+id/mainV2_activationStatusIcon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:scaleType="centerCrop"
android:src="@drawable/ic_check_circle" />
android:background="@drawable/ic_bg_gradient"
android:gravity="center">

<LinearLayout

android:id="@+id/mainV2_activationStatusLinearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_margin="16dp"
android:background="@drawable/bg_yellow_solid"
android:orientation="horizontal"
android:gravity="center"
android:paddingLeft="0dp"
android:paddingTop="18dp"
android:paddingRight="0dp"
android:paddingBottom="18dp">

<ImageView
android:id="@+id/mainV2_activationStatusIcon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:scaleType="centerCrop"
android:src="@drawable/ic_check_circle" />

<TextView
android:id="@+id/mainV2_activationStatusTitle"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="0dp"
android:text="N/A"
android:textColor="@color/whiteTextColor"
android:textSize="16sp" />
android:orientation="vertical">

<TextView
android:id="@+id/mainV2_activationStatusDesc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="2dp"
android:text="Internal error"
android:textColor="@color/whiteTextColor"
android:textSize="12sp" />
<TextView
android:id="@+id/mainV2_activationStatusTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="0dp"
android:text="N/A"
android:textColor="@color/whiteTextColor"
android:textSize="16sp" />

<TextView
android:id="@+id/mainV2_activationStatusDesc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="2dp"
android:text="Internal error"
android:textColor="@color/whiteTextColor"
android:textSize="12sp" />

</LinearLayout>

</LinearLayout>

Expand All @@ -84,8 +93,11 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/bg_trans_border_ripple"
android:background="@drawable/ic_bg_white"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
Expand All @@ -103,7 +115,7 @@
android:layout_marginBottom="16dp"
android:scaleType="centerCrop"
android:src="@drawable/ic_info"
app:tint="@color/themeColor" />
app:tint="@color/themeIconColor" />

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -141,8 +153,11 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/bg_trans_border_ripple"
android:background="@drawable/ic_bg_white"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
Expand All @@ -159,7 +174,7 @@
android:layout_marginRight="16dp"
android:scaleType="centerCrop"
android:src="@drawable/ic_settings"
app:tint="@color/themeColor" />
app:tint="@color/themeIconColor" />

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -217,7 +232,7 @@
android:paddingRight="0dp"
android:paddingBottom="2dp"
android:text="@string/qq"
android:textColor="@color/themeColor"
android:textColor="@color/themeIconColor"
android:textSize="16sp" />

<TextView
Expand All @@ -233,7 +248,7 @@
android:paddingRight="0dp"
android:paddingBottom="2dp"
android:text="@string/tim"
android:textColor="@color/themeColor"
android:textColor="@color/themeIconColor"
android:textSize="16sp" />

<TextView
Expand All @@ -249,7 +264,7 @@
android:paddingRight="0dp"
android:paddingBottom="2dp"
android:text="@string/qq_lite"
android:textColor="@color/themeColor"
android:textColor="@color/themeIconColor"
android:textSize="16sp" />
</LinearLayout>

Expand All @@ -261,6 +276,9 @@
android:id="@+id/mainV2_githubRepo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/bg_trans_border_null_ripple"
android:clickable="true"
Expand Down Expand Up @@ -305,6 +323,9 @@
android:id="@+id/mainV2_help"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/bg_trans_border_null_ripple"
android:clickable="true"
Expand Down
Loading

0 comments on commit c82c568

Please sign in to comment.