New Layout Added

aau-network-security · Jul 1, 2020 · 19f3db9 · 19f3db9
1 parent cc965fc
commit 19f3db9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -48,7 +48,7 @@
         android:icon="@drawable/ic_launcher"
         android:installLocation="preferExternal"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
+        android:theme="@style/Theme.App"
         android:vmSafeMode="true"
         android:largeHeap="true">
 

diff --git a/src/main/java/de/tudarmstadt/informatik/hostage/ui/activity/MainActivity.java b/src/main/java/de/tudarmstadt/informatik/hostage/ui/activity/MainActivity.java
@@ -4,7 +4,6 @@
 import java.util.List;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.Fragment;
@@ -36,7 +35,7 @@
 import android.widget.Toast;
 
 
-import android.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.legacy.app.ActionBarDrawerToggle;
@@ -68,7 +67,7 @@
  * @author Alexander Brakowski
  * @created 12.01.14 23:24
  */
-public class MainActivity extends Activity {
+public class MainActivity extends AppCompatActivity {
 	public static volatile Context context;
 
 	/** singleton instance of the MainActivity **/
@@ -250,7 +249,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		arr.recycle();
 
 		// configures the action bar
-		ActionBar actionBar = getActionBar();
+		ActionBar actionBar = getSupportActionBar();
 		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_HOME_AS_UP);
 		actionBar.setDisplayHomeAsUpEnabled(true);
 		actionBar.setHomeButtonEnabled(true);
@@ -289,13 +288,13 @@ protected void onCreate(Bundle savedInstanceState) {
 			R.string.drawer_close /* "close drawer" description for accessibility */
 		) {
 			public void onDrawerClosed(View view) {
-				getActionBar().setTitle(mTitle);
+				getSupportActionBar().setTitle(mTitle);
 				invalidateOptionsMenu(); // creates call to
 											// onPrepareOptionsMenu()
 			}
 
 			public void onDrawerOpened(View drawerView) {
-				getActionBar().setTitle(mDrawerTitle);
+				getSupportActionBar().setTitle(mDrawerTitle);
 				invalidateOptionsMenu(); // creates call to
 											// onPrepareOptionsMenu()
 			}
@@ -490,7 +489,7 @@ public void navigateBack(){
 	@Override
 	public void setTitle(CharSequence title) {
 		mTitle = title;
-		getActionBar().setTitle(mTitle);
+		getSupportActionBar().setTitle(mTitle);
 	}
 
 	/**