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

Update design #40, fixes #65

Browse source
This commit is contained in:
Gregor Santner 2016-09-09 20:56:43 +02:00
parent 1b06e20c84
commit 1dcd05af10
17 changed files with 50 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.hidden
View file

@ -1,4 +1,3 @@
build
crowdin.yaml
diaspora-android.iml
gradle

4
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -202,7 +202,7 @@ public class MainActivity extends AppCompatActivity
boolean newWebView = (webView == null);
if(newWebView) {
Log.d(App.TAG, "Webview was null. Create new one.");
View webviewHolder = getLayoutInflater().inflate(R.layout.webview, this.contentLayout);
View webviewHolder = getLayoutInflater().inflate(R.layout.webview, this.contentLayout, false);
webView = (ContextMenuWebView) webviewHolder.findViewById(R.id.webView);
((LinearLayout)webView.getParent()).removeView(webView);
setupWebView(savedInstanceState);
@ -806,7 +806,7 @@ public class MainActivity extends AppCompatActivity
if (WebHelper.isOnline(MainActivity.this)) {
final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
View layout = getLayoutInflater().inflate(R.layout.dialog_search__people_tags, contentLayout);
View layout = getLayoutInflater().inflate(R.layout.dialog_search__people_tags, contentLayout, false);
final EditText input = (EditText) layout.findViewById(R.id.dialog_search__input);
final DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() {
@Override

8
app/src/main/java/com/github/dfa/diaspora_android/activity/SplashActivity.java
View file

@ -36,9 +36,6 @@ import butterknife.ButterKnife;
public class SplashActivity extends AppCompatActivity {
private App app;
@BindView(R.id.splash__splashimage)
ImageView imgSplash;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -46,11 +43,6 @@ public class SplashActivity extends AppCompatActivity {
ButterKnife.bind(this);
app = (App) getApplication();
TypedArray images = getResources().obtainTypedArray(R.array.splash_images);
int choice = (int) (Math.random() * images.length());
imgSplash.setImageResource(images.getResourceId(choice, R.drawable.splashscreen1));
images.recycle();
int delay = getResources().getInteger(R.integer.splash_delay);
new Handler().postDelayed(startActivityRunnable, delay);
}

BIN
app/src/main/res/drawable/header.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 106 KiB

2
app/src/main/res/drawable/ic_email_colored_48px.xml
View file

@ -1,4 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#EBFF7C" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
<path android:fillColor="#4CAF50" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
</vector>

2
app/src/main/res/drawable/ic_notifications_colored_48px.xml
View file

@ -1,4 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#EBFF7C" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
<path android:fillColor="#4CAF50" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
</vector>

BIN
app/src/main/res/drawable/splashscreen1.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 610 KiB

BIN
app/src/main/res/drawable/splashscreen2.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 504 KiB

BIN
app/src/main/res/drawable/splashscreen3.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 368 KiB

BIN
app/src/main/res/drawable/splashscreen4.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 347 KiB

BIN
app/src/main/res/drawable/splashscreen5.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 383 KiB

BIN
app/src/main/res/drawable/splashscreen6.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 644 KiB

3
app/src/main/res/layout/main__activity.xml
View file

@ -19,6 +19,9 @@
android:layout_height="match_parent"
android:layout_gravity="start"
android:fitsSystemWindows="true"
app:itemTextColor="@color/primary_text"
app:paddingEnd="0dp"
app:paddingStart="0dp"
app:headerLayout="@layout/main__nav_header"
app:menu="@menu/main__navdrawer" />

31
app/src/main/res/layout/splash__activity.xml
View file

@ -1,15 +1,40 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/primary"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".activity.SplashActivity">
<ImageView
android:id="@+id/splash__splashimage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
android:src="@drawable/splashscreen1" />
android:shadowColor="@color/black"
android:minHeight="100dp"
android:scaleType="fitXY"
android:minWidth="100dp"
android:src="@drawable/ic_launcher"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="15dp"
android:shadowColor="@color/black"
android:shadowDx="-4"
android:shadowDy="4"
android:shadowRadius="6"
android:text="@string/app_name"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/white"
android:textSize="32sp"
android:textStyle="bold"/>
</RelativeLayout>

9
app/src/main/res/values/arrays.xml
View file

@ -1,11 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<array name="splash_images">
<item>@drawable/splashscreen1</item>
<item>@drawable/splashscreen2</item>
<item>@drawable/splashscreen3</item>
<item>@drawable/splashscreen4</item>
<item>@drawable/splashscreen5</item>
<item>@drawable/splashscreen6</item>
</array>
</resources>

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

@ -5,10 +5,16 @@
<color name="colorAccent">@color/accent</color>
<!-- Colors from Palette -->
<color name="primary">#608b6f</color> <!-- #607d8b -->
<color name="primary_dark">#608b6f</color> <!-- #607d8b -->
<color name="accent">#8b685b</color> <!-- #4CAF50 -->
<color name="primary">#3F51B5</color>
<color name="primary_dark">#303F9F</color>
<color name="primary_light">#C5CAE9</color>
<color name="accent">#4CAF50</color>
<color name="primary_text">#212121</color>
<color name="secondary_text">#757575</color>
<color name="icons">#FFFFFF</color>
<color name="divider">#BDBDBD</color>
<!-- End colors from Palette -->
<color name="white">#ffffff</color>
<color name="black">#000000</color>
</resources>

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

@ -1,6 +1,6 @@
<resources>
<!-- App - AppName specific -->
<string name="diaspora" translatable="false">Diaspora</string>
<string name="diaspora" translatable="false">diaspora*</string>
<string name="diaspora_for_android" translatable="false">Diaspora for Android</string>
<string name="app_name" translatable="false">@string/diaspora</string>
<string name="app_hashtag" translatable="false">#DiasporaForAndroid</string>