mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #450 from veyndan/activity

Browse source 
Extend from AppCompatActivity instead of Activity
This commit is contained in:
Vivek Maskara 2017-03-21 05:44:19 +05:30 • committed by GitHub
commit bcda4474b9
9 changed files with 16 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View file

@ -32,11 +32,11 @@
<activity
android:name=".auth.LoginActivity"
android:theme="@style/NoTitle" >
>
</activity>
<activity
android:name=".WelcomeActivity"
android:theme="@style/NoTitle" >
>
</activity>
<activity
android:name=".upload.ShareActivity"

3
app/src/main/java/fr/free/nrw/commons/AboutActivity.java
View file

@ -21,6 +21,9 @@ public class AboutActivity extends BaseActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about);
getSupportActionBar().hide();
ButterKnife.bind(this);
uploadsToText.setText(CommonsApplication.EVENTLOG_WIKI);

2
app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
View file

@ -33,6 +33,8 @@ public class WelcomeActivity extends BaseActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_welcome);
getSupportActionBar().hide();
pager = (ViewPager)findViewById(R.id.welcomePager);
pager.setAdapter(new PagerAdapter() {
@Override

4
app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java
View file

@ -10,11 +10,11 @@ import android.os.Bundle;
import java.io.IOException;
import fr.free.nrw.commons.theme.BaseAppCompatActivity;
import fr.free.nrw.commons.theme.BaseActivity;
import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.Utils;
public abstract class AuthenticatedActivity extends BaseAppCompatActivity {
public abstract class AuthenticatedActivity extends BaseActivity {
String accountType;
CommonsApplication app;

2
app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
View file

@ -19,6 +19,8 @@ public class SignupActivity extends BaseActivity {
super.onCreate(savedInstanceState);
Log.d("SignupActivity", "Signup Activity started");
getSupportActionBar().hide();
webView = new WebView(this);
setContentView(webView);

4
app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
View file

@ -12,10 +12,10 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import fr.free.nrw.commons.theme.BaseAppCompatActivity;
import fr.free.nrw.commons.theme.BaseActivity;
import fr.free.nrw.commons.R;
public class NearbyActivity extends BaseAppCompatActivity {
public class NearbyActivity extends BaseActivity {
private MyLocationListener myLocationListener;
private LocationManager locationManager;

7
app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
View file

@ -1,14 +1,13 @@
package fr.free.nrw.commons.theme;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import fr.free.nrw.commons.R;
public class BaseActivity extends Activity {
public class BaseActivity extends AppCompatActivity {
boolean currentTheme;
@Override
@ -27,7 +26,7 @@ public class BaseActivity extends Activity {
protected void onResume() {
// Restart activity if theme is changed
boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true);
if(currentTheme!=newTheme){ // is activity theme changed
if(currentTheme!=newTheme){ //is activity theme changed
Intent intent = getIntent();
finish();
startActivity(intent);

36
app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java
View file

@ -1,36 +0,0 @@
package fr.free.nrw.commons.theme;
import android.content.Intent;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import fr.free.nrw.commons.R;
public class BaseAppCompatActivity extends AppCompatActivity {
boolean currentTheme;
@Override
protected void onCreate(Bundle savedInstanceState) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
currentTheme = true;
setTheme(R.style.DarkAppTheme);
}else {
currentTheme = false;
setTheme(R.style.LightAppTheme); // default
}
super.onCreate(savedInstanceState);
}
@Override
protected void onResume() {
// Restart activity if theme is changed
boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true);
if(currentTheme!=newTheme){ //is activity theme changed
Intent intent = getIntent();
finish();
startActivity(intent);
}
super.onResume();
}
}

4
app/src/main/res/values/styles.xml
View file

@ -43,10 +43,6 @@
<item name="colorControlNormal">#ffffff</item>
</style>
<style name="NoTitle" parent="DarkAppTheme">
<item name="android:windowNoTitle">true</item>
</style>
<style name="ProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" />
</resources>