eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-19 04:05:36 +00:00
Code Activity

preferences are now plain Theme.AppCompat.Light.NoActionBar (with the "light" primary, primaryDark und accent color)

Browse Source
This commit is contained in:
Peter Siegmund
2016-04-01 12:48:21 +02:00
parent 4775f9bba5
commit 9b9dddc3fc
15 changed files with 190 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
+36 -35
View File
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.sap.sailing.racecommittee.app"
xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="7"
android:versionName="7 - Laser">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.sap.sailing.racecommittee.app"
android:versionCode="7"
android:versionName="7 - Laser">
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="22"/>
android:targetSdkVersion="22" />
<permission
android:name="com.sap.sailing.racecommittee.app.MAPS_RECEIVE"
android:protectionLevel="signature"/>
android:protectionLevel="signature" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<!--<uses-permission android:name="android.permission.CAMERA"/>-->
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.INTERNET" />
<!--<uses-permission android:name="android.permission.RECORD_AUDIO"/>-->
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
<uses-permission android:name="com.sap.sailing.racecommittee.app.MAPS_RECEIVE"/>
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
<!--<uses-permission android:name="com.sap.sailing.racecommittee.app.MAPS_RECEIVE" />-->
<uses-feature
android:glEsVersion="0x00020000"
android:required="true"/>
android:required="true" />
<uses-feature
android:name="android.hardware.camera"
android:required="false"/>
android:required="false" />
<application
android:name=".RaceApplication"
@@ -39,54 +39,55 @@
android:theme="@style/AppTheme.Light">
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version"/>
android:value="@integer/google_play_services_version" />
<meta-data
android:name="com.google.android.maps.v2.API_KEY"
android:value="AIzaSyDH-Dwy5yFlyBa2-VUgiZ3qGGUO8M_0MPY"/>
android:value="AIzaSyDH-Dwy5yFlyBa2-VUgiZ3qGGUO8M_0MPY" />
<activity android:name=".ui.activities.LoginActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".ui.activities.RacingActivity" />
<activity android:name=".ui.activities.PasswordActivity" />
<activity
android:name=".ui.activities.LoginActivity">
android:name=".ui.activities.PreferenceActivity"
android:theme="@style/PreferenceTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".ui.activities.RacingActivity"/>
<activity android:name=".ui.activities.PasswordActivity"/>
<activity android:name=".ui.activities.PreferenceActivity">
<intent-filter>
<action android:name="android.intent.action.MANAGE_NETWORK_USAGE"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity android:name=".ui.activities.SystemInformationActivity"/>
<activity android:name=".ui.activities.SystemInformationActivity" />
<service
android:name=".services.RaceStateService"
android:enabled="true"
android:exported="false">
<intent-filter>
<action android:name="com.sap.sailing.racecommittee.app.action.startProcedureSpecificAction"/>
<action android:name="com.sap.sailing.racecommittee.app.action.startProcedureSpecificAction" />
</intent-filter>
</service>
<service
android:name="com.sap.sailing.android.shared.services.sending.MessageSendingService"
android:exported="false">
<intent-filter>
<action android:name="com.sap.sailing.racecommittee.app.action.sendSavedIntents"/>
<action android:name="com.sap.sailing.racecommittee.app.action.sendMessage"/>
<action android:name="com.sap.sailing.racecommittee.app.action.sendSavedIntents" />
<action android:name="com.sap.sailing.racecommittee.app.action.sendMessage" />
</intent-filter>
<meta-data
android:name="com.sap.sailing.android.shared.services.sending.messageRestorer"
android:value="com.sap.sailing.racecommittee.app.services.sending.EventRestorer"/>
android:value="com.sap.sailing.racecommittee.app.services.sending.EventRestorer" />
</service>
<receiver android:name="com.sap.sailing.android.shared.services.sending.ConnectivityChangedReceiver">
<intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
</intent-filter>
</receiver>
</application>
mobile/com.sap.sailing.racecommittee.app/res/layout/pref_header.xml
+2 -2
View File
@@ -15,7 +15,7 @@
android:drawablePadding="32dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="?attr/textXSmall"
android:paddingRight="8dp"
tools:text="@string/settings_category_general" />
<View
@@ -24,5 +24,5 @@
android:layout_height="@dimen/thin_line"
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/preference_line_margin"
android:background="?attr/sap_gray" />
android:background="@color/light_sap_gray" />
</RelativeLayout>
mobile/com.sap.sailing.racecommittee.app/res/layout/preference_view.xml
+2 -2
View File
@@ -4,11 +4,11 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical"
android:background="?attr/sap_gray_black_30">
android:background="@color/light_sap_gray_black_30">
<include
android:id="@+id/toolbar_layout"
layout="@layout/toolbar" />
layout="@layout/toolbar_pref" />
<FrameLayout
android:id="@+id/content_frame"
mobile/com.sap.sailing.racecommittee.app/res/layout/toolbar_pref_normal.xml
+56
View File
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
android:id="@+id/toolbar_layout"
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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
app:theme="@style/ToolBarStyle"
app:popupTheme="@style/Theme.AppCompat.Light">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
tools:text="AUSWAHL"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:gravity="center"
android:minHeight="?attr/actionBarSize"
android:orientation="horizontal">
<ProgressBar
android:id="@+id/progress_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:indeterminate="true"
android:visibility="gone"/>
</LinearLayout>
</android.support.v7.widget.Toolbar>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/thick_line"
android:layout_below="@id/toolbar"
android:background="@color/sap_yellow"/>
</RelativeLayout>
mobile/com.sap.sailing.racecommittee.app/res/layout/toolbar_pref_xlarge.xml
+57
View File
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
android:id="@+id/toolbar_layout"
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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
app:theme="@style/ToolBarRacingStyle"
app:popupTheme="@style/Theme.AppCompat.Light"
app:titleTextAppearance="@style/RacingToolBarTitle">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
tools:text="AUSWAHL"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:gravity="center"
android:minHeight="?attr/actionBarSize"
android:orientation="horizontal">
<ProgressBar
android:id="@+id/progress_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:indeterminate="true"
android:visibility="gone"/>
</LinearLayout>
</android.support.v7.widget.Toolbar>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/thick_line"
android:layout_below="@id/toolbar"
android:background="@color/sap_yellow"/>
</RelativeLayout>
mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp-land/dimens.xml
+2
View File
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="preference_columns" format="integer" type="integer">2</item>
<dimen name="navigation_drawer_width">500dp</dimen>
<dimen name="side_button_lockSize">16dp</dimen>
mobile/com.sap.sailing.racecommittee.app/res/values-sw600dp/dimens.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<dimen name="preference_margin">16dp</dimen>
<dimen name="preference_line_margin">0dp</dimen>
<item name="preference_columns" format="integer" type="integer">2</item>
<item name="preference_columns" format="integer" type="integer">1</item>
<!-- race state dependent -->
<!-- login -->
mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/dimens.xml
+1
View File
@@ -47,6 +47,7 @@
<dimen name="flags">96dp</dimen>
<dimen name="preference_side_margin">72dp</dimen>
<item name="preference_columns" format="integer" type="integer">2</item>
<!-- custom dimens (float, integer) -->
<item name="picker_scale" format="float" type="integer">1.55</item>
mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml
+1
View File
@@ -17,5 +17,6 @@
<item name="race_schedule_procedure_pathfinder" type="layout">@layout/race_schedule_procedure_pathfinder_xlarge</item>
<item name="race_schedule_procedure_timing" type="layout">@layout/race_schedule_procedure_timing_xlarge</item>
<item name="toolbar" type="layout">@layout/toolbar_xlarge</item>
<item name="toolbar_pref" type="layout">@layout/toolbar_pref_xlarge</item>
</resources>
mobile/com.sap.sailing.racecommittee.app/res/values-v19/styles.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="PreferenceTheme" parent="PreferenceBase">
<item name="android:windowTranslucentStatus">true</item>
</style>
</resources>
mobile/com.sap.sailing.racecommittee.app/res/values-v21/styles.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="PreferenceTheme" parent="PreferenceBase">
<item name="android:colorPrimary">@color/light_colorPrimary</item>
<item name="android:colorPrimaryDark">@color/light_colorPrimaryDark</item>
<item name="android:colorAccent">@color/light_colorAccent</item>
<item name="android:windowTranslucentStatus">true</item>
</style>
</resources>
mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
+1
View File
@@ -29,6 +29,7 @@
<item name="race_schedule_start_time" type="layout">@layout/race_schedule_start_time_normal</item>
<item name="race_time_picker" type="layout">@layout/race_time_picker_normal</item>
<item name="toolbar" type="layout">@layout/toolbar_normal</item>
<item name="toolbar_pref" type="layout">@layout/toolbar_pref_normal</item>
<item name="wind_view" type="layout">@layout/wind_view_normal</item>
<item name="system_information_view" type="layout">@layout/system_information_view_normal</item>
mobile/com.sap.sailing.racecommittee.app/res/values/styles.xml
+10 -2
View File
@@ -22,6 +22,14 @@
<item name="android:textColor">@color/dialog_color_header</item>
</style>
<style name="PreferenceTheme" parent="PreferenceBase"/>
<style name="PreferenceBase" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/light_colorPrimary</item>
<item name="colorPrimaryDark">@color/light_colorPrimaryDark</item>
<item name="colorAccent">@color/light_colorAccent</item>
</style>
<style name="ToolBarStyle" parent="@style/ThemeOverlay.AppCompat.Dark">
<item name="android:textColorSecondary">@color/constant_white</item>
</style>
@@ -34,9 +42,9 @@
<style name="DrawerButton" parent="Widget.AppCompat.DrawerArrowToggle">
<item name="thickness">4dp</item>
<!--
<!--
<item name="barSize">30dp</item>
-->
-->
<item name="gapBetweenBars">6dp</item>
<item name="drawableSize">32dp</item>
<item name="spinBars">false</item>
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/PreferenceActivity.java
-2
View File
@@ -25,7 +25,6 @@ import com.sap.sailing.racecommittee.app.domain.configuration.impl.PreferencesRe
import com.sap.sailing.racecommittee.app.ui.fragments.MainPreferenceFragment;
import com.sap.sailing.racecommittee.app.ui.fragments.preference.RegattaPreferenceFragment;
import com.sap.sailing.racecommittee.app.utils.PreferenceHelper;
import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
public class PreferenceActivity extends AppCompatActivity {
@@ -80,7 +79,6 @@ public class PreferenceActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
AppUtils.lockOrientation(this);
ThemeHelper.setTheme(this);
setContentView(R.layout.preference_view);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/views/decoration/PreferenceMarginItemDecoration.java
+1 -2
View File
@@ -10,7 +10,6 @@ import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
public class PreferenceMarginItemDecoration extends RecyclerView.ItemDecoration {
@@ -20,7 +19,7 @@ public class PreferenceMarginItemDecoration extends RecyclerView.ItemDecoration
public PreferenceMarginItemDecoration(Context context, int margin) {
mMargin = margin;
mBackground = new ColorDrawable(ThemeHelper.getColor(context, R.attr.sap_gray_black_30));
mBackground = new ColorDrawable(context.getResources().getColor(R.color.light_sap_gray_black_30));
mItemHeight = context.getResources().getDimensionPixelSize(R.dimen.preference_item_height);
}