voussoir
/
trkpt
1
0
Fork 0
Code Issues Packages Projects Releases Activity

resume button layout (see #33)

master
y20k 2018-03-15 12:11:04 +01:00
parent e34187bb78
commit 871a1ceb90
10 changed files with 101 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -6,11 +6,11 @@
<uses-feature android:name="android.hardware.location.gps" android:required="true" />
<!-- NORMAL PERMISSIONS, automatically granted -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<!-- DANGEROUS PERMISSIONS, must request -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

89
app/src/main/res/layout/activity_main.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.design.widget.CoordinatorLayout 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"
@ -21,8 +20,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:clickable="true"
android:focusable="true"
android:contentDescription="@string/descr_fab_my_location"
android:focusable="true"
app:backgroundTint="@color/location_buttom_background"
app:fabSize="mini"
app:layout_constraintBottom_toBottomOf="@+id/fabMainButton"
@ -31,19 +30,66 @@
app:srcCompat="@drawable/ic_my_location_24dp" />
<!-- BUTTON SAVE AND CLEAR -->
<!-- BUTTON RESUME -->
<android.support.design.widget.FloatingActionButton
android:id="@+id/fabSubMenuButtonResume"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="28dp"
android:clickable="true"
android:contentDescription="@string/descr_fab_sub_menu_button_3"
android:focusable="true"
app:backgroundTint="@color/trackbook_red"
app:fabSize="mini"
app:layout_constraintBottom_toTopOf="@+id/fabSubMenuButtonSave"
app:layout_constraintEnd_toEndOf="@+id/fabSubMenuButtonSave"
app:layout_constraintStart_toStartOf="@+id/fabSubMenuButtonSave"
app:srcCompat="@drawable/ic_fiber_manual_record_white_24dp" />
<android.support.v7.widget.CardView
android:id="@+id/fabSubMenuLabelResume"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:clickable="true"
android:contentDescription="@string/descr_fab_sub_menu_label_3"
android:focusable="true"
app:cardBackgroundColor="@color/fab_button_card_background"
app:cardCornerRadius="4dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="true"
app:layout_constraintBottom_toBottomOf="@+id/fabSubMenuButtonResume"
app:layout_constraintEnd_toStartOf="@+id/fabSubMenuButtonResume"
app:layout_constraintTop_toTopOf="@+id/fabSubMenuButtonResume">
<TextView
android:layout_width="wrap_content"
android:layout_height="24dp"
android:paddingBottom="2dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="2dp"
android:text="@string/fab_sub_menu_resume"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/fab_button_card_text"
android:textStyle="bold" />
</android.support.v7.widget.CardView>
<!-- BUTTON SAVE -->
<android.support.design.widget.FloatingActionButton
android:id="@+id/fabSubMenuButtonSave"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginBottom="28dp"
android:clickable="true"
android:focusable="true"
android:contentDescription="@string/descr_fab_sub_menu_button_1"
android:focusable="true"
app:backgroundTint="@color/trackbook_green"
app:fabSize="mini"
app:layout_constraintBottom_toTopOf="@+id/fabSubMenuButtonClear"
app:layout_constraintEnd_toEndOf="@+id/fabSubMenuButtonClear"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/fabSubMenuButtonClear"
app:srcCompat="@drawable/ic_save_white_24dp" />
@ -54,8 +100,8 @@
android:layout_gravity="bottom|end"
android:layout_marginEnd="8dp"
android:clickable="true"
android:focusable="true"
android:contentDescription="@string/descr_fab_sub_menu_label_1"
android:focusable="true"
app:cardBackgroundColor="@color/fab_button_card_background"
app:cardCornerRadius="4dp"
app:cardElevation="4dp"
@ -74,9 +120,7 @@
android:text="@string/fab_sub_menu_save"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/fab_button_card_text"
android:textStyle="bold"
tools:layout_editor_absoluteX="110dp"
tools:layout_editor_absoluteY="239dp" />
android:textStyle="bold" />
</android.support.v7.widget.CardView>
@ -87,8 +131,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:clickable="true"
android:focusable="true"
android:contentDescription="@string/descr_fab_sub_menu_button_2"
android:focusable="true"
app:backgroundTint="@color/trackbook_blue"
app:fabSize="mini"
app:layout_constraintBottom_toTopOf="@+id/fabMainButton"
@ -102,8 +146,8 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:clickable="true"
android:focusable="true"
android:contentDescription="@string/descr_fab_sub_menu_label_2"
android:focusable="true"
app:cardBackgroundColor="@color/fab_button_card_background"
app:cardCornerRadius="4dp"
app:cardElevation="4dp"
@ -122,9 +166,7 @@
android:text="@string/fab_sub_menu_clear"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/fab_button_card_text"
android:textStyle="bold"
tools:layout_editor_absoluteX="124dp"
tools:layout_editor_absoluteY="447dp" />
android:textStyle="bold" />
</android.support.v7.widget.CardView>
@ -136,8 +178,8 @@
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:clickable="true"
android:focusable="true"
android:contentDescription="@string/descr_fab_main"
android:focusable="true"
app:backgroundTint="@color/trackbook_blue"
app:fabSize="normal"
app:layout_constraintBottom_toTopOf="@+id/navigation"
@ -160,14 +202,15 @@
app:layout_constraintRight_toRightOf="parent"
app:menu="@menu/menu_main" />
<org.y20k.trackbook.layout.NonSwipeableViewPager
android:id="@+id/fragmentContainer"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/navigation"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:id="@+id/fragmentContainer"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/navigation"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.design.widget.CoordinatorLayout>

8
app/src/main/res/values-de/strings.xml
View File

@ -19,11 +19,13 @@
<!-- snackbar messages -->
<string name="snackbar_message_tracking_stopped">Aufzeichnung angehalten</string>
<string name="snackbar_message_tracking_started">Aufzeichnung gestartet</string>
<string name="snackbar_message_tracking_resumed">Aufzeichnung fortgesetzt</string>
<string name="snackbar_message_location_offline">Standortdienste sind deaktiviert. Trackbook wird nicht funktionieren.</string>
<!-- fab sub menu -->
<string name="fab_sub_menu_clear">Zurücksetzen</string>
<string name="fab_sub_menu_save">Speichernn</string>
<string name="fab_sub_menu_resume">Fortsetzen</string>
<!-- dialogs -->
<string name="dialog_default_action_cancel">Abbrechen</string>
@ -96,10 +98,12 @@
<string name="descr_map_last_track">Kartierung der letzten Aufzeichnung</string>
<string name="descr_fab_my_location">Mein-Standort-Button</string>
<string name="descr_fab_main">Haupt-Aktionsbutton</string>
<string name="descr_fab_sub_menu_label_1">Beschreibung des Speichern-und-Zurücksetzen-Buttons</string>
<string name="descr_fab_sub_menu_button_1">kleiner Speichern-und-Zurücksetzen-Button</string>
<string name="descr_fab_sub_menu_label_1">Beschreibung des Speichern-Buttons</string>
<string name="descr_fab_sub_menu_button_1">kleiner Speichern-Button</string>
<string name="descr_fab_sub_menu_label_2">Beschreibung des Zurücksetzen-Buttons</string>
<string name="descr_fab_sub_menu_button_2">kleiner Zurücksetzen-Button</string>
<string name="descr_fab_sub_menu_label_3">Beschreibung des Fortsetzen-Buttons</string>
<string name="descr_fab_sub_menu_button_3">kleiner Fortsetzen-Button</string>
<string name="descr_statistics_sheet_headline">Überschrift der Statistik-Einblendung</string>
<string name="descr_statistics_sheet_icon">Informations-Icon</string>
<string name="descr_statistics_sheet_p_distance">Datenpunkt: Distanz</string>

4
app/src/main/res/values-id/strings.xml
View File

@ -19,11 +19,13 @@
<!-- snackbar messages -->
<string name="snackbar_message_tracking_stopped">Pelacakan berhenti</string>
<string name="snackbar_message_tracking_started">Pelacakan dimulai</string>
<string name="snackbar_message_tracking_resumed">Tracking resumed</string>
<string name="snackbar_message_location_offline">Location is turned off. Trackbook will not work.</string>
<!-- fab sub menu -->
<string name="fab_sub_menu_clear">Clear</string>
<string name="fab_sub_menu_save">Save and Clear</string>
<string name="fab_sub_menu_resume">Resume</string>
<!-- dialogs -->
<string name="dialog_default_action_cancel">Cancel</string>
@ -100,6 +102,8 @@
<string name="descr_fab_sub_menu_button_1">small Save and Clear button</string>
<string name="descr_fab_sub_menu_label_2">Label of the Clear button</string>
<string name="descr_fab_sub_menu_button_2">small Clear button</string>
<string name="descr_fab_sub_menu_label_3">Label of the Resume button</string>
<string name="descr_fab_sub_menu_button_3">small Resume button</string>
<string name="descr_statistics_sheet_headline">Headline of the statistics sheet</string>
<string name="descr_statistics_sheet_icon">Icon of a bar chart</string>
<string name="descr_statistics_sheet_p_distance">Data point: Distance</string>

4
app/src/main/res/values-it/strings.xml
View File

@ -19,11 +19,13 @@
<!-- snackbar messages -->
<string name="snackbar_message_tracking_stopped">Tracciamento interrotto</string>
<string name="snackbar_message_tracking_started">Tracciamento avviato</string>
<string name="snackbar_message_tracking_resumed">Tracking resumed</string>
<string name="snackbar_message_location_offline">La posizione è disattivata. Trackbook non può funzionare.</string>
<!-- fab sub menu -->
<string name="fab_sub_menu_clear">Cancella</string>
<string name="fab_sub_menu_save">Salva e ripristina la mappa</string>
<string name="fab_sub_menu_resume">Resume</string>
<!-- dialogs -->
<string name="dialog_default_action_cancel">Annulla</string>
@ -100,6 +102,8 @@
<string name="descr_fab_sub_menu_button_1">piccolo pulsante Salva e ripristina la mappa</string>
<string name="descr_fab_sub_menu_label_2">Etichetta del pulsante Cancella</string>
<string name="descr_fab_sub_menu_button_2">piccolo pulsante Cancella</string>
<string name="descr_fab_sub_menu_label_3">Label of the Resume button</string>
<string name="descr_fab_sub_menu_button_3">small Resume button</string>
<string name="descr_statistics_sheet_headline">Titolo scheda statistiche</string>
<string name="descr_statistics_sheet_icon">Icona grafico a barre</string>
<string name="descr_statistics_sheet_p_distance">Data point: Distanza</string>

4
app/src/main/res/values-ja/strings.xml
View File

@ -19,11 +19,13 @@
<!-- snackbar messages -->
<string name="snackbar_message_tracking_stopped">トレースを停止しました</string>
<string name="snackbar_message_tracking_started">トレースを開始しました</string>
<string name="snackbar_message_tracking_resumed">Tracking resumed</string>
<string name="snackbar_message_location_offline">位置情報がオフです。Trackbook は動作しません。</string>
<!-- fab sub menu -->
<string name="fab_sub_menu_clear">クリア</string>
<string name="fab_sub_menu_save">保存してクリア</string>
<string name="fab_sub_menu_resume">Resume</string>
<!-- dialogs -->
<string name="dialog_default_action_cancel">キャンセル</string>
@ -100,6 +102,8 @@
<string name="descr_fab_sub_menu_button_1">小さな保存してクリア ボタン</string>
<string name="descr_fab_sub_menu_label_2">クリア ボタンのラベル</string>
<string name="descr_fab_sub_menu_button_2">小さなクリア ボタン</string>
<string name="descr_fab_sub_menu_label_3">Label of the Resume button</string>
<string name="descr_fab_sub_menu_button_3">small Resume button</string>
<string name="descr_statistics_sheet_headline">統計情報シートの見出し</string>
<string name="descr_statistics_sheet_icon">情報アイコン</string>
<string name="descr_statistics_sheet_p_distance">データ地点: 距離</string>

4
app/src/main/res/values-nb-rNO/strings.xml
View File

@ -19,11 +19,13 @@
<!-- snackbar messages -->
<string name="snackbar_message_tracking_stopped">Sporing stoppet</string>
<string name="snackbar_message_tracking_started">Sporing startet</string>
<string name="snackbar_message_tracking_resumed">Tracking resumed</string>
<string name="snackbar_message_location_offline">Plassering avskrudd. Trackbook bil ikke fungere.</string>
<!-- fab sub menu -->
<string name="fab_sub_menu_clear">Tøm</string>
<string name="fab_sub_menu_save">Lagre og tøm</string>
<string name="fab_sub_menu_resume">Resume</string>
<!-- dialogs -->
<string name="dialog_default_action_cancel">Avbryt</string>
@ -100,6 +102,8 @@
<string name="descr_fab_sub_menu_button_1">liten Lagre- og Tøm-knapp</string>
<string name="descr_fab_sub_menu_label_2">Etikett for Tøm-knappen</string>
<string name="descr_fab_sub_menu_button_2">liten Tøm-knapp</string>
<string name="descr_fab_sub_menu_label_3">Label of the Resume button</string>
<string name="descr_fab_sub_menu_button_3">small Resume button</string>
<string name="descr_statistics_sheet_headline">Overskrift for statistikkarket</string>
<string name="descr_statistics_sheet_icon">Informasjonsikon</string>
<string name="descr_statistics_sheet_p_distance">Datapunkt: Distanse</string>

4
app/src/main/res/values-nl/strings.xml
View File

@ -19,11 +19,13 @@
<!-- snackbar messages -->
<string name="snackbar_message_tracking_stopped">Bijhouden gestopt</string>
<string name="snackbar_message_tracking_started">Bijhouden gestart</string>
<string name="snackbar_message_tracking_resumed">Tracking resumed</string>
<string name="snackbar_message_location_offline">Locatie is uitgeschakeld; Trackbook zal niet werken.</string>
<!-- fab sub menu -->
<string name="fab_sub_menu_clear">Wissen</string>
<string name="fab_sub_menu_save">Opslaan en wissen</string>
<string name="fab_sub_menu_resume">Resume</string>
<!-- dialogs -->
<string name="dialog_default_action_cancel">Cancel</string>
@ -100,6 +102,8 @@
<string name="descr_fab_sub_menu_button_1">kleine Opslaan en wissen-knop</string>
<string name="descr_fab_sub_menu_label_2">Label van de Wissen-knop</string>
<string name="descr_fab_sub_menu_button_2">kleine Wissen-knop</string>
<string name="descr_fab_sub_menu_label_3">Label of the Resume button</string>
<string name="descr_fab_sub_menu_button_3">small Resume button</string>
<string name="descr_statistics_sheet_headline">Kop van het statistiekenblad</string>
<string name="descr_statistics_sheet_icon">Informatiepictogram</string>
<string name="descr_statistics_sheet_p_distance">Gegevenspunt: afstand</string>

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

@ -19,11 +19,13 @@
<!-- snackbar messages -->
<string name="snackbar_message_tracking_stopped">Tracking stopped</string>
<string name="snackbar_message_tracking_started">Tracking started</string>
<string name="snackbar_message_tracking_resumed">Tracking resumed</string>
<string name="snackbar_message_location_offline">Location is turned off. Trackbook will not work.</string>
<!-- fab sub menu -->
<string name="fab_sub_menu_clear">Clear</string>
<string name="fab_sub_menu_save">Save</string>
<string name="fab_sub_menu_resume">Resume</string>
<!-- dialogs -->
<string name="dialog_default_action_cancel">Cancel</string>
@ -96,10 +98,12 @@
<string name="descr_map_last_track">Mapping of last track</string>
<string name="descr_fab_my_location">My Location Button</string>
<string name="descr_fab_main">Main Action Button</string>
<string name="descr_fab_sub_menu_label_1">Label of the Save and Clear button</string>
<string name="descr_fab_sub_menu_button_1">small Save and Clear button</string>
<string name="descr_fab_sub_menu_label_1">Label of the Save button</string>
<string name="descr_fab_sub_menu_button_1">small Save button</string>
<string name="descr_fab_sub_menu_label_2">Label of the Clear button</string>
<string name="descr_fab_sub_menu_button_2">small Clear button</string>
<string name="descr_fab_sub_menu_label_3">Label of the Resume button</string>
<string name="descr_fab_sub_menu_button_3">small Resume button</string>
<string name="descr_statistics_sheet_headline">Headline of the statistics sheet</string>
<string name="descr_statistics_sheet_icon">Information icon</string>
<string name="descr_statistics_sheet_p_distance">Data point: Distance</string>

4
build.gradle
View File

@ -20,8 +20,8 @@ allprojects {
}
project.ext {
applicationId = 'org.y20k.trackbook'
versionCode = 21
versionName = '1.1.5'
versionCode = 22
versionName = '1.1.6'
minSdkVersion = 22
compileSdkVersion = 27
targetSdkVersion = 27