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

reactivated resume buttons again

master
y20k 2018-03-20 20:43:00 +01:00
parent eb5a89b398
commit be849ef95a
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -12,7 +12,7 @@ android {
versionName project.ext.versionName
vectorDrawables.useSupportLibrary = true
resConfigs "en", "de", "id", "it", "ja", "nb-rNO", "nl", "v21", "w820dp"
resConfigs "en", "de", "id", "it", "ja", "nb-rNO", "nl"
}
buildTypes {
release {

2
app/proguard-rules.pro vendored
View File

@ -19,4 +19,4 @@
# needed for osmdroid v5.6.5 if using SDK version 26 TODO remove as soom as osmdroid v5.6.6 is released
# see https://github.com/osmdroid/osmdroid/issues/633
-dontwarn org.osmdroid.tileprovider.modules.NetworkAvailabliltyCheck
# -dontwarn org.osmdroid.tileprovider.modules.NetworkAvailabliltyCheck

8
app/src/main/java/org/y20k/trackbook/MainActivity.java
View File

@ -567,16 +567,16 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys {
/* Shows (and hides) the sub menu of the floating action button */
private void showFloatingActionButtonMenu(boolean visible) {
if (visible) {
// mFloatingActionButtonSubResume.setVisibility(View.VISIBLE);
// mFloatingActionButtonSubResumeLabel.setVisibility(View.VISIBLE);
mFloatingActionButtonSubResume.setVisibility(View.VISIBLE);
mFloatingActionButtonSubResumeLabel.setVisibility(View.VISIBLE);
mFloatingActionButtonSubClear.setVisibility(View.VISIBLE);
mFloatingActionButtonSubClearLabel.setVisibility(View.VISIBLE);
mFloatingActionButtonSubSave.setVisibility(View.VISIBLE);
mFloatingActionButtonSubSaveLabel.setVisibility(View.VISIBLE);
mFloatingActionButtonSubMenuVisible = true;
} else {
// mFloatingActionButtonSubResume.setVisibility(View.INVISIBLE);
// mFloatingActionButtonSubResumeLabel.setVisibility(View.INVISIBLE);
mFloatingActionButtonSubResume.setVisibility(View.INVISIBLE);
mFloatingActionButtonSubResumeLabel.setVisibility(View.INVISIBLE);
mFloatingActionButtonSubClear.setVisibility(View.INVISIBLE);
mFloatingActionButtonSubClearLabel.setVisibility(View.INVISIBLE);
mFloatingActionButtonSubSaveLabel.setVisibility(View.INVISIBLE);

4
app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.java
View File

@ -89,8 +89,8 @@ public final class NotificationHelper implements TrackbookKeys {
builder.setContentTitle(context.getString(R.string.notification_title_trackbook_running));
builder.setContentText(getContextString(context, track));
} else {
// builder.addAction(R.drawable.ic_fiber_manual_record_white_24dp, context.getString(R.string.notification_resume), resuneActionPendingIntent);
// builder.addAction(R.drawable.ic_compass_needle_white_24dp, context.getString(R.string.notification_show), tapActionPendingIntent);
builder.addAction(R.drawable.ic_fiber_manual_record_white_24dp, context.getString(R.string.notification_resume), resuneActionPendingIntent);
builder.addAction(R.drawable.ic_compass_needle_white_24dp, context.getString(R.string.notification_show), tapActionPendingIntent);
builder.setContentTitle(context.getString(R.string.notification_title_trackbook_not_running));
builder.setContentText(getContextString(context, track));
}

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

@ -134,7 +134,6 @@
android:clickable="true"
android:contentDescription="@string/descr_fab_sub_menu_button_resume"
android:focusable="true"
android:visibility="gone"
app:backgroundTint="@color/trackbook_blue"
app:fabSize="mini"
app:layout_constraintBottom_toTopOf="@+id/fabMainButton"
@ -150,7 +149,6 @@
android:clickable="true"
android:contentDescription="@string/descr_fab_sub_menu_label_resume"
android:focusable="true"
android:visibility="gone"
app:cardBackgroundColor="@color/fab_button_card_background"
app:cardCornerRadius="4dp"
app:cardElevation="4dp"
@ -166,7 +164,6 @@
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="2dp"
android:visibility="gone"
android:text="@string/fab_sub_menu_resume"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/fab_button_card_text"

4
build.gradle
View File

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