From da8236062507dc0500aa7cf01804e47869ba310b Mon Sep 17 00:00:00 2001 From: y20k Date: Tue, 20 Sep 2016 13:51:17 +0200 Subject: [PATCH] some clean-up --- .../java/org/y20k/trackbook/MainActivity.java | 10 +++--- .../trackbook/MainActivityMapFragment.java | 4 +-- .../trackbook/MainActivityTrackFragment.java | 22 +++++++++++- .../org/y20k/trackbook/TrackerService.java | 13 ++++--- .../trackbook/helpers/NotificationHelper.java | 12 +++---- .../res/layout/activity_infosheet_about.xml | 34 +++++++++++-------- app/src/main/res/values-de/strings.xml | 10 +++--- app/src/main/res/values/strings.xml | 5 +-- build.gradle | 2 +- 9 files changed, 67 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/org/y20k/trackbook/MainActivity.java b/app/src/main/java/org/y20k/trackbook/MainActivity.java index d720bc0..f9bac8f 100644 --- a/app/src/main/java/org/y20k/trackbook/MainActivity.java +++ b/app/src/main/java/org/y20k/trackbook/MainActivity.java @@ -70,8 +70,6 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys { private FloatingActionButton mFloatingActionButton; private MainActivityMapFragment mMainActivityMapFragment; private BroadcastReceiver mTrackingStoppedReceiver; - private SectionsPagerAdapter mSectionsPagerAdapter; - private ViewPager mViewPager; @Override @@ -277,14 +275,14 @@ public class MainActivity extends AppCompatActivity implements TrackbookKeys { /* BEGIN NEW STUFF */ // Create the adapter that will return a fragment for each of the three // primary sections of the activity. - mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager()); + SectionsPagerAdapter sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager()); // Set up the ViewPager with the sections adapter. - mViewPager = (ViewPager) findViewById(R.id.container); - mViewPager.setAdapter(mSectionsPagerAdapter); + ViewPager viewPager = (ViewPager) findViewById(R.id.container); + viewPager.setAdapter(sectionsPagerAdapter); TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs); - tabLayout.setupWithViewPager(mViewPager); + tabLayout.setupWithViewPager(viewPager); /* END NEW STUFF */ // get reference to fragment diff --git a/app/src/main/java/org/y20k/trackbook/MainActivityMapFragment.java b/app/src/main/java/org/y20k/trackbook/MainActivityMapFragment.java index 2a1ac60..f9f5394 100644 --- a/app/src/main/java/org/y20k/trackbook/MainActivityMapFragment.java +++ b/app/src/main/java/org/y20k/trackbook/MainActivityMapFragment.java @@ -1,6 +1,6 @@ /** * MainActivityMapFragment.java - * Implements the main fragment of the main activity + * Implements the map fragment used in the map tab of the main activity * This fragment displays a map using osmdroid * * This file is part of @@ -557,7 +557,7 @@ public class MainActivityMapFragment extends Fragment implements TrackbookKeys { toggleLocationOffBar(); } - // start / stop perliminary tracking + // start / stop preliminary tracking if (!mLocationSystemSetting) { stopPreliminaryTracking(); } else if (!mTrackerServiceRunning && mFragmentVisible) { diff --git a/app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java b/app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java index da56808..ac492aa 100644 --- a/app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java +++ b/app/src/main/java/org/y20k/trackbook/MainActivityTrackFragment.java @@ -1,3 +1,19 @@ +/** + * MainActivityTrackFragment.java + * Implements the track fragment used in the track tab of the main activity + * This fragment displays a saved track + * + * This file is part of + * TRACKBOOK - Movement Recorder for Android + * + * Copyright (c) 2016 - Y20K.org + * Licensed under the MIT-License + * http://opensource.org/licenses/MIT + * + * Trackbook uses osmdroid - OpenStreetMap-Tools for Android + * https://github.com/osmdroid/osmdroid + */ + package org.y20k.trackbook; import android.os.Bundle; @@ -7,11 +23,15 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + /** - * Created by solaris on 16/09/16. + * MainActivityTrackFragment class */ public class MainActivityTrackFragment extends Fragment { + /* Define log tag */ + private static final String LOG_TAG = MainActivityTrackFragment.class.getSimpleName(); + /* Main class variables */ private View mRootView; diff --git a/app/src/main/java/org/y20k/trackbook/TrackerService.java b/app/src/main/java/org/y20k/trackbook/TrackerService.java index 57546bd..291d6a8 100644 --- a/app/src/main/java/org/y20k/trackbook/TrackerService.java +++ b/app/src/main/java/org/y20k/trackbook/TrackerService.java @@ -83,12 +83,6 @@ public class TrackerService extends Service implements TrackbookKeys, SensorEven // create content observer for changes in System Settings mSettingsContentObserver = new SettingsContentObserver( new Handler()); - // checking for empty intent - if (intent == null) { - LogHelper.v(LOG_TAG, "Null-Intent received. Stopping self."); - stopSelf(); - } - // check if user did turn off location in device settings if (!mLocationSystemSetting) { LogHelper.v(LOG_TAG, "Location Setting is turned off."); @@ -97,11 +91,16 @@ public class TrackerService extends Service implements TrackbookKeys, SensorEven return START_STICKY; } + // checking for empty intent + if (intent == null) { + LogHelper.v(LOG_TAG, "Null-Intent received. Stopping self."); + stopSelf(); + } // ACTION START else if (intent.getAction().equals(ACTION_START) && mLocationSystemSetting) { startTracking(intent); - } + } // ACTION STOP else if (intent.getAction().equals(ACTION_STOP) || !mLocationSystemSetting) { diff --git a/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.java b/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.java index f21f0b5..782f602 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.java +++ b/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.java @@ -155,11 +155,11 @@ public class NotificationHelper implements TrackbookKeys { int width = (int) resources.getDimension(android.R.dimen.notification_large_icon_width); Bitmap bitmap; - if (tracking) { - bitmap = getBitmap(R.drawable.ic_notification_large_tracking_48dp); - } else { - bitmap = getBitmap(R.drawable.ic_notification_large_not_tracking_48dp); - } + if (tracking) { + bitmap = getBitmap(R.drawable.ic_notification_large_tracking_48dp); + } else { + bitmap = getBitmap(R.drawable.ic_notification_large_not_tracking_48dp); + } return Bitmap.createScaledBitmap(bitmap, width, height, false); } @@ -179,6 +179,4 @@ public class NotificationHelper implements TrackbookKeys { } } - - } diff --git a/app/src/main/res/layout/activity_infosheet_about.xml b/app/src/main/res/layout/activity_infosheet_about.xml index 6b0a061..171fe41 100644 --- a/app/src/main/res/layout/activity_infosheet_about.xml +++ b/app/src/main/res/layout/activity_infosheet_about.xml @@ -26,35 +26,37 @@ android:layout_height="wrap_content" android:text="@string/infosheet_about_h2_recorder" android:textAppearance="@android:style/TextAppearance.Medium" - android:textStyle="bold" /> + android:textStyle="bold" + android:layout_marginTop="4dp" /> + android:textStyle="bold" + android:layout_marginTop="8dp" /> + android:layout_marginTop="8dp" /> + android:layout_marginTop="4dp" /> + android:layout_marginTop="4dp" /> + android:textAppearance="@android:style/TextAppearance.Small" + android:layout_marginTop="2dp" /> + android:layout_marginTop="8dp" /> + android:textAppearance="@android:style/TextAppearance.Small" + android:layout_marginTop="2dp" /> + android:layout_marginTop="8dp" /> + android:textAppearance="@android:style/TextAppearance.Small" + android:layout_marginTop="2dp" /> + android:layout_marginTop="8dp" /> + android:textAppearance="@android:style/TextAppearance.Small" + android:layout_marginTop="2dp" /> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c3e168e..5600b6c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -6,10 +6,10 @@ Mein Standort - Über + Über Trackbook - Über + Über Trackbook KARTE @@ -19,13 +19,13 @@ Trackbook ist aktiv Trackbook ist inaktiv Stopp - AUSBLENDEN um Kartenansicht zurückzusetzen + (Ausblenden setzt Kartenansicht zurück) Dauer Entfernung - Tracking wurde deaktiviert - Tracking wurde aktiviert + Tracking deaktiviert + Tracking aktiviert Standortdienste sind deaktiviert. Trackbook kann nicht aufzeichnen. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8c6c638..7801fe7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ + Trackbook @@ -8,7 +9,7 @@ About - About + About Trackbook MAP @@ -18,7 +19,7 @@ Trackbook running Trackbook not running Stop - SWIPE to clear map. + (swipe to clear map) Duration Distance diff --git a/build.gradle b/build.gradle index 77ce66e..a3330d4 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files