ownSoft/Chat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed phone number from profile (it's just invisible, not deleted)

Browse Source
This commit is contained in:
Lyndon
2017-10-13 10:42:34 +02:00
parent c2993c5574
commit ac1eec7bed
4 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
View File

@@ -70,45 +70,45 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
testCompile 'junit:junit:4.12'
// Android support libraries
compile 'com.android.support:appcompat-v7:25.3.0'
compile 'com.android.support:design:25.3.0'
// Butter Knife
compile 'com.jakewharton:butterknife:8.4.0'
apt 'com.jakewharton:butterknife-compiler:8.4.0'
// Dagger
compile 'com.google.dagger:dagger:2.7'
apt 'com.google.dagger:dagger-compiler:2.7'
provided 'javax.annotation:jsr250-api:1.0'
// Rx Java
compile 'io.reactivex:rxjava:1.1.6'
compile 'io.reactivex:rxandroid:1.2.1'
compile 'com.jakewharton.rxbinding:rxbinding:0.4.0'
// Retrofit
compile 'com.squareup.retrofit2:retrofit:2.1.0'
compile 'com.squareup.retrofit2:converter-gson:2.1.0'
compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
// OkHttp
compile 'com.squareup.okhttp3:okhttp:3.4.1'
compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
// Glide
compile 'com.github.bumptech.glide:glide:3.7.0'
// Circle ImageView
compile 'de.hdodenhof:circleimageview:2.1.0'
compile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
transitive = true;
}
// Secure Preferences
compile 'com.scottyab:secure-preferences-lib:0.1.4'
// Firebase
compile 'com.google.firebase:firebase-messaging:10.2.0'
// emojis
compile 'hani.momanii.supernova_emoji_library:supernova-emoji-library:0.0.2'
// circle progress
compile 'com.github.lzyzsd:circleprogress:1.2.1'
// event bus
compile 'com.android.support:appcompat-v7:25.3.0'
compile 'com.android.support:design:25.3.0'
compile 'com.jakewharton:butterknife:8.4.0'
compile 'com.google.dagger:dagger:2.7'
compile 'io.reactivex:rxjava:1.1.6'
compile 'io.reactivex:rxandroid:1.2.1'
compile 'com.jakewharton.rxbinding:rxbinding:0.4.0'
compile 'com.squareup.retrofit2:retrofit:2.1.0'
compile 'com.squareup.retrofit2:converter-gson:2.1.0'
compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
compile 'com.squareup.okhttp3:okhttp:3.4.1'
compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'de.hdodenhof:circleimageview:2.1.0'
compile 'com.scottyab:secure-preferences-lib:0.1.4'
compile 'com.google.firebase:firebase-messaging:10.2.0'
compile 'hani.momanii.supernova_emoji_library:supernova-emoji-library:0.0.2'
compile 'com.github.lzyzsd:circleprogress:1.2.1'
compile 'org.greenrobot:eventbus:3.0.0'
testCompile 'junit:junit:4.12'
apt 'com.jakewharton:butterknife-compiler:8.4.0'
apt 'com.google.dagger:dagger-compiler:2.7'
provided 'javax.annotation:jsr250-api:1.0'
}
task adp2upload(type: Exec, dependsOn: "build") {

19
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml
View File

@@ -9,52 +9,47 @@
<uses-permission android:name="android.permission.VIBRATE" />
<application
android:name="com.p3.bewoplaner.BewoplanerApplication"
android:name=".BewoplanerApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name="com.p3.bewoplaner.page.splash.SplashActivity"
android:name=".page.splash.SplashActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.FullBackground">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".page.login.LoginActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.FullBackground" />
<activity
android:name=".page.main.MainActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".page.impressum.ImpressumActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".page.chat.SingleChatActivity"
android:label=""
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/ChatStyle" />
<activity
android:name=".page.chat.GroupChatActivity"
android:label=""
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/ChatStyle" />
<activity
android:name=".page.chatmembers.ChatMembersActivity"
android:label=""
@@ -70,9 +65,9 @@
<action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
</intent-filter>
</service>
<service android:name=".utils.AppStoppedService" android:stopWithTask="false"/>
<service
android:name=".utils.AppStoppedService"
android:stopWithTask="false" />
<service android:name=".data.firebase.HandleMessagesService">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
@@ -100,6 +95,8 @@
<meta-data
android:name="com.google.firebase.messaging.default_notification_color"
android:resource="@color/colorDefault" />
<activity android:name=".page.chat.FileConfirmationActivity"></activity>
</application>
</manifest>

3
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatActivity.java
View File

@@ -265,15 +265,18 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha
private void selectFile(int requestCode) {
Intent intent;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
intent.addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION);
} else {
intent = new Intent(Intent.ACTION_GET_CONTENT);
}
intent.setType("*/*");
intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
startActivityForResult(Intent.createChooser(intent, getResources().getString(R.string.chat_select_file)), SELECT_FILE);
}

8
BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/fragment_profile.xml
View File

@@ -37,13 +37,14 @@
android:layout_height="0dp"
android:layout_marginTop="24dp"
android:layout_weight="1"
tools:text="Howard Hines" />
tools:text="Sasha Grey" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/profile_phone_number"
android:textSize="@dimen/profile_phone_number_subtext" />
android:textSize="@dimen/profile_phone_number_subtext"
android:visibility="invisible"/>
<EditText
android:id="@+id/profile_phone_number"
@@ -54,7 +55,8 @@
android:textSize="@dimen/profile_phone_number_text"
android:inputType="phone"
android:digits="0123456789+"
tools:text="775-206-8983" />
tools:text="775-206-8983"
android:visibility="invisible"/>
<Button
android:id="@+id/profile_update_button"