1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-25 05:42:10 +01:00

changed package name due to organisation name

This commit is contained in:
scoute-dich 2016-03-25 23:24:45 +01:00
parent 2ffaa3f1f9
commit 30734f8f2a
18 changed files with 35 additions and 42 deletions

View file

@ -6,7 +6,7 @@ android {
useLibrary 'org.apache.http.legacy' useLibrary 'org.apache.http.legacy'
defaultConfig { defaultConfig {
applicationId "de.baumann.diaspora" applicationId "de.dfa.diaspora"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 23 targetSdkVersion 23
versionCode 17 versionCode 17

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.baumann.diaspora"> package="de.dfa.diaspora">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@ -10,11 +10,11 @@
android:allowBackup="true" android:allowBackup="true"
android:fullBackupContent="true" android:fullBackupContent="true"
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:name=".App" android:name="de.dfa.diaspora.App"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme" > android:theme="@style/AppTheme" >
<activity <activity
android:name=".SplashActivity" android:name="de.dfa.diaspora.SplashActivity"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name" android:label="@string/app_name"
@ -26,7 +26,7 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".PodsActivity" android:name="de.dfa.diaspora.PodsActivity"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/title_activity_pods" android:label="@string/title_activity_pods"
@ -34,7 +34,7 @@
android:windowSoftInputMode="stateHidden" > android:windowSoftInputMode="stateHidden" >
</activity> </activity>
<activity <activity
android:name=".MainActivity" android:name="de.dfa.diaspora.MainActivity"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:windowSoftInputMode="adjustResize" android:windowSoftInputMode="adjustResize"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
@ -43,7 +43,7 @@
</activity> </activity>
<activity <activity
android:name=".ShareActivity" android:name="de.dfa.diaspora.ShareActivity"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/new_post" android:label="@string/new_post"
@ -58,7 +58,7 @@
</activity> </activity>
<activity <activity
android:name=".ShareActivity2" android:name="de.dfa.diaspora.ShareActivity2"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/new_post" android:label="@string/new_post"
@ -74,7 +74,7 @@
</activity> </activity>
<service <service
android:name=".services.GetPodsService" android:name="de.dfa.diaspora.services.GetPodsService"
android:enabled="true" android:enabled="true"
android:exported="false" > android:exported="false" >
</service> </service>

View file

@ -1,10 +1,8 @@
package de.baumann.diaspora; package de.dfa.diaspora;
import android.app.Application; import android.app.Application;
import java.io.File; import de.dfa.diaspora.utils.AvatarImageLoader;
import de.baumann.diaspora.utils.AvatarImageLoader;
/** /**
* Created by gregor on 24.03.16. * Created by gregor on 24.03.16.

View file

@ -1,4 +1,4 @@
package de.baumann.diaspora; package de.dfa.diaspora;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;

View file

@ -1,4 +1,4 @@
package de.baumann.diaspora; package de.dfa.diaspora;
/** /**
* Created by juergen on 29.02.16. Part of Diaspora WebApp. * Created by juergen on 29.02.16. Part of Diaspora WebApp.

View file

@ -1,4 +1,4 @@
package de.baumann.diaspora; package de.dfa.diaspora;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;

View file

@ -17,7 +17,7 @@
If not, see <http://www.gnu.org/licenses/>. If not, see <http://www.gnu.org/licenses/>.
*/ */
package de.baumann.diaspora; package de.dfa.diaspora;
import android.Manifest; import android.Manifest;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
@ -80,8 +80,8 @@ import java.util.Date;
import butterknife.Bind; import butterknife.Bind;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import de.baumann.diaspora.utils.Helpers; import de.dfa.diaspora.utils.Helpers;
import de.baumann.diaspora.utils.SoftKeyboardStateWatcher; import de.dfa.diaspora.utils.SoftKeyboardStateWatcher;
public class MainActivity extends AppCompatActivity public class MainActivity extends AppCompatActivity
implements NavigationView.OnNavigationItemSelectedListener, WebUserProfileChangedListener { implements NavigationView.OnNavigationItemSelectedListener, WebUserProfileChangedListener {

View file

@ -17,7 +17,7 @@
If not, see <http://www.gnu.org/licenses/>. If not, see <http://www.gnu.org/licenses/>.
*/ */
package de.baumann.diaspora; package de.dfa.diaspora;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.AlertDialog; import android.app.AlertDialog;
@ -27,7 +27,6 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
@ -48,8 +47,8 @@ import android.widget.TextView;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import de.baumann.diaspora.services.GetPodsService; import de.dfa.diaspora.services.GetPodsService;
import de.baumann.diaspora.utils.Helpers; import de.dfa.diaspora.utils.Helpers;
public class PodsActivity extends AppCompatActivity { public class PodsActivity extends AppCompatActivity {

View file

@ -17,7 +17,7 @@
If not, see <http://www.gnu.org/licenses/>. If not, see <http://www.gnu.org/licenses/>.
*/ */
package de.baumann.diaspora; package de.dfa.diaspora;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
@ -46,7 +46,7 @@ import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import de.baumann.diaspora.utils.Helpers; import de.dfa.diaspora.utils.Helpers;
public class ShareActivity extends MainActivity { public class ShareActivity extends MainActivity {

View file

@ -17,12 +17,11 @@
If not, see <http://www.gnu.org/licenses/>. If not, see <http://www.gnu.org/licenses/>.
*/ */
package de.baumann.diaspora; package de.dfa.diaspora;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@ -47,7 +46,7 @@ import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import de.baumann.diaspora.utils.Helpers; import de.dfa.diaspora.utils.Helpers;
public class ShareActivity2 extends MainActivity { public class ShareActivity2 extends MainActivity {

View file

@ -17,10 +17,9 @@
If not, see <http://www.gnu.org/licenses/>. If not, see <http://www.gnu.org/licenses/>.
*/ */
package de.baumann.diaspora; package de.dfa.diaspora;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;

View file

@ -1,4 +1,4 @@
package de.baumann.diaspora; package de.dfa.diaspora;
import android.os.Handler; import android.os.Handler;
import android.util.Log; import android.util.Log;
@ -6,8 +6,6 @@ import android.util.Log;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import java.io.File;
/** /**
* Created by de-live-gdev on 24.03.16. Part of Diaspora WebApp. * Created by de-live-gdev on 24.03.16. Part of Diaspora WebApp.
*/ */

View file

@ -17,7 +17,7 @@
If not, see <http://www.gnu.org/licenses/>. If not, see <http://www.gnu.org/licenses/>.
*/ */
package de.baumann.diaspora.services; package de.dfa.diaspora.services;
import android.app.Service; import android.app.Service;
import android.content.Intent; import android.content.Intent;
@ -42,7 +42,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class GetPodsService extends Service { public class GetPodsService extends Service {
public static final String MESSAGE = "de.baumann.diaspora.podsreceived"; public static final String MESSAGE = "de.dfa.diaspora.podsreceived";
private static final String TAG = "Diaspora Pod Service"; private static final String TAG = "Diaspora Pod Service";

View file

@ -1,4 +1,4 @@
package de.baumann.diaspora.utils; package de.dfa.diaspora.utils;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@ -7,7 +7,7 @@ import android.widget.ImageView;
import java.io.File; import java.io.File;
import de.baumann.diaspora.ImageDownloadTask; import de.dfa.diaspora.ImageDownloadTask;
/** /**
* Created by Gregor Santner (de-live-gdev) on 24.03.16. * Created by Gregor Santner (de-live-gdev) on 24.03.16.

View file

@ -17,7 +17,7 @@
If not, see <http://www.gnu.org/licenses/>. If not, see <http://www.gnu.org/licenses/>.
*/ */
package de.baumann.diaspora.utils; package de.dfa.diaspora.utils;
import android.content.Context; import android.content.Context;

View file

@ -1,4 +1,4 @@
package de.baumann.diaspora.utils; package de.dfa.diaspora.utils;
/** /**
* Created by juergen on 25.03.16. Part of Diaspora WebApp. * Created by juergen on 25.03.16. Part of Diaspora WebApp.

View file

@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:context="de.baumann.myapplication.MainActivity"> tools:context="de.dfa.myapplication.MainActivity">
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -37,7 +37,7 @@
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
app:layout_behavior="de.baumann.diaspora.FloatingActionsMenuBehavior"> app:layout_behavior="de.dfa.diaspora.FloatingActionsMenuBehavior">
<com.getbase.floatingactionbutton.FloatingActionButton <com.getbase.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_top" android:id="@+id/fab_top"

View file

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="de.baumann.myapplication.MainActivity" tools:context="de.dfa.myapplication.MainActivity"
tools:showIn="@layout/app_bar_main"> tools:showIn="@layout/app_bar_main">
<android.support.v4.widget.SwipeRefreshLayout <android.support.v4.widget.SwipeRefreshLayout