Skip to content

Fix for issue 52 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
duki994 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for issue 52 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
464d92f
Force portrait layout until all fragments have been loaded within act…
duki994 Aug 9, 2016
7130e69
Move MyPreferenceFragment out of Settings activity class
duki994 Aug 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/main/java/com/af/synapse/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.os.Build;
import android.os.Bundle;
Expand Down Expand Up @@ -117,6 +118,9 @@ protected void onCreate(Bundle savedInstanceState) {
setPaddingDimensions();
setContentView(R.layout.activity_loading);

if (!Utils.appStarted)
this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);

super.onCreate(fragments == null ? null : savedInstanceState);

if (fragments == null) {
Expand Down Expand Up @@ -189,6 +193,9 @@ private void continueCreate() {
setPaddingDimensions();
L.i("Interface creation finished in " + (System.nanoTime() - startTime) + "ns");

if (Utils.appStarted)
this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);

if (!BootService.getBootFlag() && !BootService.getBootFlagPending()) {
new AlertDialog.Builder(this)
.setTitle(R.string.popup_failed_boot_title)
Expand Down
34 changes: 34 additions & 0 deletions src/main/java/com/af/synapse/MyPreferenceFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.af.synapse;

import android.os.Bundle;
import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

import com.af.synapse.utils.Utils;


public class MyPreferenceFragment extends PreferenceFragment {

public MyPreferenceFragment() {
super();
}

@Override
public void onCreate(final Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
PreferenceManager.setDefaultValues(Utils.settingsActivity, R.xml.preference_main, true);
addPreferencesFromResource(R.xml.preference_main);
}

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup root, Bundle savedInstanceState){
View v = super.onCreateView(inflater, root, savedInstanceState);
if (v != null)
v.setPadding(0, MainActivity.topPadding, 0, 0);
return v;
}
}
22 changes: 0 additions & 22 deletions src/main/java/com/af/synapse/Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,9 @@
import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle;
import android.preference.PreferenceActivity;
import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;

import com.af.synapse.utils.Utils;
Expand Down Expand Up @@ -129,22 +125,4 @@ public boolean onOptionsItemSelected(MenuItem item) {

return super.onOptionsItemSelected(item);
}

public class MyPreferenceFragment extends PreferenceFragment {
@Override
public void onCreate(final Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
PreferenceManager.setDefaultValues(Settings.this, R.xml.preference_main, true);
addPreferencesFromResource(R.xml.preference_main);
}

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup root, Bundle savedInstanceState){
View v = super.onCreateView(inflater, root, savedInstanceState);
if (v != null)
v.setPadding(0, MainActivity.topPadding, 0, 0);
return v;
}
}
}