diff --git a/.gitignore b/.gitignore index 4cd1c5ee..21da4996 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ /captures keystore.jks keystore.properties +fastlane/fastlane.json +Gemfile +Gemfile.lock diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index ef74273d..418e7fb6 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -16,7 +16,6 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:background="@color/color_primary" - app:layout_scrollFlags="scroll|enterAlways" app:title="@string/settings" app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />