nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add information to onboarding activity, make strings translatable

This commit is contained in:
Andreas Shimokawa 2016-08-29 00:17:40 +02:00
parent c55369747d
commit 07ee860b1c
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/OnboardingActivity.java
View File

@ -33,7 +33,8 @@ public class OnboardingActivity extends GBActivity {
throw new IllegalArgumentException("Must provide a device when invoking this activity"); throw new IllegalArgumentException("Must provide a device when invoking this activity");
} }
importOldActivityDataButton = (Button) findViewById(R.id.mergeOldActivityData); importOldActivityDataButton = (Button) findViewById(R.id.button_import_old_activitydata);
importOldActivityDataButton.setText(String.format(getString(R.string.import_old_db_information), device.getName()));
final GBDevice finalDevice = device; final GBDevice finalDevice = device;
importOldActivityDataButton.setOnClickListener(new View.OnClickListener() { importOldActivityDataButton.setOnClickListener(new View.OnClickListener() {
@Override @Override

16
app/src/main/res/layout/activity_onboarding.xml
View File

@ -10,10 +10,22 @@
<Button <Button
android:id="@+id/mergeOldActivityData" android:id="@+id/button_import_old_activitydata"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="fill_horizontal" android:layout_gravity="fill_horizontal"
android:text="Merge old activity data" /> android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/import_old_db_buttonlabel" />
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/button_import_old_activitydata"
android:layout_alignParentEnd="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:text="@string/import_old_db_information" />
</RelativeLayout> </RelativeLayout>

6
app/src/main/res/values/strings.xml
View File

@ -284,4 +284,10 @@
<string name="appmanager_cached_watchapps_watchfaces">Apps in cache</string> <string name="appmanager_cached_watchapps_watchfaces">Apps in cache</string>
<string name="appmanager_installed_watchapps">Installed apps</string> <string name="appmanager_installed_watchapps">Installed apps</string>
<string name="appmanager_installed_watchfaces">Installed watchfaces</string> <string name="appmanager_installed_watchfaces">Installed watchfaces</string>
<string name="import_old_db_buttonlabel">Import old activity data</string>
<string name="import_old_db_information">Since Gadgetbridge 0.12.0 we use a new database format.
You are able to import old activity data and associate it with the device you are connecting to (%1$s).
Please note that you can import data from Mi Band, Pebble Health and Morpheuz but NOT from Pebble Misfit.
</string>
</resources> </resources>