tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finished the new about screens layout. Now only the onClick listeners are missing.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-09-05 21:21:56 +02:00
commit 7eddffed74
57 changed files with 892 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

65
app/src/main/java/com/kabouzeid/gramophone/dialogs/AboutDialog.java
View file

@ -1,65 +0,0 @@
package com.kabouzeid.gramophone.dialogs;
import android.app.Dialog;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.text.TextUtils;
import com.afollestad.materialdialogs.MaterialDialog;
import com.kabouzeid.gramophone.R;
/**
* @author Karim Abou Zeid (kabouzeid), Aidan Follestad (afollestad)
*/
public class AboutDialog extends LeakDetectDialogFragment {
private static String getCurrentVersionName(@NonNull final Context context) {
String versionName;
try {
versionName = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
} catch (PackageManager.NameNotFoundException e) {
return "Unknown";
}
return versionName;
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new MaterialDialog.Builder(getActivity())
.title(getActivity().getResources().getString(R.string.app_name) + " " + getCurrentVersionName(getActivity()))
.iconRes(R.drawable.ic_launcher)
.content(TextUtils.concat(getActivity().getResources().getText(R.string.credits_1),
" ",
getActivity().getResources().getText(R.string.karim_abou_zeid),
".\n",
getActivity().getResources().getText(R.string.karim_abou_zeid_links),
"\n\n",
getActivity().getResources().getText(R.string.special_thanks_to),
" ",
getActivity().getResources().getText(R.string.aidan_follestad),
".\n\n",
getActivity().getResources().getText(R.string.credits_3),
" ",
getActivity().getResources().getText(R.string.cookicons),
".\n\n",
getActivity().getResources().getText(R.string.play_store_illustration_by),
" ",
getActivity().getResources().getText(R.string.maarten_corpel),
"."
)
)
.positiveText(android.R.string.ok)
.neutralText(R.string.changelog)
.callback(new MaterialDialog.ButtonCallback() {
@Override
public void onNeutral(MaterialDialog dialog) {
super.onNeutral(dialog);
ChangelogDialog.create().show(getActivity().getSupportFragmentManager(), "CHANGE_LOG_DIALOG");
}
})
.build();
}
}

58
app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java Normal file
View file

@ -0,0 +1,58 @@
package com.kabouzeid.gramophone.ui.activities;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
import butterknife.Bind;
import butterknife.ButterKnife;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class AboutActivity extends AbsBaseActivity {
@Bind(R.id.toolbar)
Toolbar toolbar;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about);
setStatusBarTransparent();
ButterKnife.bind(this);
toolbar.setBackgroundColor(getThemeColorPrimary());
setSupportActionBar(toolbar);
//noinspection ConstantConditions
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (shouldColorNavigationBar())
setNavigationBarThemeColor();
setStatusBarThemeColor();
}
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
if (item.getItemId() == android.R.id.home) {
onBackPressed();
return true;
}
return super.onOptionsItemSelected(item);
}
private static String getCurrentVersionName(@NonNull final Context context) {
String versionName;
try {
versionName = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
} catch (PackageManager.NameNotFoundException e) {
return "Unknown";
}
return versionName;
}
}

3
app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
View file

@ -49,7 +49,6 @@ import com.anjlab.android.iab.v3.TransactionDetails;
import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.adapter.PagerAdapter;
import com.kabouzeid.gramophone.dialogs.AboutDialog;
import com.kabouzeid.gramophone.dialogs.ChangelogDialog;
import com.kabouzeid.gramophone.dialogs.CreatePlaylistDialog;
import com.kabouzeid.gramophone.dialogs.SleepTimerDialog;
@ -254,7 +253,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
new AboutDialog().show(getSupportFragmentManager(), "ABOUT_DIALOG");
startActivity(new Intent(MainActivity.this, AboutActivity.class));
}
}, 300);
break;