diff --git a/.idea/misc.xml b/.idea/misc.xml index fbb6828..5d19981 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/framework/framework.iml b/framework/framework.iml index dad98d5..4465d18 100644 --- a/framework/framework.iml +++ b/framework/framework.iml @@ -67,14 +67,6 @@ - - - - - - - - @@ -83,6 +75,14 @@ + + + + + + + + diff --git a/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/activities/AppCompatPreferenceActivity.java b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/activities/AppCompatPreferenceActivity.java new file mode 100644 index 0000000..44578f4 --- /dev/null +++ b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/activities/AppCompatPreferenceActivity.java @@ -0,0 +1,109 @@ +package de.arcus.playmusicexporter2.activities; + +import android.content.res.Configuration; +import android.os.Bundle; +import android.preference.PreferenceActivity; +import android.support.annotation.LayoutRes; +import android.support.annotation.Nullable; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatDelegate; +import android.support.v7.widget.Toolbar; +import android.view.MenuInflater; +import android.view.View; +import android.view.ViewGroup; + +/** + * A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls + * to be used with AppCompat. + */ +public abstract class AppCompatPreferenceActivity extends PreferenceActivity { + + private AppCompatDelegate mDelegate; + + @Override + protected void onCreate(Bundle savedInstanceState) { + getDelegate().installViewFactory(); + getDelegate().onCreate(savedInstanceState); + super.onCreate(savedInstanceState); + } + + @Override + protected void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + getDelegate().onPostCreate(savedInstanceState); + } + + public ActionBar getSupportActionBar() { + return getDelegate().getSupportActionBar(); + } + + public void setSupportActionBar(@Nullable Toolbar toolbar) { + getDelegate().setSupportActionBar(toolbar); + } + + @Override + public MenuInflater getMenuInflater() { + return getDelegate().getMenuInflater(); + } + + @Override + public void setContentView(@LayoutRes int layoutResID) { + getDelegate().setContentView(layoutResID); + } + + @Override + public void setContentView(View view) { + getDelegate().setContentView(view); + } + + @Override + public void setContentView(View view, ViewGroup.LayoutParams params) { + getDelegate().setContentView(view, params); + } + + @Override + public void addContentView(View view, ViewGroup.LayoutParams params) { + getDelegate().addContentView(view, params); + } + + @Override + protected void onPostResume() { + super.onPostResume(); + getDelegate().onPostResume(); + } + + @Override + protected void onTitleChanged(CharSequence title, int color) { + super.onTitleChanged(title, color); + getDelegate().setTitle(title); + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + getDelegate().onConfigurationChanged(newConfig); + } + + @Override + protected void onStop() { + super.onStop(); + getDelegate().onStop(); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + getDelegate().onDestroy(); + } + + public void invalidateOptionsMenu() { + getDelegate().invalidateOptionsMenu(); + } + + private AppCompatDelegate getDelegate() { + if (mDelegate == null) { + mDelegate = AppCompatDelegate.create(this, null); + } + return mDelegate; + } +} diff --git a/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/services/ExportAllJob.java b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/services/ExportAllJob.java new file mode 100644 index 0000000..b82b331 --- /dev/null +++ b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/services/ExportAllJob.java @@ -0,0 +1,8 @@ +package de.arcus.playmusicexporter2.services; + +/** + * Created by jcgruenhage on 11/28/16. + */ + +public class ExportAllJob { +} diff --git a/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/services/ExportAllService.java b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/services/ExportAllService.java new file mode 100644 index 0000000..4451911 --- /dev/null +++ b/playmusicexporter/src/main/java/de/arcus/playmusicexporter2/services/ExportAllService.java @@ -0,0 +1,8 @@ +package de.arcus.playmusicexporter2.services; + +/** + * Created by jcgruenhage on 11/28/16. + */ + +public class ExportAllService { +} diff --git a/playmusiclib/playmusiclib.iml b/playmusiclib/playmusiclib.iml index 3b7fcb2..11d5cb3 100644 --- a/playmusiclib/playmusiclib.iml +++ b/playmusiclib/playmusiclib.iml @@ -67,14 +67,6 @@ - - - - - - - - @@ -83,6 +75,14 @@ + + + + + + + +