gilardh
/
SilentDragonAndroid
forked from hush/SilentDragonAndroid-old
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Removed icon in main Activity; Changed text colors of Chat and fix the gui

chat
N1CK145 5 years ago
parent
1e855ca72f
commit
9e3053ca80
5 changed files with 100 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/src/main/java/org/myhush/silentdragon/Addressbook.kt
  2. 129
      app/src/main/res/layout/content_main.xml
  3. 5
      app/src/main/res/layout/fragment_conversation_item_recive.xml
  4. 20
      app/src/main/res/layout/fragment_conversation_item_send.xml
  5. 1
      app/src/main/res/values/colors.xml

4
app/src/main/java/org/myhush/silentdragon/Addressbook.kt
View File

@ -38,6 +38,6 @@ class Addressbook {
if (it.firstName == firstName && it.lastName == lastName)
list.add(it)
}
return list }
return list
}
}

129
app/src/main/res/layout/content_main.xml
View File

@ -52,86 +52,109 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtMainBalance" />
<ImageView
android:id="@+id/imageView3"
android:layout_width="wrap_content"
android:layout_height="80dp"
android:layout_marginTop="107dp"
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swiperefresh"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/bottomNav"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_launcher_dragon_foreground" />
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swiperefresh"
android:layout_width="match_parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2">
<ScrollView
android:id="@+id/scrollViewTxns"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:clipToPadding="false"
android:fillViewport="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView3" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@+id/bottomNav">
app:layout_constraintTop_toBottomOf="parent">
<LinearLayout
android:id="@+id/txList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" android:id="@+id/scrollViewTxns"
app:layout_constraintBottom_toBottomOf="parent" android:layout_marginBottom="16dp"
android:fillViewport="true" android:clipToPadding="false"
android:layout_marginTop="8dp" app:layout_constraintTop_toBottomOf="parent">
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/txList" android:orientation="vertical">
<TextView
android:text="Past Transactions"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:id="@+id/textView2" android:textStyle="bold"
android:textSize="18sp" android:padding="16dp"/>
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:text="Past Transactions"
android:textSize="18sp"
android:textStyle="bold" />
</LinearLayout>
</ScrollView>
</android.support.v4.widget.SwipeRefreshLayout>
<android.support.constraint.ConstraintLayout
android:id="@+id/layoutConnect"
android:layout_width="match_parent"
android:layout_height="364dp" app:layout_constraintTop_toBottomOf="@+id/imageView3"
android:layout_marginBottom="32dp" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="32dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp"
android:id="@+id/layoutConnect">
android:layout_height="364dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="32dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView2">
<ImageView
android:id="@+id/imageView5"
android:layout_width="72dp"
android:layout_height="72dp"
android:src="@mipmap/ic_silent_dragon_round"
android:id="@+id/imageView5" app:layout_constraintTop_toTopOf="parent"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="0.22000003" app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="8dp"/>
android:layout_marginBottom="8dp"
android:src="@mipmap/ic_silent_dragon_round"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.22000003" />
<Button
android:text="Scan QR Code"
android:id="@+id/btnConnect"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btnConnect" app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/imageView5"/>
android:layout_marginEnd="8dp"
android:text="Scan QR Code"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView5" />
<TextView
android:text="OR"
android:id="@+id/lblConnectionOr"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/lblConnectionOr" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/btnConnect" app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="8dp" android:textAlignment="center"/>
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="OR"
android:textAlignment="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btnConnect" />
<Button
android:text="Reconnect"
android:id="@+id/btnReconnect"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btnReconnect" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@+id/lblConnectionOr" app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="8dp"/>
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="Reconnect"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/lblConnectionOr" />
</android.support.constraint.ConstraintLayout>
<android.support.design.widget.BottomNavigationView
android:layout_width="match_parent"

5
app/src/main/res/layout/fragment_conversation_item_recive.xml
View File

@ -7,14 +7,15 @@
tools:context=".conversation_item_send" >
<TextView
android:id="@+id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginStart="9dp"
android:layout_marginTop="10dp"
android:background="@drawable/chat_background_recive"
android:maxWidth="260sp"
android:padding="10sp"
android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr"
android:textColor="@color/message_text"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>

20
app/src/main/res/layout/fragment_conversation_item_send.xml
View File

@ -10,12 +10,28 @@
android:id="@+id/message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="9dp"
android:background="@drawable/chat_background_send"
android:maxWidth="260sp"
android:padding="10sp"
android:paddingLeft="10sp"
android:paddingTop="10sp"
android:paddingRight="5sp"
android:paddingBottom="25sp"
android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."
android:textColor="@color/message_text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/Time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginBottom="5dp"
android:text="10:15 AM"
android:textColor="@color/message_text"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/message"
app:layout_constraintStart_toStartOf="@+id/message" />
</android.support.constraint.ConstraintLayout>

1
app/src/main/res/values/colors.xml
View File

@ -12,4 +12,5 @@
<color name="charcole">#36454f</color>
<color name="message_send">#aa007878</color>
<color name="message_recive">#aa00bbbb</color>
<color name="message_text">#cccccc</color>
</resources>

Write Preview
Loading…
Cancel
Save