Merge branch 'dev'

* dev: update whatsnew use simple class name for analytics fix crash on pre-lollipop
shalzz · Apr 24, 2018 · cc98d91 · cc98d91
2 parents f43cd43 + ede5325
commit cc98d91
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 8 deletions.
diff --git a/app/src/main/java/com/shalzz/attendance/ui/attendance/AttendanceListFragment.java b/app/src/main/java/com/shalzz/attendance/ui/attendance/AttendanceListFragment.java
@@ -194,7 +194,7 @@ public View onCreateView( @NonNull LayoutInflater inflater, ViewGroup container,
     @Override
     public void onStart() {
         super.onStart();
-        mTracker.setCurrentScreen(mActivity, getClass().getSimpleName(), getClass().getName());
+        mTracker.setCurrentScreen(mActivity, getClass().getSimpleName(), getClass().getSimpleName());
     }
 
     @Override

diff --git a/app/src/main/java/com/shalzz/attendance/ui/settings/AboutSettingsFragment.java b/app/src/main/java/com/shalzz/attendance/ui/settings/AboutSettingsFragment.java
@@ -61,7 +61,7 @@ public void onCreatePreferences(Bundle bundle, String s) {
     @Override
     public void onStart() {
         super.onStart();
-        mTracker.setCurrentScreen(mainActivity, getClass().getSimpleName(), getClass().getName());
+        mTracker.setCurrentScreen(mainActivity, getClass().getSimpleName(), getClass().getSimpleName());
     }
 
     @Override

diff --git a/app/src/main/java/com/shalzz/attendance/ui/settings/SettingsFragment.java b/app/src/main/java/com/shalzz/attendance/ui/settings/SettingsFragment.java
@@ -122,7 +122,7 @@ public void onCreatePreferences(Bundle bundle, String s) {
     @Override
     public void onStart() {
         super.onStart();
-        mTracker.setCurrentScreen(mActivity, getClass().getSimpleName(), getClass().getName());
+        mTracker.setCurrentScreen(mActivity, getClass().getSimpleName(), getClass().getSimpleName());
     }
 
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {

diff --git a/app/src/main/java/com/shalzz/attendance/ui/splash/SplashActivity.java b/app/src/main/java/com/shalzz/attendance/ui/splash/SplashActivity.java
@@ -27,7 +27,6 @@
 import com.bugsnag.android.Bugsnag;
 import com.bugsnag.android.Severity;
 import com.google.firebase.analytics.FirebaseAnalytics;
-import com.shalzz.attendance.BuildConfig;
 import com.shalzz.attendance.R;
 import com.shalzz.attendance.data.local.PreferencesHelper;
 import com.shalzz.attendance.ui.base.BaseActivity;

diff --git a/app/src/main/java/com/shalzz/attendance/ui/timetable/TimeTablePagerFragment.java b/app/src/main/java/com/shalzz/attendance/ui/timetable/TimeTablePagerFragment.java
@@ -81,7 +81,7 @@ public class TimeTablePagerFragment extends Fragment implements TimeTableMvpView
     @Override
     public void onStart() {
         super.onStart();
-        mTracker.setCurrentScreen(mActivity, getClass().getSimpleName(), getClass().getName());
+        mTracker.setCurrentScreen(mActivity, getClass().getSimpleName(), getClass().getSimpleName());
     }
 
     @Override

diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
@@ -1,2 +1 @@
-• Introduced Pro Mode which unlocks additional features.
-• Bug fixes and improvements
+• fix crash on pre-lollipop devices
diff --git a/app/src/main/res/drawable/launch_screen.xml b/app/src/main/res/drawable/launch_screen.xml
@@ -31,7 +31,7 @@
         android:height="64dp"
         android:gravity="top">
         <shape android:shape="rectangle">
-            <solid android:color="?colorPrimary"/>
+            <solid android:color="@color/primary"/>
         </shape>
     </item>