Skip to content

Commit

Permalink
Merge pull request #39 from rumboalla/dev
Browse files Browse the repository at this point in the history 
Dev merge
  • Loading branch information
@rumboalla
rumboalla authored Mar 15, 2017
2 parents fa99954 + 1f6e779 commit 16be9f8
Show file tree
Hide file tree
Showing 10 changed files with 333 additions and 141 deletions.
8 changes: 4 additions & 4 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ dependencies {
apt "org.androidannotations:otto:$AAVersion"

compile "org.androidannotations:androidannotations-api:$AAVersion"
compile 'com.android.support:appcompat-v7:25.2.0'
compile 'com.android.support:design:25.2.0'
compile 'com.android.support:preference-v7:25.2.0'
compile 'com.android.support:cardview-v7:25.2.0'
compile 'com.android.support:appcompat-v7:25.3.0'
compile 'com.android.support:design:25.3.0'
compile 'com.android.support:preference-v7:25.3.0'
compile 'com.android.support:cardview-v7:25.3.0'
compile 'org.jsoup:jsoup:1.9.2'
compile 'com.squareup:otto:1.3.8'
compile 'com.google.code.gson:gson:2.7'
Expand Down
126 changes: 66 additions & 60 deletions app/src/main/java/com/apkupdater/activity/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.support.transition.AutoTransition;
import android.support.transition.TransitionManager;
import android.os.Handler;
import android.support.v4.app.Fragment;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
Expand All @@ -24,9 +22,9 @@
import com.apkupdater.service.UpdaterService_;
import com.apkupdater.util.AnimationUtil;
import com.apkupdater.util.MyBus;
import com.apkupdater.util.ServiceUtil;
import com.apkupdater.util.ThemeUtil;

import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.Bean;
import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.OptionsItem;
Expand Down Expand Up @@ -64,35 +62,51 @@ public class MainActivity
public void onCreate(
Bundle savedInstanceState
) {
setThemeFromOptions();
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Set theme and set activity content and toolbar
setThemeFromOptions();
setContentView(R.layout.activity_main);
setSupportActionBar(mToolbar);

@AfterViews
void init(
) {
checkFirstStart();
mBus.register(this);
setSupportActionBar(mToolbar);
mAppState.clearUpdates();

// Simulate a boot com.apkupdater.receiver to set alarm
new BootReceiver_().onReceive(getBaseContext(), null);

// Create fragments
mMainFragment = new MainFragment_();
mSettingsFragment = new SettingsFragment_();
mLogFragment = new LogFragment_();

// Add the main fragment and configure the correct state
// Add the main fragment
if (!(getSupportFragmentManager().findFragmentById(R.id.container) instanceof MainFragment)) {
getSupportFragmentManager().beginTransaction().add(R.id.container, mMainFragment).commit();
getSupportFragmentManager().beginTransaction()
.add(R.id.container, mMainFragment)
.add(R.id.container, mSettingsFragment)
.add(R.id.container, mLogFragment)
.show(mMainFragment)
.hide(mSettingsFragment)
.hide(mLogFragment)
.commit();
}

// Switch to the correct fragment
if (mAppState.getSettingsActive()) {
switchSettings(true);
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
switchSettings(true);
}
}, 1);
} else if (mAppState.getLogActive()) {
switchLog(true);
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
switchLog(true);
}
}, 1);
}
}

Expand All @@ -102,10 +116,26 @@ private void switchSettings(
boolean b
) {
if (b) {
replaceFragment(mSettingsFragment, true);
//replaceFragment(mSettingsFragment, true);

getSupportFragmentManager().beginTransaction()
.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_right, R.anim.slide_in_right, R.anim.slide_out_left)
.show(mSettingsFragment)
.hide(mMainFragment)
.hide(mLogFragment)
.commit();

changeToolbar(getString(R.string.action_settings), true);
} else {
replaceFragment(mMainFragment, false);
//replaceFragment(mMainFragment, false);

getSupportFragmentManager().beginTransaction()
.setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_left, R.anim.slide_in_left, R.anim.slide_out_right)
.show(mMainFragment)
.hide(mSettingsFragment)
.hide(mLogFragment)
.commit();

changeToolbar(getString(R.string.app_name), false);
}

Expand All @@ -118,33 +148,26 @@ private void switchLog(
boolean b
) {
if (b) {
replaceFragment(mLogFragment, true);
changeToolbar(getString(R.string.action_log), true);
} else {
replaceFragment(mMainFragment, false);
changeToolbar(getString(R.string.app_name), false);
}

mAppState.setLogActive(b);
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

private void replaceFragment(
Fragment f,
boolean in
) {
if (in) {
getSupportFragmentManager().beginTransaction()
.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_right, R.anim.slide_in_right, R.anim.slide_out_left)
.replace(R.id.container, f)
.commit();
.show(mLogFragment)
.hide(mMainFragment)
.hide(mSettingsFragment)
.commit();

changeToolbar(getString(R.string.action_log), true);
} else {
getSupportFragmentManager().beginTransaction()
.setCustomAnimations(R.anim.slide_in_right, R.anim.slide_out_left, R.anim.slide_in_left, R.anim.slide_out_right)
.replace(R.id.container, f)
.commit();
.show(mMainFragment)
.hide(mSettingsFragment)
.hide(mLogFragment)
.commit();

changeToolbar(getString(R.string.app_name), false);
}

mAppState.setLogActive(b);
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand All @@ -168,25 +191,6 @@ private void changeToolbar(
} catch (Exception e) {}
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

private void checkFirstStart(
) {
if (mAppState.getFirstStart()) {
// Remove any stored updates we had and reset tab position
mAppState.clearUpdates();
mAppState.setSelectedTab(0);

// Simulate a boot com.apkupdater.receiver to set alarm
new BootReceiver_().onReceive(getBaseContext(), null);

// Set the first start flag to false
mAppState.setFirstStart(false);
mAppState.setSettingsActive(false);
}
}


////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

@OptionsItem(R.id.action_settings)
Expand All @@ -200,7 +204,9 @@ void onSettingsClick(
@OptionsItem(R.id.action_update)
void onUpdateClick(
) {
UpdaterService_.intent(getApplication()).start();
if (!ServiceUtil.isServiceRunning(getBaseContext(), UpdaterService_.class)) {
UpdaterService_.intent(getApplication()).start();
}
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
20 changes: 20 additions & 0 deletions app/src/main/java/com/apkupdater/event/UpdateStartEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,26 @@

public class UpdateStartEvent
{
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

private int mNumUpdates;

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

public UpdateStartEvent(
int n
) {
mNumUpdates = n;
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

public int getNumUpdates(
) {
return mNumUpdates;
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
37 changes: 21 additions & 16 deletions app/src/main/java/com/apkupdater/fragment/LogFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.widget.ListView;

import com.apkupdater.R;
import com.apkupdater.adapter.LogAdapter;
import com.apkupdater.model.LogMessage;
import com.apkupdater.util.LogUtil;
import com.apkupdater.util.AnimationUtil;
import com.apkupdater.util.MyBus;
import com.squareup.otto.Subscribe;

import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.Bean;
Expand All @@ -32,30 +32,35 @@ public class LogFragment
LogAdapter mAdapter;

@Bean
LogUtil mLog;
MyBus mBus;

Bundle mSavedInstance;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

@AfterViews
public void init(
) {
mListView.setAdapter(mAdapter);
mBus.register(this);
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

@Override
public void onCreate(
@Nullable Bundle savedInstanceState
public void onDestroy(
) {
mSavedInstance = savedInstanceState;
super.onCreate(savedInstanceState);
super.onDestroy();
mBus.unregister(this);
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

@AfterViews
void init(
@Subscribe
public void onMessage(
LogMessage message
) {
mAdapter.clear();
for (LogMessage m : mLog.getMessages()) {
mAdapter.add(m);
}
mListView.setAdapter(mAdapter);
AnimationUtil.startListAnimation(mListView);
mAdapter.add(message);
mAdapter.notifyDataSetChanged();
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
Loading

0 comments on commit 16be9f8

Please sign in to comment.