Manage POI
This commit is contained in:
parent
49a48fc371
commit
844be6a4a7
|
@ -29,7 +29,7 @@ public class ActivityMaintenance extends Activity
|
|||
|
||||
final static String prefsFileName = "com.jens.automation2_preferences.xml";
|
||||
|
||||
TextView tvFileStoreLocation;
|
||||
TextView tvFileStoreLocation, tvAppVersion;
|
||||
Button bVolumeTest, bMoreSettings, bSettingsSetToDefault, bShareConfigAndLog, bImportConfiguration, bExportConfiguration;
|
||||
|
||||
@Override
|
||||
|
@ -103,6 +103,13 @@ public class ActivityMaintenance extends Activity
|
|||
});
|
||||
|
||||
tvFileStoreLocation = (TextView)findViewById(R.id.tvFileStoreLocation);
|
||||
tvAppVersion = (TextView)findViewById(R.id.tvAppVersion);
|
||||
|
||||
tvAppVersion.setText(
|
||||
"Version: " + BuildConfig.VERSION_NAME + Miscellaneous.lineSeparator +
|
||||
"Version code: " + String.valueOf(BuildConfig.VERSION_CODE) + Miscellaneous.lineSeparator +
|
||||
"Flavor: " + BuildConfig.FLAVOR
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -193,8 +193,8 @@ public class ActivityManagePoi extends Activity
|
|||
|
||||
Miscellaneous.logEvent("i", "POI Manager", "Starting timeout for location search: " + String.valueOf(searchTimeout) + " seconds", 5);
|
||||
|
||||
TimerTask updateBall = new TimeoutTask();
|
||||
timer.scheduleAtFixedRate(updateBall, 0, searchTimeout * 1000);
|
||||
TimerTask timeoutTask = new TimeoutTask();
|
||||
timer.schedule(timeoutTask, searchTimeout * 1000);
|
||||
}
|
||||
|
||||
private void stopTimeout()
|
||||
|
|
|
@ -97,6 +97,15 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvAppVersion"
|
||||
android:layout_marginTop="@dimen/default_margin"
|
||||
android:layout_marginVertical="@dimen/default_margin"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:gravity="center_horizontal"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
</androidx.appcompat.widget.LinearLayoutCompat>
|
||||
|
||||
</ScrollView>
|
|
@ -2,10 +2,9 @@
|
|||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="10dp" >
|
||||
android:layout_margin="@dimen/default_margin" >
|
||||
|
||||
<LinearLayout
|
||||
android:layout_margin="@dimen/default_margin"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical" >
|
||||
|
@ -25,7 +24,9 @@
|
|||
|
||||
<TableLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_height="wrap_content"
|
||||
android:shrinkColumns="1"
|
||||
android:stretchColumns="1">
|
||||
|
||||
<TableRow
|
||||
android:layout_marginBottom="@dimen/activity_vertical_margin">
|
||||
|
|
|
@ -212,7 +212,7 @@
|
|||
<string name="anotherPoiByThatName">Es gibt bereits einen Ort mit diesem Namen.</string>
|
||||
<string name="anotherRuleByThatName">Es gibt bereits eine Regel mit diesem Namen.</string>
|
||||
<string name="startOtherActivity">Programm starten</string>
|
||||
<string name="selectApplication">Wählen Sie\neine Anwendung</string>
|
||||
<string name="selectApplication">Anwendung wählen</string>
|
||||
<string name="selectPackageOfApplication">Wählen Sie ein Paket der Anwendung</string>
|
||||
<string name="selectActivityToBeStarted">Wählen Sie die Activity des Pakets</string>
|
||||
<string name="errorStartingOtherActivity">Fehler beim Starten einer anderen Anwendung</string>
|
||||
|
|
|
@ -141,7 +141,7 @@
|
|||
<string name="exceeding">exedendo</string>
|
||||
<string name="droppingBelow">estendo menos que</string>
|
||||
<string name="anyWifi">algún wifi</string>
|
||||
<string name="selectApplication">Elija la app</string>
|
||||
<string name="selectApplication">Elija app</string>
|
||||
<string name="selectPackageOfApplication">Elija el paquete de la app</string>
|
||||
<string name="selectActivityToBeStarted">Elija la actividad de la app</string>
|
||||
<string name="errorStartingOtherActivity">Error encendiendo otra app</string>
|
||||
|
|
Loading…
Reference in New Issue