Skip to content

Commit 73cda1a

Browse files
committed
add SharedPreferencesStore,
fix not showing intro screens
1 parent 8ce8b64 commit 73cda1a

File tree

6 files changed

+50
-32
lines changed

6 files changed

+50
-32
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@
7979
android:name="io.fabric.ApiKey"
8080
android:value="d0f1e70e1d5744ad206e0eff1cd3c02cb3a2e4ab"/>
8181

82-
<meta-data
83-
android:name="io.gloop.ApiKey"
84-
android:value="8e962b49-3013-4ef3-8ac5-7fea1047fe4b"/>
85-
8682
<!--<meta-data-->
8783
<!--android:name="io.gloop.ApiKey"-->
88-
<!--android:value="18a2eb06-e0a8-4836-9ff0-bcb3c8ce3b8a"/>-->
89-
<!--<meta-data-->
90-
<!--android:name="io.gloop.Host"-->
91-
<!--android:value="192.168.0.87:8080"/>-->
84+
<!--android:value="8e962b49-3013-4ef3-8ac5-7fea1047fe4b"/>-->
85+
86+
<meta-data
87+
android:name="io.gloop.ApiKey"
88+
android:value="50ac6d59-8737-44e4-a09f-6fae0e7186dd"/>
89+
<meta-data
90+
android:name="io.gloop.Host"
91+
android:value="192.168.0.87:8080"/>
9292

9393
</application>
9494

app/src/main/java/io/gloop/drawed/DrawingView.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public DrawingView(Context context, AttributeSet attrs) {
5656

5757
//setup drawing
5858
private void setupDrawing() {
59-
6059
//prepare for drawing and setup paint stroke properties
6160
brushSize = getResources().getInteger(R.integer.medium_size);
6261
drawPath = new Path();

app/src/main/java/io/gloop/drawed/SplashActivity.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
import android.app.Activity;
44
import android.content.Intent;
5-
import android.content.SharedPreferences;
65
import android.os.Bundle;
7-
import android.preference.PreferenceManager;
86
import android.support.annotation.Nullable;
97

108
import com.crashlytics.android.Crashlytics;
@@ -15,6 +13,7 @@
1513
import io.gloop.Gloop;
1614
import io.gloop.drawed.utils.NameUtil;
1715
import io.gloop.drawed.utils.ScreenUtil;
16+
import io.gloop.drawed.utils.SharedPreferencesStore;
1817

1918
public class SplashActivity extends Activity {
2019

@@ -25,6 +24,8 @@ public void onCreate(Bundle icicle) {
2524
super.onCreate(icicle);
2625
Fabric.with(this, new Crashlytics());
2726
setContentView(R.layout.activity_splashscreen);
27+
28+
SharedPreferencesStore.setContext(getBaseContext());
2829
}
2930

3031

@@ -35,7 +36,7 @@ protected void onPostCreate(@Nullable Bundle savedInstanceState) {
3536
// setup screen util at start
3637
ScreenUtil.setActivity(this);
3738

38-
if (isFirstStart())
39+
if (SharedPreferencesStore.isFirstStart())
3940
showIntroOnFirstRun();
4041
else {
4142
new Thread(new Runnable() {
@@ -65,27 +66,19 @@ public void run() {
6566
}
6667
}
6768

68-
private boolean isFirstStart() {
69-
return PreferenceManager.getDefaultSharedPreferences(getBaseContext()).getBoolean(SHARED_PREFERENCES_FIRST_START, true);
70-
}
71-
7269
private void showIntroOnFirstRun() {
7370
// Declare a new thread to do a preference check
7471
new Thread(new Runnable() {
7572
@Override
7673
public void run() {
77-
SharedPreferences getPrefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
78-
7974
// If the activity has never started before...
80-
if (isFirstStart()) {
75+
if (SharedPreferencesStore.isFirstStart()) {
8176

8277
// Launch app intro
8378
Intent i = new Intent(SplashActivity.this, IntroActivity.class);
8479
startActivity(i);
8580

86-
SharedPreferences.Editor e = getPrefs.edit();
87-
e.putBoolean(SHARED_PREFERENCES_FIRST_START, false);
88-
e.apply();
81+
SharedPreferencesStore.setFirstRun(false);
8982
}
9083
}
9184
}).start();

app/src/main/java/io/gloop/drawed/dialogs/UserDialog.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
import android.app.PendingIntent;
66
import android.content.Context;
77
import android.content.Intent;
8-
import android.content.SharedPreferences;
98
import android.content.pm.PackageManager;
10-
import android.preference.PreferenceManager;
119
import android.support.annotation.NonNull;
1210
import android.view.View;
1311
import android.view.Window;
@@ -17,10 +15,9 @@
1715
import io.gloop.Gloop;
1816
import io.gloop.GloopLogger;
1917
import io.gloop.drawed.R;
18+
import io.gloop.drawed.utils.SharedPreferencesStore;
2019
import io.gloop.permissions.GloopUser;
2120

22-
import static io.gloop.drawed.SplashActivity.SHARED_PREFERENCES_FIRST_START;
23-
2421
/**
2522
* Created by Alex Untertrifaller on 09.06.17.
2623
*/
@@ -59,10 +56,7 @@ public void onClick(View view) {
5956
}
6057

6158
private static void resetShowIntroOnNextStart(final @NonNull Context context) {
62-
SharedPreferences getPrefs = PreferenceManager.getDefaultSharedPreferences(context);
63-
SharedPreferences.Editor e = getPrefs.edit();
64-
e.putBoolean(SHARED_PREFERENCES_FIRST_START, false);
65-
e.apply();
59+
SharedPreferencesStore.setFirstRun(true);
6660
}
6761

6862
private static void doRestart(Context c) {
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package io.gloop.drawed.utils;
2+
3+
import android.content.Context;
4+
import android.content.SharedPreferences;
5+
import android.preference.PreferenceManager;
6+
7+
import static io.gloop.drawed.SplashActivity.SHARED_PREFERENCES_FIRST_START;
8+
9+
/**
10+
* Created by Alex Untertrifaller on 06.09.17.
11+
*/
12+
13+
public class SharedPreferencesStore {
14+
15+
private static Context context;
16+
17+
public static void setContext(Context c) {
18+
context = c;
19+
}
20+
21+
public static boolean isFirstStart() {
22+
return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SHARED_PREFERENCES_FIRST_START, true);
23+
}
24+
25+
public static void setFirstRun(boolean enable) {
26+
SharedPreferences getPrefs = PreferenceManager.getDefaultSharedPreferences(context);
27+
SharedPreferences.Editor e = getPrefs.edit();
28+
e.putBoolean(SHARED_PREFERENCES_FIRST_START, enable);
29+
e.apply();
30+
}
31+
32+
}

app/version.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#Tue Sep 05 17:36:00 CEST 2017
2-
VERSION_CODE=252
1+
#Wed Sep 06 14:31:58 CEST 2017
2+
VERSION_CODE=258

0 commit comments

Comments
 (0)