diff --git a/.gitignore b/.gitignore index 93d25cf2..09b993d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,7 @@ *.iml .gradle /local.properties -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/caches -/.idea/tasks.xml -/.idea/gradle.xml -/.idea/dictionaries +/.idea .DS_Store /build /captures diff --git a/app/src/main/java/com/deniscerri/ytdlnis/page/settings/SettingsActivity.java b/app/src/main/java/com/deniscerri/ytdlnis/page/settings/SettingsActivity.java index 91251e27..c100b88a 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/page/settings/SettingsActivity.java +++ b/app/src/main/java/com/deniscerri/ytdlnis/page/settings/SettingsActivity.java @@ -24,9 +24,7 @@ public class SettingsActivity extends AppCompatActivity{ context = getBaseContext(); topAppBar = findViewById(R.id.settings_toolbar); topAppBar.setNavigationOnClickListener(view -> onBackPressed()); - fm = getSupportFragmentManager(); - fm.beginTransaction() .replace(R.id.settings_frame_layout, new SettingsFragment()) .commit(); diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 8dc923b6..91ae690d 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -30,6 +30,7 @@ app:layout_scrollFlags="scroll|enterAlways|snap" app:title="@string/settings" android:layout_width="match_parent" + app:navigationIcon="@drawable/ic_back" android:layout_height="match_parent"/> diff --git a/app/src/main/res/layout/downloads_no_results.xml b/app/src/main/res/layout/downloads_no_results.xml index 6273c13b..68f73f23 100644 --- a/app/src/main/res/layout/downloads_no_results.xml +++ b/app/src/main/res/layout/downloads_no_results.xml @@ -7,21 +7,18 @@ android:layout_height="match_parent"> @@ -46,16 +44,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@drawable/ic_app_icon" /> - - - + android:background="@drawable/ic_app_icon" + android:scaleType="center" /> diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml deleted file mode 100644 index c665ebc1..00000000 --- a/app/src/main/res/values-v31/styles.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - -