diff --git a/app/src/main/assets/svg/hamburger.svg b/app/src/main/assets/svg/hamburger.svg
deleted file mode 100644
index 86ff00b4..00000000
--- a/app/src/main/assets/svg/hamburger.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java
index 183211cc..e72930d4 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java
@@ -59,7 +59,6 @@ public class MainActivity extends BaseActivity implements RecentFragment.RecentF
private SectionsPagerAdapter sectionsPagerAdapter;
private ViewPager viewPager;
private TabLayout tabLayout;
- private ImageView drawerButton;
//Fix for vector drawables on android <21
static {
@@ -87,12 +86,15 @@ public class MainActivity extends BaseActivity implements RecentFragment.RecentF
return; //Avoid executing the code below
}
+ toolbar = findViewById(R.id.toolbar);
+ toolbar.setTitle("");
+ setSupportActionBar(toolbar);
+
//Initialize drawer
createDrawer();
tabLayout = findViewById(R.id.tabs);
viewPager = findViewById(R.id.container);
- drawerButton = findViewById(R.id.main_activity_open_drawer_btn);
//Create the adapter that will return a fragment for each section of the activity
sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
@@ -114,7 +116,6 @@ public class MainActivity extends BaseActivity implements RecentFragment.RecentF
updateTabIcon(i);
setMainActivity(this);
- setDrawerButtonListener();
}
@Override
@@ -292,17 +293,4 @@ public class MainActivity extends BaseActivity implements RecentFragment.RecentF
}
}
}
-
-
- private void setDrawerButtonListener()
- {
- this.drawerButton.setOnClickListener(new View.OnClickListener()
- {
- @Override
- public void onClick(View v)
- {
- drawer.openDrawer();
- }
- });
- }
}
\ No newline at end of file
diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index be9ec059..9d71710b 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -721,11 +721,10 @@ public abstract class BaseActivity extends AppCompatActivity {
@Override
public void onRequestPermissionsResult(int permsRequestCode, @NonNull String[] permissions
, @NonNull int[] grantResults) {
- switch (permsRequestCode) {
- case DOWNLOAD_REQUEST_CODE:
- if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED)
- prepareDownload(tempThmmyFile);
- break;
+ super.onRequestPermissionsResult(permsRequestCode, permissions, grantResults);
+ if (permsRequestCode == DOWNLOAD_REQUEST_CODE) {
+ if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED)
+ prepareDownload(tempThmmyFile);
}
}
diff --git a/app/src/main/res/drawable-anydpi/ic_hamburger.xml b/app/src/main/res/drawable-anydpi/ic_hamburger.xml
deleted file mode 100644
index 34ec2b86..00000000
--- a/app/src/main/res/drawable-anydpi/ic_hamburger.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-hdpi/ic_hamburger.png b/app/src/main/res/drawable-hdpi/ic_hamburger.png
deleted file mode 100644
index 495e80e3..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_hamburger.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_hamburger.png b/app/src/main/res/drawable-mdpi/ic_hamburger.png
deleted file mode 100644
index d2c88870..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_hamburger.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_hamburger.png b/app/src/main/res/drawable-xhdpi/ic_hamburger.png
deleted file mode 100644
index 85536ef9..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_hamburger.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hamburger.png b/app/src/main/res/drawable-xxhdpi/ic_hamburger.png
deleted file mode 100644
index c0da043c..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_hamburger.png and /dev/null differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9d12a05f..22c1bcbf 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -17,30 +17,28 @@
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
-
+
-
@@ -48,5 +46,5 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+ app:layout_behavior="@string/appbar_scrolling_view_behavior" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0491f5c5..43af28b3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -234,6 +234,4 @@
SessionSharedPrefs
- Button to open the drawer menu
-
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 28fe1690..5906eabc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -57,7 +57,7 @@