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

changed licence into license

Browse Source
This commit is contained in:
Peter Siegmund committed 2016-03-10 17:40:33 +01:00
1 parent a81afae17b
commit aaf729e403
12 files changed
+25 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.android.shared/build.gradle
+1 -1
View File
@@ -51,7 +51,7 @@ dependencies {
/* Google Play Services */
compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
/* licence dialog */
/* license dialog */
compile("de.psdev.licensesdialog:licensesdialog:${rootProject.ext.license_dialog}")
/* all local jar-libs */
mobile/com.sap.sailing.android.shared/res/layout/fragment_about.xml
+2 -2
View File
@@ -11,7 +11,7 @@
/>
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/licence_button"
android:id="@+id/license_button"
android:layout_width="match_parent"
android:layout_height="@dimen/about_button_height"
android:layout_above="@id/center_anchor"
@@ -21,7 +21,7 @@
android:layout_marginRight="@dimen/about_button_side_margin"
android:layout_marginTop="@dimen/about_button_top_bottom_margin"
android:background="@drawable/rounded_btn_yellow"
android:text="@string/licence_information"
android:text="@string/license_information"
android:textAllCaps="false"
android:textSize="@dimen/about_button_text_size"
android:textStyle="bold"/>
mobile/com.sap.sailing.android.shared/res/values-de/strings.xml
+1 -1
View File
@@ -41,6 +41,6 @@
<!-- About this app -->
<string name="about_this_app">Über diese App</string>
<string name="eula">Datenschutz</string>
<string name="licence_information">Lizenzhinweise</string>
<string name="license_information">Lizenzhinweise</string>
</resources>
mobile/com.sap.sailing.android.shared/res/values/strings.xml
+1 -1
View File
@@ -57,7 +57,7 @@
<!-- About this app -->
<string name="about_this_app">About this app</string>
<string name="eula">EULA</string>
<string name="licence_information">Licence Information</string>
<string name="license_information">License Information</string>
<!-- HTTP Requests -->
<string name="http_request_exception" translatable="false">(Request %1$d) %2$s\nHTTP response code: %3$d.\nHTTP response body: %4$s.</string>
mobile/com.sap.sailing.android.tracking.app/build.gradle
+1 -1
View File
@@ -75,7 +75,7 @@ dependencies {
compile "com.google.android.gms:play-services-gcm:${rootProject.ext.play_services}"
compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
/* licence dialog */
/* license dialog */
compile("de.psdev.licensesdialog:licensesdialog:${rootProject.ext.license_dialog}")
/* local dependencies */
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/AboutFragment.java
+4 -4
View File
@@ -28,10 +28,10 @@ public class AboutFragment extends com.sap.sailing.android.ui.fragments.BaseFrag
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_about, container, false);
view.findViewById(R.id.licence_button).setOnClickListener(new View.OnClickListener() {
view.findViewById(R.id.license_button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showLicenceDialog();
showLicenseDialog();
}
});
view.findViewById(R.id.eula_button).setOnClickListener(new View.OnClickListener() {
@@ -45,7 +45,7 @@ public class AboutFragment extends com.sap.sailing.android.ui.fragments.BaseFrag
return view;
}
private void showLicenceDialog() {
private void showLicenseDialog() {
Notices notices = new Notices();
LicenseHelper licenseHelper = new LicenseHelper();
notices.addNotice(licenseHelper.getAndroidSupportNotice());
@@ -53,7 +53,7 @@ public class AboutFragment extends com.sap.sailing.android.ui.fragments.BaseFrag
notices.addNotice(licenseHelper.getJsonSimpleNotice());
notices.addNotice(licenseHelper.getDialogNotice());
LicensesDialog.Builder builder = new LicensesDialog.Builder(getActivity());
builder.setTitle(getString(R.string.licence_information));
builder.setTitle(getString(R.string.license_information));
builder.setNotices(notices);
builder.build().show();
}
mobile/com.sap.sailing.buoy.positioning/build.gradle
+1 -1
View File
@@ -74,7 +74,7 @@ dependencies {
/* Google Play Services */
compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
/* licence dialog */
/* license dialog */
compile("de.psdev.licensesdialog:licensesdialog:${rootProject.ext.license_dialog}")
/* local dependencies */
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/AboutFragment.java
+4 -4
View File
@@ -29,10 +29,10 @@ public class AboutFragment extends BaseFragment {
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_about, container, false);
view.findViewById(R.id.licence_button).setOnClickListener(new View.OnClickListener() {
view.findViewById(R.id.license_button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showLicenceDialog();
showLicenseDialog();
}
});
view.findViewById(R.id.eula_button).setOnClickListener(new View.OnClickListener() {
@@ -46,7 +46,7 @@ public class AboutFragment extends BaseFragment {
return view;
}
private void showLicenceDialog() {
private void showLicenseDialog() {
Notices notices = new Notices();
LicenseHelper licenseHelper = new LicenseHelper();
notices.addNotice(licenseHelper.getAndroidSupportNotice());
@@ -54,7 +54,7 @@ public class AboutFragment extends BaseFragment {
notices.addNotice(licenseHelper.getJsonSimpleNotice());
notices.addNotice(licenseHelper.getDialogNotice());
LicensesDialog.Builder builder = new LicensesDialog.Builder(getActivity());
builder.setTitle(getString(R.string.licence_information));
builder.setTitle(getString(R.string.license_information));
builder.setNotices(notices);
builder.build().show();
}
mobile/com.sap.sailing.racecommittee.app/build.gradle
+1 -1
View File
@@ -82,7 +82,7 @@ dependencies {
/* Google Play Services */
compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
/* licence dialog */
/* license dialog */
compile("de.psdev.licensesdialog:licensesdialog:${rootProject.ext.license_dialog}")
/* local dependencies */
mobile/com.sap.sailing.racecommittee.app/res/layout/system_information_view_normal.xml
+2 -2
View File
@@ -119,13 +119,13 @@
android:text="@string/eula"/>
<Button
android:id="@+id/licence_button"
android:id="@+id/license_button"
style="?buttonSolidSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:text="@string/licence_information"/>
android:text="@string/license_information"/>
</LinearLayout>
<TextView
mobile/com.sap.sailing.racecommittee.app/res/layout/system_information_view_xlarge.xml
+2 -2
View File
@@ -115,13 +115,13 @@
android:text="@string/eula"/>
<Button
android:id="@+id/licence_button"
android:id="@+id/license_button"
style="?buttonSolidSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:text="@string/licence_information"/>
android:text="@string/license_information"/>
</LinearLayout>
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SystemInformationActivityHelper.java
+5 -5
View File
@@ -107,22 +107,22 @@ public class SystemInformationActivityHelper {
private void setupAboutButtons() {
Button eulaButton = (Button) activity.findViewById(R.id.eula_button);
Button licenceButton = (Button) activity.findViewById(R.id.licence_button);
Button licenseButton = (Button) activity.findViewById(R.id.license_button);
eulaButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
EulaHelper.with(activity).openEulaPage();
}
});
licenceButton.setOnClickListener(new OnClickListener() {
licenseButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
showLicenceDialog();
showLicenseDialog();
}
});
}
private void showLicenceDialog() {
private void showLicenseDialog() {
Notices notices = new Notices();
LicenseHelper licenseHelper = new LicenseHelper();
notices.addNotice(licenseHelper.getAndroidSupportNotice());
@@ -130,7 +130,7 @@ public class SystemInformationActivityHelper {
notices.addNotice(licenseHelper.getJsonSimpleNotice());
notices.addNotice(licenseHelper.getDialogNotice());
LicensesDialog.Builder builder = new LicensesDialog.Builder(activity);
builder.setTitle(activity.getString(R.string.licence_information));
builder.setTitle(activity.getString(R.string.license_information));
builder.setNotices(notices);
builder.build().show();
}