eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-30 01:16:40 +00:00
Code Activity

new SAP background image

Browse Source
This commit is contained in:
Peter Siegmund
2016-02-19 14:03:46 +01:00
parent b571aaaa44
commit cc71402aa4
8 changed files with 135 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.android.tracking.app/res/drawable/working_title.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 666 KiB

After

Width:  |  Height:  |  Size: 1.1 MiB

mobile/com.sap.sailing.buoy.positioning/res/drawable/working_title.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 MiB

mobile/com.sap.sailing.racecommittee.app/res/drawable-sw600dp/backdrop.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 MiB

mobile/com.sap.sailing.racecommittee.app/res/drawable/backdrop.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 2.0 MiB

mobile/com.sap.sailing.racecommittee.app/res/drawable/nav_drawer_header.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 666 KiB

After

Width:  |  Height:  |  Size: 1.3 MiB

mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_normal.xml
+61 -53
View File
@@ -35,62 +35,70 @@
android:textColor="@color/constant_white"
android:textSize="@dimen/textSize_40" />
<LinearLayout
android:id="@+id/button_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="@dimen/default_margin_half"
android:alpha="0"
android:orientation="horizontal"
tools:alpha="1">
<ImageView
android:id="@+id/more"
style="?attr/round"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginRight="@dimen/default_margin_half"
android:src="@drawable/ic_more_vert_white_48dp" />
</LinearLayout>
<TextView
android:id="@+id/backdrop_login"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/button_bar"
android:alpha="0"
android:drawableLeft="@drawable/ic_assignment_white_48dp"
android:drawablePadding="@dimen/default_padding_half"
android:gravity="center_vertical"
android:paddingBottom="@dimen/default_padding_half"
android:paddingLeft="@dimen/default_padding_half"
android:paddingRight="@dimen/default_padding_half"
android:paddingTop="@dimen/default_padding"
android:text="@string/login_sub_text"
android:textColor="@color/constant_white"
android:textSize="@dimen/textSize_40" />
android:layout_height="wrap_content"
android:background="@color/constant_black_transparent"
android:id="@+id/gradient"
android:alpha="0">
<TextView
android:id="@+id/backdrop_onboarding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/button_bar"
android:alpha="0"
android:drawableLeft="@drawable/ic_assignment_white_48dp"
android:drawablePadding="@dimen/default_padding_half"
android:gravity="center_vertical"
android:paddingBottom="@dimen/default_padding_half"
android:paddingLeft="@dimen/default_padding_half"
android:paddingRight="@dimen/default_padding_half"
android:paddingTop="@dimen/default_padding"
android:text="@string/login_onboarding_text"
android:textColor="@color/constant_white"
android:textSize="@dimen/textSize_40" />
<LinearLayout
android:id="@+id/button_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0"
android:orientation="horizontal"
tools:alpha="1"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true">
<ImageView
android:id="@+id/more"
style="?attr/round"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginRight="@dimen/default_margin_half"
android:src="@drawable/ic_more_vert_white_48dp"
android:layout_marginBottom="@dimen/default_margin_half" />
</LinearLayout>
<TextView
android:id="@+id/backdrop_login"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/button_bar"
android:alpha="0"
android:drawableLeft="@drawable/ic_assignment_white_48dp"
android:drawablePadding="@dimen/default_padding_half"
android:gravity="center_vertical"
android:paddingBottom="@dimen/default_padding_half"
android:paddingLeft="@dimen/default_padding_half"
android:paddingRight="@dimen/default_padding_half"
android:paddingTop="@dimen/default_padding"
android:text="@string/login_sub_text"
android:textColor="@color/constant_white"
android:textSize="@dimen/textSize_40" />
<TextView
android:id="@+id/backdrop_onboarding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/button_bar"
android:alpha="0"
android:drawableLeft="@drawable/ic_assignment_white_48dp"
android:drawablePadding="@dimen/default_padding_half"
android:gravity="center_vertical"
android:paddingBottom="@dimen/default_padding_half"
android:paddingLeft="@dimen/default_padding_half"
android:paddingRight="@dimen/default_padding_half"
android:paddingTop="@dimen/default_padding"
android:text="@string/login_onboarding_text"
android:textColor="@color/constant_white"
android:textSize="@dimen/textSize_40" />
</RelativeLayout>
<View
android:id="@+id/line"
mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_xlarge.xml
+70 -62
View File
@@ -32,72 +32,80 @@
android:textColor="@color/constant_white"
android:textSize="@dimen/textSize_40" />
<LinearLayout
android:id="@id/button_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="@dimen/default_margin"
android:alpha="0"
android:orientation="horizontal"
tools:alpha="1">
<ImageView
android:id="@+id/settings_button"
style="?attr/round"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginRight="@dimen/default_margin_half"
android:src="@drawable/ic_settings_white_48dp" />
<ImageView
android:id="@+id/technical_info"
style="?attr/round"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginRight="@dimen/default_margin_half"
android:src="@drawable/ic_info_outline_white_48dp" />
<ImageView
android:id="@+id/refresh_data"
style="?attr/round"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginRight="@dimen/default_margin_half"
android:src="@drawable/ic_refresh_white_48dp" />
</LinearLayout>
<TextView
android:id="@+id/backdrop_login"
<RelativeLayout
android:id="@+id/gradient"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/constant_black_transparent"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/button_bar"
android:alpha="0"
android:drawableLeft="@drawable/ic_assignment_white_48dp"
android:drawablePadding="@dimen/default_padding_half"
android:gravity="center_vertical"
android:padding="@dimen/default_padding"
android:text="@string/login_sub_text"
android:textColor="@color/constant_white"
android:textSize="@dimen/textSize_40" />
android:alpha="0">
<TextView
android:id="@+id/backdrop_onboarding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/button_bar"
android:alpha="0"
android:drawableLeft="@drawable/ic_assignment_white_48dp"
android:drawablePadding="@dimen/default_padding_half"
android:gravity="center_vertical"
android:padding="@dimen/default_padding"
android:text="@string/login_onboarding_text"
android:textColor="@color/constant_white"
android:textSize="@dimen/textSize_40" />
<LinearLayout
android:id="@id/button_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0"
android:orientation="horizontal"
tools:alpha="1"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true">
<ImageView
android:id="@+id/settings_button"
style="?attr/round"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginRight="@dimen/default_margin_half"
android:src="@drawable/ic_settings_white_48dp"
android:layout_marginBottom="@dimen/default_margin" />
<ImageView
android:id="@+id/technical_info"
style="?attr/round"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginRight="@dimen/default_margin_half"
android:src="@drawable/ic_info_outline_white_48dp" />
<ImageView
android:id="@+id/refresh_data"
style="?attr/round"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginRight="@dimen/default_margin_half"
android:src="@drawable/ic_refresh_white_48dp" />
</LinearLayout>
<TextView
android:id="@+id/backdrop_login"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/button_bar"
android:alpha="0"
android:drawableLeft="@drawable/ic_assignment_white_48dp"
android:drawablePadding="@dimen/default_padding_half"
android:gravity="center_vertical"
android:padding="@dimen/default_padding"
android:text="@string/login_sub_text"
android:textColor="@color/constant_white"
android:textSize="@dimen/textSize_40" />
<TextView
android:id="@+id/backdrop_onboarding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/button_bar"
android:alpha="0"
android:drawableLeft="@drawable/ic_assignment_white_48dp"
android:drawablePadding="@dimen/default_padding_half"
android:gravity="center_vertical"
android:padding="@dimen/default_padding"
android:text="@string/login_onboarding_text"
android:textColor="@color/constant_white"
android:textSize="@dimen/textSize_40" />
</RelativeLayout>
<View
android:id="@+id/line"
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
+4 -3
View File
@@ -19,7 +19,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.Nullable;
import android.support.annotation.NonNull;
import android.support.v4.content.LocalBroadcastManager;
import android.text.TextUtils;
import android.view.View;
@@ -508,6 +508,7 @@ public class LoginActivity extends BaseActivity
animators.add(heightAnimation);
animators.add(frameAnimation);
animators.add(getAlphaRevAnimator(findViewById(R.id.backdrop_title)));
animators.add(getAlphaAnimator(findViewById(R.id.gradient)));
animators.add(getAlphaAnimator(findViewById(R.id.backdrop_login)));
animators.add(getAlphaAnimator(findViewById(R.id.backdrop_onboarding)));
animators.add(getAlphaAnimator(findViewById(R.id.button_bar)));
@@ -520,11 +521,11 @@ public class LoginActivity extends BaseActivity
animatorSet.start();
}
private ObjectAnimator getAlphaAnimator(@Nullable Object target) {
private ObjectAnimator getAlphaAnimator(@NonNull Object target) {
return ObjectAnimator.ofFloat(target, "alpha", 0f, 1f);
}
private ObjectAnimator getAlphaRevAnimator(@Nullable Object target) {
private ObjectAnimator getAlphaRevAnimator(@NonNull Object target) {
return ObjectAnimator.ofFloat(target, "alpha", 1f, 0f);
}