vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-24 13:22:08 +01:00
Code Issues Releases Wiki Activity

Merged latest master

Browse source
This commit is contained in:
vanitasvitae 2016-11-04 23:37:54 +01:00
commit 2b12747ddf
Signed by: vanitasvitae
GPG key ID: DCCFB3302C9E4615
13 changed files with 40 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/build.gradle
View file

@ -97,19 +97,6 @@ task copyRepoFiles(type: Copy) {
}
}
<<<<<<< HEAD
def downloadFile(filePath, url, downloadIfExists ) {
def f = new File(filePath)
if (f.exists() && downloadIfExists){
f.delete();
}
if (!f.exists()) {
new URL(url).withInputStream{ i -> f.withOutputStream{ it << i }}
}
}
tasks.copyRepoFiles.execute()
=======
// Downloads a file
def downloadFile(filePath, url, downloadIfExists) {
def f = new File(filePath)
@ -120,4 +107,3 @@ def downloadFile(filePath, url, downloadIfExists) {
}
tasks.copyRepoFiles.execute()
>>>>>>> master

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

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.github.dfa.diaspora_android">
xmlns:tools="http://schemas.android.com/tools"
package="com.github.dfa.diaspora_android"
tools:ignore="GoogleAppIndexingWarning">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@ -15,7 +17,8 @@
<provider
android:name="com.github.dfa.diaspora_android.service.HashtagContentProvider"
android:authorities="com.github.dfa.diaspora_android.mainactivity" />
android:authorities="com.github.dfa.diaspora_android.mainactivity"
android:exported="false"/>
<service
android:name="com.github.dfa.diaspora_android.service.FetchPodsService"

2
app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java
View file

@ -1,5 +1,6 @@
package com.github.dfa.diaspora_android.activity;
import android.annotation.SuppressLint;
import android.app.AlarmManager;
import android.app.AlertDialog;
import android.app.FragmentTransaction;
@ -284,6 +285,7 @@ public class SettingsActivity extends ThemedActivity {
*
* @param type 1 -> Primary Color, 2 -> Accent Color
*/
@SuppressLint("InflateParams")
public void showColorPickerDialog(final int type) {
final AppSettings appSettings = ((App) getActivity().getApplication()).getSettings();
final Context context = getActivity();

11
app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java
View file

@ -1,6 +1,7 @@
package com.github.dfa.diaspora_android.ui;
import android.annotation.SuppressLint;
import android.app.Dialog;
import android.os.Bundle;
import android.support.annotation.NonNull;
@ -9,6 +10,7 @@ import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.RadioGroup;
@ -93,6 +95,12 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
@BindView(R.id.podselection__dialog__text_protocol)
TextView textProtocol;
@BindView(R.id.podselection__dialog__btn_ok)
Button btnOk;
@BindView(R.id.podselection__dialog__btn_cancel)
Button btnCancel;
private PodSelectionDialogResultListener resultListener;
private View root;
private DiasporaPod pod = new DiasporaPod();
@ -100,6 +108,7 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
@NonNull
@Override
@SuppressLint("InflateParams")
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
LayoutInflater inflater = getActivity().getLayoutInflater();
@ -135,6 +144,8 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
textProfile.setTextColor(ThemeHelper.getAccentColor());
textProtocol.setTextColor(ThemeHelper.getAccentColor());
textTorPreset.setTextColor(ThemeHelper.getAccentColor());
btnOk.setTextColor(ThemeHelper.getAccentColor());
btnCancel.setTextColor(ThemeHelper.getAccentColor());
ThemeHelper.updateEditTextColor(editPodAddress);
ThemeHelper.updateEditTextColor(editPodName);

5
app/src/main/res/layout/main__nav_header.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nav_drawer"
android:layout_width="wrap_content"
android:layout_height="110dp"
android:background="@color/colorPrimary"
android:gravity="bottom"
android:orientation="vertical"
android:theme="@style/ThemeOverlay.AppCompat.Dark">
@ -36,7 +36,8 @@
android:layout_marginEnd="@dimen/activity_horizontal_margin_half"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:scaleType="fitCenter"
android:src="@drawable/ic_launcher" />
android:src="@drawable/ic_launcher"
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="wrap_content"

7
app/src/main/res/layout/podselection__dialog.xml
View file

@ -11,6 +11,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/buttonBarStyle"
android:orientation="vertical">
<TextView
@ -88,14 +89,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="http" />
android:text="@string/http" />
<RadioButton
android:id="@+id/podselection__dialog__radio_https"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="https" />
android:text="@string/https" />
</RadioGroup>
<TextView
@ -127,6 +128,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
style="?android:attr/buttonBarButtonStyle"
android:text="@android:string/cancel" />
<Button
@ -134,6 +136,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
style="?android:attr/buttonBarButtonStyle"
android:text="@android:string/ok" />
</LinearLayout>

3
app/src/main/res/menu/main__menu_bottom.xml
View file

@ -1,7 +1,8 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".activity.MainActivity">
tools:context=".activity.MainActivity"
tools:ignore="AlwaysShowAction">
<item

3
app/src/main/res/menu/main__menu_top.xml
View file

@ -1,7 +1,8 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".activity.MainActivity">
tools:context=".activity.MainActivity"
tools:ignore="AlwaysShowAction">
<item
android:id="@+id/action_notifications"

3
app/src/main/res/menu/main__menu_top__notifications_dropdown.xml
View file

@ -1,7 +1,8 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".activity.MainActivity">
tools:context=".activity.MainActivity"
tools:ignore="AlwaysShowAction">
<item
android:id="@+id/action_notifications"

4
app/src/main/res/menu/stream__menu_bottom.xml
View file

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AlwaysShowAction">
<item
android:icon="@drawable/ic_share_white_48px"

2
app/src/main/res/menu/stream__menu_top.xml
View file

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_reload"
android:icon="@drawable/ic_refresh_white_48px"
android:orderInCategory="1000"
android:title="@string/reload"
app:showAsAction="always" />
</menu>

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

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools"
tools:ignore="UnusedResources">
<color name="colorPrimary">@color/md_blue_650</color>
<color name="colorPrimaryDark">@color/md_blue_750</color>
<color name="colorAccent">@color/md_deep_orange_650</color>

2
app/src/main/res/values/strings.xml
View file

@ -120,6 +120,8 @@
<string name="podselection__custom_pod">Custom Pod</string>
<string name="pod_name">Pod name</string>
<string name="http_protocol">Protocol</string>
<string name="http" translatable="false">http</string>
<string name="https" translatable="false">https</string>
<string name="pod_address">Pod address</string>
<string name="missing_value">Missing value</string>
</resources>