Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP: Fixing styles and removing unused styles.

Browse Source
This commit is contained in:
Peter Serwylo 2015-08-01 22:50:41 +10:00
parent 5ee8307703
commit ba6d2e7793
29 changed files with 20 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
F-Droid/res/drawable-hdpi/wifi_ap_personal.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
F-Droid/res/drawable-hdpi/wifi_ap_private.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
F-Droid/res/drawable-hdpi/wifi_ap_public.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
F-Droid/res/drawable-ldpi/wifi_ap_personal.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 588 B

BIN
F-Droid/res/drawable-ldpi/wifi_ap_private.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 475 B

BIN
F-Droid/res/drawable-ldpi/wifi_ap_public.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 527 B

BIN
F-Droid/res/drawable-mdpi/wifi_ap_personal.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 915 B

BIN
F-Droid/res/drawable-mdpi/wifi_ap_private.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 616 B

BIN
F-Droid/res/drawable-mdpi/wifi_ap_public.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 776 B

BIN
F-Droid/res/drawable-xhdpi/wifi_ap_personal.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
F-Droid/res/drawable-xhdpi/wifi_ap_private.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
F-Droid/res/drawable-xhdpi/wifi_ap_public.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

28
F-Droid/res/drawable/swap_action_button_skin.xml
View File

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<solid android:color="@color/swap_light_blue_pressed" />
<padding
android:left="26.9dp"
android:top="17.9dp"
android:right="26.9dp"
android:bottom="17.9dp" />
<!--
Padding left/right = 48px * 90dpi / 160dpi = ~26.9dp
Padding top/bottom = 32px * 90dpi / 160dpi = ~17.9dp
-->
</shape>
</item>
<item>
<shape>
<solid android:color="@color/swap_light_blue" />
<padding
android:left="26.9dp"
android:top="17.9dp"
android:right="26.9dp"
android:bottom="17.9dp" />
</shape>
</item>
</selector>

20
F-Droid/res/drawable/swap_button_normal.xml
View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/white" />
<padding
android:top="1dp"/>
</shape>
</item>
<item>
<shape>
<solid android:color="@color/swap_blue" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
</layer-list>

20
F-Droid/res/drawable/swap_button_pressed.xml
View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/white" />
<padding
android:top="1dp"/>
</shape>
</item>
<item>
<shape>
<solid android:color="@color/swap_blue_pressed" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
</layer-list>

5
F-Droid/res/drawable/swap_button_skin.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/swap_button_pressed" />
<item android:drawable="@drawable/swap_button_normal" />
</selector>

23
F-Droid/res/drawable/swap_confirm_button_skin.xml
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<solid android:color="@color/swap_confirm_pressed" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
<item>
<shape>
<solid android:color="@color/swap_confirm" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
</selector>

23
F-Droid/res/drawable/swap_deny_button_skin.xml
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<solid android:color="@color/swap_deny_pressed" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
<item>
<shape>
<solid android:color="@color/swap_deny" />
<padding
android:left="10dp"
android:top="10dp"
android:right="10dp"
android:bottom="10dp" />
</shape>
</item>
</selector>

8
F-Droid/res/drawable/swap_start_button_skin.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/swap_light_blue" />
</shape>
</item>
</selector>

5
F-Droid/res/drawable/swap_wifi_likely_to_work.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/swap_wifi_likely_to_work" />
<size android:width="88dp" android:height="7dp" />
</shape>

5
F-Droid/res/drawable/swap_wifi_may_work.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/swap_wifi_may_work"/>
<size android:width="88dp" android:height="7dp" />
</shape>

4
F-Droid/res/drawable/swap_window_background.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/swap_blue" />
</shape>

5
F-Droid/res/layout/swap_app_list_item.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
@ -31,6 +33,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/swap_light_blue"
backgroundTint="@color/swap_light_blue"
android:textColor="@android:color/white"
android:text="@string/menu_install"/>

4
F-Droid/res/layout/swap_confirm_receive.xml
View File

@ -56,6 +56,7 @@
<Button
android:id="@+id/no_button"
android:text="@string/no"
android:backgroundTint="@color/swap_deny"
app:backgroundTint="@color/swap_deny"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -67,7 +68,8 @@
<Button
android:id="@+id/yes_button"
android:text="@string/yes"
app:backgroundTint="@color/swap_confirm"
android:backgroundTint="@color/swap_light_blue"
app:backgroundTint="@color/swap_light_blue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>

24
F-Droid/res/layout/swap_connecting.xml
View File

@ -3,6 +3,7 @@
<org.fdroid.fdroid.views.swap.SwapConnecting
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -15,7 +16,7 @@
android:textSize="20sp"
android:padding="30dp"
android:textAlignment="center"
android:text="@string/swap_connecting" />
tools:text="@string/swap_connecting" />
<ProgressBar
android:layout_width="wrap_content"
@ -23,26 +24,25 @@
android:indeterminate="true"
android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/progress"
tools:text="Downloading index from http://10.0.0.4:8888/fdroid/repo"
android:padding="30dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/error"
android:textSize="20sp"
android:textAlignment="center"
android:text="@string/swap_connection_misc_error"
android:padding="30dp"
android:visibility="gone" />
android:visibility="gone"
android:padding="30dp" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/back"
android:text="@string/back"
android:visibility="gone" />
android:backgroundTint="@color/swap_light_blue"
app:backgroundTint="@color/swap_light_blue"
android:textColor="@android:color/white"
android:layout_gravity="center_horizontal"
android:visibility="gone"
android:text="@string/back" />
</org.fdroid.fdroid.views.swap.SwapConnecting>

118
F-Droid/res/layout/swap_learn_about_wifi.xml
View File

@ -1,118 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:gravity="bottom"
android:paddingBottom="20dp"
android:paddingTop="20dp"
tools:context=".views.swap.SwapActivity">
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
>
<ImageView
android:id="@+id/wifi_icon_public"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/wifi_ap_public"/>
<TextView
android:id="@+id/wifi_label_public"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wifi_ap_public"/>
<TextView
android:id="@+id/wifi_warning_public"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wifi_warning_public"/>
<ImageView
android:id="@+id/wifi_status_public"
android:src="@drawable/swap_wifi_may_work"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginRight="10dp"
android:layout_marginLeft="10dp">
<ImageView
android:id="@+id/wifi_icon_private"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/wifi_ap_private" />
<TextView
android:id="@+id/wifi_label_private"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wifi_ap_private" />
<TextView
android:id="@+id/wifi_warning_private"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wifi_warning_private" />
<ImageView
android:id="@+id/wifi_status_private"
android:src="@drawable/swap_wifi_likely_to_work"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
>
<ImageView
android:id="@+id/wifi_icon_personal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/wifi_ap_personal" />
<TextView
android:id="@+id/wifi_label_personal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wifi_ap_personal" />
<TextView
android:id="@+id/wifi_warning_personal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wifi_warning_personal" />
<ImageView
android:id="@+id/wifi_status_personal"
android:src="@drawable/swap_wifi_likely_to_work"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>

7
F-Droid/res/values/colors.xml
View File

@ -10,15 +10,8 @@
<color name="swap_incompatible">#ff7900</color>
<color name="swap_light_blue">#27aae1</color>
<color name="swap_light_blue_pressed">#ff98cce1</color>
<color name="swap_blue">#1c6bbc</color>
<color name="swap_blue_pressed">#ff6ca8d5</color>
<color name="swap_confirm">#ff27aae1</color>
<color name="swap_confirm_pressed">#ff2ed7eb</color>
<color name="swap_deny">#ff21488c</color>
<color name="swap_deny_pressed">#ff3096b9</color>
<color name="swap_wifi_may_work">#fbb040</color>
<color name="swap_wifi_likely_to_work">#00a14b</color>
<color name="swap_bright_blue">#00b9e6</color>
<color name="swap_light_text">#bbbbbb</color>
<color name="swap_grey_icon">#4a4a4a</color>

27
F-Droid/res/values/styles.xml
View File

@ -66,20 +66,6 @@
<style name="SwapTheme.AppList.ListItem" parent="AppThemeLight">
</style>
<style name="SwapTheme.StartSwap.StartButton">
<item name="android:layout_marginLeft">9dp</item> <!-- 16px * 96dpi / 160dpi -->
<item name="android:layout_marginRight">9dp</item> <!-- 16px * 96dpi / 160dpi -->
<item name="android:layout_height">63.3dp</item> <!-- 113px * 96dpi / 160dpi -->
<item name="android:layout_width">match_parent</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">18.5sp</item> <!-- 33px * 96dpi / 160dpi -->
<item name="android:background">@drawable/swap_start_button_skin</item>
<item name="android:drawableLeft">@drawable/ic_swap</item>
<item name="android:paddingLeft">10dp</item>
</style>
<style name="SwapTheme.AppList.SwapSuccess">
<item name="android:textAlignment">center</item>
<item name="android:gravity">center</item>
@ -180,19 +166,6 @@
<!--
Buttons used to ask the user to confirm they want to receive a swap repo from someone
-->
<style name="SwapTheme.Wizard.ReceiveSwap.ButtonBase" parent="SwapTheme.Wizard.ButtonBase">
<item name="android:layout_width">0dp</item>
</style>
<style name="SwapTheme.Wizard.ReceiveSwap.Confirm" parent="SwapTheme.Wizard.ReceiveSwap.ButtonBase">
<item name="android:background">@drawable/swap_confirm_button_skin</item>
<item name="android:layout_marginLeft">7dp</item>
</style>
<style name="SwapTheme.Wizard.ReceiveSwap.Deny" parent="SwapTheme.Wizard.ReceiveSwap.ButtonBase">
<item name="android:background">@drawable/swap_deny_button_skin</item>
<item name="android:layout_marginRight">7dp</item>
</style>
<style name="SwapTheme.Wizard.ReceiveSwap.MainText" parent="SwapTheme.Wizard.MainText">
<item name="android:textSize">33.6sp</item> <!-- 60 * 96dpi / 160dpi -->

2
F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java
View File

@ -87,7 +87,7 @@ public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity
int statusCode = intent.getIntExtra(UpdateService.EXTRA_STATUS_CODE, -1);
TextView progressText = ((TextView) findViewById(R.id.progress));
TextView progressText = ((TextView) findViewById(R.id.heading));
TextView errorText = ((TextView) findViewById(R.id.error));
Button backButton = ((Button) findViewById(R.id.back));